Merge remote-tracking branch 'origin/develop' into release/2.2.4

Author: samerton

.github/CONTRIBUTING.md

@@ -38,6 +38,20 @@ Here are some things you should know when contributing:
       ```console
       vendor/bin/phinx migrate -c core/migrations/phinx.php
       ```
+- To test emails locally, we reccommend using [MailHog](https://github.com/mailhog/MailHog) - it allows you to view emails sent from your local server without actually sending them to a recipient.
+    - Tweak your `core/config.php` file to use MailHog as the SMTP server:
+        ```php
+        'email' => [
+          'email' => '<some address, outgoing>',
+          'username' => '',
+          'password' => '',
+          'name' => '',
+          'host' => 'localhost',
+          'port' => 1025,
+          'smtp_auth' => false,
+          'secure' => '',
+        ],
+        ```
 
 ## Versioning
 As of NamelessMC 2.0.0, we use a unique versioning system.

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         operating-system: ["ubuntu-latest"]
-        php-versions: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]
+        php-versions: ["8.2", "8.3", "8.4"]
     steps:
       - uses: actions/checkout@v2
 

.gitignore

@@ -8,8 +8,7 @@
 .valet-env.php
 /vendor
 /core/assets/vendor
-/uploads/avatars/**
-/uploads/logos/**
+/uploads/**
 /node_modules/
 composer.lock
 checksums.json

.styleci.yml

@@ -1,5 +1,5 @@
 risky: false
-version: 7.4
+version: 8.2
 preset: recommended
 monolithic: true
 finder:
@@ -10,4 +10,4 @@ disabled:
   - concat_without_spaces
   - include
   - die_to_exit
-  - phpdoc_separation
+  - phpdoc_separation

composer.json

@@ -5,42 +5,40 @@
     "license": "MIT",
     "config": {
         "platform": {
-            "php": "7.4"
+            "php": "8.2"
         }
     },
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.2",
         "jdorn/sql-formatter": "^1.2.17",
         "smarty/smarty": "^4.3",
         "ezyang/htmlpurifier": "^4.16",
-        "samayo/bulletproof": "^4.0.1",
+        "samayo/bulletproof": "^5.0",
         "phpmailer/phpmailer": "^6.7.1",
         "evert/sitemap-php": "^1.2",
-        "robthree/twofactorauth": "^1.8.2",
+        "robthree/twofactorauth": "^3.0",
         "league/oauth2-client": "^2.6.1",
         "wohali/oauth2-discord-new": "^1.2.1",
         "league/oauth2-google": "^4.0",
         "guzzlehttp/guzzle": "^7.5",
         "xpaw/php-minecraft-query": "^4.0.1",
         "games647/minecraft-banner-generator": "^0.4.1",
-        "symfony/polyfill-php80": "^v1.25",
-        "ircmaxell/password-compat": "^1.0.4",
         "astrotomic/php-twemoji": "^0.2.2",
         "samerton/i18next": "^1.0.1",
-        "robmorgan/phinx": "^0.13.4",
-        "symfony/http-foundation": "^5.4.17",
-        "joypixels/emoji-toolkit": "^7.0",
-        "geoip2/geoip2": "^2.13",
+        "robmorgan/phinx": "^0.16.0",
+        "symfony/http-foundation": "^7.2",
+        "joypixels/emoji-toolkit": "^9.0",
+        "geoip2/geoip2": "^3.0",
         "jenssegers/agent": "^2.6",
-        "php-di/php-di": "^6.4",
+        "php-di/php-di": "^7.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
         "phpstan/phpstan": "1.6.9",
-        "maximebf/debugbar": "^1.18.1",
         "junker/debugbar-smarty": "^0.2.1",
-        "hannesvdvreken/guzzle-debugbar": "^3.0.1",
-        "fakerphp/faker": "^1.21"
+        "hannesvdvreken/guzzle-debugbar": "^4.0.1",
+        "fakerphp/faker": "^1.21",
+        "php-debugbar/php-debugbar": "^2.1"
     },
     "autoload": {
         "classmap": [

core/avatar/LICENSE.md

@@ -42,7 +42,7 @@ public static function getAvatarFromUUID(string $uuid, int $size = 128): string
     public static function getAvatarFromUserData(object $data, bool $allow_gifs = false, int $size = 128, bool $full = false): string
     {
         // If custom avatars are enabled, first check if they have gravatar enabled, and then fallback to normal image
-        if (defined('CUSTOM_AVATARS')) {
+        if (Settings::get('custom_avatars')) {
             if ($data->gravatar) {
                 return 'https://secure.gravatar.com/avatar/' . md5(strtolower(trim($data->email))) . '?s=' . $size;
             }
@@ -64,10 +64,10 @@ public static function getAvatarFromUserData(object $data, bool $allow_gifs = fa
         }
 
         // Fallback to default avatar image if it is set and the avatar type is custom
-        if (defined('DEFAULT_AVATAR_TYPE') && DEFAULT_AVATAR_TYPE == 'custom' && DEFAULT_AVATAR_IMAGE !== '') {
-            if (file_exists(ROOT_PATH . '/uploads/avatars/defaults/' . DEFAULT_AVATAR_IMAGE)) {
+        if (Settings::get('default_avatar_type') === 'custom' && Settings::get('default_avatar_image') !== '') {
+            if (file_exists(ROOT_PATH . '/uploads/avatars/defaults/' . Settings::get('default_avatar_image'))) {
                 // We don't check the validity here since we know the file exists for sure
-                return ($full ? rtrim(URL::getSelfURL(), '/') : '') . ((defined('CONFIG_PATH')) ? CONFIG_PATH . '/' : '/') . 'uploads/avatars/defaults/' . DEFAULT_AVATAR_IMAGE;
+                return ($full ? rtrim(URL::getSelfURL(), '/') : '') . ((defined('CONFIG_PATH')) ? CONFIG_PATH . '/' : '/') . 'uploads/avatars/defaults/' . Settings::get('default_avatar_image');
             }
         }
 
@@ -106,50 +106,41 @@ private static function validImageUrl(string $url): bool
         $cache = new Cache(['name' => 'nameless', 'extension' => '.cache', 'path' => ROOT_PATH . '/cache/']);
         $cache->setCache('avatar_validity');
 
-        if ($cache->isCached($url)) {
-            return $cache->retrieve($url);
-        }
-
-        $is_valid = false;
-
-        try {
-            $response = HttpClient::createClient()->head($url);
-            $headers = $response->getHeaders();
-            if (isset($headers['Content-Type']) && $headers['Content-Type'][0] === 'image/png') {
-                $is_valid = true;
+        return $cache->fetch($url, function () use ($url) {
+            $is_valid = false;
+
+            try {
+                $response = HttpClient::createClient()->head($url, [
+                    // https://vzge.me requires a user agent
+                    'headers' => [
+                        'User-Agent' => 'NamelessMC/' . NAMELESS_VERSION . ' (https://namelessmc.com)',
+                    ],
+                ]);
+                $headers = $response->getHeaders();
+                if (isset($headers['Content-Type']) && $headers['Content-Type'][0] === 'image/png') {
+                    $is_valid = true;
+                }
+            } catch (Exception $ignored) {
             }
-        } catch (Exception $ignored) {
-        }
 
-        $cache->store($url, $is_valid, 3600);
-
-        return $is_valid;
+            return $is_valid;
+        }, 3600);
     }
 
     /**
      * Get the currently active avatar source.
      *
      * @return AvatarSourceBase The active source.
      */
