@select-org/select-post-builder 1.1.34 → 1.1.35

package/dist/index.d.ts

@@ -4,13 +4,11 @@ import { JSX as JSX_2 } from 'react/jsx-runtime';
 import { ReactNode } from 'react';
 
 declare type AppUserPayload = {
-    users: Array<UserPayload>;
     background: string;
     username: string;
     relationship: 2;
     refresh_token: string;
     name: string;
-    new_user: boolean;
     longitude: number;
     latitude: number;
     jwtoken: string;
@@ -20,11 +18,10 @@ declare type AppUserPayload = {
     avatar: string;
     avatarPlaceholder: string;
     highResolutionAvatar: string;
-    twitterUsername: string;
-    email: string;
     description: string;
-    email_verified: boolean;
     featured_groups: string[];
+    new_user?: boolean;
+    email?: string;
 };
 
 declare type BasePollOptionItem = {
@@ -253,23 +250,6 @@ declare enum SpecialType {
     FEATURED_POST = 1
 }
 
-declare type UserPayload = {
-    id: string;
-    username: string;
-    name: string;
-    avatar: string;
-    avatarPlaceholder: string;
-    highResolutionAvatar: string;
-    gender: string;
-    birthday: string;
-    description?: string;
-    type?: string;
-    latitude?: number;
-    longitude?: number;
-    relationship?: number;
-    interactionIds?: Array<string>;
-};
-
 declare type WithModalProps = BaseProps & {
     openModal: boolean;
     onModalOpenChange: (open: boolean) => void;

package/dist/post-builder.cjs.js

@@ -2506,6 +2506,11 @@ const {
   getAdapter,
   mergeConfig
 } = axios;
+var ConversationType = /* @__PURE__ */ ((ConversationType2) => {
+  ConversationType2[ConversationType2["GROUP"] = 0] = "GROUP";
+  ConversationType2[ConversationType2["USER"] = 1] = "USER";
+  return ConversationType2;
+})(ConversationType || {});
 var PostType = /* @__PURE__ */ ((PostType2) => {
   PostType2["Post"] = "post";
   PostType2["Comment"] = "comment";
@@ -4189,10 +4194,12 @@ const asyncCache = (key, fetcher) => {
 };
 class CoreApi {
   isAuthorize;
+  baseUrl;
   url;
   language;
   onError;
   api;
+  apiV2;
   token;
   toI18N;
   /**
@@ -4203,13 +4210,14 @@ class CoreApi {
    */
   constructor(coreUrl, token, toI18N, language) {
     this.isAuthorize = false;
+    this.baseUrl = coreUrl;
     this.url = `${coreUrl}v1/`;
     this.language = language ?? getLanguage();
     this.onError = () => {
     };
     this.toI18N = toI18N;
-    this.initApi();
     this.token = token;
+    this.initApi();
   }
   /**
    * Set the 'Authorization' header
@@ -4246,6 +4254,12 @@ class CoreApi {
       token: this.token,
       isFileStore: false
     });
+    this.apiV2 = createApiClient({
+      baseURL: `${this.baseUrl}v2/`,
+      t: this.toI18N,
+      token: this.token,
+      isFileStore: false
+    });
   }
   getErrorMessage(response) {
     if (response && response.response && response.response.data && response.response.data.error) {
@@ -4257,26 +4271,19 @@ class CoreApi {
     return null;
   }
   /**
-   * get all group
+   * get conversations sorted by last activity
    */
-  getAllGroup() {
-    return this.api.get("/group/").then((response) => {
-      return response.data;
-    }).catch((response) => {
-      throw this.throwHTTPError(response);
-    });
-  }
-  /**
-   * get group conversations sorted by last activity
-   */
-  fetchGroupConversations(amount, fromTime) {
-    const cacheKey = `group-conversations`;
+  fetchConversationList(amount, fromTime) {
+    const cacheKey = `conversation-list`;
     const cachedFetcher = asyncCache(
       cacheKey,
-      () => this.api.post("/group/fetch/conversations", {
-        amount,
-        from_time: fromTime
-      }).then((response) => response.data).catch((response) => {
+      () => this.apiV2.get("conversation/list", {
+        params: { from_time: fromTime, amount }
+      }).then(
+        (response) => response?.data?.filter(
+          (data) => data?.conversation_detail?.type === ConversationType.GROUP
+        )
+      ).catch((response) => {
         throw this.throwHTTPError(response);
       })
     );
@@ -4323,25 +4330,6 @@ class CoreApi {
         l: limit,
         o: offset2,
         in_china: isUsingChineseProvider
-        // || stringContainsChineseCharacter(query),
-      }
-    }).then((response) => {
-      return response.data;
-    }).catch((response) => {
-      throw this.throwHTTPError(response);
-    });
-  }
-  /**
-   * Get random GIF based on q parameter via a GET request into the backend
-   *
-   * @param {string} query
-   * @returns {Promise<WebImageSearchResponse>}
-   * @memberof CoreApi
-   */
-  fetchRandomGif(query) {
-    return this.api.get("search/gifs/random", {
-      params: {
-        q: query
       }
     }).then((response) => {
       return response.data;
@@ -4375,7 +4363,7 @@ class CoreApi {
     });
   }
   /**
-   * Fetch mateData from url
+   * Fetch metadata from url
    */
   resolveUrl(url) {
     const cacheKey = url;
@@ -4391,15 +4379,6 @@ class CoreApi {
     );
     return cachedFetcher();
   }
-  resolveUrlForText(body) {
-    return this.api.post("url/resolve-text", {
-      body
-    }).then((response) => {
-      return response.data;
-    }).catch((response) => {
-      throw this.throwHTTPError(response);
-    });
-  }
 }
 const byteToHex = [];
 for (let i2 = 0; i2 < 256; ++i2) {
@@ -4572,11 +4551,11 @@ class MFSApi {
       isFileStore: false
     });
   }
-  getRecommendationPost(groupId, postId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_data", "post_counter"]) {
+  getRecommendationPost(groupId, postId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_details", "post_counter"]) {
     const cacheKey = `post-recommendation:${groupId}${postId ? `:${postId}` : ``}`;
     const cachedFetcher = asyncCache(
       cacheKey,
-      () => this.api.post("/recommendation/post", {
+      () => this.api.post("v2/recommendation/post", {
         group_id: groupId,
         post_id: postId,
         included_user_ids: includedUserIds,
@@ -4594,11 +4573,11 @@ class MFSApi {
     );
     return cachedFetcher();
   }
-  getRecommendationGroup(groupId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_data"]) {
+  getRecommendationGroup(groupId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_details"]) {
     const cacheKey = `group-recommendation:${groupId}`;
     const cachedFetcher = asyncCache(
       cacheKey,
-      () => this.api.post("/recommendation/group", {
+      () => this.api.post("v2/recommendation/group", {
         group_id: groupId,
         included_user_ids: includedUserIds,
         excluded_user_ids: excludedUserIds,
@@ -16370,9 +16349,9 @@ const GroupSelector = ({ store, onGroupSelect }) => {
     const loadGroups = async () => {
       setIsLoading(true);
       try {
-        const response = await core2.fetchGroupConversations(999, 0);
+        const response = await core2.fetchConversationList(999, 0);
         if (!cancelled) {
-          setGroups(response.entries ?? []);
+          setGroups(response ?? []);
         }
       } catch (error) {
       } finally {
@@ -16407,13 +16386,13 @@ const GroupSelector = ({ store, onGroupSelect }) => {
         )
       }
     ),
-    /* @__PURE__ */ jsxRuntime.jsx(SelectContent, { align: "start", children: groups.map((entry) => /* @__PURE__ */ jsxRuntime.jsxs(SelectItem, { value: entry.group_id, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(SelectContent, { align: "start", children: groups.map((conversation) => /* @__PURE__ */ jsxRuntime.jsxs(SelectItem, { value: conversation.conversation_id, children: [
       /* @__PURE__ */ jsxRuntime.jsxs(Avatar, { className: "size-6", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: entry.group.avatar }),
-        /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { children: entry?.group?.name?.charAt(0) })
+        /* @__PURE__ */ jsxRuntime.jsx(AvatarImage, { src: conversation.conversation_detail.avatar ?? void 0 }),
+        /* @__PURE__ */ jsxRuntime.jsx(AvatarFallback, { children: conversation.conversation_detail.name?.charAt(0) })
       ] }),
-      /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm", children: entry.group?.name ?? entry.group_id })
-    ] }, entry.group_id)) })
+      /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-sm", children: conversation.conversation_detail.name ?? conversation.conversation_id })
+    ] }, conversation.conversation_id)) })
   ] }) });
 };
 const GifIcon = (props) => /* @__PURE__ */ jsxRuntime.jsx(
@@ -32502,14 +32481,14 @@ const mentionService = (api, mfs, store, user) => {
     }
     const { groupId, postId } = params;
     const response = postId ? await mfs.getRecommendationPost(groupId, postId, 0, 999) : await mfs.getRecommendationGroup(groupId, 0, 999);
-    const apiResults = response.entries?.filter((item) => Boolean(item?.user_data))?.map(
+    const apiResults = response.entries?.filter((item) => Boolean(item?.user_details))?.map(
       (item) => ({
-        id: item?.user_data?.id,
-        label: item?.user_data?.name,
-        avatar: item?.user_data?.avatar,
+        id: item?.user_details?.id,
+        label: item?.user_details?.name,
+        avatar: item?.user_details?.avatar,
         inThisThread: 1,
-        name: item?.user_data?.name,
-        selectId: item.user_data?.username,
+        name: item?.user_details?.name,
+        selectId: item.user_details?.username,
         type: MentionType.User,
         from: PostType.Post
       })
@@ -32536,18 +32515,18 @@ const mentionService = (api, mfs, store, user) => {
     if (!activeGroupId) {
       return [];
     }
-    const response = await api.fetchGroupConversations(999, 0);
-    return response.entries.map(
-      (item) => ({
-        id: item?.group_id,
-        label: item?.group?.name,
-        avatar: item?.group?.avatar,
+    const response = await api.fetchConversationList(999, 0);
+    return response.map(
+      (conversation) => ({
+        id: conversation?.conversation_id,
+        label: conversation?.conversation_detail?.name,
+        avatar: conversation?.conversation_detail?.avatar,
         inThisThread: 1,
-        name: item?.group?.name,
-        selectId: item?.group?.select_id,
+        name: conversation?.conversation_detail?.name,
+        selectId: conversation?.conversation_detail?.select_id,
         type: MentionType.Group,
         from: PostType.Post,
-        isCrossExposureEnable: item?.group?.allow_cross_exposure
+        isCrossExposureEnable: conversation?.conversation_detail?.allow_cross_exposure
       })
     );
   };

package/dist/post-builder.js

@@ -2476,6 +2476,11 @@ const {
   getAdapter,
   mergeConfig
 } = axios;
+var ConversationType = /* @__PURE__ */ ((ConversationType2) => {
+  ConversationType2[ConversationType2["GROUP"] = 0] = "GROUP";
+  ConversationType2[ConversationType2["USER"] = 1] = "USER";
+  return ConversationType2;
+})(ConversationType || {});
 var PostType = /* @__PURE__ */ ((PostType2) => {
   PostType2["Post"] = "post";
   PostType2["Comment"] = "comment";
@@ -4159,10 +4164,12 @@ const asyncCache = (key, fetcher) => {
 };
 class CoreApi {
   isAuthorize;
+  baseUrl;
   url;
   language;
   onError;
   api;
+  apiV2;
   token;
   toI18N;
   /**
@@ -4173,13 +4180,14 @@ class CoreApi {
    */
   constructor(coreUrl, token, toI18N, language) {
     this.isAuthorize = false;
+    this.baseUrl = coreUrl;
     this.url = `${coreUrl}v1/`;
     this.language = language ?? getLanguage();
     this.onError = () => {
     };
     this.toI18N = toI18N;
-    this.initApi();
     this.token = token;
+    this.initApi();
   }
   /**
    * Set the 'Authorization' header
@@ -4216,6 +4224,12 @@ class CoreApi {
       token: this.token,
       isFileStore: false
     });
+    this.apiV2 = createApiClient({
+      baseURL: `${this.baseUrl}v2/`,
+      t: this.toI18N,
+      token: this.token,
+      isFileStore: false
+    });
   }
   getErrorMessage(response) {
     if (response && response.response && response.response.data && response.response.data.error) {
@@ -4227,26 +4241,19 @@ class CoreApi {
     return null;
   }
   /**
-   * get all group
+   * get conversations sorted by last activity
    */
-  getAllGroup() {
-    return this.api.get("/group/").then((response) => {
-      return response.data;
-    }).catch((response) => {
-      throw this.throwHTTPError(response);
-    });
-  }
-  /**
-   * get group conversations sorted by last activity
-   */
-  fetchGroupConversations(amount, fromTime) {
-    const cacheKey = `group-conversations`;
+  fetchConversationList(amount, fromTime) {
+    const cacheKey = `conversation-list`;
     const cachedFetcher = asyncCache(
       cacheKey,
-      () => this.api.post("/group/fetch/conversations", {
-        amount,
-        from_time: fromTime
-      }).then((response) => response.data).catch((response) => {
+      () => this.apiV2.get("conversation/list", {
+        params: { from_time: fromTime, amount }
+      }).then(
+        (response) => response?.data?.filter(
+          (data) => data?.conversation_detail?.type === ConversationType.GROUP
+        )
+      ).catch((response) => {
         throw this.throwHTTPError(response);
       })
     );
@@ -4293,25 +4300,6 @@ class CoreApi {
         l: limit,
         o: offset2,
         in_china: isUsingChineseProvider
-        // || stringContainsChineseCharacter(query),
-      }
-    }).then((response) => {
-      return response.data;
-    }).catch((response) => {
-      throw this.throwHTTPError(response);
-    });
-  }
-  /**
-   * Get random GIF based on q parameter via a GET request into the backend
-   *
-   * @param {string} query
-   * @returns {Promise<WebImageSearchResponse>}
-   * @memberof CoreApi
-   */
-  fetchRandomGif(query) {
-    return this.api.get("search/gifs/random", {
-      params: {
-        q: query
       }
     }).then((response) => {
       return response.data;
@@ -4345,7 +4333,7 @@ class CoreApi {
     });
   }
   /**
-   * Fetch mateData from url
+   * Fetch metadata from url
    */
   resolveUrl(url) {
     const cacheKey = url;
@@ -4361,15 +4349,6 @@ class CoreApi {
     );
     return cachedFetcher();
   }
-  resolveUrlForText(body) {
-    return this.api.post("url/resolve-text", {
-      body
-    }).then((response) => {
-      return response.data;
-    }).catch((response) => {
-      throw this.throwHTTPError(response);
-    });
-  }
 }
 const byteToHex = [];
 for (let i2 = 0; i2 < 256; ++i2) {
@@ -4542,11 +4521,11 @@ class MFSApi {
       isFileStore: false
     });
   }
-  getRecommendationPost(groupId, postId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_data", "post_counter"]) {
+  getRecommendationPost(groupId, postId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_details", "post_counter"]) {
     const cacheKey = `post-recommendation:${groupId}${postId ? `:${postId}` : ``}`;
     const cachedFetcher = asyncCache(
       cacheKey,
-      () => this.api.post("/recommendation/post", {
+      () => this.api.post("v2/recommendation/post", {
         group_id: groupId,
         post_id: postId,
         included_user_ids: includedUserIds,
@@ -4564,11 +4543,11 @@ class MFSApi {
     );
     return cachedFetcher();
   }
-  getRecommendationGroup(groupId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_data"]) {
+  getRecommendationGroup(groupId, offset2 = 0, amount = 10, excludedUserIds = [], includedUserIds = [], keyword = "", scope = ["user_details"]) {
     const cacheKey = `group-recommendation:${groupId}`;
     const cachedFetcher = asyncCache(
       cacheKey,
-      () => this.api.post("/recommendation/group", {
+      () => this.api.post("v2/recommendation/group", {
         group_id: groupId,
         included_user_ids: includedUserIds,
         excluded_user_ids: excludedUserIds,
@@ -16340,9 +16319,9 @@ const GroupSelector = ({ store, onGroupSelect }) => {
     const loadGroups = async () => {
       setIsLoading(true);
       try {
-        const response = await core.fetchGroupConversations(999, 0);
+        const response = await core.fetchConversationList(999, 0);
         if (!cancelled) {
-          setGroups(response.entries ?? []);
+          setGroups(response ?? []);
         }
       } catch (error) {
       } finally {
@@ -16377,13 +16356,13 @@ const GroupSelector = ({ store, onGroupSelect }) => {
         )
       }
     ),
-    /* @__PURE__ */ jsx(SelectContent, { align: "start", children: groups.map((entry) => /* @__PURE__ */ jsxs(SelectItem, { value: entry.group_id, children: [
+    /* @__PURE__ */ jsx(SelectContent, { align: "start", children: groups.map((conversation) => /* @__PURE__ */ jsxs(SelectItem, { value: conversation.conversation_id, children: [
       /* @__PURE__ */ jsxs(Avatar, { className: "size-6", children: [
-        /* @__PURE__ */ jsx(AvatarImage, { src: entry.group.avatar }),
-        /* @__PURE__ */ jsx(AvatarFallback, { children: entry?.group?.name?.charAt(0) })
+        /* @__PURE__ */ jsx(AvatarImage, { src: conversation.conversation_detail.avatar ?? void 0 }),
+        /* @__PURE__ */ jsx(AvatarFallback, { children: conversation.conversation_detail.name?.charAt(0) })
       ] }),
-      /* @__PURE__ */ jsx("span", { className: "text-sm", children: entry.group?.name ?? entry.group_id })
-    ] }, entry.group_id)) })
+      /* @__PURE__ */ jsx("span", { className: "text-sm", children: conversation.conversation_detail.name ?? conversation.conversation_id })
+    ] }, conversation.conversation_id)) })
   ] }) });
 };
 const GifIcon = (props) => /* @__PURE__ */ jsx(
@@ -32472,14 +32451,14 @@ const mentionService = (api, mfs, store, user) => {
     }
     const { groupId, postId } = params;
     const response = postId ? await mfs.getRecommendationPost(groupId, postId, 0, 999) : await mfs.getRecommendationGroup(groupId, 0, 999);
-    const apiResults = response.entries?.filter((item) => Boolean(item?.user_data))?.map(
+    const apiResults = response.entries?.filter((item) => Boolean(item?.user_details))?.map(
       (item) => ({
-        id: item?.user_data?.id,
-        label: item?.user_data?.name,
-        avatar: item?.user_data?.avatar,
+        id: item?.user_details?.id,
+        label: item?.user_details?.name,
+        avatar: item?.user_details?.avatar,
         inThisThread: 1,
-        name: item?.user_data?.name,
-        selectId: item.user_data?.username,
+        name: item?.user_details?.name,
+        selectId: item.user_details?.username,
         type: MentionType.User,
         from: PostType.Post
       })
@@ -32506,18 +32485,18 @@ const mentionService = (api, mfs, store, user) => {
     if (!activeGroupId) {
       return [];
     }
-    const response = await api.fetchGroupConversations(999, 0);
-    return response.entries.map(
-      (item) => ({
-        id: item?.group_id,
-        label: item?.group?.name,
-        avatar: item?.group?.avatar,
+    const response = await api.fetchConversationList(999, 0);
+    return response.map(
+      (conversation) => ({
+        id: conversation?.conversation_id,
+        label: conversation?.conversation_detail?.name,
+        avatar: conversation?.conversation_detail?.avatar,
         inThisThread: 1,
-        name: item?.group?.name,
-        selectId: item?.group?.select_id,
+        name: conversation?.conversation_detail?.name,
+        selectId: conversation?.conversation_detail?.select_id,
         type: MentionType.Group,
         from: PostType.Post,
-        isCrossExposureEnable: item?.group?.allow_cross_exposure
+        isCrossExposureEnable: conversation?.conversation_detail?.allow_cross_exposure
       })
     );
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@select-org/select-post-builder",
-  "version": "1.1.34",
+  "version": "1.1.35",
   "description": "A reusable, extensible Post Builder widget for the Select platform and beyond.",
   "main": "./dist/post-builder.cjs.js",
   "module": "./dist/post-builder.js",