@connectedxm/client 0.1.9 → 0.1.20

package/dist/index.d.mts

@@ -919,6 +919,10 @@ interface NotificationPreferences {
     chatPush: boolean;
     chatUnreadPush: boolean;
     chatUnreadEmail: boolean;
+    organizationAnnouncementEmail: boolean;
+    organizationAnnouncementPush: boolean;
+    communityAnnouncementEmail: boolean;
+    communityAnnouncementPush: boolean;
     eventAnnouncementEmail: boolean;
     eventAnnouncementPush: boolean;
 }
@@ -2238,7 +2242,6 @@ declare const CancelSubscription: ({ subscriptionId, clientApiParams, queryClien
 declare const useCancelSubscription: (options?: Omit<MutationOptions<Awaited<ReturnType<typeof CancelSubscription>>, Omit<CancelSubscriptionParams, "queryClient" | "clientApiParams">>, "mutationFn">) => _tanstack_react_query.UseMutationResult<ConnectedXMResponse<null>, axios.AxiosError<ConnectedXMResponse<null>, any>, Omit<CancelSubscriptionParams, "queryClient" | "clientApiParams">, unknown>;
 
 interface CreateSubscriptionParams extends MutationParams {
-    subscriptionId: string;
     productId: string;
     priceId: string;
 }

package/dist/index.d.ts

@@ -919,6 +919,10 @@ interface NotificationPreferences {
     chatPush: boolean;
     chatUnreadPush: boolean;
     chatUnreadEmail: boolean;
+    organizationAnnouncementEmail: boolean;
+    organizationAnnouncementPush: boolean;
+    communityAnnouncementEmail: boolean;
+    communityAnnouncementPush: boolean;
     eventAnnouncementEmail: boolean;
     eventAnnouncementPush: boolean;
 }
@@ -2238,7 +2242,6 @@ declare const CancelSubscription: ({ subscriptionId, clientApiParams, queryClien
 declare const useCancelSubscription: (options?: Omit<MutationOptions<Awaited<ReturnType<typeof CancelSubscription>>, Omit<CancelSubscriptionParams, "queryClient" | "clientApiParams">>, "mutationFn">) => _tanstack_react_query.UseMutationResult<ConnectedXMResponse<null>, axios.AxiosError<ConnectedXMResponse<null>, any>, Omit<CancelSubscriptionParams, "queryClient" | "clientApiParams">, unknown>;
 
 interface CreateSubscriptionParams extends MutationParams {
-    subscriptionId: string;
     productId: string;
     priceId: string;
 }

package/dist/index.js

@@ -4890,58 +4890,36 @@ var useUnfollowAccount = (options = {}) => {
 };
 
 // src/mutations/activities/optimistic/UpdateReshares.ts
+var import_immer2 = require("immer");
 var UpdateResharesSingle = (increment, queryClient, KEY) => {
-  queryClient.setQueryData(KEY, (data) => {
-    if (!data?.data) {
-      return data;
-    }
-    data = data.data;
-    if (typeof data?._count != "undefined") {
-      return {
-        data: {
-          ...data,
-          _count: {
-            ...data._count,
-            reshares: increment ? data._count.reshares + 1 : data._count.reshares - 1
-          },
-          reshares: increment ? [{}] : void 0
-        }
-      };
-    }
-  });
+  queryClient.setQueryData(
+    KEY,
+    (originalData) => (0, import_immer2.produce)(originalData, (draft) => {
+      if (!draft?.data) {
+        return;
+      }
+      draft.data._count.reshares += increment ? 1 : -1;
+      draft.data.reshares = increment ? [{ id: Date.now().toString() }] : [];
+    })
+  );
 };
 var UpdateResharesInfinite = (increment, queryClient, KEY, activityId) => {
-  queryClient.setQueriesData({ queryKey: KEY, exact: false }, (data) => {
-    if (!data?.pages || data?.pages?.length === 0) {
-      return data;
-    }
-    const pages = data.pages;
-    let activityIndex;
-    let pageIndex;
-    let reshareActivityIndex;
-    let resharePageIndex;
-    for (let x = 0; x < pages?.length; x++) {
-      for (let y = 0; y < pages?.[x]?.data?.length; y++) {
-        if (pages?.[x]?.data?.[y]?.id === activityId) {
-          pageIndex = x;
-          activityIndex = y;
-        }
-        if (pages?.[x]?.data?.[y]?.reshared?.id === activityId) {
-          resharePageIndex = x;
-          reshareActivityIndex = y;
+  queryClient.setQueriesData(
+    { queryKey: KEY, exact: false },
+    (originalData) => (0, import_immer2.produce)(originalData, (draft) => {
+      if (!draft?.pages || draft.pages.length === 0) {
+        return;
+      }
+      for (const page of draft.pages) {
+        for (const activity of page.data) {
+          if (activity.id === activityId) {
+            activity._count.reshares += increment ? 1 : -1;
+            activity.reshares = increment ? [{ id: Date.now().toString() }] : [];
+          }
         }
       }
-    }
-    if (typeof pageIndex != "undefined" && typeof activityIndex != "undefined") {
-      pages[pageIndex].data[activityIndex]._count.reshares = increment ? pages?.[pageIndex]?.data[activityIndex]._count.reshares + 1 : pages?.[pageIndex]?.data[activityIndex]._count.reshares - 1;
-      pages[pageIndex].data[activityIndex].reshares = increment ? [{}] : void 0;
-    }
-    if (typeof resharePageIndex != "undefined" && typeof reshareActivityIndex != "undefined") {
-      pages[resharePageIndex].data[reshareActivityIndex].reshared._count.reshares = increment ? pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.reshares + 1 : pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.reshares - 1;
-      pages[resharePageIndex].data[reshareActivityIndex].reshared.reshares = increment ? [{}] : void 0;
-    }
-    return { ...data, pages };
-  });
+    })
+  );
 };
 
 // src/mutations/activities/useDeleteReshare.ts
@@ -4951,7 +4929,10 @@ var DeleteReshare = async ({
   queryClient
 }) => {
   if (queryClient) {
-    UpdateResharesSingle(false, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateResharesSingle(false, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateResharesInfinite(
       false,
       queryClient,
@@ -4970,58 +4951,36 @@ var useDeleteReshare = (options = {}) => {
 };
 
 // src/mutations/activities/optimistic/UpdateLikes.ts
+var import_immer3 = require("immer");
 var UpdateLikesSingle = (increment, queryClient, KEY) => {
-  queryClient.setQueryData(KEY, (data) => {
-    if (!data?.data) {
-      return data;
-    }
-    data = data.data;
-    if (typeof data?._count != "undefined") {
-      return {
-        data: {
-          ...data,
-          _count: {
-            ...data._count,
-            likes: increment ? data._count.likes + 1 : data._count.likes - 1
-          },
-          likes: increment ? [{}] : void 0
-        }
-      };
-    }
-  });
+  queryClient.setQueryData(
+    KEY,
+    (originalData) => (0, import_immer3.produce)(originalData, (draft) => {
+      if (!draft?.data) {
+        return;
+      }
+      draft.data._count.likes += increment ? 1 : -1;
+      draft.data.likes = increment ? [{ createdAt: (/* @__PURE__ */ new Date()).toISOString() }] : [];
+    })
+  );
 };
 var UpdateLikesInfinite = (increment, queryClient, KEY, activityId) => {
-  queryClient.setQueriesData({ queryKey: KEY, exact: false }, (data) => {
-    if (!data?.pages || data?.pages?.length === 0) {
-      return data;
-    }
-    const pages = data.pages;
-    let activityIndex;
-    let pageIndex;
-    let reshareActivityIndex;
-    let resharePageIndex;
-    for (let x = 0; x < pages?.length; x++) {
-      for (let y = 0; y < pages?.[x]?.data?.length; y++) {
-        if (pages?.[x]?.data?.[y]?.id === activityId) {
-          pageIndex = x;
-          activityIndex = y;
-        }
-        if (pages?.[x]?.data?.[y]?.reshared?.id === activityId) {
-          resharePageIndex = x;
-          reshareActivityIndex = y;
+  queryClient.setQueriesData(
+    { queryKey: KEY, exact: false },
+    (originalData) => (0, import_immer3.produce)(originalData, (draft) => {
+      if (!draft?.pages || draft.pages.length === 0) {
+        return;
+      }
+      for (const page of draft.pages) {
+        for (const activity of page.data) {
+          if (activity.id === activityId) {
+            activity._count.likes += increment ? 1 : -1;
+            activity.likes = increment ? [{ createdAt: (/* @__PURE__ */ new Date()).toISOString() }] : [];
+          }
         }
       }
-    }
-    if (typeof pageIndex != "undefined" && typeof activityIndex != "undefined") {
-      pages[pageIndex].data[activityIndex]._count.likes = increment ? pages?.[pageIndex]?.data[activityIndex]._count.likes + 1 : pages?.[pageIndex]?.data[activityIndex]._count.likes - 1;
-      pages[pageIndex].data[activityIndex].likes = increment ? [{}] : void 0;
-    }
-    if (typeof resharePageIndex != "undefined" && typeof reshareActivityIndex != "undefined") {
-      pages[resharePageIndex].data[reshareActivityIndex].reshared._count.likes = increment ? pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.likes + 1 : pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.likes - 1;
-      pages[resharePageIndex].data[reshareActivityIndex].reshared.likes = increment ? [{}] : void 0;
-    }
-    return { ...data, pages };
-  });
+    })
+  );
 };
 
 // src/mutations/activities/useLikeActivity.ts
@@ -5031,7 +4990,10 @@ var LikeActivity = async ({
   queryClient
 }) => {
   if (queryClient) {
-    UpdateLikesSingle(true, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateLikesSingle(true, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateLikesInfinite(true, queryClient, ACTIVITIES_QUERY_KEY(), activityId);
   }
   const clientApi = await GetClientAPI(clientApiParams);
@@ -5051,7 +5013,10 @@ var ReshareActivity = async ({
   clientApiParams
 }) => {
   if (queryClient) {
-    UpdateResharesSingle(true, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateResharesSingle(true, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateResharesInfinite(
       true,
       queryClient,
@@ -5079,7 +5044,10 @@ var UnlikeActivity = async ({
   queryClient
 }) => {
   if (queryClient) {
-    UpdateLikesSingle(false, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateLikesSingle(false, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateLikesInfinite(false, queryClient, ACTIVITIES_QUERY_KEY(), activityId);
   }
   const clientApi = await GetClientAPI(clientApiParams);
@@ -6596,63 +6564,35 @@ var useSelfCheckinRegistration = (options = {}) => {
 };
 
 // src/mutations/activities/optimistic/UpdateComments.ts
+var import_immer4 = require("immer");
 var UpdateCommentsSingle = (increment, queryClient, KEY) => {
-  queryClient.setQueryData(KEY, (data) => {
-    if (!data?.data) {
-      return data;
-    }
-    data = data.data;
-    if (typeof data?._count != "undefined") {
-      return {
-        data: {
-          ...data,
-          _count: {
-            ...data._count,
-            comments: increment ? data._count.comments + 1 : data._count.comments - 1
-          },
-          comments: increment ? [{}] : void 0
-        }
-      };
-    }
-  });
+  queryClient.setQueryData(
+    KEY,
+    (originalData) => (0, import_immer4.produce)(originalData, (draft) => {
+      if (!draft?.data) {
+        return;
+      }
+      draft.data._count.comments += increment ? 1 : -1;
+      draft.data.comments = increment ? [{ id: Date.now().toString() }] : [];
+    })
+  );
 };
 var UpdateCommentsInfinite = (increment, queryClient, KEY, activityId) => {
   queryClient.setQueriesData(
-    {
-      queryKey: KEY,
-      exact: false
-    },
-    (data) => {
-      if (!data?.pages || data?.pages?.length === 0) {
-        return data;
+    { queryKey: KEY, exact: false },
+    (originalData) => (0, import_immer4.produce)(originalData, (draft) => {
+      if (!draft?.pages || draft.pages.length === 0) {
+        return;
       }
-      const pages = data.pages;
-      let activityIndex;
-      let pageIndex;
-      let reshareActivityIndex;
-      let resharePageIndex;
-      for (let x = 0; x < pages?.length; x++) {
-        for (let y = 0; y < pages?.[x]?.data?.length; y++) {
-          if (pages?.[x]?.data?.[y]?.id === activityId) {
-            pageIndex = x;
-            activityIndex = y;
-          }
-          if (pages?.[x]?.data?.[y]?.reshared?.id === activityId) {
-            resharePageIndex = x;
-            reshareActivityIndex = y;
+      for (const page of draft.pages) {
+        for (const activity of page.data) {
+          if (activity.id === activityId) {
+            activity._count.comments += increment ? 1 : -1;
+            activity.comments = increment ? [{ id: Date.now().toString() }] : [];
           }
         }
       }
-      if (typeof pageIndex != "undefined" && typeof activityIndex != "undefined") {
-        pages[pageIndex].data[activityIndex]._count.comments = increment ? pages?.[pageIndex]?.data[activityIndex]._count.comments + 1 : pages?.[pageIndex]?.data[activityIndex]._count.comments - 1;
-        pages[pageIndex].data[activityIndex].comments = increment ? [{}] : void 0;
-      }
-      if (typeof resharePageIndex != "undefined" && typeof reshareActivityIndex != "undefined") {
-        pages[resharePageIndex].data[reshareActivityIndex].reshared._count.comments = increment ? pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.comments + 1 : pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.comments - 1;
-        pages[resharePageIndex].data[reshareActivityIndex].reshared.comments = increment ? [{}] : void 0;
-      }
-      return { ...data, pages };
-    }
+    })
   );
 };
 
@@ -6668,7 +6608,7 @@ var SelfCreateActivity = async ({
     if (activity.commentedId) {
       UpdateCommentsSingle(true, queryClient, [
         ...ACTIVITY_QUERY_KEY(activity.commentedId),
-        clientApiParams.locale
+        ...GetBaseSingleQueryKeys(clientApiParams.locale)
       ]);
       UpdateCommentsInfinite(
         true,
@@ -6683,51 +6623,51 @@ var SelfCreateActivity = async ({
     `/self/activities`,
     {
       activity,
-      buffer: base64Image ? `data:image/jpeg;base64,${base64Image}` : void 0,
-      videoUri: videoUri || void 0
+      imageUri: base64Image ?? void 0,
+      videoUri: videoUri ?? void 0
     }
   );
   if (queryClient && data.status === "ok") {
     let nested = false;
-    if (data.data?.commented?.id) {
+    if (activity.commentedId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...ACTIVITY_COMMENTS_QUERY_KEY(data.data.commented.id),
+          ...ACTIVITY_COMMENTS_QUERY_KEY(activity.commentedId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
       );
     }
-    if (data.data?.content?.id) {
+    if (activity.contentId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...CONTENT_ACTIVITIES_QUERY_KEY(data.data.content.id),
+          ...CONTENT_ACTIVITIES_QUERY_KEY(activity.contentId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
       );
     }
-    if (data.data?.event?.id) {
+    if (activity.eventId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...EVENT_ACTIVITIES_QUERY_KEY(data.data.event.id),
+          ...EVENT_ACTIVITIES_QUERY_KEY(activity.eventId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
       );
     }
-    if (data.data?.community?.id) {
+    if (activity.communityId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...COMMUNITY_ACTIVITIES_QUERY_KEY(data.data.community.id),
+          ...COMMUNITY_ACTIVITIES_QUERY_KEY(activity.communityId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
@@ -6892,7 +6832,7 @@ var UpdateSelfEventListing = async ({
     `/self/events/listings/${eventId}`,
     {
       event,
-      image: base64 ? `data:image/jpeg;base64,${base64}` : void 0
+      image: base64 ?? void 0
     }
   );
   if (queryClient && data.status === "ok") {

package/dist/index.mjs

@@ -4324,58 +4324,36 @@ var useUnfollowAccount = (options = {}) => {
 };
 
 // src/mutations/activities/optimistic/UpdateReshares.ts
+import { produce as produce2 } from "immer";
 var UpdateResharesSingle = (increment, queryClient, KEY) => {
-  queryClient.setQueryData(KEY, (data) => {
-    if (!data?.data) {
-      return data;
-    }
-    data = data.data;
-    if (typeof data?._count != "undefined") {
-      return {
-        data: {
-          ...data,
-          _count: {
-            ...data._count,
-            reshares: increment ? data._count.reshares + 1 : data._count.reshares - 1
-          },
-          reshares: increment ? [{}] : void 0
-        }
-      };
-    }
-  });
+  queryClient.setQueryData(
+    KEY,
+    (originalData) => produce2(originalData, (draft) => {
+      if (!draft?.data) {
+        return;
+      }
+      draft.data._count.reshares += increment ? 1 : -1;
+      draft.data.reshares = increment ? [{ id: Date.now().toString() }] : [];
+    })
+  );
 };
 var UpdateResharesInfinite = (increment, queryClient, KEY, activityId) => {
-  queryClient.setQueriesData({ queryKey: KEY, exact: false }, (data) => {
-    if (!data?.pages || data?.pages?.length === 0) {
-      return data;
-    }
-    const pages = data.pages;
-    let activityIndex;
-    let pageIndex;
-    let reshareActivityIndex;
-    let resharePageIndex;
-    for (let x = 0; x < pages?.length; x++) {
-      for (let y = 0; y < pages?.[x]?.data?.length; y++) {
-        if (pages?.[x]?.data?.[y]?.id === activityId) {
-          pageIndex = x;
-          activityIndex = y;
-        }
-        if (pages?.[x]?.data?.[y]?.reshared?.id === activityId) {
-          resharePageIndex = x;
-          reshareActivityIndex = y;
+  queryClient.setQueriesData(
+    { queryKey: KEY, exact: false },
+    (originalData) => produce2(originalData, (draft) => {
+      if (!draft?.pages || draft.pages.length === 0) {
+        return;
+      }
+      for (const page of draft.pages) {
+        for (const activity of page.data) {
+          if (activity.id === activityId) {
+            activity._count.reshares += increment ? 1 : -1;
+            activity.reshares = increment ? [{ id: Date.now().toString() }] : [];
+          }
         }
       }
-    }
-    if (typeof pageIndex != "undefined" && typeof activityIndex != "undefined") {
-      pages[pageIndex].data[activityIndex]._count.reshares = increment ? pages?.[pageIndex]?.data[activityIndex]._count.reshares + 1 : pages?.[pageIndex]?.data[activityIndex]._count.reshares - 1;
-      pages[pageIndex].data[activityIndex].reshares = increment ? [{}] : void 0;
-    }
-    if (typeof resharePageIndex != "undefined" && typeof reshareActivityIndex != "undefined") {
-      pages[resharePageIndex].data[reshareActivityIndex].reshared._count.reshares = increment ? pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.reshares + 1 : pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.reshares - 1;
-      pages[resharePageIndex].data[reshareActivityIndex].reshared.reshares = increment ? [{}] : void 0;
-    }
-    return { ...data, pages };
-  });
+    })
+  );
 };
 
 // src/mutations/activities/useDeleteReshare.ts
@@ -4385,7 +4363,10 @@ var DeleteReshare = async ({
   queryClient
 }) => {
   if (queryClient) {
-    UpdateResharesSingle(false, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateResharesSingle(false, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateResharesInfinite(
       false,
       queryClient,
@@ -4404,58 +4385,36 @@ var useDeleteReshare = (options = {}) => {
 };
 
 // src/mutations/activities/optimistic/UpdateLikes.ts
+import { produce as produce3 } from "immer";
 var UpdateLikesSingle = (increment, queryClient, KEY) => {
-  queryClient.setQueryData(KEY, (data) => {
-    if (!data?.data) {
-      return data;
-    }
-    data = data.data;
-    if (typeof data?._count != "undefined") {
-      return {
-        data: {
-          ...data,
-          _count: {
-            ...data._count,
-            likes: increment ? data._count.likes + 1 : data._count.likes - 1
-          },
-          likes: increment ? [{}] : void 0
-        }
-      };
-    }
-  });
+  queryClient.setQueryData(
+    KEY,
+    (originalData) => produce3(originalData, (draft) => {
+      if (!draft?.data) {
+        return;
+      }
+      draft.data._count.likes += increment ? 1 : -1;
+      draft.data.likes = increment ? [{ createdAt: (/* @__PURE__ */ new Date()).toISOString() }] : [];
+    })
+  );
 };
 var UpdateLikesInfinite = (increment, queryClient, KEY, activityId) => {
-  queryClient.setQueriesData({ queryKey: KEY, exact: false }, (data) => {
-    if (!data?.pages || data?.pages?.length === 0) {
-      return data;
-    }
-    const pages = data.pages;
-    let activityIndex;
-    let pageIndex;
-    let reshareActivityIndex;
-    let resharePageIndex;
-    for (let x = 0; x < pages?.length; x++) {
-      for (let y = 0; y < pages?.[x]?.data?.length; y++) {
-        if (pages?.[x]?.data?.[y]?.id === activityId) {
-          pageIndex = x;
-          activityIndex = y;
-        }
-        if (pages?.[x]?.data?.[y]?.reshared?.id === activityId) {
-          resharePageIndex = x;
-          reshareActivityIndex = y;
+  queryClient.setQueriesData(
+    { queryKey: KEY, exact: false },
+    (originalData) => produce3(originalData, (draft) => {
+      if (!draft?.pages || draft.pages.length === 0) {
+        return;
+      }
+      for (const page of draft.pages) {
+        for (const activity of page.data) {
+          if (activity.id === activityId) {
+            activity._count.likes += increment ? 1 : -1;
+            activity.likes = increment ? [{ createdAt: (/* @__PURE__ */ new Date()).toISOString() }] : [];
+          }
         }
       }
-    }
-    if (typeof pageIndex != "undefined" && typeof activityIndex != "undefined") {
-      pages[pageIndex].data[activityIndex]._count.likes = increment ? pages?.[pageIndex]?.data[activityIndex]._count.likes + 1 : pages?.[pageIndex]?.data[activityIndex]._count.likes - 1;
-      pages[pageIndex].data[activityIndex].likes = increment ? [{}] : void 0;
-    }
-    if (typeof resharePageIndex != "undefined" && typeof reshareActivityIndex != "undefined") {
-      pages[resharePageIndex].data[reshareActivityIndex].reshared._count.likes = increment ? pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.likes + 1 : pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.likes - 1;
-      pages[resharePageIndex].data[reshareActivityIndex].reshared.likes = increment ? [{}] : void 0;
-    }
-    return { ...data, pages };
-  });
+    })
+  );
 };
 
 // src/mutations/activities/useLikeActivity.ts
@@ -4465,7 +4424,10 @@ var LikeActivity = async ({
   queryClient
 }) => {
   if (queryClient) {
-    UpdateLikesSingle(true, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateLikesSingle(true, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateLikesInfinite(true, queryClient, ACTIVITIES_QUERY_KEY(), activityId);
   }
   const clientApi = await GetClientAPI(clientApiParams);
@@ -4485,7 +4447,10 @@ var ReshareActivity = async ({
   clientApiParams
 }) => {
   if (queryClient) {
-    UpdateResharesSingle(true, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateResharesSingle(true, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateResharesInfinite(
       true,
       queryClient,
@@ -4513,7 +4478,10 @@ var UnlikeActivity = async ({
   queryClient
 }) => {
   if (queryClient) {
-    UpdateLikesSingle(false, queryClient, ACTIVITY_QUERY_KEY(activityId));
+    UpdateLikesSingle(false, queryClient, [
+      ...ACTIVITY_QUERY_KEY(activityId),
+      ...GetBaseSingleQueryKeys(clientApiParams.locale)
+    ]);
     UpdateLikesInfinite(false, queryClient, ACTIVITIES_QUERY_KEY(), activityId);
   }
   const clientApi = await GetClientAPI(clientApiParams);
@@ -6030,63 +5998,35 @@ var useSelfCheckinRegistration = (options = {}) => {
 };
 
 // src/mutations/activities/optimistic/UpdateComments.ts
+import { produce as produce4 } from "immer";
 var UpdateCommentsSingle = (increment, queryClient, KEY) => {
-  queryClient.setQueryData(KEY, (data) => {
-    if (!data?.data) {
-      return data;
-    }
-    data = data.data;
-    if (typeof data?._count != "undefined") {
-      return {
-        data: {
-          ...data,
-          _count: {
-            ...data._count,
-            comments: increment ? data._count.comments + 1 : data._count.comments - 1
-          },
-          comments: increment ? [{}] : void 0
-        }
-      };
-    }
-  });
+  queryClient.setQueryData(
+    KEY,
+    (originalData) => produce4(originalData, (draft) => {
+      if (!draft?.data) {
+        return;
+      }
+      draft.data._count.comments += increment ? 1 : -1;
+      draft.data.comments = increment ? [{ id: Date.now().toString() }] : [];
+    })
+  );
 };
 var UpdateCommentsInfinite = (increment, queryClient, KEY, activityId) => {
   queryClient.setQueriesData(
-    {
-      queryKey: KEY,
-      exact: false
-    },
-    (data) => {
-      if (!data?.pages || data?.pages?.length === 0) {
-        return data;
+    { queryKey: KEY, exact: false },
+    (originalData) => produce4(originalData, (draft) => {
+      if (!draft?.pages || draft.pages.length === 0) {
+        return;
       }
-      const pages = data.pages;
-      let activityIndex;
-      let pageIndex;
-      let reshareActivityIndex;
-      let resharePageIndex;
-      for (let x = 0; x < pages?.length; x++) {
-        for (let y = 0; y < pages?.[x]?.data?.length; y++) {
-          if (pages?.[x]?.data?.[y]?.id === activityId) {
-            pageIndex = x;
-            activityIndex = y;
-          }
-          if (pages?.[x]?.data?.[y]?.reshared?.id === activityId) {
-            resharePageIndex = x;
-            reshareActivityIndex = y;
+      for (const page of draft.pages) {
+        for (const activity of page.data) {
+          if (activity.id === activityId) {
+            activity._count.comments += increment ? 1 : -1;
+            activity.comments = increment ? [{ id: Date.now().toString() }] : [];
           }
         }
       }
-      if (typeof pageIndex != "undefined" && typeof activityIndex != "undefined") {
-        pages[pageIndex].data[activityIndex]._count.comments = increment ? pages?.[pageIndex]?.data[activityIndex]._count.comments + 1 : pages?.[pageIndex]?.data[activityIndex]._count.comments - 1;
-        pages[pageIndex].data[activityIndex].comments = increment ? [{}] : void 0;
-      }
-      if (typeof resharePageIndex != "undefined" && typeof reshareActivityIndex != "undefined") {
-        pages[resharePageIndex].data[reshareActivityIndex].reshared._count.comments = increment ? pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.comments + 1 : pages?.[resharePageIndex]?.data[reshareActivityIndex].reshared._count.comments - 1;
-        pages[resharePageIndex].data[reshareActivityIndex].reshared.comments = increment ? [{}] : void 0;
-      }
-      return { ...data, pages };
-    }
+    })
   );
 };
 
@@ -6102,7 +6042,7 @@ var SelfCreateActivity = async ({
     if (activity.commentedId) {
       UpdateCommentsSingle(true, queryClient, [
         ...ACTIVITY_QUERY_KEY(activity.commentedId),
-        clientApiParams.locale
+        ...GetBaseSingleQueryKeys(clientApiParams.locale)
       ]);
       UpdateCommentsInfinite(
         true,
@@ -6117,51 +6057,51 @@ var SelfCreateActivity = async ({
     `/self/activities`,
     {
       activity,
-      buffer: base64Image ? `data:image/jpeg;base64,${base64Image}` : void 0,
-      videoUri: videoUri || void 0
+      imageUri: base64Image ?? void 0,
+      videoUri: videoUri ?? void 0
     }
   );
   if (queryClient && data.status === "ok") {
     let nested = false;
-    if (data.data?.commented?.id) {
+    if (activity.commentedId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...ACTIVITY_COMMENTS_QUERY_KEY(data.data.commented.id),
+          ...ACTIVITY_COMMENTS_QUERY_KEY(activity.commentedId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
       );
     }
-    if (data.data?.content?.id) {
+    if (activity.contentId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...CONTENT_ACTIVITIES_QUERY_KEY(data.data.content.id),
+          ...CONTENT_ACTIVITIES_QUERY_KEY(activity.contentId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
       );
     }
-    if (data.data?.event?.id) {
+    if (activity.eventId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...EVENT_ACTIVITIES_QUERY_KEY(data.data.event.id),
+          ...EVENT_ACTIVITIES_QUERY_KEY(activity.eventId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
       );
     }
-    if (data.data?.community?.id) {
+    if (activity.communityId) {
       nested = true;
       AppendInfiniteQuery(
         queryClient,
         [
-          ...COMMUNITY_ACTIVITIES_QUERY_KEY(data.data.community.id),
+          ...COMMUNITY_ACTIVITIES_QUERY_KEY(activity.communityId),
           ...GetBaseInfiniteQueryKeys(clientApiParams.locale)
         ],
         data.data
@@ -6326,7 +6266,7 @@ var UpdateSelfEventListing = async ({
     `/self/events/listings/${eventId}`,
     {
       event,
-      image: base64 ? `data:image/jpeg;base64,${base64}` : void 0
+      image: base64 ?? void 0
     }
   );
   if (queryClient && data.status === "ok") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connectedxm/client",
-  "version": "0.1.9",
+  "version": "0.1.20",
   "description": "Client API javascript SDK",
   "author": "ConnectedXM Inc.",
   "repository": {