@amityco/ts-sdk 6.17.3-e382dbe.0 → 6.18.0

package/dist/storyRepository/observers/getGlobalStoryTargets/GlobalStoryLiveCollectionController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GlobalStoryLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/storyRepository/observers/getGlobalStoryTargets/GlobalStoryLiveCollectionController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAU1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAQxE,qBAAa,mCAAoC,SAAQ,wBAAwB,CAC/E,iBAAiB,EACjB,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,WAAW,EACjB,yBAAyB,CAC1B;IACC,OAAO,CAAC,qBAAqB,CAAmC;IAEhE,OAAO,CAAC,KAAK,CAAyB;gBAGpC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAC7B,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,CAAC;IAsB3D,SAAS,CAAC,KAAK;IAUf,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,sBAAsB;IAI7D,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,iBAAiB,CAAC;IAIlE,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IAyBzE,OAAO,CAAC,WAAW;IAuCnB,iBAAiB;CAalB"}
+{"version":3,"file":"GlobalStoryLiveCollectionController.d.ts","sourceRoot":"","sources":["../../../../src/storyRepository/observers/getGlobalStoryTargets/GlobalStoryLiveCollectionController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAU1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAQxE,qBAAa,mCAAoC,SAAQ,wBAAwB,CAC/E,iBAAiB,EACjB,KAAK,CAAC,gBAAgB,EACtB,KAAK,CAAC,WAAW,EACjB,yBAAyB,CAC1B;IACC,OAAO,CAAC,qBAAqB,CAAmC;IAEhE,OAAO,CAAC,KAAK,CAAyB;gBAGpC,KAAK,EAAE,KAAK,CAAC,gBAAgB,EAC7B,QAAQ,EAAE,KAAK,CAAC,sBAAsB,CAAC,KAAK,CAAC,WAAW,CAAC;IAsB3D,SAAS,CAAC,KAAK;IAUf,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,KAAK,CAAC,sBAAsB;IAI7D,SAAS,CAAC,kBAAkB,CAAC,EAC3B,QAAQ,EACR,SAAS,EACT,OAAO,GACR,EAAE,KAAK,CAAC,sCAAsC,CAAC,iBAAiB,CAAC;IAIlE,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,0BAA0B;IA6BzE,OAAO,CAAC,WAAW;IAkCnB,iBAAiB;CAalB"}

package/dist/storyRepository/utils/StoryComputedValue.d.ts

@@ -5,7 +5,6 @@ export declare class StoryComputedValue {
     private cacheStoryExpireTime?;
     private cacheStoreSeenTime?;
     private _syncingStoriesCount;
-    private _syncedStoriesCount;
     private _errorStoriesCount;
     constructor(targetId: string, lastStoryExpiresAt?: Amity.timestamp, lastStorySeenExpiresAt?: Amity.timestamp);
     get lastStoryExpiresAt(): number;
@@ -16,7 +15,6 @@ export declare class StoryComputedValue {
     getLocalLastSortingDate(): number;
     getHasUnseenFlag(): boolean;
     getTotalStoryByStatus(): void;
-    get syncedStoriesCount(): number;
     get syncingStoriesCount(): number;
     get failedStoriesCount(): number;
 }

package/dist/storyRepository/utils/StoryComputedValue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StoryComputedValue.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/utils/StoryComputedValue.ts"],"names":[],"mappings":"AAGA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAkB;IAEvD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAkB;IAE3D,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,OAAO,CAAC,kBAAkB,CAAC,CAAgC;IAE3D,OAAO,CAAC,oBAAoB,CAAK;IAEjC,OAAO,CAAC,mBAAmB,CAAK;IAEhC,OAAO,CAAC,kBAAkB,CAAK;gBAG7B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,EACpC,sBAAsB,CAAC,EAAE,KAAK,CAAC,SAAS;IAqB1C,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,IAAI,sBAAsB,IAAI,MAAM,CAEnC;IAED,IAAI,qBAAqB,IAAI,MAAM,CAIlC;IAED,IAAI,2BAA2B,IAAI,MAAM,CAExC;IAED,IAAI,sBAAsB,IAAI,OAAO,CASpC;IAED,uBAAuB,IAAI,MAAM;IAQjC,gBAAgB,IAAI,OAAO;IAiB3B,qBAAqB,IAAI,IAAI;IAkC7B,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;CACF"}
+{"version":3,"file":"StoryComputedValue.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/utils/StoryComputedValue.ts"],"names":[],"mappings":"AAGA,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IAEnC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAkB;IAEvD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAkB;IAE3D,OAAO,CAAC,oBAAoB,CAAC,CAAgC;IAE7D,OAAO,CAAC,kBAAkB,CAAC,CAAgC;IAE3D,OAAO,CAAC,oBAAoB,CAAK;IAEjC,OAAO,CAAC,kBAAkB,CAAK;gBAG7B,QAAQ,EAAE,MAAM,EAChB,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,EACpC,sBAAsB,CAAC,EAAE,KAAK,CAAC,SAAS;IAqB1C,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,IAAI,sBAAsB,IAAI,MAAM,CAEnC;IAED,IAAI,qBAAqB,IAAI,MAAM,CAIlC;IAED,IAAI,2BAA2B,IAAI,MAAM,CAExC;IAED,IAAI,sBAAsB,IAAI,OAAO,CASpC;IAED,uBAAuB,IAAI,MAAM;IAQjC,gBAAgB,IAAI,OAAO;IAiB3B,qBAAqB,IAAI,IAAI;IAgC7B,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;CACF"}

package/dist/storyRepository/utils/convertStoryPayloadToRaw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertStoryPayloadToRaw.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/utils/convertStoryPayloadToRaw.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,YAC1B,MAAM,kBAAkB,KAChC,MAAM,0BAsCR,CAAC"}
+{"version":3,"file":"convertStoryPayloadToRaw.d.ts","sourceRoot":"","sources":["../../../src/storyRepository/utils/convertStoryPayloadToRaw.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,wBAAwB,YAC1B,MAAM,kBAAkB,KAChC,MAAM,0BA0DR,CAAC"}

package/dist/utils/linkedObject/storyTargetLinkedObject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storyTargetLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/storyTargetLinkedObject.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB,gBAAiB,MAAM,cAAc,KAAG,MAAM,WAiCjF,CAAC"}
+{"version":3,"file":"storyTargetLinkedObject.d.ts","sourceRoot":"","sources":["../../../src/utils/linkedObject/storyTargetLinkedObject.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,uBAAuB,gBAAiB,MAAM,cAAc,KAAG,MAAM,WAgCjF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "6.17.3-e382dbe.0",
+  "version": "6.18.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/@types/domains/client.ts

@@ -58,11 +58,7 @@ declare global {
 
       use: () => void;
 
-      accessTokenExpiryWatcher: (
-        expiresAt: Amity.Tokens['expiresAt'],
-        issuedAt: Amity.Tokens['issuedAt'],
-        sessionHandler: Amity.SessionHandler,
-      ) => Amity.Unsubscriber;
+      accessTokenExpiryWatcher: (sessionHandler: Amity.SessionHandler) => Amity.Unsubscriber;
 
       getFeedSettings: () => Promise<Amity.FeedSettings>;
       getSocialSettings: () => Promise<Amity.SocialSettings>;

package/src/@types/domains/community.ts

@@ -61,6 +61,8 @@ declare global {
 
       hasFlaggedComment: boolean;
       hasFlaggedPost: boolean;
+
+      allowCommentInStory?: boolean;
     } & Amity.Taggable &
       Amity.Metadata &
       Amity.Timestamps &
@@ -70,9 +72,6 @@ declare global {
     type Community = Omit<Amity.RawCommunity, 'onlyAdminCanPost' | 'needApprovalOnPostCreation'> &
       Amity.CommunityStorySettings & {
         postSetting?: ValueOf<typeof CommunityPostSettings>;
-        storySetting?: {
-          enableComment: boolean;
-        };
       };
 
     type QueryCommunities = {

package/src/@types/domains/story.ts

@@ -48,12 +48,14 @@ declare global {
     };
 
     type RawStoryTarget = {
-      lastStoryExpiresAt?: Amity.timestamp;
-      lastStorySeenExpiresAt?: Amity.timestamp;
       targetId: string;
       targetType: string;
       targetPublicId: string;
       targetUpdatedAt: Amity.timestamp;
+
+      lastStoryExpiresAt?: Amity.timestamp;
+      lastStorySeenExpiresAt?: Amity.timestamp;
+
       localFilter?: Amity.StorySeenQuery;
     };
 
@@ -82,7 +84,6 @@ declare global {
       localSortingDate: number;
       localFilter?: Amity.StorySeenQuery;
 
-      syncedStoriesCount: number;
       syncingStoriesCount: number;
       failedStoriesCount: number;
     };
@@ -119,6 +120,7 @@ declare global {
         markAsSeen: () => void;
         markLinkAsClicked: () => void;
       };
+      creator?: Amity.User;
       storyTarget?: Amity.StoryTarget;
       community?: Amity.Community;
       communityCategories?: Amity.Category[];

package/src/client/api/accessTokenExpiryWatcher.ts

@@ -3,6 +3,7 @@ import { scheduleTask } from '~/core/microtasks';
 import { MINUTE, ACCESS_TOKEN_WATCHER_INTERVAL } from '~/utils/constants';
 
 import { renewal } from './renewal';
+import { getActiveClient } from './activeClient';
 
 const ABOUT_TO_EXPIRE_THRESHOLD = 80 / 100;
 const COMPENSATED_DELAY = 5 * MINUTE;
@@ -50,11 +51,15 @@ export const isAboutToExpire = (params: {
  * @category private
  */
 export const accessTokenExpiryWatcher = (
-  expiresAt: Amity.Tokens['expiresAt'],
-  issuedAt: Amity.Tokens['issuedAt'],
   sessionHandler: Amity.SessionHandler,
 ): Amity.Unsubscriber => {
   const interval: ReturnType<typeof setInterval> = setInterval(() => {
+    const client = getActiveClient();
+
+    if (!client.token) return;
+
+    const { issuedAt, expiresAt } = client.token;
+
     if (isExpired(expiresAt)) {
       /*
        * the event handler will take care of updating session state

package/src/client/api/login.ts

@@ -132,11 +132,7 @@ export const login = async (
      * Cannot push to subscriptions as watcher needs to continue working even if
      * token expires
      */
-    unsubWatcher = client.accessTokenExpiryWatcher(
-      client.token?.expiresAt!,
-      client.token?.issuedAt!,
-      sessionHandler!,
-    );
+    unsubWatcher = client.accessTokenExpiryWatcher(sessionHandler);
 
     setActiveUser(user);
   } catch (error) {

package/src/client/api/renewal.ts

@@ -35,14 +35,11 @@ export const renewal = (): Amity.AccessTokenRenewal => {
 
     const params = { userId, displayName, authToken, deviceId };
 
-    if (client.sessionState === Amity.SessionStates.TOKEN_EXPIRED) {
-      // sessionHandler will never be empty when renewal is instantiatied
-      await login(params, client.sessionHandler!);
+    if (client.sessionState === Amity.SessionStates.TOKEN_EXPIRED && client.sessionHandler) {
+      await login(params, client.sessionHandler);
     } else {
       // about to expire
 
-      // @ts-ignore: in that particular case, typing can be
-      // ignored since we enforce default values just before.
       await refreshToken(params);
     }
 

package/src/client/utils/setClientToken.ts

@@ -19,8 +19,6 @@ export const setClientToken = async (params: Parameters<typeof getToken>[0]) =>
   // begin establishing session
   setSessionState(Amity.SessionStates.ESTABLISHING);
 
-  // @ts-ignore: in that particular case, typing can be
-  // ignored since we enforce default values just before.
   const { accessToken, users, expiresAt, issuedAt, refreshToken } = await getToken(params);
 
   // manually setup the token for http transport

package/src/storyRepository/observers/getGlobalStoryTargets/GlobalStoryLiveCollectionController.ts

@@ -87,7 +87,11 @@ export class GlobalStoryLiveCollectionController extends LiveCollectionControlle
 
     if (!this.shouldNotify(data) && origin === 'event') return;
 
-    data = this.applyFilter(data);
+    data = this.applyFilter(data)
+      // Remove internal fields
+      .map(
+        ({ localFilter, localLastExpires, localLastSeen, localSortingDate, ...rest }) => rest,
+      ) as Amity.StoryTarget[];
 
     this.callback({
       onNextPage: () => this.loadPage(false, Amity.LiveCollectionPageDirection.NEXT),
@@ -98,7 +102,7 @@ export class GlobalStoryLiveCollectionController extends LiveCollectionControlle
     });
   }
 
-  private applyFilter(data: Amity.StoryTarget[]) {
+  private applyFilter(data: Amity.StoryTarget[]): Amity.StoryTarget[] {
     if (this.query.seenState !== Amity.StorySeenQuery.SMART) {
       return data
         .filter(({ hasUnseen }) => {
@@ -129,12 +133,7 @@ export class GlobalStoryLiveCollectionController extends LiveCollectionControlle
     const sortedSeen = result.seen.sort(sortByLocalSortingDate) || [];
 
     // Merge all status and remove internal fields
-    return sortedUnknown
-      .concat(sortedUnseen, sortedSeen)
-      .map(
-        ({ localFilter, localLastExpires, localLastSeen, localSortingDate, ...rest }) =>
-          rest as Amity.StoryTarget,
-      );
+    return sortedUnknown.concat(sortedUnseen, sortedSeen);
   }
 
   startSubscription() {

package/src/storyRepository/utils/StoryComputedValue.ts

@@ -14,8 +14,6 @@ export class StoryComputedValue {
 
   private _syncingStoriesCount = 0;
 
-  private _syncedStoriesCount = 0;
-
   private _errorStoriesCount = 0;
 
   constructor(
@@ -101,7 +99,6 @@ export class StoryComputedValue {
 
     if (!stories) {
       this._errorStoriesCount = 0;
-      this._syncedStoriesCount = 0;
       this._syncingStoriesCount = 0;
       return;
     }
@@ -126,14 +123,9 @@ export class StoryComputedValue {
     );
 
     this._errorStoriesCount = groupByType.error;
-    this._syncedStoriesCount = groupByType.synced;
     this._syncingStoriesCount = groupByType.syncing;
   }
 
-  get syncedStoriesCount(): number {
-    return this._syncedStoriesCount;
-  }
-
   get syncingStoriesCount(): number {
     return this._syncingStoriesCount;
   }

package/src/storyRepository/utils/convertStoryPayloadToRaw.ts

@@ -1,5 +1,8 @@
 import { getActiveClient } from '~/client';
 import { YEAR } from '~/utils/constants';
+import { pullFromCache } from '~/cache/api';
+import { STORY_KEY_CACHE } from '~/storyRepository/constants';
+import { ingestInCache } from '~/cache/api/ingestInCache';
 
 export const convertStoryPayloadToRaw = (
   payload: Amity.StoryCreatePayload,
@@ -8,6 +11,26 @@ export const convertStoryPayloadToRaw = (
 
   const now = new Date();
   const expiresAt = now.getTime() + YEAR;
+  const expiresAtDate = new Date(expiresAt).toISOString();
+
+  let storyTarget = pullFromCache<Amity.RawStoryTarget>([
+    STORY_KEY_CACHE.STORY_TARGET,
+    'get',
+    payload.targetId,
+  ])?.data;
+
+  if (!storyTarget) {
+    // Save mock story target to cache
+    storyTarget = {
+      targetType: payload.targetType,
+      targetId: payload.targetId,
+      lastStoryExpiresAt: expiresAtDate,
+      targetPublicId: payload.targetId,
+      targetUpdatedAt: now.toISOString(),
+    };
+
+    ingestInCache({ storyTargets: [storyTarget] });
+  }
 
   return {
     stories: [

package/src/utils/linkedObject/storyTargetLinkedObject.ts

@@ -24,7 +24,6 @@ export const storyTargetLinkedObject = (storyTarget: Amity.RawStoryTarget): Amit
 
     // Additional data
     hasUnseen: computedValue.getHasUnseenFlag(),
-    syncedStoriesCount: computedValue.syncedStoriesCount,
     syncingStoriesCount: computedValue.syncingStoriesCount,
     failedStoriesCount: computedValue.failedStoriesCount,