Model Visibility Scoping Extender and Tests (#2460)

src/User/AbstractPolicy.php

@@ -54,6 +54,7 @@ abstract class AbstractPolicy
 
     /**
      * @param ScopeModelVisibility $event
+     * @deprecated beta 15, remove beta 16
      */
     public function scopeModelVisibility(ScopeModelVisibility $event)
     {

src/User/Access/ScopeUserVisibility.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\User\Access;
+
+use Flarum\User\User;
+use Illuminate\Database\Eloquent\Builder;
+
+class ScopeUserVisibility
+{
+    /**
+     * @param User $actor
+     * @param Builder $query
+     */
+    public function __invoke(User $actor, $query)
+    {
+        if ($actor->cannot('viewDiscussions')) {
+            if ($actor->isGuest()) {
+                $query->whereRaw('FALSE');
+            } else {
+                $query->where('id', $actor->id);
+            }
+        }
+    }
+}

src/User/UserPolicy.php

@@ -9,8 +9,6 @@
 
 namespace Flarum\User;
 
-use Illuminate\Database\Eloquent\Builder;
-
 class UserPolicy extends AbstractPolicy
 {
     /**
@@ -29,19 +27,4 @@ class UserPolicy extends AbstractPolicy
             return true;
         }
     }
-
-    /**
-     * @param User $actor
-     * @param Builder $query
-     */
-    public function find(User $actor, Builder $query)
-    {
-        if ($actor->cannot('viewDiscussions')) {
-            if ($actor->isGuest()) {
-                $query->whereRaw('FALSE');
-            } else {
-                $query->where('id', $actor->id);
-            }
-        }
-    }
 }

src/User/UserServiceProvider.php

@@ -12,6 +12,7 @@ namespace Flarum\User;
 use Flarum\Foundation\AbstractServiceProvider;
 use Flarum\Foundation\ContainerUtil;
 use Flarum\Settings\SettingsRepositoryInterface;
+use Flarum\User\Access\ScopeUserVisibility;
 use Flarum\User\DisplayName\DriverInterface;
 use Flarum\User\DisplayName\UsernameDriver;
 use Flarum\User\Event\EmailChangeRequested;
@@ -96,5 +97,7 @@ class UserServiceProvider extends AbstractServiceProvider
         User::registerPreference('discloseOnline', 'boolval', true);
         User::registerPreference('indexProfile', 'boolval', true);
         User::registerPreference('locale');
+
+        User::registerVisibilityScoper(new ScopeUserVisibility(), 'view');
     }
 }