Merge pull request #1101 from discord-php/feat-thread-member-guild-me…

…mber

Add Thread Member::$member

src/Discord/Parts/Thread/Member.php

@@ -13,7 +13,9 @@
 
 use Carbon\Carbon;
 use Discord\Http\Endpoint;
+use Discord\Parts\Guild\Guild;
 use Discord\Parts\Part;
+use Discord\Parts\User\Member as GuildMember;
 use Discord\Parts\User\User;
 use React\Promise\ExtendedPromiseInterface;
 
@@ -25,11 +27,12 @@
  *
  * @since 7.0.0
  *
- * @property      string|null $id             ID of the thread.
- * @property      string|null $user_id        ID of the user that the member object represents.
- * @property-read User|null   $user           The user that the member object represents.
- * @property      Carbon      $join_timestamp The time that the member joined the thread.
- * @property      int         $flags          Flags relating to the member. Only used for client notifications.
+ * @property      string|null      $id             ID of the thread.
+ * @property      string|null      $user_id        ID of the user that the member object represents.
+ * @property-read User|null        $user           The user that the member object represents.
+ * @property      Carbon           $join_timestamp The time that the member joined the thread.
+ * @property      int              $flags          Flags relating to the member. Only used for client notifications.
+ * @property-read GuildMember|null $member         Additional information about the user.
  */
 class Member extends Part
 {
@@ -41,6 +44,9 @@ class Member extends Part
         'user_id',
         'join_timestamp',
         'flags',
+        'member',
+        // @internal and events only
+        'guild_id',
     ];
 
     /**
@@ -65,6 +71,41 @@ protected function getJoinTimestampAttribute(): Carbon
         return new Carbon($this->attributes['join_timestamp']);
     }
 
+    /**
+     * Returns the guild member that the thread member represents.
+     *
+     * @return GuildMember|null
+     *
+     * @since 10.0.0
+     */
+    protected function getMemberAttribute(): ?GuildMember
+    {
+        if (! isset($this->attributes['member'])) {
+            if ($guild = $this->getGuildAttribute()) {
+                return $guild->members->get('id', $this->user_id);
+            }
+
+            return null;
+        }
+
+        $memberData = (array) $this->attributes['member'];
+        if (isset($this->guild_id)) {
+            $memberData['guild_id'] = $this->guild_id;
+        }
+
+        return $this->factory->part(Member::class, $memberData, true);
+    }
+
+    /**
+     * Returns the guild attribute based on internal `guild_id`.
+     *
+     * @return Guild|null The guild attribute.
+     */
+    private function getGuildAttribute(): ?Guild
+    {
+        return $this->discord->guilds->get('id', $this->guild_id);
+    }
+
     /**
      * Attempts to remove the member from the thread.
      *

src/Discord/Parts/Thread/Thread.php

@@ -126,6 +126,7 @@ protected function afterConstruct(): void
             $memberPart = $this->members->create((array) $this->attributes['member'] + [
                 'id' => $this->id,
                 'user_id' => $this->discord->id,
+                'guild_id' => $this->guild_id,
             ], $this->created);
             $memberPart->created = &$this->created;
             $this->members->pushItem($memberPart);

src/Discord/Repository/Channel/ThreadRepository.php

@@ -72,7 +72,7 @@ protected function cacheFreshen($response): ExtendedPromiseInterface
             foreach ($items as $thread) {
                 foreach ($members as $member) {
                     if ($member->id == $thread->id) {
-                        $thread->members->cache->set($member->id, $thread->members->create($member, true));
+                        $thread->members->cache->set($member->id, $thread->members->create((array) $member + ['guild_id' => $thread->guild_id], true));
                         break;
                     }
                 }

src/Discord/WebSockets/Events/ThreadListSync.php

@@ -53,7 +53,7 @@ public function handle($data)
             foreach ($data->members as $member) {
                 /** @var ?Thread */
                 if ($threadPart = $threadParts[$member->id] ?? null) {
-                    $threadPart->members->set($member->user_id, $threadPart->members->create($member, true));
+                    $threadPart->members->set($member->user_id, $threadPart->members->create((array) $member + ['guild_id' => $data->guild_id], true));
                 }
             }
         }

src/Discord/WebSockets/Events/ThreadMembersUpdate.php

@@ -45,7 +45,7 @@ public function handle($data)
                 }
 
                 foreach ($data->added_members ?? [] as $member) {
-                    $thread->members->set($member->user_id, $thread->members->create($member, true));
+                    $thread->members->set($member->user_id, $thread->members->create((array) $member + ['guild_id' => $data->guild_id], true));
 
                     if (isset($member->member)) {
                         $this->cacheMember($guild->members, (array) $member->member);