fix: stream review changes

push-protocol · Nov 14, 2023 · cdf4370 · cdf4370
1 parent fc9aa28
commit cdf4370
Show file tree

Hide file tree

Showing 6 changed files with 259 additions and 122 deletions.
diff --git a/packages/restapi/src/lib/constantsV2.ts b/packages/restapi/src/lib/constantsV2.ts
@@ -5,6 +5,10 @@ import { ConditionType, GROUP_INVITER_ROLE, GROUP_RULES_CATEGORY, GROUP_RULES_PE
 
 
 
+// TODO: Change this do . type
+// TODO: Add Notif type.
+// TODO: Add Notif settings, boolean and slider
+// TODO: Notification alias chain
 const CONSTANTS = {
   ENV: ENV,
   STREAM: STREAM,

diff --git a/packages/restapi/src/lib/pushapi/PushAPI.ts b/packages/restapi/src/lib/pushapi/PushAPI.ts
@@ -28,7 +28,7 @@ export class PushAPI {
   public profile: Profile;
   public encryption: Encryption;
   private user: User;
-  public _stream!: PushStream;
+  public stream!: PushStream;
   // Notification
   public channel!: Channel;
   public notification!: Notification;
@@ -163,15 +163,15 @@ export class PushAPI {
     }
   }
 
-  async stream(
+  async initStream(
     listen: STREAM[],
     options?: PushStreamInitializeProps
   ): Promise<PushStream> {
-    if (this._stream) {
+    if (this.stream) {
       throw new Error('Stream is already initialized.');
     }
 
-    this._stream = await PushStream.initialize(
+    this.stream = await PushStream.initialize(
       this.account,
       this.decryptedPgpPvtKey,
       this.signer,
@@ -181,7 +181,7 @@ export class PushAPI {
       options
     );
 
-    return this._stream;
+    return this.stream;
   }
 
   async info() {

diff --git a/packages/restapi/src/lib/pushstream/DataModifier.ts b/packages/restapi/src/lib/pushstream/DataModifier.ts
@@ -16,6 +16,7 @@ import {
   NotificationEventType,
   NotificationType,
   NOTIFICATION,
+  ProposedEventNames,
 } from './pushStreamTypes';
 
 export class DataModifier {
@@ -317,16 +318,15 @@ export class DataModifier {
         (key) => NOTIFICATION.TYPE[key] === data.payload.data.type
       ) || 'BROADCAST'; // Assuming 'BROADCAST' as the default
 
+    let recipients: string[];
 
-       let recipients: string[];
-
-       if (Array.isArray(data.payload.recipients)) {
-         recipients = data.payload.recipients;
-       } else if (typeof data.payload.recipients === 'string') {
-         recipients = [data.payload.recipients];
-       } else {
-         recipients = Object.keys(data.payload.recipients);
-       }
+    if (Array.isArray(data.payload.recipients)) {
+      recipients = data.payload.recipients;
+    } else if (typeof data.payload.recipients === 'string') {
+      recipients = [data.payload.recipients];
+    } else {
+      recipients = Object.keys(data.payload.recipients);
+    }
 
     const notificationEvent: NotificationEvent = {
       event: notificationEventType,
@@ -376,4 +376,50 @@ export class DataModifier {
 
     return notificationEvent;
   }
+
+  public static convertToProposedName(
+    currentEventName: string
+  ): ProposedEventNames {
+    switch (currentEventName) {
+      case 'message':
+        return ProposedEventNames.Message;
+      case 'request':
+        return ProposedEventNames.Request;
+      case 'accept':
+        return ProposedEventNames.Accept;
+      case 'reject':
+        return ProposedEventNames.Reject;
+      case 'leaveGroup':
+        return ProposedEventNames.LeaveGroup;
+      case 'joinGroup':
+        return ProposedEventNames.JoinGroup;
+      case 'createGroup':
+        return ProposedEventNames.CreateGroup;
+      case 'updateGroup':
+        return ProposedEventNames.UpdateGroup;
+      case 'remove':
+        return ProposedEventNames.Remove;
+      default:
+        throw new Error(`Unknown current event name: ${currentEventName}`);
+    }
+  }
+
+  public static handleToField(data: any): void {
+    switch (data.event) {
+      case ProposedEventNames.LeaveGroup:
+      case ProposedEventNames.JoinGroup:
+        data.to = null;
+        break;
+
+      case ProposedEventNames.Accept:
+      case ProposedEventNames.Reject:
+        if (data.meta?.group) {
+          data.to = null;
+        }
+        break;
+
+      default:
+        break;
+    }
+  }
 }