Merge branch 'develop' into user-sessions-page

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -40,7 +40,7 @@ Here are some things you should know when contributing:
       ```
 
 ## Versioning
-As of NamelessMC 2.0.0 (to be released at time of writing), we use a unique versioning system.
+As of NamelessMC 2.0.0, we use a unique versioning system.
 Similar to [semver](https://semver.org), we follow the `major.minor.patch` versioning pattern, however there are a few things to note:
 - We use the naming `constant.major.patch` compared to semver.
 - The `constant` version is pinned at `2` for the time being.
@@ -89,6 +89,6 @@ After adding a new module to core, you need to do the following:
 ## Releasing a new version
 
 1. Ensure you have a clean copy of the source code without leftover files from testing. For example, clone the Nameless repository into a new directory
-2. Run ./release.sh. Release zip files are produced and placed in `./release`.
+2. Run ./dev/scripts/release.sh. Release zip files are produced and placed in `./release`.
 3. TODO: Add instructions for producing a zip only containing files changed since the last release
 4. TODO: Add instructions for publishing a release

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -16,11 +16,8 @@ body:
       description: From StaffCP -> Overview
       options:
         - Development version
-        - 2.0.3
-        - 2.0.2
-        - 2.0.1
-        - 2.0.0
-        - < 2.0.0
+        - 2.1.0
+        - < 2.1.0
     validations:
       required: true
 

SECURITY.md → .github/SECURITY.md

@@ -6,11 +6,11 @@ We endeavour to respond to and patch high-severity security vulnerabilities as s
 
 The following NamelessMC releases are supported by the development team
 
-| Version       | Supported          |
-|---------------|--------------------|
-| 2.0.x         | :white_check_mark: |
-| <= 2.0.0-pr13 | :x:                |
-| <= 1.0.22     | :x:                |
+| Version   | Supported          |
+|-----------|--------------------|
+| 2.1.x     | :white_check_mark: |
+| <= 2.0.3  | :x:                |
+| <= 1.0.22 | :x:                |
 
 ## Reporting a Vulnerability
 

.github/workflows/ci.yml

@@ -13,15 +13,15 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.16.0
+        uses: shivammathur/setup-php@2.24.0
         with:
           php-version: ${{ matrix.php-versions }}
 
       - name: Install dependencies
         run: composer update --no-interaction --no-suggest --no-progress
 
       - name: Execute PHPStan
-        run: vendor/bin/phpstan
+        run: vendor/bin/phpstan --configuration=dev/phpstan.neon
 
   code-style:
     runs-on: ubuntu-latest
@@ -31,7 +31,7 @@ jobs:
       - name: PHP Code Style (phpcs)
         uses: chindit/actions-phpcs@master
         with:
-          cli: "-q"
+          cli: -q --standard=dev/phpcs.xml
 
   unused-language-term-check:
     runs-on: ubuntu-latest

.gitignore

@@ -1,3 +1,4 @@
+/.fleet/
 /.idea/
 /core/config.php
 /cache
@@ -10,5 +11,6 @@
 /uploads/avatars/**
 /node_modules/
 composer.lock
+checksums.json
 /.node_cache/
 /release/

CHANGELOG.md

@@ -1,7 +1,107 @@
 # NamelessMC v2 Changelog
 
-## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.0.0...v2)
-> [Milestone](https://github.com/NamelessMC/Nameless/milestone/18)
+## [Unreleased](https://github.com/NamelessMC/Nameless/compare/v2.1.0...v2)
+> [Milestone](https://github.com/NamelessMC/Nameless/milestone/21)
+
+## [2.1.0](https://github.com/NamelessMC/Nameless/compare/v2.0.3...v2.1.0) - 2023-05-01
+### Added
+- Add dark mode toggle switch [#2877](https://github.com/NamelessMC/Nameless/pull/2877)
+- Add option to use OAuth linking method for Discord Integration [#3051](https://github.com/NamelessMC/Nameless/pull/3051)
+- Add limit setting to latest posts widget [#2862](https://github.com/NamelessMC/Nameless/issues/2862), [#3107](https://github.com/NamelessMC/Nameless/pull/3107)
+- Add option for user to reset their avatar [#3042](https://github.com/NamelessMC/Nameless/issues/3042), [#3100](https://github.com/NamelessMC/Nameless/pull/3100)
+- Add integrations settings system & Setting to turn off mc username requirement [#3043](https://github.com/NamelessMC/Nameless/issues/3043), [#3109](https://github.com/NamelessMC/Nameless/pull/3109)
+- Add semantic config and change node_modules copy method [#3111](https://github.com/NamelessMC/Nameless/pull/3111)
+- Add createWebhookEndpoint [#3096](https://github.com/NamelessMC/Nameless/pull/3096)
+- Add new webhook events for profile posts and profile post replies [#3073](https://github.com/NamelessMC/Nameless/pull/3073)
+- Add Finnish language [#3117](https://github.com/NamelessMC/Nameless/pull/3117)
+- Add groups parameter to list users endpoint [#3052](https://github.com/NamelessMC/Nameless/issues/3052), [#3193](https://github.com/NamelessMC/Nameless/pull/3193)
+- Add support for automatically verifying emails from OAuth register [#3203](https://github.com/NamelessMC/Nameless/pull/3203)
+- Add ability to query servers via plugin [#3244](https://github.com/NamelessMC/Nameless/pull/3244)
+- Allow selecting between native/twemoji/emojione emojis [#3269](https://github.com/NamelessMC/Nameless/pull/3269)
+- Add Latvian language [#3277](https://github.com/NamelessMC/Nameless/pull/3277)
+- Create Members module with member list page [#3106](https://github.com/NamelessMC/Nameless/pull/3106)
+- Allow enabling/disabling modules during installer [#3273](https://github.com/NamelessMC/Nameless/pull/3273)
+- Add delete button for placeholders [#3069](https://github.com/NamelessMC/Nameless/issues/3069), [#3283](https://github.com/NamelessMC/Nameless/pull/3283)
+- Queue system [#3274](https://github.com/NamelessMC/Nameless/pull/3274)
+- Add support to customise OAuth login buttons [#3285](https://github.com/NamelessMC/Nameless/pull/3285)
+- Add ability to customise number of news items on front page [#3303](https://github.com/NamelessMC/Nameless/pull/3303)
+- Create `HasWebhookParams` interface [#3275](https://github.com/NamelessMC/Nameless/issues/3275), [#3281](https://github.com/NamelessMC/Nameless/pull/3281)
+- Integrity checking system [#3159](https://github.com/NamelessMC/Nameless/pull/3159)
+- Cancellable events [#3329](https://github.com/NamelessMC/Nameless/pull/3329)
+- Add dependency injection library + task to generate sitemap [#3332](https://github.com/NamelessMC/Nameless/pull/3332)
+
+### Changed
+- Handle OAuth errors [#3030](https://github.com/NamelessMC/Nameless/pull/3030)
+- Allow OAuth providers to pass additional options to provider constructor [#3062](https://github.com/NamelessMC/Nameless/pull/3062)
+- Place dark mode toggle inline [#3054](https://github.com/NamelessMC/Nameless/pull/3054)
+- Use composer platform php version [#3063](https://github.com/NamelessMC/Nameless/pull/3063)
+- Convert error page to Fomantic UI [#3029](https://github.com/NamelessMC/Nameless/pull/3029)
+- Update TFA page to use a post request to disable TFA [#3080](https://github.com/NamelessMC/Nameless/pull/3080)
+- Show message if there was an error loading a widget [#3138](https://github.com/NamelessMC/Nameless/pull/3138)
+- Clarify meaning of "query" [#3142](https://github.com/NamelessMC/Nameless/pull/3142)
+- Change exception page Prism theme to One Light [#3163](https://github.com/NamelessMC/Nameless/pull/3163)
+- Update Prism token colours [#3169](https://github.com/NamelessMC/Nameless/pull/3169)
+- Catch exception when installing modules [#2875](https://github.com/NamelessMC/Nameless/issues/2875), [#3143](https://github.com/NamelessMC/Nameless/pull/3143)
+- Remove group sync info from user info endpoint [#3194](https://github.com/NamelessMC/Nameless/pull/3194)
+- PHPDoc: Use debian image and speed up build [#3201](https://github.com/NamelessMC/Nameless/pull/3201)
+- Check for pdo_mysql extension, mysqli is no longer used [#3202](https://github.com/NamelessMC/Nameless/pull/3202)
+- Remove panel template "Find Templates" section [#3196](https://github.com/NamelessMC/Nameless/pull/3196)
+- Small email tidy up [#3215](https://github.com/NamelessMC/Nameless/pull/3215)
+- Swap API URL and API key fields [#3218](https://github.com/NamelessMC/Nameless/pull/3218)
+- AuthMe improvements and fixes [#3198](https://github.com/NamelessMC/Nameless/pull/3198)
+- Update server status page to refresh every 5 seconds [#3223](https://github.com/NamelessMC/Nameless/pull/3223)
+- Remove status page cache [#3228](https://github.com/NamelessMC/Nameless/pull/3228)
+- Remove MCAssoc [#3220](https://github.com/NamelessMC/Nameless/pull/3220)
+- Don't validate unused parameters [#3235](https://github.com/NamelessMC/Nameless/pull/3235)
+- Rewrite Discord group sync to use v5 Nameless-Link API [#2945](https://github.com/NamelessMC/Nameless/issues/2945), [#3222](https://github.com/NamelessMC/Nameless/pull/3222)
+- Update contributing documentation to mention npm [#3242](https://github.com/NamelessMC/Nameless/pull/3242)
+- Remove query interval cache [#3247](https://github.com/NamelessMC/Nameless/pull/3247)
+- Attempt to remove roles in Discord when unlinking Discord integration [#3236](https://github.com/NamelessMC/Nameless/pull/3236)
+- Remove MINECRAFT constant [#3225](https://github.com/NamelessMC/Nameless/pull/3225)
+- Remove code scheduled for removal in 2.1.0 [#3165](https://github.com/NamelessMC/Nameless/pull/3165)
+- Misc fixes and improvements [#3265](https://github.com/NamelessMC/Nameless/issues/3265), [#3267](https://github.com/NamelessMC/Nameless/issues/3267), [#2861](https://github.com/NamelessMC/Nameless/issues/2861), [#3270](https://github.com/NamelessMC/Nameless/pull/3270), [#3284](https://github.com/NamelessMC/Nameless/pull/3284)
+- Make sure the dark mode switcher has a pointer cursor [#3289](https://github.com/NamelessMC/Nameless/pull/3289)
+- Make sure that installation has finished [#3297](https://github.com/NamelessMC/Nameless/pull/3297)
+- Use labels instead of code within installer [#3296](https://github.com/NamelessMC/Nameless/pull/3296)
+- Make sure the Like button is at the bottom [#2892](https://github.com/NamelessMC/Nameless/issues/2892), [#3305](https://github.com/NamelessMC/Nameless/pull/3305)
+- Use regex to determine which files to treat as migration files [#3287](https://github.com/NamelessMC/Nameless/issues/3287), [#3308](https://github.com/NamelessMC/Nameless/pull/3308)
+- Better handling of closures in exception frames [#3309](https://github.com/NamelessMC/Nameless/pull/3309)
+- Remove the v1 converter during installation [#3293](https://github.com/NamelessMC/Nameless/pull/3293)
+- Deprecate codeTransform and decode methods within ContentHook [#3250](https://github.com/NamelessMC/Nameless/pull/3250)
+- Don't decode before encoding for new installations [#3171](https://github.com/NamelessMC/Nameless/pull/3171)
+- Do not encode welcome post [#3316](https://github.com/NamelessMC/Nameless/pull/3316)
+- Use relative paths so phpdoc treats it as a single docset [#3318](https://github.com/NamelessMC/Nameless/issues/3318), [#3324](https://github.com/NamelessMC/Nameless/pull/3324)
+- Use utf8mb4_unicode_ci for DB class to match Phinx [#3179](https://github.com/NamelessMC/Nameless/issues/3179), [#3317](https://github.com/NamelessMC/Nameless/pull/3317)
+- Setting constants [#3232](https://github.com/NamelessMC/Nameless/pull/3232)
+- Replace manual queries with util setting functions [#3224](https://github.com/NamelessMC/Nameless/pull/3224)
+- Improve release script [#3325](https://github.com/NamelessMC/Nameless/pull/3325)
+- Allow correct webhook action types in endpoint [#3326](https://github.com/NamelessMC/Nameless/pull/3326)
+- Use CSS instead of the script to put the footer at the bottom [#3301](https://github.com/NamelessMC/Nameless/pull/3301)
+- Make sure module is enabled to process task [#3331](https://github.com/NamelessMC/Nameless/pull/3331)
+- Initialise tasks in installer [#3342](https://github.com/NamelessMC/Nameless/pull/3342)
+- Dependency updates
+- Translation updates [#3252](https://github.com/NamelessMC/Nameless/pull/3252)
+
+### Fixed
+- Fix private profiles [#3020](https://github.com/NamelessMC/Nameless/pull/3020)
+- Fix for some pages which don't show the updated values/data [#3105](https://github.com/NamelessMC/Nameless/pull/3105)
+- Fix Discord verify command translation [#3087](https://github.com/NamelessMC/Nameless/pull/3087)
+- Fix hardcoded language terms [#3036](https://github.com/NamelessMC/Nameless/issues/3036), [#3113](https://github.com/NamelessMC/Nameless/pull/3113)
+- Fix ROOT_PATH in cli installer [#3123](https://github.com/NamelessMC/Nameless/pull/3123)
+- Use X-Real-IP header last [#3230](https://github.com/NamelessMC/Nameless/pull/3230)
+- Fix `register_method` column not being filled when accounts are created [#3231](https://github.com/NamelessMC/Nameless/pull/3231)
+- Add smarty.js to postinstall script [#3245](https://github.com/NamelessMC/Nameless/pull/3245)
+- Fix member module issues [#3282](https://github.com/NamelessMC/Nameless/pull/3282)
+- Fix permissions not being respected for news posts [#3290](https://github.com/NamelessMC/Nameless/pull/3290)
+- Fix errors during admin creation [#3295](https://github.com/NamelessMC/Nameless/pull/3295)
+- Fix nofollow noopener on external links [#3306](https://github.com/NamelessMC/Nameless/pull/3306)
+- Make like button text not hardcoded [#3304](https://github.com/NamelessMC/Nameless/pull/3304)
+- Recaptcha v3 validation not working [#3276](https://github.com/NamelessMC/Nameless/issues/3276), [#3307](https://github.com/NamelessMC/Nameless/pull/3307)
+- Fix missing event in regular webhook [#3327](https://github.com/NamelessMC/Nameless/pull/3327)
+- Fix default user template setting [#3330](https://github.com/NamelessMC/Nameless/pull/3330)
+- Add missing avatar upload directory [#3333](https://github.com/NamelessMC/Nameless/pull/3333)
+- Fix cookie text on StaffCP permissions page [#3336](https://github.com/NamelessMC/Nameless/pull/3336)
+- Fix DataCollector not found error [#3341](https://github.com/NamelessMC/Nameless/pull/3341)
 
 ## [2.0.3](https://github.com/NamelessMC/Nameless/compare/v2.0.2...v2.0.3) - 2023-01-28
 ### Added

Dockerfile.phpdoc

@@ -2,13 +2,18 @@ FROM phpdoc/phpdoc as doc_builder
 
 COPY . /source
 
+WORKDIR /source
+
 RUN mkdir /target && \
-    phpdoc -d /source/core/classes \
-        -d /source/modules/Core/classes \
-        -d "/source/modules/Discord Integration/classes" \
-        -d "/source/modules/Cookie Consent/classes" \
-        -d /source/modules/Forum/classes \
-        -d /source/modules/Members/classes -t /target -i /vendor
+    phpdoc \
+        -d 'core/classes' \
+        -d 'modules/Core/classes' \
+        -d 'modules/Discord Integration/classes' \
+        -d 'modules/Cookie Consent/classes' \
+        -d 'modules/Forum/classes' \
+        -d 'modules/Members/classes' \
+        -i vendor \
+        -t /target
 
 FROM nginxinc/nginx-unprivileged:stable
 

README.md

@@ -1,4 +1,4 @@
-# NamelessMC - v2.0
+# NamelessMC version 2
 ![NamelessMC Banner](https://i.imgur.com/gt8uezk.png)
 NamelessMC is a free, easy to use & powerful website software for your Minecraft server, which includes a large range of features.
 
@@ -33,6 +33,7 @@ The following list is a brief summary of the features available in v2:
 - ✏️ New template and language systems, allowing for total customisation.
 - ✨ Pretty URL option (requires mod_rewrite or special nginx config).
 - 🎛 Widgets: allows modules to create widgets which can be displayed on most user-facing pages and display almost anything.
+- ⏳ Queue: schedule tasks to happen at a certain point in the future
 - 🚩 Translated into [over 20 languages](https://github.com/NamelessMC/Nameless/tree/v2/custom/languages)
 
 
@@ -74,5 +75,4 @@ Please see the contributing document for information on how to contribute to Nam
 The security policy for NamelessMC can be found [here](https://github.com/NamelessMC/Nameless/blob/v2/SECURITY.md).
 
 ## Special Thanks
-- All NamelessMC [contributors](https://github.com/NamelessMC/Nameless/graphs/contributors).
-- [JetBrains](https://www.jetbrains.com/), whose products are used to develop the NamelessMC project.
+- All NamelessMC [contributors](https://github.com/NamelessMC/Nameless/graphs/contributors).

composer.json

@@ -31,7 +31,8 @@
         "symfony/http-foundation": "^5.4.17",
         "joypixels/emoji-toolkit": "^7.0",
         "geoip2/geoip2": "^2.13",
-        "jenssegers/agent": "^2.6"
+        "jenssegers/agent": "^2.6",
+        "php-di/php-di": "^6.4"
     },
     "require-dev": {
         "phpstan/phpstan": "1.6.9",