@amityco/ts-sdk 6.10.0 → 6.10.1-50f2392.0

package/dist/index.esm.js

@@ -23446,6 +23446,56 @@ const onChannelMemberUnbanned = (callback) => {
     return createEventSubscriber(client, 'onChannelMemberUnbanned', 'channel.unbanned', filter);
 };
 
+/**
+ * ```js
+ * import { onChannelMemberRoleAdded } from '@amityco/ts-sdk'
+ * const dispose = onChannelMemberRoleAdded((channel, member) => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when any {@link Amity.channelUsers} 's role has been added to any {@link Amity.Channel}
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category Channel Events
+ */
+const onChannelMemberRoleAdded = (callback) => {
+    const client = getActiveClient();
+    const filter = async (payload) => {
+        const { channels, channelUsers } = payload;
+        callback(channels[0], channelUsers.find(channelUser => channelUser.membership === 'member'));
+    };
+    return createEventSubscriber(client, 'onChannelMemberRoleAdded', 'local.channel-moderator.role-added', filter);
+};
+
+/**
+ * ```js
+ * import { onChannelMemberRoleRemoved } from '@amityco/ts-sdk'
+ * const dispose = onChannelMemberRoleRemoved((channel, member) => {
+ *   // ...
+ * })
+ * ```
+ *
+ * Fired when any {@link Amity.channelUsers} 's role has been deleted to any {@link Amity.Channel}
+ *
+ * @param callback The function to call when the event was fired
+ * @returns an {@link Amity.Unsubscriber} function to stop listening
+ *
+ * @category Channel Events
+ */
+const onChannelMemberRoleRemoved = (callback) => {
+    const client = getActiveClient();
+    const filter = async (payload) => {
+        const preparedPayload = await prepareChannelPayload(payload);
+        const { channels, channelUsers } = preparedPayload;
+        ingestInCache(preparedPayload);
+        callback(channels[0], channelUsers.find(channelUser => channelUser.membership === 'member'));
+    };
+    return createEventSubscriber(client, 'onChannelMemberRoleRemoved', 'local.channel-moderator.role-removed', filter);
+};
+
 const convertEventPayload = (eventHandler, sourceModelProp, destinationDomain) => (callback) => eventHandler(sourceModel => {
     var _a;
     if (!sourceModel) {
@@ -24071,7 +24121,7 @@ const getMembers$1 = (params, callback, config) => {
             responder(data);
         }, queryOptions(policy));
     };
-    disposers.push(onChannelJoined(realtimeRouter()), onChannelLeft(realtimeRouter()), onChannelMemberAdded(realtimeRouter()), onChannelMemberRemoved(realtimeRouter()), onChannelMemberBanned(realtimeRouter()), onChannelMemberUnbanned(realtimeRouter()));
+    disposers.push(onChannelJoined(realtimeRouter()), onChannelLeft(realtimeRouter()), onChannelMemberAdded(realtimeRouter()), onChannelMemberRemoved(realtimeRouter()), onChannelMemberBanned(realtimeRouter()), onChannelMemberUnbanned(realtimeRouter()), onChannelMemberRoleAdded(realtimeRouter()), onChannelMemberRoleRemoved(realtimeRouter()));
     onFetch(true);
     return () => {
         log(`getMembers(tmpid: ${timestamp}) > dispose`);
@@ -24142,6 +24192,7 @@ const addRole = async (channelId, roleId, userIds) => {
     const data = await prepareChannelPayload(payload);
     if (client.cache)
         ingestInCache(data);
+    fireEvent('local.channel-moderator.role-added', data);
     const { channelUsers } = data;
     return !!channelUsers.find(channelUser => channelUser.channelId === channelId && channelUser.roles.includes(roleId));
 };
@@ -24173,6 +24224,7 @@ const removeRole = async (channelId, roleId, userIds) => {
     const data = await prepareChannelPayload(payload);
     if (client.cache)
         ingestInCache(data);
+    fireEvent('local.channel-moderator.role-removed', data);
     const { channelUsers } = data;
     return !!channelUsers.find(channelUser => channelUser.channelId === channelId && !channelUser.roles.includes(roleId));
 };
@@ -24279,6 +24331,8 @@ var index$g = /*#__PURE__*/Object.freeze({
   onChannelMemberRemoved: onChannelMemberRemoved,
   onChannelMemberBanned: onChannelMemberBanned,
   onChannelMemberUnbanned: onChannelMemberUnbanned,
+  onChannelMemberRoleAdded: onChannelMemberRoleAdded,
+  onChannelMemberRoleRemoved: onChannelMemberRoleRemoved,
   observeChannel: observeChannel,
   observeChannels: observeChannels,
   getChannel: getChannel,
@@ -29827,10 +29881,10 @@ function merge(collection1, collection2) {
 const querySubChannels = async (query) => {
     const client = getActiveClient();
     client.log('channel/querySubChannels', query);
-    const _a = convertQueryParams(query), { page = { limit: 10 }, channelId, includeDeleted } = _a, params = __rest(_a, ["page", "channelId", "includeDeleted"]);
+    const _a = convertQueryParams(query), { page = { limit: 10 }, channelId, includeDeleted, pageToken } = _a, params = __rest(_a, ["page", "channelId", "includeDeleted", "pageToken"]);
     const response = await client.http.get(`/api/v5/message-feeds/channel/${channelId}`, {
         params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), options: {
-                token: toToken(page, 'afterbefore'),
+                token: pageToken || toToken(page, 'afterbefore'),
             } }),
     });
     const _b = response.data, { paging } = _b, payload = __rest(_b, ["paging"]);
@@ -29849,7 +29903,13 @@ const querySubChannels = async (query) => {
     fireEvent('local.message-feed.fetched', data);
     const nextPage = toPage(paging.next);
     const prevPage = toPage(paging.previous);
-    return { data: subChannels, cachedAt, prevPage, nextPage };
+    return {
+        data: subChannels,
+        cachedAt,
+        prevPage,
+        nextPage,
+        paging,
+    };
 };
 /* end_public_function */
 /**
@@ -29886,7 +29946,7 @@ querySubChannels.locally = (query) => {
     const prevPage = toPage(data === null || data === void 0 ? void 0 : data.paging.previous);
     const nextPage = toPage(data === null || data === void 0 ? void 0 : data.paging.next);
     return subChannels.length === ((_c = data === null || data === void 0 ? void 0 : data.subChannels) === null || _c === void 0 ? void 0 : _c.length)
-        ? { data: subChannels, cachedAt, prevPage, nextPage }
+        ? { data: subChannels, cachedAt, prevPage, nextPage, paging: data === null || data === void 0 ? void 0 : data.paging }
         : undefined;
 };
 
@@ -29924,7 +29984,7 @@ const getSubChannels = (params, callback, config) => {
     let snapshot;
     const disposers = [];
     const responder = (data) => {
-        var _a;
+        var _a, _b;
         let subChannels = data.data;
         if (!params.includeDeleted) {
             subChannels = filterByPropEquality(subChannels, 'isDeleted', false);
@@ -29933,7 +29993,7 @@ const getSubChannels = (params, callback, config) => {
         callback({
             onNextPage: onFetch,
             data: subChannels,
-            hasNextPage: !!((_a = data.params) === null || _a === void 0 ? void 0 : _a.page),
+            hasNextPage: !!((_b = (_a = data.params) === null || _a === void 0 ? void 0 : _a.paging) === null || _b === void 0 ? void 0 : _b.next),
             loading: data.loading,
             error: data.error,
         });
@@ -29954,16 +30014,17 @@ const getSubChannels = (params, callback, config) => {
         responder(snapshot);
     };
     const onFetch = () => {
+        var _a, _b, _c, _d;
         const subChannels = snapshot ? snapshot.data : [];
-        if (subChannels.length > 0 && !(snapshot === null || snapshot === void 0 ? void 0 : snapshot.params.page)) {
+        if (subChannels.length > 0 && !((_b = (_a = snapshot === null || snapshot === void 0 ? void 0 : snapshot.params) === null || _a === void 0 ? void 0 : _a.paging) === null || _b === void 0 ? void 0 : _b.next)) {
             return;
         }
-        const query = createQuery(querySubChannels, Object.assign(Object.assign({}, queryParams), { page: (snapshot === null || snapshot === void 0 ? void 0 : snapshot.params.page) ? Object.assign(Object.assign({}, snapshot === null || snapshot === void 0 ? void 0 : snapshot.params.page), { limit }) : { limit } }));
-        runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
+        const query = createQuery(querySubChannels, Object.assign(Object.assign({}, queryParams), { page: (snapshot === null || snapshot === void 0 ? void 0 : snapshot.params.page) ? Object.assign(Object.assign({}, snapshot === null || snapshot === void 0 ? void 0 : snapshot.params.page), { limit }) : { limit }, pageToken: (_d = (_c = snapshot === null || snapshot === void 0 ? void 0 : snapshot.params) === null || _c === void 0 ? void 0 : _c.paging) === null || _d === void 0 ? void 0 : _d.next }));
+        runQuery(query, ({ data: result, error, loading, nextPage: page, paging }) => {
             snapshot = {
                 loading,
                 error,
-                params: { page },
+                params: { page, paging },
                 data: result ? merge(subChannels, result.map(convertGetterPropsToStatic)) : subChannels,
             };
             responder(snapshot);
@@ -33197,13 +33258,10 @@ const unflagComment = async (commentId) => {
  * @async
  * */
 const isCommentFlaggedByMe = async (commentId) => {
-    var _a, _b;
     const client = getActiveClient();
     client.log('comment/isCommentFlaggedByMe', commentId);
-    const { result, isFlagByMe } = (_a = (await synchronousWSCall(client, 'v3/comment.isflagbyme', {
-        commentId,
-    }))) !== null && _a !== void 0 ? _a : {};
-    return (_b = result !== null && result !== void 0 ? result : isFlagByMe) !== null && _b !== void 0 ? _b : false;
+    const { data: { result }, } = await client.http.get(`/api/v3/comments/${commentId}/isflagbyme`);
+    return result;
 };
 /* end_public_function */
 
@@ -33337,11 +33395,12 @@ const getComment = (commentId, callback) => {
  * @async
  */
 const queryComments = async (query) => {
+    var _a;
     const client = getActiveClient();
     client.log('comment/queryComments', query);
     const { page = { limit: 10 }, includeDeleted } = query, params = __rest(query, ["page", "includeDeleted"]);
     const options = {
-        type: params.sortBy ? 'pagination' : undefined,
+        type: params.sortBy || ((_a = query.page) === null || _a === void 0 ? void 0 : _a.limit) ? 'pagination' : undefined,
         token: toToken(page, params.sortBy ? 'skiplimit' : 'afterbefore'),
     };
     // const filterByParentId = query.parentId !== undefined
@@ -33461,7 +33520,7 @@ const getComments = (params, callback, config) => {
         const query = createQuery(queryComments, Object.assign(Object.assign({}, queryParams), { page: (_d = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _d !== void 0 ? _d : { limit } }));
         runQuery(query, ({ data: result, error, loading, prevPage, nextPage }) => {
             // depend on sortBy value we have two different pagination type
-            const page = queryParams.sortBy ? nextPage : prevPage;
+            const page = queryParams.sortBy || (params === null || params === void 0 ? void 0 : params.limit) ? nextPage : prevPage;
             const data = {
                 loading,
                 error,