@amityco/ts-sdk 0.0.1-beta.11 → 0.0.1-beta.12

package/dist/post/api/createPost.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPost.d.ts","sourceRoot":"","sources":["../../../src/post/api/createPost.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU;;;;;MAIpB,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAwBlC,CAAA"}
+{"version":3,"file":"createPost.d.ts","sourceRoot":"","sources":["../../../src/post/api/createPost.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,UAAU;;;;;MAIpB,QAAQ,MAAM,MAAM,CAAC,MAAM,IAAI,CAAC,CAuBlC,CAAA"}

package/dist/post/events/onPostReactionAdded.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onPostReactionAdded.d.ts","sourceRoot":"","sources":["../../../src/post/events/onPostReactionAdded.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,mBAAmB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YA8BhF,CAAA"}
+{"version":3,"file":"onPostReactionAdded.d.ts","sourceRoot":"","sources":["../../../src/post/events/onPostReactionAdded.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,mBAAmB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YAwBhF,CAAA"}

package/dist/post/events/onPostReactionRemoved.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onPostReactionRemoved.d.ts","sourceRoot":"","sources":["../../../src/post/events/onPostReactionRemoved.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YA8BlF,CAAA"}
+{"version":3,"file":"onPostReactionRemoved.d.ts","sourceRoot":"","sources":["../../../src/post/events/onPostReactionRemoved.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YAwBlF,CAAA"}

package/dist/post/events/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/post/events/utils.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,yBAAyB,UAC7B,MAAM,MAAM,qBAAqB,YAC9B,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,uBA+CrC,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/post/events/utils.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,yBAAyB,UAC7B,MAAM,MAAM,qBAAqB,YAC9B,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,uBAyCrC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "0.0.1-beta.11",
+  "version": "0.0.1-beta.12",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",
@@ -36,7 +36,6 @@
     "@rollup/plugin-replace": "^3.0.0",
     "@types/axios": "^0.14.0",
     "@types/debug": "^4.1.5",
-    "@types/lodash.ismatch": "^4.4.6",
     "@types/node": "^14.0.11",
     "@types/socket.io-client": "^1.4.34",
     "chalk": "^4.1.2",
@@ -54,7 +53,6 @@
     "axios": "0.21.1",
     "debug": "^4.3.1",
     "js-base64": "^3.6.1",
-    "lodash.ismatch": "^4.4.0",
     "mitt": "^3.0.0",
     "mqtt": "^4.2.8",
     "react-native-uuid": "^2.0.1",

package/src/@types/core/events.ts

@@ -53,12 +53,12 @@ declare global {
     }
 
     type MqttCommunityUserMessageEvents = {
-      'community.joined': Amity.CommunityPayload
-      'community.left': Amity.CommunityPayload
-      'community.userAdded': Amity.CommunityPayload
-      'community.userRemoved': Amity.CommunityPayload
-      'community.userBanned': Amity.CommunityPayload
-      'community.userUnbanned': Amity.CommunityPayload
+      'community.joined': Amity.CommunityMembershipPayload
+      'community.left': Amity.CommunityMembershipPayload
+      'community.userAdded': Amity.CommunityMembershipPayload
+      'community.userRemoved': Amity.CommunityMembershipPayload
+      'community.userBanned': Amity.CommunityMembershipPayload
+      'community.userUnbanned': Amity.CommunityMembershipPayload
     }
 
     type MqttCommunityMessageEvents = {

package/src/@types/core/payload.ts

@@ -70,11 +70,11 @@ declare global {
     }
 
     type CommunityMembershipPayload = {
-      communities?: Amity.Community[]
+      communities: Amity.Community[]
       communityUsers: Amity.Membership<'community'>[]
       categories?: Amity.Category[]
       feeds?: Amity.Feed[]
-      users?: Amity.User[]
+      users: Amity.User[]
       files?: Amity.File[]
     }
 

package/src/channel/events/onChannelCreated.ts

@@ -1,8 +1,7 @@
 import { getActiveClient } from '~/client/api'
 import { createEventSubscriber } from '~/core/events'
 
-import { decoratePayload } from '~/core/query'
-import { ingestInCache } from '~/core/cache'
+import { ingestInCache } from '~/cache/api/ingestInCache'
 
 /**
  * ```js
@@ -23,7 +22,6 @@ export const onChannelCreated = (callback: Amity.Listener<Amity.Channel>) => {
   const client = getActiveClient()
 
   const filter = (payload: Amity.ChannelPayload) => {
-    decoratePayload(payload)
     ingestInCache(payload)
     callback(payload.channels[0])
   }

package/src/client/events/onConnectionError.ts

@@ -38,7 +38,7 @@ export const onConnectionError = (
       `client/onConnectionError(${event})`,
       event,
       (response) => {
-        const error = (response && 'code' in response)
+        const error = response?.code
           ? new ASCError(response.message, response.code, Amity.ErrorLevel.FATAL)
           : new ASCConnectionError(event)
 

package/src/comment/events/onCommentReactionAdded.ts

@@ -1,4 +1,3 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
 import { pullFromCache } from '~/cache/api'
 import { ingestInCache } from '~/cache/api/ingestInCache'
@@ -29,8 +28,6 @@ export const onCommentReactionAdded = (
     if (!client.cache) {
       callback(payload.comments[0])
     } else {
-      const cached = pullFromCache<Amity.Comment>(['comment', 'get', payload.comments[0].commentId])
-
       preparePayloadForCache('comment.addReaction', payload)
       const { reactor, ...commentPayload } = payload;
 
@@ -38,10 +35,6 @@ export const onCommentReactionAdded = (
 
       const comment = pullFromCache<Amity.Comment>(['comment', 'get', payload.comments[0].commentId])!
 
-      if (cached && isMatch(cached.data, comment.data)) {
-        return
-      }
-
       callback(comment.data)
     }
   }

package/src/comment/events/onCommentReactionRemoved.ts

@@ -1,4 +1,3 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
 import { pullFromCache } from '~/cache/api'
 import { ingestInCache } from '~/cache/api/ingestInCache'
@@ -29,8 +28,6 @@ export const onCommentReactionRemoved = (
     if (!client.cache) {
       callback(payload.comments[0])
     } else {
-      const cached = pullFromCache<Amity.Comment>(['comment', 'get', payload.comments[0].commentId])
-
       preparePayloadForCache('comment.removeReaction', payload)
       const { reactor, ...commentPayload } = payload;
 
@@ -38,10 +35,6 @@ export const onCommentReactionRemoved = (
 
       const comment = pullFromCache<Amity.Comment>(['comment', 'get', payload.comments[0].commentId])!
 
-      if (cached && isMatch(cached.data, comment.data)) {
-        return
-      }
-
       callback(comment.data)
     }
   }

package/src/comment/events/utils.ts

@@ -1,9 +1,7 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
-import { pullFromCache } from '~/cache/api'
-import { ingestInCache } from '~/cache/api/ingestInCache'
 import { createEventSubscriber } from '~/core/events'
-import { queryCache, upsertInCache } from '~/cache/api'
+import { queryCache, upsertInCache, pullFromCache } from '~/cache/api'
+import { ingestInCache } from '~/cache/api/ingestInCache'
 
 export const createCommentEventSubscriber = (
   event: keyof Amity.MqttCommentMessageEvents,
@@ -13,18 +11,13 @@ export const createCommentEventSubscriber = (
 
   const filter = (payload: Amity.CommentPayload) => {
     if (!client.cache) {
+      // TODO: here we are missing specific properties here!
       callback(payload.comments[0])
     } else {
-      const cached = pullFromCache<Amity.Comment>(['comment', 'get', payload.comments[0].commentId])
-
       ingestInCache(payload)
 
       const comment = pullFromCache<Amity.Comment>(['comment', 'get', payload.comments[0].commentId])!
 
-      if (cached && isMatch(cached.data, comment.data)) {
-        return
-      }
-
       if (['comment.created'].includes(event)) {
         const queries = queryCache(['comment', 'query'])
           // @ts-ignore

package/src/community/api/addCommunityMembers.ts

@@ -1,7 +1,8 @@
 import { getActiveClient } from '~/client/api'
 
-import { ingestInCache } from '~/cache/api/ingestInCache'
 import { fireEvent } from '~/core/events'
+import { ingestInCache } from '~/cache/api/ingestInCache'
+
 /**
  * ```js
  * import { addCommunityMembers } from '@amityco/ts-sdk'
@@ -29,12 +30,9 @@ export const addCommunityMembers = async (
     { communityId, userIds }
   )
 
-
   if (client.cache) ingestInCache(data)
 
-  fireEvent('community.userAdded', {
-    communities: data.communities!,
-  })
+  fireEvent('community.userAdded', data)
 
   const { communityUsers } = data
   return !!communityUsers.find(

package/src/community/api/joinCommunity.ts

@@ -30,9 +30,7 @@ export const joinCommunity = async (
   const cachedAt = client.cache && Date.now()
   if (client.cache) ingestInCache(data, { cachedAt })
 
-  fireEvent('community.joined', {
-    communities: data.communities!
-  })
+  fireEvent('community.joined', data)
 
   const { communityUsers } = data
 

package/src/community/api/leaveCommunity.ts

@@ -30,9 +30,7 @@ export const leaveCommunity = async (
   const cachedAt = client.cache && Date.now()
   if (client.cache) ingestInCache(data, { cachedAt })
 
-  fireEvent('community.left', {
-    communities: data.communities!,
-  })
+  fireEvent('community.left', data)
 
   const { communityUsers } = data
 

package/src/community/api/removeCommunityMembers.ts

@@ -32,9 +32,7 @@ export const removeCommunityMembers = async (
 
   if (client.cache) ingestInCache(data)
 
-  fireEvent('community.userRemoved', {
-    communities: data.communities!,
-  })
+  fireEvent('community.userRemoved', data)
 
   const { communityUsers } = data
   return !!communityUsers.find(

package/src/community/events/utils.ts

@@ -1,8 +1,7 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
-import { pullFromCache } from '~/cache/api'
 import { ingestInCache } from '~/cache/api/ingestInCache'
 import { createEventSubscriber } from '~/core/events'
+import { pullFromCache } from '~/cache/api'
 import { getResolver } from '~/core/model'
 
 export const createCommunityEventSubscriber = (
@@ -13,18 +12,13 @@ export const createCommunityEventSubscriber = (
 
   const filter = (payload: Amity.CommunityPayload) => {
     if (!client.cache) {
+      // TODO: here we are missing specific properties here!
       callback(payload.communities[0])
     } else {
-      const cached = pullFromCache<Amity.Community>(['community', 'get', payload.communities[0].communityId])
-
       ingestInCache(payload)
 
       const community = pullFromCache<Amity.Community>(['community', 'get', payload.communities[0].communityId])!
 
-      if (cached && isMatch(cached.data, community?.data)) {
-        return
-      }
-
       callback(community.data)
     }
   }
@@ -37,7 +31,7 @@ export const createCommunityEventSubscriber = (
   )
 }
 
-function hasPermission(member: Amity.Membership<'community'>, payload: Amity.CommunityPayload, permission: string) {
+function hasPermission(member: Amity.Membership<'community'>, payload: Amity.CommunityMembershipPayload, permission: string) {
   if (member.permissions.some(x => x === permission)) {
     return true;
   }
@@ -47,10 +41,9 @@ function hasPermission(member: Amity.Membership<'community'>, payload: Amity.Com
     .permissions.some(x => x === permission)
 }
 
-
 function getEventRelatedMember(
   event: keyof Amity.MqttCommunityUserMessageEvents,
-  payload: Amity.CommunityPayload
+  payload: Amity.CommunityMembershipPayload
 )  {
   if (event === 'community.joined' || event === 'community.left') {
     return payload.communityUsers![0];
@@ -80,29 +73,22 @@ export const createCommunityMemberEventSubscriber = (
 ) => {
   const client = getActiveClient()
 
-  const filter = (payload: Amity.CommunityPayload) => {
-    const cachedCommunity = pullFromCache<Amity.Community>(['community', 'get', payload.communities[0].communityId])
-    const cachedMember = pullFromCache<Amity.Membership<'community'>>([
-      'communityUsers',
-      'get',
-      getResolver('communityUsers')(getEventRelatedMember(event, payload))
-    ])
-
-    ingestInCache(payload)
-
-    const community = pullFromCache<Amity.Community>(['community', 'get', payload.communities[0].communityId])!
-    const member = pullFromCache<Amity.Membership<'community'>>([
-      'communityUsers',
-      'get',
-      getResolver('communityUsers')(getEventRelatedMember(event, payload))
-    ])!
-
-    if (cachedCommunity && isMatch(cachedCommunity.data, community.data)
-      && cachedMember && isMatch(cachedMember.data, member.data)) {
-      return
-    }
+  const filter = (payload: Amity.CommunityMembershipPayload) => {
+    if (!client.cache) {
+      // TODO: here we are missing specific properties here!
+      callback(payload.communities[0], getEventRelatedMember(event, payload))
+    } else {
+      ingestInCache(payload)
 
-    callback(community.data, member.data)
+      const community = pullFromCache<Amity.Community>(['community', 'get', payload.communities[0].communityId])!
+      const member = pullFromCache<Amity.Membership<'community'>>([
+        'communityUsers',
+        'get',
+        getResolver('communityUsers')(getEventRelatedMember(event, payload))
+      ])!
+
+      callback(community.data, member.data)
+    }
   }
 
   return createEventSubscriber(

package/src/post/api/createPost.ts

@@ -40,7 +40,6 @@ export const createPost = async <T extends Amity.PostContentType | string>(
   const cachedAt = client.cache && Date.now()
   if (client.cache) ingestInCache(data, { cachedAt })
 
-  fireEvent('community.updated', { communities: data.communities! })
   fireEvent('post.created', data)
 
   const { posts } = data

package/src/post/events/onPostReactionAdded.ts

@@ -1,4 +1,3 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
 import { pullFromCache } from '~/cache/api'
 import { ingestInCache } from '~/cache/api/ingestInCache'
@@ -27,8 +26,6 @@ export const onPostReactionAdded = (callback: Amity.Listener<Amity.Post>): Amity
     if (!client.cache) {
       callback(payload.posts[0])
     } else {
-      const cached = pullFromCache<Amity.Post>(['post', 'get', payload.posts[0].postId])
-
       preparePayloadForCache('post.addReaction', payload)
       const { reactor, ...postPayload } = payload;
 
@@ -36,10 +33,6 @@ export const onPostReactionAdded = (callback: Amity.Listener<Amity.Post>): Amity
 
       const post = pullFromCache<Amity.Post>(['post', 'get', payload.posts[0].postId])!
 
-      if (cached && isMatch(cached.data, post.data)) {
-        return
-      }
-
       callback(post.data)
     }
   }

package/src/post/events/onPostReactionRemoved.ts

@@ -1,4 +1,3 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
 import { pullFromCache } from '~/cache/api'
 import { ingestInCache } from '~/cache/api/ingestInCache'
@@ -27,8 +26,6 @@ export const onPostReactionRemoved = (callback: Amity.Listener<Amity.Post>): Ami
     if (!client.cache) {
       callback(payload.posts[0])
     } else {
-      const cached = pullFromCache<Amity.Post>(['post', 'get', payload.posts[0].postId])
-
       preparePayloadForCache('post.removeReaction', payload)
       const { reactor, ...postPayload } = payload;
 
@@ -36,10 +33,6 @@ export const onPostReactionRemoved = (callback: Amity.Listener<Amity.Post>): Ami
 
       const post = pullFromCache<Amity.Post>(['post', 'get', payload.posts[0].postId])!
 
-      if (cached && isMatch(cached.data, post.data)) {
-        return
-      }
-
       callback(post.data)
     }
   }

package/src/post/events/utils.ts

@@ -1,9 +1,7 @@
-import isMatch from 'lodash.ismatch'
 import { getActiveClient } from '~/client/api'
-import { pullFromCache } from '~/cache/api'
 import { ingestInCache } from '~/cache/api/ingestInCache'
 import { createEventSubscriber, fireEvent } from '~/core/events'
-import { queryCache, upsertInCache } from '~/cache/api'
+import { queryCache, upsertInCache, pullFromCache } from '~/cache/api'
 
 export const createPostEventSubscriber = (
   event: keyof Amity.MqttPostMessageEvents,
@@ -15,22 +13,16 @@ export const createPostEventSubscriber = (
     if (!client.cache) {
       callback(payload.posts[0])
     } else {
-      const cached = pullFromCache<Amity.Post>(['post', 'get', payload.posts[0].postId])
-
       const { communities, ...others } = payload
 
       ingestInCache(others as Amity.PostPayload)
 
-      if (communities?.[0]) {
+      if (communities?.[0] && !['post.updated'].includes(event)) {
         fireEvent('community.updated', { communities })
       }
 
       const post = pullFromCache<Amity.Post>(['post', 'get', payload.posts[0].postId])!
 
-      if (cached && isMatch(cached.data, post.data)) {
-        return
-      }
-
       if (['post.created', 'post.approved', 'post.declined'].includes(event)) {
         let queries = queryCache(['post', 'query'])
           // @ts-ignore

package/src/report/api/createReport.ts

@@ -35,7 +35,7 @@ export const createReport = async (
 
   const event = referenceType === 'message'
     ? 'v3.message.didUpdate' as const
-    : `${referenceType}.updated` as const
+    : `${referenceType}.flagged` as const
 
   fireEvent(event, data)
 

package/src/report/api/deleteReport.ts

@@ -35,7 +35,7 @@ export const deleteReport = async (
 
   const event = referenceType === 'message'
     ? 'v3.message.didUpdate' as const
-    : `${referenceType}.updated` as const
+    : `${referenceType}.unflagged` as const
 
   fireEvent(event, data)