@amityco/ts-sdk-react-native 6.26.3-3e5fb0d.0 → 6.26.4-2eb3673.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk-react-native",
-  "version": "6.26.3-3e5fb0d.0",
+  "version": "6.26.4-2eb3673.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/commentRepository/observers/getComments/CommentLiveCollectionController.ts

@@ -90,7 +90,7 @@ export class CommentLiveCollectionController extends LiveCollectionController<
 
     const data = this.applyFilter(
       collection.data
-        .map(id => pullFromCache<Amity.InternalComment>(['comments', 'get', id])!)
+        .map(id => pullFromCache<Amity.InternalComment>(['comment', 'get', id])!)
         .filter(isNonNullable)
         .map(({ data }) => data) ?? [],
     ).map(LinkedObject.comment);
@@ -109,7 +109,7 @@ export class CommentLiveCollectionController extends LiveCollectionController<
   applyFilter(data: Amity.InternalComment[]) {
     let comments = data;
 
-    if (this.query.includeDeleted) {
+    if (!this.query.includeDeleted) {
       comments = filterByPropEquality(comments, 'isDeleted', false);
     }
 
@@ -117,6 +117,36 @@ export class CommentLiveCollectionController extends LiveCollectionController<
       comments = comments.filter(comment => comment.parentId === this.query.parentId);
     }
 
+    if (typeof this.query.hasFlag === 'boolean') {
+      if (this.query.hasFlag) {
+        comments = comments.filter(comment => comment.hashFlag != null);
+      } else {
+        comments = comments.filter(comment => comment.hashFlag == null);
+      }
+    }
+
+    if (this.query.dataTypes) {
+      if (this.query.dataTypes.matchType === 'exact') {
+        comments = comments.filter(comment => {
+          const sortedDataTypesQueryValue = this.query.dataTypes?.values.sort() || [];
+          const sortedDataTypesCommentValue = comment.dataTypes?.sort() || [];
+
+          if (sortedDataTypesCommentValue.length !== sortedDataTypesQueryValue.length) {
+            return false;
+          }
+
+          return sortedDataTypesQueryValue.every(
+            (value, index) => value === sortedDataTypesCommentValue[index],
+          );
+        });
+      }
+      if (this.query.dataTypes.matchType === 'any') {
+        comments = comments.filter(comment =>
+          this.query.dataTypes?.values.some(value => comment.dataTypes?.includes(value)),
+        );
+      }
+    }
+
     switch (this.query.sortBy) {
       case 'firstCreated':
         comments = comments.sort(sortByFirstCreated);

package/src/commentRepository/observers/getComments/CommentQueryStreamController.ts

@@ -68,10 +68,16 @@ export class CommentQueryStreamController extends QueryStreamController<
         return;
       }
 
+      if (this.query.parentId && this.query.parentId !== comment.parentId) {
+        return;
+      }
+
+      if (!this.query.parentId && comment.parentId) {
+        return;
+      }
+
       if (action === EnumCommentActions.OnCommentCreated) {
         collection.data = [...new Set([comment.commentId, ...collection.data])];
-      } else if (action === EnumCommentActions.OnCommentDeleted) {
-        collection.data = collection.data.filter(p => p !== comment.commentId);
       }
 
       pushToCache(this.cacheKey, collection);

package/src/communityRepository/communityMembership/observers/getMembers.ts

@@ -76,7 +76,6 @@ export const getMembers = (
   const communityMemberLiveCollection = new CommunityMembersLiveCollectionController(
     params,
     resp => {
-      console.log('resp', resp);
       callback(resp);
     },
   );

package/src/communityRepository/observers/getCommunities/CommunitiesLiveCollectionController.ts

@@ -117,7 +117,7 @@ export class CommunityLiveCollectionController extends LiveCollectionController<
 
     let communities = data;
 
-    if (this.query.includeDeleted) {
+    if (!this.query.includeDeleted) {
       communities = filterByPropEquality(communities, 'isDeleted', false);
     }
 

package/src/communityRepository/observers/searchCommunities/SearchCommunitiesLiveCollectionController.ts

@@ -106,7 +106,7 @@ export class SearchCommunityLiveCollectionController extends LiveCollectionContr
 
     let communities = data;
 
-    if (this.query.includeDeleted) {
+    if (!this.query.includeDeleted) {
       communities = filterByPropEquality(communities, 'isDeleted', false);
     }