Merge branch 'develop' into dev-ks/php84

Traewelling · Nov 15, 2024 · 67522a9 · 67522a9
2 parents 1829d60 + 5033cce
commit 67522a9
Show file tree

Hide file tree

Showing 10 changed files with 415 additions and 340 deletions.
diff --git a/app/Http/Resources/UserBaseResource.php b/app/Http/Resources/UserBaseResource.php
@@ -38,6 +38,7 @@ public function toArray($request): array {
                     'muted'             => (bool) $this->muted,
                     'following'         => (bool) $this->following,
                     'followPending'     => (bool) $this->followPending,
+                    'followedBy'        => (bool) $this->followedBy,
                 ])
         ];
     }

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -261,6 +261,10 @@ public function getMutedAttribute(): bool {
         return auth()->check() && auth()->user()->mutedUsers->contains('id', $this->id);
     }
 
+    public function getFollowedByAttribute(): bool {
+        return (auth()->check() && $this->followings->contains('follow_id', auth()->user()->id));
+    }
+
     /**
      * The auth-user is blocked by $this user. auth-user can not see $this's statuses.
      */

diff --git a/app/Virtual/Models/User.php b/app/Virtual/Models/User.php
@@ -188,6 +188,18 @@ class User
      */
     private $followPending;
 
+    /**
+     * @OA\Property (
+     *     title="followedBy",
+     *     description="Is the user following you?",
+     *     type="boolean",
+     *     example=false
+     * )
+     *
+     * @var bool
+     */
+    private $followedBy;
+
     /**
      * @OA\Property (
      *     title="preventIndex",