Enh: Use the new ContentCreationService to search spaces

controllers/ShareController.php

@@ -3,11 +3,12 @@
 namespace humhub\modules\sharebetween\controllers;
 
 use humhub\modules\content\models\Content;
+use humhub\modules\post\permissions\CreatePost;
 use humhub\modules\sharebetween\models\ShareForm;
 use humhub\modules\sharebetween\services\ShareService;
+use humhub\modules\space\helpers\CreateContentPermissionHelper;
 use humhub\modules\space\models\Space;
 use humhub\modules\user\models\User;
-use humhub\modules\user\Module as UserModule;
 use humhub\widgets\ModalClose;
 use Yii;
 
@@ -63,9 +64,11 @@ public function actionSearchSpaces()
             return $this->forbidden();
         }
 
-        $shareService = new ShareService($content->getModel(), Yii::$app->user->getIdentity());
-
-        $spaces = $shareService->searchSpaces(Yii::$app->request->get('keyword', ''));
+        $spaces = CreateContentPermissionHelper::findSpaces(
+            CreatePost::class,
+            Yii::$app->request->get('keyword', ''),
+            Yii::$app->user->identity,
+        );
 
         return $this->asJson($spaces);
     }

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.0.11 (Unreleased)
+-------------------------
+- Enh #74: Use the new ContentCreationService to search spaces
+
 1.0.10 (February 5, 2025)
 -------------------------
 - Enh #71: Show the list of available spaces to share to without having to enter the 2 first letters

module.json

@@ -3,9 +3,9 @@
     "name": "Share content",
     "description": "Share content between Spaces in the simplest way possible.",
     "keywords": ["share", "between", "content"],
-    "version": "1.0.10",
+    "version": "1.0.11",
     "humhub": {
-        "minVersion": "1.14"
+        "minVersion": "1.17.2"
     },
     "screenshots": [
         "resources/screen1.png",

services/ShareService.php

@@ -12,10 +12,8 @@
 use humhub\modules\post\permissions\CreatePost;
 use humhub\modules\sharebetween\models\Share;
 use humhub\modules\space\models\Space;
-use humhub\modules\space\widgets\Chooser;
 use humhub\modules\user\models\User;
 use Yii;
-use yii\db\Expression;
 use yii\web\IdentityInterface;
 
 final class ShareService
@@ -130,47 +128,6 @@ private function getShareByContainer(ContentContainerActiveRecord $container): A
         return $this->getShareQuery()->andWhere(['content.contentcontainer_id' => $container->contentcontainer_id]);
     }
 
-    public function searchSpaces(string $keyword): array
-    {
-        $spaces = Space::find()
-            ->visible($this->user)
-            ->filterBlockedSpaces($this->user)
-            ->search($keyword);
-
-        if ($this->record->content->container instanceof Space) {
-            $spaces->andWhere(['!=', 'space.id', $this->record->content->container->id]);
-        }
-
-        if (!$this->user->isSystemAdmin()) {
-            // Check the User can create a Post in the searched Spaces
-            $spaces->leftJoin('space_membership', 'space_membership.space_id = space.id')
-                ->leftJoin(
-                    'contentcontainer_permission',
-                    'contentcontainer_permission.contentcontainer_id = space.contentcontainer_id
-                    AND contentcontainer_permission.group_id = space_membership.group_id
-                    AND contentcontainer_permission.permission_id = :permission_id',
-                )
-                ->andWhere(['space_membership.user_id' => $this->user->id])
-                ->andWhere(['OR',
-                    // Allowed by default
-                    ['AND',
-                        ['IN', 'space_membership.group_id', $this->getDefaultAllowedGroups()],
-                        ['IS', 'contentcontainer_permission.permission_id', new Expression('NULL')],
-                    ],
-                    // Set to allow
-                    ['contentcontainer_permission.state' => CreatePost::STATE_ALLOW],
-                ])
-                ->addParams(['permission_id' => CreatePost::class]);
-        }
-
-        $result = [];
-        foreach ($spaces->all() as $space) {
-            $result[] = Chooser::getSpaceResult($space);
-        }
-
-        return $result;
-    }
-
     public function getDefaultAllowedGroups(): array
     {
         $defaultAllowedGroups = (new CreatePost())->defaultAllowedGroups;