Merge branch 'release/3.5.21' into v3

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,18 @@
 # SEOmatic Changelog
 
+## 3.5.21 - 2025.10.06
+### Added
+* Added a `twigExtensionClasses` config setting to allow additional TwigExtension classes to be loaded in the Twig `SandboxView` that SEOmatic uses to render ([#1632](https://github.com/nystudio107/craft-seomatic/issues/1632))
+* Only allow users to pick SEO/Facebook/Twitter images from asset volumes that they had permission to access ([#1650](https://github.com/nystudio107/craft-seomatic/issues/1650))
+
+### Changed
+* No longer block various AI bots via `robots.txt` by default ([#1635](https://github.com/nystudio107/craft-seomatic/issues/1635))
+* Handle setting the focal point for social images that are transformed ([#1626](https://github.com/nystudio107/craft-seomatic/issues/1626))
+
+### Fixed
+* Fixed an issue with page footer text being untranslatable on 3 pages due to filter ordering ([#1651](https://github.com/nystudio107/craft-seomatic/issues/1651))
+* Don't overwrite the `dataLayer` if it already exists in the Google Tag Manager default script ([#1642](https://github.com/nystudio107/craft-seomatic/issues/1642))
+
 ## 3.5.20 - 2025.08.17
 ### Changed
 * Use `StringHelper::convertToUtf8()` instead of our homebrew solution

buildchain/package-lock.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-seomatic",
   "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 3. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
   "type": "craft-plugin",
-  "version": "3.5.20",
+  "version": "3.5.21",
   "keywords": [
     "craft",
     "cms",
@@ -32,7 +32,7 @@
     "craftcms/cms": "^3.2.0",
     "nystudio107/craft-plugin-vite": "^1.0.31",
     "nystudio107/craft-code-editor": "^1.0.0",
-    "nystudio107/craft-twig-sandbox": "^3.0.5",
+    "nystudio107/craft-twig-sandbox": "^3.0.6",
     "php-science/textrank": "^1.0.3",
     "davechild/textstatistics": "1.0.2",
     "sunra/php-simple-html-dom-parser": "^1.5.2"

composer.json

@@ -481,6 +481,12 @@ protected function installEventListeners()
             $seomaticTwigExtension = new SeomaticTwigExtension();
             self::$view->registerTwigExtension($seomaticTwigExtension);
             self::$sandboxView->registerTwigExtension($seomaticTwigExtension);
+            // Register the additional TwigExtension classes
+            foreach (Seomatic::$settings->twigExtensionClasses as $className) {
+                if (class_exists($className)) {
+                    self::$sandboxView->registerTwigExtension(new $className());
+                }
+            }
             $request = Craft::$app->getRequest();
             // Add in our event listeners that are needed for every request
             $this->installGlobalEventListeners();

docs/package-lock.json

@@ -174,4 +174,7 @@
     // string[] URL params that are allowed to be considered part of the unique URL used for the metadata cache
     'allowedUrlParams' => [
     ],
+    // class-string[] Array of TwigExtension classes to instantiate and add to the SandboxView
+    'twigExtensionClasses' => [
+    ],
 ];

src/Seomatic.php

@@ -20,6 +20,7 @@
 use nystudio107\seomatic\assetbundles\seomatic\SeomaticAsset;
 use nystudio107\seomatic\autocompletes\TrackingVarsAutocomplete;
 use nystudio107\seomatic\helpers\ArrayHelper;
+use nystudio107\seomatic\helpers\AssetHelper;
 use nystudio107\seomatic\helpers\DynamicMeta as DynamicMetaHelper;
 use nystudio107\seomatic\helpers\Field as FieldHelper;
 use nystudio107\seomatic\helpers\ImageTransform as ImageTransformHelper;
@@ -318,6 +319,7 @@ public function actionGlobal(string $subSection = 'general', string $siteHandle
             // Image selectors
             $bundleSettings = $metaBundle->metaBundleSettings;
             $variables['elementType'] = Asset::class;
+            $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
             $variables['seoImageElements'] = ImageTransformHelper::assetElementsFromIds(
                 $bundleSettings->seoImageIds,
                 $siteId
@@ -615,6 +617,7 @@ public function actionEditContent(
         $variables['currentSubSection'] = $subSection;
         $bundleSettings = $metaBundle->metaBundleSettings;
         $variables['elementType'] = Asset::class;
+        $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
         $variables['seoImageElements'] = ImageTransformHelper::assetElementsFromIds(
             $bundleSettings->seoImageIds,
             $siteId
@@ -794,6 +797,7 @@ public function actionSite(string $subSection = 'identity', string $siteHandle =
             );
         }
         $variables['elementType'] = Asset::class;
+        $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
 
         // Render the template
         return $this->renderTemplate('seomatic/settings/site/' . $subSection, $variables);

src/config.php

@@ -19,6 +19,7 @@
 use craft\helpers\StringHelper;
 use nystudio107\seomatic\assetbundles\seomatic\SeomaticAsset;
 use nystudio107\seomatic\helpers\ArrayHelper;
+use nystudio107\seomatic\helpers\AssetHelper;
 use nystudio107\seomatic\helpers\Config as ConfigHelper;
 use nystudio107\seomatic\helpers\Field as FieldHelper;
 use nystudio107\seomatic\helpers\Migration as MigrationHelper;
@@ -347,7 +348,7 @@ public function getInputHtml($value, ElementInterface $element = null): string
 
         /** @var MetaBundle $value */
         $variables['elementType'] = Asset::class;
-
+        $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
         $variables['parentBundles'] = [];
         // Preview the containers so the preview is correct in the field
         if ($element !== null && $element->uri !== null) {

src/controllers/SettingsController.php

@@ -0,0 +1,53 @@
+<?php
+/**
+ * SEOmatic plugin for Craft CMS
+ *
+ * A turnkey SEO implementation for Craft CMS that is comprehensive, powerful,
+ * and flexible
+ *
+ * @link      https://nystudio107.com
+ * @copyright Copyright (c) nystudio107
+ */
+
+namespace nystudio107\seomatic\helpers;
+
+use Craft;
+use craft\elements\Asset;
+use craft\helpers\ArrayHelper;
+
+/**
+ * @author    nystudio107
+ * @package   Seomatic
+ * @since     3.5.21
+ */
+class AssetHelper
+{
+    /**
+     * Return asset volume sources that can be accessed by the current user
+     *
+     * @return array
+     */
+    public static function getAssetInputSources(): array
+    {
+        $sources = [];
+        foreach (Craft::$app->getElementIndexes()->getSources(Asset::class) as $source) {
+            if (isset($source['key'])) {
+                $sources[] = $source['key'];
+            }
+        }
+
+        // Now enforce the showUnpermittedVolumes setting
+        $assetsService = Craft::$app->getAssets();
+        $userService = Craft::$app->getUser();
+        return ArrayHelper::where($sources, function(string $source) use ($assetsService, $userService) {
+            // If it's not a volume folder, let it through
+            if (strpos($source, 'folder:') !== 0) {
+                return true;
+            }
+            // Only show it if they have permission to view it
+            $folder = $assetsService->getFolderByUid(explode(':', $source)[1]);
+            $volume = $folder ? $folder->getVolume() : null;
+            return $volume && $userService->checkPermission("viewVolume:{$volume->uid}");
+        }, true, true, false);
+    }
+}

src/fields/SeoSettings.php

@@ -147,6 +147,9 @@ public static function socialTransform(
                 }
             }
             try {
+                if ($asset->getHasFocalPoint()) {
+                    $transform->position = $asset->getFocalPoint(true);
+                }
                 $url = $assets->getAssetUrl($asset, $transform, $generateNow);
             } catch (Exception $e) {
                 $url = $asset->getUrl();