refactor

Author: Rafael Marinho

examples/mark_delivered_example.php

@@ -354,38 +354,6 @@ public function markRead(string $userId, ?array $data = null): StreamResponse
         return $this->client->post($this->getUrl() . "/read", $payload);
     }
 
-    /** Send the mark delivered event for this user, only works if
-     * the `delivery_receipts` setting is enabled.
-     * 
-     * @param string $userId The user ID sending the delivery receipt
-     * @param array|null $data Optional data for the mark delivered request. Expected structure:
-     *                         [
-     *                             'channel_delivered_message' => [
-     *                                 'channel_id' => 'message_id'
-     *                             ],
-     *                             'client_id' => 'optional_client_id',
-     *                             'connection_id' => 'optional_connection_id',
-     *                             'user' => [/* user data */],
-     *                             'user_id' => 'optional_user_id'
-     *                         ]
-     * @return StreamResponse
-     * @throws StreamException
-     * @link https://getstream.io/chat/docs/php/send_message/?language=php
-     */
-    public function markDelivered(string $userId, ?array $data = null): StreamResponse
-    {
-        if ($data === null) {
-            $data = [];
-        }
-        
-        // Note: In PHP, we don't have access to the current user's privacy settings
-        // through the client like in JavaScript. The delivery receipts check should
-        // be handled on the client side before calling this method.
-        
-        $payload = Channel::addUser($data, $userId);
-        return $this->client->post("channels/delivered", $payload);
-    }
-
     /** List the message replies for a parent message.
      * @link https://getstream.io/chat/docs/php/threads/?language=php
      * @throws StreamException

lib/GetStream/StreamChat/Channel.php

@@ -1748,4 +1748,19 @@ public function updateUserActiveLiveLocation(string $userId, array $location): S
         $params = ["user_id" => $userId];
         return $this->put("users/live_locations", $location, $params);
     }
+
+    /**
+     * Mark messages as delivered
+     * @param string $userId The user ID
+     * @param array $latestDeliveredMessages Array of DeliveredMessageConfirmation objects
+     * @throws StreamException
+     */
+    public function markDelivered(string $userId, array $latestDeliveredMessages): StreamResponse
+    {
+        $data = [
+            'latest_delivered_messages' => $latestDeliveredMessages
+        ];
+        $params = ["user_id" => $userId];
+        return $this->post("channels/delivered", $lastDeliveredMessages, $params);
+    }
 }

lib/GetStream/StreamChat/Client.php

@@ -1828,4 +1828,22 @@ public function testSharedLocations()
         $this->assertEquals(-118.2437, $newUserLocations["active_live_locations"][0]["longitude"]);
         $this->assertEquals('test-device-123', $newUserLocations["active_live_locations"][0]["created_by_device_id"]);
     }
+
+    public function testMarkDelivered()
+    {
+        // Send a message first
+        $message = $this->channel->sendMessage(["text" => "Test message for delivery receipt"], $this->user1["id"]);
+        
+        // Mark the message as delivered
+        $latestDeliveredMessages = [
+            [
+                'cid' => $this->channel->getCID(),
+                'id' => $message["message"]["id"]
+            ]
+        ];
+
+        $response = $this->client->markDelivered($this->user1["id"], $latestDeliveredMessages);
+        
+        $this->assertInstanceOf(\GetStream\StreamChat\StreamResponse::class, $response);
+    }
 }