-    public static function getActiveSource(): AvatarSourceBase
+    private static function getActiveSource(): AvatarSourceBase
     {
-        return self::$_active_source;
-    }
-
-    /**
-     * Set the active source to the source by name.
-     * Fallsback to Cravatar if name was not found.
-     *
-     * @param string $name Name of source to set as active.
-     */
-    public static function setActiveSource(string $name): void
-    {
-        $source = self::getSourceByName($name);
-        if ($source === null) {
-            $source = self::getSourceByName('cravatar');
+        // Compatibility with old built-in source, can be removed in 2.3.0
+        $setting = Settings::get('default_avatar_source', 'cravatar');
+        if ($setting === 'Nameless') {
+            $setting = 'cravatar';
         }
 
-        self::$_active_source = $source;
+        return self::$_active_source ??= self::getSourceByName($setting);
     }
 
     /**
@@ -159,11 +150,7 @@ public static function setActiveSource(string $name): void
      */
     private static function getDefaultPerspective(): string
     {
-        if (defined('DEFAULT_AVATAR_PERSPECTIVE')) {
-            return DEFAULT_AVATAR_PERSPECTIVE;
-        }
-
-        return 'face';
+        return Settings::get('default_avatar_perspective', 'face');
     }
 
     /**
@@ -199,13 +186,6 @@ public static function getAllSources(): iterable
      */
     public static function getUrlToFormat(): string
     {
-        // Default to Cravatar
-        if (!isset(self::$_active_source)) {
-            require_once(ROOT_PATH . '/modules/Core/classes/Avatars/CravatarAvatarSource.php');
-
-            return (new CravatarAvatarSource())->getUrlToFormat(self::getDefaultPerspective());
-        }
-
         return self::getActiveSource()->getUrlToFormat(self::getDefaultPerspective());
     }