Add isAdmin and isGlobalModerator fields to user api response (#1044

)
MbinOrg · Aug 20, 2024 · 4973e4a · 4973e4a
1 parent a103bd7
commit 4973e4a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/src/DTO/UserDto.php b/src/DTO/UserDto.php
@@ -41,6 +41,8 @@ class UserDto implements UserDtoInterface
     public ?int $id = null;
     public ?int $followersCount = 0;
     public ?bool $isBot = null;
+    public ?bool $isAdmin = null;
+    public ?bool $isGlobalModerator = null;
     public ?bool $isFollowedByUser = null;
     public ?bool $isFollowerOfUser = null;
     public ?bool $isBlockedByUser = null;
@@ -87,6 +89,8 @@ public static function create(
         ?int $id = null,
         ?int $followersCount = 0,
         ?bool $isBot = null,
+        ?bool $isAdmin = null,
+        ?bool $isGlobalModerator = null,
     ): self {
         $dto = new UserDto();
         $dto->id = $id;
@@ -101,6 +105,8 @@ public static function create(
         $dto->apProfileId = $apProfileId;
         $dto->followersCount = $followersCount;
         $dto->isBot = $isBot;
+        $dto->isAdmin = $isAdmin;
+        $dto->isGlobalModerator = $isGlobalModerator;
 
         return $dto;
     }

diff --git a/src/DTO/UserResponseDto.php b/src/DTO/UserResponseDto.php
@@ -21,6 +21,8 @@ class UserResponseDto implements \JsonSerializable
     public ?bool $isFollowedByUser = null;
     public ?bool $isFollowerOfUser = null;
     public ?bool $isBlockedByUser = null;
+    public ?bool $isAdmin = null;
+    public ?bool $isGlobalModerator = null;
     public ?int $userId = null;
     public ?string $serverSoftware = null;
     public ?string $serverSoftwareVersion = null;
@@ -42,6 +44,8 @@ public function __construct(UserDto $dto)
         $this->isBlockedByUser = $dto->isBlockedByUser;
         $this->serverSoftware = $dto->serverSoftware;
         $this->serverSoftwareVersion = $dto->serverSoftwareVersion;
+        $this->isAdmin = $dto->isAdmin;
+        $this->isGlobalModerator = $dto->isGlobalModerator;
     }
 
     public function jsonSerialize(): mixed
@@ -57,6 +61,8 @@ public function jsonSerialize(): mixed
             'apId' => $this->apId,
             'apProfileId' => $this->apProfileId,
             'isBot' => $this->isBot,
+            'isAdmin' => $this->isAdmin,
+            'isGlobalModerator' => $this->isGlobalModerator,
             'isFollowedByUser' => $this->isFollowedByUser,
             'isFollowerOfUser' => $this->isFollowerOfUser,
             'isBlockedByUser' => $this->isBlockedByUser,

diff --git a/src/DTO/UserSmallResponseDto.php b/src/DTO/UserSmallResponseDto.php
@@ -15,6 +15,8 @@ class UserSmallResponseDto implements \JsonSerializable
     public ?bool $isFollowedByUser = null;
     public ?bool $isFollowerOfUser = null;
     public ?bool $isBlockedByUser = null;
+    public ?bool $isAdmin = null;
+    public ?bool $isGlobalModerator = null;
     public ?ImageDto $avatar = null;
     public ?string $apId = null;
     public ?string $apProfileId = null;
@@ -32,6 +34,8 @@ public function __construct(UserDto $dto)
         $this->apId = $dto->apId;
         $this->apProfileId = $dto->apProfileId;
         $this->createdAt = $dto->createdAt;
+        $this->isAdmin = $dto->isAdmin;
+        $this->isGlobalModerator = $dto->isGlobalModerator;
     }
 
     public function jsonSerialize(): mixed
@@ -43,6 +47,8 @@ public function jsonSerialize(): mixed
             'isFollowedByUser' => $this->isFollowedByUser,
             'isFollowerOfUser' => $this->isFollowerOfUser,
             'isBlockedByUser' => $this->isBlockedByUser,
+            'isAdmin' => $this->isAdmin,
+            'isGlobalModerator' => $this->isGlobalModerator,
             'avatar' => $this->avatar,
             'apId' => $this->apId,
             'apProfileId' => $this->apProfileId,

diff --git a/src/Factory/UserFactory.php b/src/Factory/UserFactory.php
@@ -33,7 +33,9 @@ public function createDto(User $user): UserDto
             $user->apProfileId,
             $user->getId(),
             $user->followersCount,
-            'Service' === $user->type // setting isBot
+            'Service' === $user->type, // setting isBot
+            $user->isAdmin(),
+            $user->isModerator(),
         );
 
         /** @var User $currentUser */