perf: Cache online users for 40seconds

afrux · Mar 3, 2022 · ca458d3 · ca458d3
1 parent 3ecb76f
commit ca458d3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/src/LoadForumOnlineUsersRelationship.php b/src/LoadForumOnlineUsersRelationship.php
@@ -40,6 +40,6 @@ public function __invoke(ShowForumController $controller, &$data, ServerRequestI
 
         $actor = RequestUtil::getActor($request);
 
-        $data['onlineUsers'] = $this->repository->getOnlineUsers($actor);
+        $data['onlineUsers'] = $this->repository->getOnlineUsers($actor) ?: null;
     }
 }
diff --git a/src/UserRepository.php b/src/UserRepository.php
@@ -11,6 +11,7 @@
 
 namespace Afrux\OnlineUsers;
 
+use Afrux\ForumWidgets\SafeCacheRepositoryAdapter;
 use Carbon\Carbon;
 use Flarum\User\User;
 use Flarum\Settings\SettingsRepositoryInterface;
@@ -22,27 +23,35 @@ class UserRepository
      */
     protected $settings;
 
-    public function __construct(SettingsRepositoryInterface $settings)
+    /**
+     * @var SafeCacheRepositoryAdapter
+     */
+    protected $cache;
+
+    public function __construct(SettingsRepositoryInterface $settings, SafeCacheRepositoryAdapter $cache)
     {
         $this->settings = $settings;
+        $this->cache = $cache;
     }
 
     public function getLastSeenUsers(User $actor): array
     {
         $time = Carbon::now()->subMinutes(5);
         $limit = $this->settings->get('afrux-online-users-widget.max_users', 15);
 
-        return User::query()
-            ->select('id', 'preferences')
-            ->whereVisibleTo($actor)
-            ->where('last_seen_at', '>', $time)
-            ->limit($limit + 1)
-            ->get()
-            ->filter(function ($user) {
-                return (bool) $user->getPreference('discloseOnline');
-            })
-            ->pluck('id')
-            ->toArray();
+        return $this->cache->remember('afrux-online-users-widget.users', 40, function () use ($actor, $time, $limit) {
+            return User::query()
+                ->select('id', 'preferences')
+                ->whereVisibleTo($actor)
+                ->where('last_seen_at', '>', $time)
+                ->limit($limit + 1)
+                ->get()
+                ->filter(function ($user) {
+                    return (bool)$user->getPreference('discloseOnline');
+                })
+                ->pluck('id')
+                ->toArray();
+        }) ?: [];
     }
 
     public function getOnlineUsers(User $actor)