fix: merge main

push-protocol · Nov 27, 2023 · 06d724b · 06d724b
2 parents d04c93a + 73f3e9c
commit 06d724b
Show file tree

Hide file tree

Showing 10 changed files with 342 additions and 267 deletions.
diff --git a/packages/restapi/src/lib/pushNotification/PushNotificationTypes.ts b/packages/restapi/src/lib/pushNotification/PushNotificationTypes.ts
@@ -21,7 +21,7 @@ export type SubscribeUnsubscribeOptions = {
 
 export type UserSetting = {
   enabled: boolean;
-  value?: number;
+  value?: number | {lower: number, upper: number};
 };
 
 export type AliasOptions = Omit<GetAliasInfoOptionsType, 'env'>;
@@ -100,7 +100,7 @@ export type CreateChannelOptions = {
 
 export type NotificationSetting = {
   type: number;
-  default: number;
+  default: number | { upper: number; lower: number };
   description: string;
   data?: {
     upper: number;

diff --git a/packages/restapi/src/lib/pushNotification/pushNotificationBase.ts b/packages/restapi/src/lib/pushNotification/pushNotificationBase.ts
@@ -36,6 +36,7 @@ const LENGTH_UPPER_LIMIT = 125;
 const LENGTH_LOWER_LIMTI = 1;
 const SETTING_DELIMITER = '-';
 const SETTING_SEPARATOR = '+';
+const RANGE_TYPE = 3;
 const SLIDER_TYPE = 2;
 const BOOLEAN_TYPE = 1;
 const DEFAULT_ENABLE_VALUE = '1';
@@ -160,17 +161,25 @@ export class PushNotificationBaseClass {
     // fetch the minimal version based on conifg that was passed
     let index = '';
     if (options.payload?.category && settings) {
-      if (settings[options.payload.category - 1].type == 2) {
+      if (settings[options.payload.category - 1].type == SLIDER_TYPE) {
         index =
           options.payload.category +
           SETTING_DELIMITER +
           SLIDER_TYPE +
           SETTING_DELIMITER +
           settings[options.payload.category - 1].default;
       }
-      if (settings[options.payload.category - 1].type == 1) {
+      if (settings[options.payload.category - 1].type == BOOLEAN_TYPE) {
         index = options.payload.category + SETTING_DELIMITER + BOOLEAN_TYPE;
       }
+      if (settings[options.payload.category - 1].type == RANGE_TYPE) {
+        index =
+          options.payload.category +
+          SETTING_DELIMITER +
+          RANGE_TYPE +
+          SETTING_DELIMITER +
+          settings[options.payload.category - 1].default.lower;
+      }
     }
     const notificationPayload: ISendNotificationInputOptions = {
       signer: signer,
@@ -715,6 +724,31 @@ export class PushNotificationBaseClass {
             ele.description;
         }
       }
+      if (ele.type == RANGE_TYPE) {
+        if (ele.default && typeof ele.default == 'object' && ele.data) {
+          const enabled =
+            ele.data && ele.data.enabled != undefined
+              ? Number(ele.data.enabled).toString()
+              : DEFAULT_ENABLE_VALUE;
+          const ticker = ele.data.ticker ?? DEFAULT_TICKER_VALUE;
+          notificationSetting =
+            notificationSetting +
+            SETTING_SEPARATOR +
+            RANGE_TYPE +
+            SETTING_DELIMITER +
+            enabled +
+            SETTING_DELIMITER +
+            ele.default.lower +
+            SETTING_DELIMITER +
+            ele.default.upper +
+            SETTING_DELIMITER +
+            ele.data.lower +
+            SETTING_DELIMITER +
+            ele.data.upper +
+            SETTING_DELIMITER +
+            ticker;
+        }
+      }
     }
     return {
       setting: notificationSetting.replace(/^\+/, ''),

diff --git a/packages/restapi/src/lib/pushapi/PushAPI.ts b/packages/restapi/src/lib/pushapi/PushAPI.ts
@@ -1,6 +1,6 @@
 import Constants, { ENV } from '../constants';
 import { SignerType, ProgressHookType } from '../types';
-import { PushAPIInitializeProps } from './pushAPITypes';
+import { InfoOptions, PushAPIInitializeProps } from './pushAPITypes';
 import * as PUSH_USER from '../user';
 import * as PUSH_CHAT from '../chat';
 import { getAccountAddress, getWallet } from '../chat/helpers';
@@ -240,9 +240,10 @@ export class PushAPI {
     return this.stream;
   }
 
-  async info() {
+  async info(options?: InfoOptions) {
+    const accountToUse = options?.overrideAccount || this.account;
     return await PUSH_USER.get({
-      account: this.account,
+      account: accountToUse,
       env: this.env,
     });
   }

diff --git a/packages/restapi/src/lib/pushapi/chat.ts b/packages/restapi/src/lib/pushapi/chat.ts
@@ -61,10 +61,13 @@ export class Chat {
        */
       page?: number;
       limit?: number;
+      overrideAccount?: string;
     }
   ): Promise<IFeeds[]> {
+    const accountToUse = options?.overrideAccount || this.account;
+
     const listParams = {
-      account: this.account,
+      account: accountToUse,
       pgpPrivateKey: this.decryptedPgpPvtKey,
       page: options?.page,
       limit: options?.limit,
@@ -188,7 +191,7 @@ export class Chat {
   }
 
   async block(users: Array<string>): Promise<IUser> {
-    if (!this.signer) {
+    if (!this.signer || !this.decryptedPgpPvtKey) {
       throw new Error(PushAPI.ensureSignerMessage());
     }
     const user = await PUSH_USER.get({

diff --git a/packages/restapi/src/lib/pushapi/profile.ts b/packages/restapi/src/lib/pushapi/profile.ts
@@ -2,6 +2,7 @@ import { ProgressHookType } from '../types';
 import * as PUSH_USER from '../user';
 import { ENV } from '../constants';
 import { PushAPI } from './PushAPI';
+import { InfoOptions } from './pushAPITypes';
 
 export class Profile {
   constructor(
@@ -11,18 +12,19 @@ export class Profile {
     private progressHook?: (progress: ProgressHookType) => void
   ) {}
 
-  async info() {
+  async info(options?: InfoOptions) {
+    const accountToUse = options?.overrideAccount || this.account;
     const response = await PUSH_USER.get({
-      account: this.account,
+      account: accountToUse,
       env: this.env,
     });
     return response.profile;
   }
 
   async update(options: { name?: string; desc?: string; picture?: string }) {
-     if (!this.decryptedPgpPvtKey) {
-       throw new Error(PushAPI.ensureSignerMessage());
-     }
+    if (!this.decryptedPgpPvtKey) {
+      throw new Error(PushAPI.ensureSignerMessage());
+    }
     const { name, desc, picture } = options;
     const response = await PUSH_USER.profile.update({
       pgpPrivateKey: this.decryptedPgpPvtKey,

diff --git a/packages/restapi/src/lib/pushapi/pushAPITypes.ts b/packages/restapi/src/lib/pushapi/pushAPITypes.ts
@@ -52,3 +52,8 @@ export interface GroupUpdateOptions {
   meta?: string | null;
   rules?: Rules | null;
 }
+
+export interface InfoOptions {
+  overrideAccount?: string;
+}
+
diff --git a/packages/restapi/src/lib/pushapi/user.ts b/packages/restapi/src/lib/pushapi/user.ts
@@ -1,12 +1,14 @@
 import * as PUSH_USER from '../user';
 import { ENV } from '../constants';
+import { InfoOptions } from './pushAPITypes';
 
 export class User {
   constructor(private account: string, private env: ENV) {}
 
-  async info() {
+  async info(options?: InfoOptions) {
+    const accountToUse = options?.overrideAccount || this.account;
     return await PUSH_USER.get({
-      account: this.account,
+      account: accountToUse,
       env: this.env,
     });
   }