Refactor following check

9 months ago · 8082c004bc
parent 0f1819125c
commit 8082c004bc
2 changed files with 585 additions and 579 deletions
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
--- a/app/Http/Controllers/PublicApiController.php
+++ b/app/Http/Controllers/PublicApiController.php
@ -788,6 +788,14 @@ class PublicApiController extends Controller

    private function determineVisibility($profile, $user)
    {
+        if (! $user || ! isset($user->profile_id)) {
+            return [];
+        }
+
+        if (! $profile || ! isset($profile['id'])) {
+            return [];
+        }
+
        if ($profile['id'] == $user->profile_id) {
            return ['public', 'unlisted', 'private'];
        }
@ -798,17 +806,13 @@ class PublicApiController extends Controller
            }

            $pid = $user->profile_id;
-            $isFollowing = Follower::whereProfileId($pid)
-                ->whereFollowingId($profile['id'])
-                ->exists();
+            $isFollowing = FollowerService::follows($pid, $profile['id']);

            return $isFollowing ? ['public', 'unlisted', 'private'] : ['public'];
        } else {
            if ($user) {
                $pid = $user->profile_id;
-                $isFollowing = Follower::whereProfileId($pid)
-                    ->whereFollowingId($profile['id'])
-                    ->exists();
+                $isFollowing = FollowerService::follows($pid, $profile['id']);

                return $isFollowing ? ['public', 'unlisted', 'private'] : ['public', 'unlisted'];
            } else {