@amityco/ts-sdk 0.0.1-beta.43 → 0.0.1-beta.43.1

package/dist/message/api/queryMessages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryMessages.d.ts","sourceRoot":"","sources":["../../../src/message/api/queryMessages.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa;YACjB,MAAM,aAAa,GACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAuCxE;;;;;;;;;;;;OAYG;mBAEM,WAAW,oBAAoB,CAAC,CAAC,CAAC,CAAC,GACzC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS;CAlB1E,CAAC"}
+{"version":3,"file":"queryMessages.d.ts","sourceRoot":"","sources":["../../../src/message/api/queryMessages.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa;YACjB,MAAM,aAAa,GACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAuCxE;;;;;;;;;;;;OAYG;mBAEM,WAAW,oBAAoB,CAAC,CAAC,CAAC,CAAC,GACzC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,OAAO,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS;CAlB1E,CAAC"}

package/package.json

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

package/src/community/observers/liveCommunities.ts

@@ -5,6 +5,7 @@ import { getActiveClient } from '~/client/api';
 import {
   createQuery,
   filterByPropEquality,
+  filterByCommunityMembership,
   queryOptions,
   runQuery,
   sortByDisplayName,
@@ -51,7 +52,7 @@ export const liveCommunities = (
   callback: Amity.LiveCollectionCallback<Amity.Community>,
   config?: Amity.LiveCollectionConfig,
 ) => {
-  const { log, cache } = getActiveClient();
+  const { log, cache, userId } = getActiveClient();
 
   if (!cache) {
     console.log(ENABLE_CACHE_MESSAGE);
@@ -89,12 +90,8 @@ export const liveCommunities = (
       communities = communities.filter(c => c.tags?.some(t => params.tags?.includes(t)));
     }
 
-    if (params.membership === 'member') {
-      communities = filterByPropEquality(communities, 'isJoined', true);
-    }
-
-    if (params.membership === 'notMember') {
-      communities = filterByPropEquality(communities, 'isJoined', false);
+    if (params.membership && userId) {
+      communities = filterByCommunityMembership(communities, params.membership, userId);
     }
 
     const sortBy = params.sortBy || 'lastCreated';

package/src/community/observers/tests/liveCommunities.test.ts

@@ -89,9 +89,6 @@ describe('liveCommunities', () => {
     ['categoryId', { categoryId: 'test-category-id' }, [community1]],
     ['displayName', { displayName: 'community 1' }, [community1]],
     ['tagged', { tags: ['test-community-tag'] }, [community1]],
-    ['member', { membership: 'member' }, [community1]],
-    ['not member', { membership: 'notMember' }, [community2]],
-    ['all membership', { membership: 'all' }, [community1, community2]],
   ];
 
   test.each(filters)('it should filter by %s communities', async (filter, params, expected) => {
@@ -216,89 +213,5 @@ describe('liveCommunities', () => {
         ),
       );
     });
-
-    const joinCommunityPayload = {
-      ...communityQueryResponse.data.communities[0],
-      communityId: 'joining-community',
-      isDeleted: false,
-    };
-
-    const joinedCommunity = prepareCommunityPayload({
-      ...emptyCommunityPayload,
-      communities: [joinCommunityPayload],
-    }).communities[0];
-
-    const joiningUser: Amity.RawMembership<'community'> = {
-      ...communityUser11,
-      userId: 'test',
-      communityId: 'joining-community',
-      communityMembership: 'member',
-    };
-
-    const memberEvents: [
-      string,
-      Amity.CommunityLiveCollection,
-      keyof Amity.Events,
-      Amity.CommunityPayload,
-      Amity.Community[],
-    ][] = [
-      [
-        'it should add new community to collection onJoin',
-        { membership: 'member' },
-        'community.joined',
-        {
-          ...emptyCommunityPayload,
-          communities: [joinCommunityPayload],
-          communityUsers: [joiningUser],
-        },
-        [joinedCommunity, community1],
-      ],
-      [
-        'it should not add new member to community collection onJoin if membership:not member',
-        { membership: 'notMember' },
-        'community.joined',
-        {
-          ...emptyCommunityPayload,
-          communities: [joinCommunityPayload],
-          communityUsers: [joiningUser],
-        },
-        [],
-      ],
-      [
-        'it should update community in collection onLeft',
-        { membership: 'member' },
-        'community.left',
-        { ...communityPayload, communities: [{ ...community1, isJoined: false }] },
-        [],
-      ],
-      [
-        'it should add new community in collection onLeft and if membership:not member',
-        { membership: 'notMember' },
-        'community.left',
-        { ...communityPayload, communities: [{ ...community1, isJoined: false }] },
-        [{ ...community1, isJoined: false }],
-      ],
-    ];
-
-    test.each(memberEvents)('%s', async (test, params, event, communityPayload, expected) => {
-      const callback = jest.fn();
-      client.http.get = jest.fn().mockResolvedValue(communityQueryResponsePage2);
-
-      liveCommunities(params, callback);
-      await pause();
-
-      client.emitter.emit(event, communityPayload);
-      await pause();
-
-      expect(callback).toHaveBeenNthCalledWith(
-        3,
-        expect.objectContaining(
-          getSnapshot({
-            data: expected,
-            loading: false,
-          }),
-        ),
-      );
-    });
   });
 });

package/src/community/observers/tests/liveCommunity.test.ts

@@ -81,10 +81,10 @@ describe('liveCommunity events', () => {
 
   const communityUserEvents: [string, keyof Amity.MqttCommunityUserEvents][] = [
     ['it should add user on community.joined event', 'community.joined'],
-    ['should get update on community.left event', 'community.left'],
-    ['should get update on community.userChanged event', 'community.userChanged'],
-    ['should get update on community.userBanned event', 'community.userBanned'],
-    ['should get update on community.userUnbanned event', 'community.userUnbanned'],
+    ['it should get update on community.left event', 'community.left'],
+    ['it should get update on community.userChanged event', 'community.userChanged'],
+    ['it should get update on community.userBanned event', 'community.userBanned'],
+    ['it should get update on community.userUnbanned event', 'community.userUnbanned'],
   ];
 
   test.each(communityUserEvents)('%s', async (test, event) => {

package/src/core/query/filtering.ts

@@ -95,3 +95,44 @@ export const filterByFeedType = <T extends Amity.Post>(
     return feed && feed.feedType === feedType;
   });
 };
+
+/**
+ * Filter a community collection by membership of the userId
+ *
+ * @param collection the community to filter
+ * @param membership the membership to be filtered by
+ * @param userId user id to be filtered by
+ * @returns a filtered collection with items only matching the criteria
+ *
+ * @hidden
+ */
+export const filterByCommunityMembership = <T extends Amity.Community>(
+  collection: T[],
+  membership: Amity.CommunityLiveCollection['membership'],
+  userId: Amity.Membership<'community'>['userId'],
+): T[] => {
+  if (membership === 'all') {
+    return collection;
+  }
+
+  return collection.filter(c => {
+    // get resolver for the community by user
+    const communityUserCacheKey = getResolver('communityUsers')({
+      communityId: c.communityId,
+      userId,
+    });
+
+    const communityUser = pullFromCache<Amity.Membership<'community'>>([
+      'communityUsers',
+      'get',
+      communityUserCacheKey,
+    ])?.data;
+
+    if (membership === 'member') {
+      return communityUser && communityUser.communityMembership === 'member';
+    }
+
+    // only membership value remainging is 'notMember'
+    return !communityUser || communityUser.communityMembership !== 'none';
+  });
+};

package/src/core/query/query.ts

@@ -165,11 +165,11 @@ export const runQuery = <Args extends any[], Returned extends any>(
   callback?: (args: Amity.Snapshot<Returned>) => void,
   options: Amity.QueryOptions = queryOptions('cache_then_server'),
 ) => {
-  console.warn(
-    'Deprecation Notice: After 1 April 2023, CreateQuery/RunQuery will no longer be supported. You will be able to use the API without either methods. Check https://docs.amity.co/ for details',
+  console.info(
+    'Deprecation Notice: By Q3, CreateQuery/RunQuery will no longer be exported from the SDK. You will be able to use the API without either methods.',
   );
-  console.warn(
-    'Deprecation Notice: After 1 March 2023, individual module imoprts will no longer be supported. All public APIs will need to be imported from their respective repositories. Ex: CommunityRepository, UserRepository, etc. Check https://docs.amity.co/ for detailed info.',
+  console.info(
+    'Deprecation Notice: From v6.0.0, individual module imports will no longer be supported. All public APIs will need to be imported from their respective repositories. Ex: CommunityRepository, UserRepository, etc.',
   );
 
   let local: Returned | undefined;

package/src/message/api/queryMessages.ts

@@ -2,9 +2,7 @@ import { getActiveClient } from '~/client/api';
 
 import { fireEvent } from '~/core/events';
 import { toPageRaw } from '~/core/query';
-import { pullFromCache, pushToCache } from '~/cache/api';
-import { ingestInCache } from '~/cache/api/ingestInCache';
-import { getResolver } from '~/core/model';
+import { pullFromCache } from '~/cache/api';
 import { convertQueryParams, prepareMessagePayload } from '../utils';
 
 /* begin_public_function
@@ -49,12 +47,12 @@ export const queryMessages = async (
 
   const cachedAt = client.cache && Date.now();
 
-  if (client.cache) {
-    ingestInCache(data, { cachedAt });
-
-    const cacheKey = ['message', 'query', params as Amity.Serializable];
-    pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
-  }
+  // if (client.cache) {
+  //   ingestInCache(data, { cachedAt });
+  //
+  //   const cacheKey = ['message', 'query', params as Amity.Serializable];
+  //   pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
+  // }
 
   fireEvent('local.message.fetched', { messages });