chore: review

appwrite · Jan 23, 2025 · a4b0de2 · a4b0de2
1 parent d6611d5
commit a4b0de2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/templates/android/library/src/main/java/io/package/models/RealtimeModels.kt.twig b/templates/android/library/src/main/java/io/package/models/RealtimeModels.kt.twig
@@ -17,7 +17,7 @@ data class RealtimeCallback(
 
 open class RealtimeResponse(
     val type: String,
-    val data: Any
+    val data: Any? = null
 )
 
 data class RealtimeResponseEvent<T>(

diff --git a/templates/flutter/lib/src/realtime_response.dart.twig b/templates/flutter/lib/src/realtime_response.dart.twig
@@ -30,7 +30,7 @@ class RealtimeResponse {
   factory RealtimeResponse.fromMap(Map<String, dynamic> map) {
     return RealtimeResponse(
       type: map['type'] ?? '',
-      data: (map.containsKey('data')) ? Map<String, dynamic>.from(map['data']) : {},
+      data: Map<String, dynamic>.from(map['data'] ?? {}),
     );
   }
 

diff --git a/templates/react-native/src/client.ts.twig b/templates/react-native/src/client.ts.twig
@@ -12,7 +12,7 @@ type Headers = {
 
 type RealtimeResponse = {
     type: 'error' | 'event' | 'connected' | 'response' | 'pong';
-    data: RealtimeResponseAuthenticated | RealtimeResponseConnected | RealtimeResponseError | RealtimeResponseEvent<unknown>;
+    data: RealtimeResponseAuthenticated | RealtimeResponseConnected | RealtimeResponseError | RealtimeResponseEvent<unknown> | undefined;
 }
 
 type RealtimeRequest = {
@@ -291,16 +291,18 @@ class Client {
                 switch (message.type) {
                     case 'event':
                         if(!message.data) return;
-                        let data = <RealtimeResponseEvent<unknown>>message.data;
-                        if (data?.channels) {
-                            const isSubscribed = data.channels.some(channel => this.realtime.channels.has(channel));
-                            if (!isSubscribed) return;
-                            this.realtime.subscriptions.forEach(subscription => {
-                                if (data.channels.some(channel => subscription.channels.includes(channel))) {
-                                    setTimeout(() => subscription.callback(data));
-                                }
-                            })
-                        }
+
+                        const data = message.data as RealtimeResponseEvent<unknown>;
+                        if (!data?.channels) return;
+
+                        const isSubscribed = data.channels.some(channel => this.realtime.channels.has(channel));
+                        if (!isSubscribed) return;
+
+                        this.realtime.subscriptions.forEach(subscription => {
+                            if (data.channels.some(channel => subscription.channels.includes(channel))) {
+                                setTimeout(() => subscription.callback(data));
+                            }
+                        });
                         break;
                     case 'pong':
                         break; // Handle pong response if needed

diff --git a/templates/web/src/client.ts.twig b/templates/web/src/client.ts.twig
@@ -19,14 +19,14 @@ type Headers = {
  */
 type RealtimeResponse = {
     /**
-     * Type of the response: 'error', 'event', 'connected', 'pong', or 'response'.
+     * Type of the response: 'error', 'event', 'connected', 'response' or 'pong'.
      */
     type: 'error' | 'event' | 'connected' | 'response' | 'pong';
 
     /**
      * Data associated with the response based on the response type.
      */
-    data: RealtimeResponseAuthenticated | RealtimeResponseConnected | RealtimeResponseError | RealtimeResponseEvent<unknown>;
+    data: RealtimeResponseAuthenticated | RealtimeResponseConnected | RealtimeResponseError | RealtimeResponseEvent<unknown> | undefined;
 }
 
 /**