fix: fix invitation and channel update logic (#74)

Author: peterdeme

lib/GetStream/StreamChat/Channel.php

@@ -231,17 +231,23 @@ public function queryMembers($filterConditions = null, $sort = null, $options =
     }
 
     /**
-      * @param array $channelData
-      * @param string $updateMessage
+      * @param array|null $channelData
+      * @param array|null $updateMessage
+      * @param array|null $options
       * @return StreamResponse
       * @throws StreamException
       */
-    public function update($channelData, $updateMessage=null)
+    public function update($channelData, $updateMessage=null, $options=null)
     {
         $payload = [
             "data" => $channelData,
             "message" => $updateMessage
         ];
+
+        if ($options !== null) {
+            $payload = array_merge($payload, $options);
+        }
+
         return $this->client->post($this->getUrl(), $payload);
     }
 
@@ -300,7 +306,7 @@ public function addMembers($userIds, $options=null)
         if ($options !== null) {
             $payload = array_merge($payload, $options);
         }
-        return $this->client->post($this->getUrl(), $payload);
+        return $this->update(null, null, $payload);
     }
 
     /**
@@ -313,7 +319,7 @@ public function addModerators($userIds)
         $payload = [
             "add_moderators" => $userIds
         ];
-        return $this->client->post($this->getUrl(), $payload);
+        return $this->update(null, null, $payload);
     }
 
     /**
@@ -326,7 +332,7 @@ public function removeMembers($userIds)
         $payload = [
             "remove_members" => $userIds
         ];
-        return $this->client->post($this->getUrl(), $payload);
+        return $this->update(null, null, $payload);
     }
 
     /**
@@ -339,7 +345,7 @@ public function demoteModerators($userIds)
         $payload = [
             "demote_moderators" => $userIds
         ];
-        return $this->client->post($this->getUrl(), $payload);
+        return $this->update(null, null, $payload);
     }
 
     /**
@@ -412,33 +418,53 @@ public function unbanUser($targetId, $options=null)
     }
 
     /**
+      * @param array $userIds
+      * @param array $message
+      * @return StreamResponse
+      * @throws StreamException
+      */
+    public function inviteMembers($userIds, $message = null)
+    {
+        $payload = [
+            "invites" => $userIds,
+            "message" => $message
+        ];
+
+        return $this->update(null, $message, $payload);
+    }
+
+    /**
+      * @param string $userId
       * @param array $options
       * @return StreamResponse
       * @throws StreamException
       */
-    public function acceptInvite($options=null)
+    public function acceptInvite($userId, $options=null)
     {
         if ($options === null) {
             $options = [];
         }
+        $options["user_id"] = $userId;
         $options['accept_invite'] = true;
-        $response = $this->client->post($this->getUrl(), $options);
+        $response = $this->update(null, null, $options);
         $this->customData = $response['channel'];
         return $response;
     }
 
     /**
+      * @param string $userId
       * @param array $options
       * @return StreamResponse
       * @throws StreamException
       */
-    public function rejectInvite($options=null)
+    public function rejectInvite($userId, $options=null)
     {
         if ($options === null) {
             $options = [];
         }
+        $options["user_id"] = $userId;
         $options['reject_invite'] = true;
-        $response = $this->client->post($this->getUrl(), $options);
+        $response = $this->update(null, null, $options);
         $this->customData = $response['channel'];
         return $response;
     }

tests/integration/IntegrationTest.php

@@ -770,6 +770,22 @@ public function testChannelUpdate()
         $this->assertSame($response["channel"]["motd"], "one apple a day");
     }
 
+    public function testInviteAndAccept()
+    {
+        $user = $this->getUser();
+        $channel = $this->getChannel();
+        $channel->inviteMembers([$user["id"]]);
+        $channel->acceptInvite($user["id"]);
+    }
+    
+    public function testInviteAndReject()
+    {
+        $user = $this->getUser();
+        $channel = $this->getChannel();
+        $channel->inviteMembers([$user["id"]]);
+        $channel->rejectInvite($user["id"]);
+    }
+
     public function testChannelUpdatePartial()
     {
         $channel = $this->getChannel();