From d70d001f5ab14a9d4b4437ea67d29d0797ef797a Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Tue, 6 May 2025 12:52:05 +0530
Subject: [PATCH] add: backported channels.

---
 src/Appwrite/Messaging/Adapter/Realtime.php          |  6 ++++++
 .../Services/Realtime/RealtimeCustomClientTest.php   | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Appwrite/Messaging/Adapter/Realtime.php b/src/Appwrite/Messaging/Adapter/Realtime.php
index 2657ecccaa..b775078c61 100644
--- a/src/Appwrite/Messaging/Adapter/Realtime.php
+++ b/src/Appwrite/Messaging/Adapter/Realtime.php
@@ -311,10 +311,16 @@ class Realtime extends Adapter
                         throw new \Exception('Table needs to be passed to Realtime for Row events in the Database.');
                     }
 
+                    // 1.7.x
                     $channels[] = 'rows';
                     $channels[] = 'databases.' . $database->getId() .  '.tables.' . $payload->getAttribute('$tableId') . '.rows';
                     $channels[] = 'databases.' . $database->getId() . '.tables.' . $payload->getAttribute('$tableId') . '.rows.' . $payload->getId();
 
+                    // 1.6.x
+                    $channels[] = 'documents';
+                    $channels[] = 'databases.' . $database->getId() .  '.collections.' . $payload->getAttribute('$tableId') . '.documents';
+                    $channels[] = 'databases.' . $database->getId() . '.collections.' . $payload->getAttribute('$tableId') . '.documents.' . $payload->getId();
+
                     $roles = $table->getAttribute('documentSecurity', false)
                         ? \array_merge($table->getRead(), $payload->getRead())
                         : $table->getRead();
diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
index 671bc491f4..eef7978a0e 100644
--- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
@@ -769,7 +769,7 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals('event', $response['type']);
         $this->assertNotEmpty($response['data']);
         $this->assertArrayHasKey('timestamp', $response['data']);
-        $this->assertCount(3, $response['data']['channels']);
+        $this->assertCount(6, $response['data']['channels']); // includes old and new channels
         $this->assertContains('rows', $response['data']['channels']);
         $this->assertContains('databases.' . $databaseId . '.tables.' . $actorsId . '.rows.' . $documentId, $response['data']['channels']);
         $this->assertContains('databases.' . $databaseId . '.tables.' . $actorsId . '.rows', $response['data']['channels']);
@@ -813,7 +813,7 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals('event', $response['type']);
         $this->assertNotEmpty($response['data']);
         $this->assertArrayHasKey('timestamp', $response['data']);
-        $this->assertCount(3, $response['data']['channels']);
+        $this->assertCount(6, $response['data']['channels']); // includes old and new channels
         $this->assertContains('rows', $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows.{$documentId}", $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows", $response['data']['channels']);
@@ -867,7 +867,7 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals('event', $response['type']);
         $this->assertNotEmpty($response['data']);
         $this->assertArrayHasKey('timestamp', $response['data']);
-        $this->assertCount(3, $response['data']['channels']);
+        $this->assertCount(6, $response['data']['channels']); // includes old and new channels
         $this->assertContains('rows', $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows.{$documentId}", $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows", $response['data']['channels']);
@@ -987,7 +987,7 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals('event', $response['type']);
         $this->assertNotEmpty($response['data']);
         $this->assertArrayHasKey('timestamp', $response['data']);
-        $this->assertCount(3, $response['data']['channels']);
+        $this->assertCount(6, $response['data']['channels']); // includes old and new channels
         $this->assertContains('rows', $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows.{$documentId}", $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows", $response['data']['channels']);
@@ -1026,7 +1026,7 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals('event', $response['type']);
         $this->assertNotEmpty($response['data']);
         $this->assertArrayHasKey('timestamp', $response['data']);
-        $this->assertCount(3, $response['data']['channels']);
+        $this->assertCount(6, $response['data']['channels']); // includes old and new channels
         $this->assertContains('rows', $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows.{$documentId}", $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows", $response['data']['channels']);
@@ -1076,7 +1076,7 @@ class RealtimeCustomClientTest extends Scope
         $this->assertEquals('event', $response['type']);
         $this->assertNotEmpty($response['data']);
         $this->assertArrayHasKey('timestamp', $response['data']);
-        $this->assertCount(3, $response['data']['channels']);
+        $this->assertCount(6, $response['data']['channels']); // includes old and new channels
         $this->assertContains('rows', $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows.{$documentId}", $response['data']['channels']);
         $this->assertContains("databases.{$databaseId}.tables.{$actorsId}.rows", $response['data']['channels']);