@connectedxm/client 2.4.1 → 3.0.1

package/dist/index.js

@@ -545,6 +545,12 @@ function MergeInfinitePages(data) {
   );
 }
 
+// src/utilities/IsUUID.ts
+var isUUID = (id) => {
+  const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/;
+  return uuidRegex.test(id);
+};
+
 // src/queries/useConnectedSingleQuery.ts
 import { useQuery } from "@tanstack/react-query";
 var GetBaseSingleQueryKeys = (locale) => {
@@ -595,81 +601,6 @@ var useConnectedSingleQuery = (queryKeys, queryFn, options = {}) => {
 };
 var useConnectedSingleQuery_default = useConnectedSingleQuery;
 
-// src/utilities/CacheIndividualQueries.ts
-var CacheIndividualQueries = (page, queryClient, queryKeyFn, locale = "en", itemMap) => {
-  page.data.forEach((item) => {
-    item = itemMap ? itemMap(item) : item;
-    if (item.id) {
-      const SudoResponse = {
-        status: page.status,
-        message: `Cached From: ${page.message}`,
-        data: item
-      };
-      queryClient.setQueryData(
-        [...queryKeyFn(item.id), ...GetBaseSingleQueryKeys(locale)],
-        SudoResponse,
-        {
-          updatedAt: Date.now() - 1e3 * 60
-        }
-      );
-      if (item.slug) {
-        queryClient.setQueryData(
-          [...queryKeyFn(item.slug), ...GetBaseSingleQueryKeys(locale)],
-          SudoResponse,
-          {
-            updatedAt: Date.now() - 1e3 * 60
-          }
-        );
-      }
-      if (item.username) {
-        queryClient.setQueryData(
-          [...queryKeyFn(item.username), ...GetBaseSingleQueryKeys(locale)],
-          SudoResponse,
-          {
-            updatedAt: Date.now() - 1e3 * 60
-          }
-        );
-      }
-      if (item.code) {
-        queryClient.setQueryData(
-          [...queryKeyFn(item.code), ...GetBaseSingleQueryKeys(locale)],
-          SudoResponse,
-          {
-            updatedAt: Date.now() - 1e3 * 60
-          }
-        );
-      }
-      if (item.name) {
-        queryClient.setQueryData(
-          [...queryKeyFn(item.name), ...GetBaseSingleQueryKeys(locale)],
-          SudoResponse,
-          {
-            updatedAt: Date.now() - 1e3 * 60
-          }
-        );
-      }
-      if (item.alternateId) {
-        queryClient.setQueryData(
-          [
-            ...queryKeyFn(item.alternateId.toString()),
-            ...GetBaseSingleQueryKeys(locale)
-          ],
-          SudoResponse,
-          {
-            updatedAt: Date.now() - 1e3 * 60
-          }
-        );
-      }
-    }
-  });
-};
-
-// src/utilities/IsUUID.ts
-var isUUID = (id) => {
-  const uuidRegex = /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[1-5][0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12}$/;
-  return uuidRegex.test(id);
-};
-
 // src/queries/useConnectedInfiniteQuery.ts
 import {
   useInfiniteQuery
@@ -779,9 +710,7 @@ var GetAccounts = async ({
   orderBy,
   search,
   accountType,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts`, {
@@ -793,14 +722,6 @@ var GetAccounts = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId) => ACCOUNT_QUERY_KEY(accountId),
-      locale
-    );
-  }
   return data;
 };
 var useGetAccounts = (accountType, params = {}, options = {}) => {
@@ -896,9 +817,7 @@ var GetActivities = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/activities`, {
@@ -909,14 +828,6 @@ var GetActivities = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetActivities = (params = {}, options = {}) => {
@@ -983,9 +894,7 @@ var GetActivityComments = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/activities/${activityId}/comments`, {
@@ -996,14 +905,6 @@ var GetActivityComments = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId2) => ACTIVITY_QUERY_KEY(activityId2),
-      locale
-    );
-  }
   return data;
 };
 var useGetActivityComments = (activityId = "", params = {}, options = {}) => {
@@ -1037,9 +938,7 @@ var GetAccountActivities = async ({
   orderBy,
   search,
   accountId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/activities`, {
@@ -1050,14 +949,6 @@ var GetAccountActivities = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetAccountActivities = (accountId = "", params = {}, options = {}) => {
@@ -1103,91 +994,6 @@ var useGetAccountByShareCode = (shareCode = "", options = {}) => {
   );
 };
 
-// src/queries/groups/useGetGroups.ts
-var GROUPS_QUERY_KEY = (access) => {
-  const keys = ["GROUPS"];
-  if (access) keys.push(access);
-  return keys;
-};
-var SET_GROUPS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
-  client.setQueryData(
-    [
-      ...GROUPS_QUERY_KEY(...keyParams),
-      ...GetBaseInfiniteQueryKeys(...baseKeys)
-    ],
-    setFirstPageData(response)
-  );
-};
-var GetGroups = async ({
-  pageParam,
-  pageSize,
-  orderBy,
-  search,
-  access,
-  queryClient,
-  clientApiParams,
-  locale
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/groups`, {
-    params: {
-      page: pageParam || void 0,
-      pageSize: pageSize || void 0,
-      orderBy: orderBy || void 0,
-      search: search || void 0,
-      access: access || void 0
-    }
-  });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (groupId) => GROUP_QUERY_KEY(groupId),
-      locale
-    );
-  }
-  return data;
-};
-var useGetGroups = (access, params = {}, options = {}) => {
-  return useConnectedInfiniteQuery(
-    GROUPS_QUERY_KEY(access),
-    (params2) => GetGroups({ access, ...params2 }),
-    params,
-    options
-  );
-};
-
-// src/queries/groups/useGetGroup.ts
-var GROUP_QUERY_KEY = (groupId) => [
-  ...GROUPS_QUERY_KEY(),
-  groupId
-];
-var SET_GROUP_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"], options) => {
-  client.setQueryData(
-    [...GROUP_QUERY_KEY(...keyParams), ...GetBaseSingleQueryKeys(...baseKeys)],
-    response,
-    options
-  );
-};
-var GetGroup = async ({
-  groupId,
-  clientApiParams
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/groups/${groupId}`);
-  return data;
-};
-var useGetGroup = (groupId = "", options = {}) => {
-  return useConnectedSingleQuery(
-    GROUP_QUERY_KEY(groupId),
-    (params) => GetGroup({ groupId, ...params }),
-    {
-      ...options,
-      enabled: !!groupId && (options?.enabled ?? true)
-    }
-  );
-};
-
 // src/queries/accounts/useGetAccountGroups.ts
 var ACCOUNT_GROUPS_QUERY_KEY = (accountId) => [
   ...ACCOUNT_QUERY_KEY(accountId),
@@ -1208,9 +1014,7 @@ var GetAccountGroups = async ({
   orderBy,
   search,
   accountId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/groups`, {
@@ -1221,14 +1025,6 @@ var GetAccountGroups = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (groupId) => GROUP_QUERY_KEY(groupId),
-      locale
-    );
-  }
   return data;
 };
 var useGetAccountGroups = (accountId = "", params = {}, options = {}) => {
@@ -1263,9 +1059,7 @@ var GetAccountFollowers = async ({
   orderBy,
   search,
   accountId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/followers`, {
@@ -1276,14 +1070,6 @@ var GetAccountFollowers = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId2) => ACCOUNT_QUERY_KEY(accountId2),
-      locale
-    );
-  }
   return data;
 };
 var useGetAccountFollowers = (accountId = "", params = {}, options = {}) => {
@@ -1318,9 +1104,7 @@ var GetAccountFollowings = async ({
   orderBy,
   search,
   accountId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/${accountId}/following`, {
@@ -1331,14 +1115,6 @@ var GetAccountFollowings = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId2) => ACCOUNT_QUERY_KEY(accountId2),
-      locale
-    );
-  }
   return data;
 };
 var useGetAccountFollowings = (accountId = "", params = {}, options = {}) => {
@@ -1373,9 +1149,7 @@ var GetAccountsPopular = async ({
   orderBy,
   search,
   accountType,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/accounts/popular`, {
@@ -1387,14 +1161,6 @@ var GetAccountsPopular = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId) => ACCOUNT_QUERY_KEY(accountId),
-      locale
-    );
-  }
   return data;
 };
 var useGetAccountsPopular = (accountType, params = {}, options = {}) => {
@@ -1511,9 +1277,7 @@ var GetBookings = async ({
   search,
   past,
   placeId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/bookings`, {
@@ -1526,14 +1290,6 @@ var GetBookings = async ({
       placeId: placeId || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (bookingId) => BOOKING_QUERY_KEY(bookingId),
-      locale
-    );
-  }
   return data;
 };
 var useGetBookings = (past = false, placeId = "", params = {}, options = {}) => {
@@ -1624,9 +1380,7 @@ var GetBookingPlaces = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/bookings/places`, {
@@ -1637,14 +1391,6 @@ var GetBookingPlaces = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (bookingPlaceId) => BOOKING_PLACE_QUERY_KEY(bookingPlaceId),
-      locale
-    );
-  }
   return data;
 };
 var useGetBookingPlaces = (params = {}, options = {}) => {
@@ -1742,9 +1488,7 @@ var GetBookingPlacesSpaces = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/bookings/places/${bookingId}/spaces`, {
@@ -1755,14 +1499,6 @@ var GetBookingPlacesSpaces = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (spaceId) => BOOKING_PLACE_SPACE_QUERY_KEY(bookingId, spaceId),
-      locale
-    );
-  }
   return data;
 };
 var useGetBookingPlacesSpaces = (bookingId = "", params = {}, options = {}) => {
@@ -1857,85 +1593,105 @@ var useGetBenefits = (params = {}, options = {}) => {
   );
 };
 
-// src/queries/groups/useGetGroupActivities.ts
-var GROUP_ACTIVITIES_QUERY_KEY = (groupId) => [
-  ...ACTIVITIES_QUERY_KEY(),
-  ...GROUP_QUERY_KEY(groupId)
-];
-var SET_GROUP_ACTIVITIES_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+// src/queries/groups/useGetGroups.ts
+var GROUPS_QUERY_KEY = (access) => {
+  const keys = ["GROUPS"];
+  if (access) keys.push(access);
+  return keys;
+};
+var SET_GROUPS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
     [
-      ...GROUP_ACTIVITIES_QUERY_KEY(...keyParams),
+      ...GROUPS_QUERY_KEY(...keyParams),
       ...GetBaseInfiniteQueryKeys(...baseKeys)
     ],
     setFirstPageData(response)
   );
 };
-var GetGroupActivities = async ({
+var GetGroups = async ({
   pageParam,
   pageSize,
   orderBy,
   search,
-  groupId,
-  queryClient,
-  clientApiParams,
-  locale
+  access,
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/groups/${groupId}/activities`, {
+  const { data } = await clientApi.get(`/groups`, {
     params: {
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
       orderBy: orderBy || void 0,
-      search: search || void 0
+      search: search || void 0,
+      access: access || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
-var useGetGroupActivities = (groupId = "", params = {}, options = {}) => {
+var useGetGroups = (access, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    GROUP_ACTIVITIES_QUERY_KEY(groupId),
-    (params2) => GetGroupActivities({ groupId, ...params2 }),
+    GROUPS_QUERY_KEY(access),
+    (params2) => GetGroups({ access, ...params2 }),
     params,
-    {
-      ...options,
-      enabled: !!groupId && (options?.enabled ?? true)
-    }
+    options
   );
 };
 
-// src/queries/groups/useGetGroupAnnouncements.ts
-var GROUP_ANNOUNCEMENTS_QUERY_KEY = (groupId) => [
-  ...GROUP_QUERY_KEY(groupId),
-  "ANNOUNCEMENTS"
+// src/queries/groups/useGetGroup.ts
+var GROUP_QUERY_KEY = (groupId) => [
+  ...GROUPS_QUERY_KEY(),
+  groupId
 ];
-var SET_GROUP_ANNOUNCEMENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+var SET_GROUP_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"], options) => {
+  client.setQueryData(
+    [...GROUP_QUERY_KEY(...keyParams), ...GetBaseSingleQueryKeys(...baseKeys)],
+    response,
+    options
+  );
+};
+var GetGroup = async ({
+  groupId,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(`/groups/${groupId}`);
+  return data;
+};
+var useGetGroup = (groupId = "", options = {}) => {
+  return useConnectedSingleQuery(
+    GROUP_QUERY_KEY(groupId),
+    (params) => GetGroup({ groupId, ...params }),
+    {
+      ...options,
+      enabled: !!groupId && (options?.enabled ?? true)
+    }
+  );
+};
+
+// src/queries/groups/useGetGroupActivities.ts
+var GROUP_ACTIVITIES_QUERY_KEY = (groupId) => [
+  ...ACTIVITIES_QUERY_KEY(),
+  ...GROUP_QUERY_KEY(groupId)
+];
+var SET_GROUP_ACTIVITIES_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
     [
-      ...GROUP_ANNOUNCEMENTS_QUERY_KEY(...keyParams),
+      ...GROUP_ACTIVITIES_QUERY_KEY(...keyParams),
       ...GetBaseInfiniteQueryKeys(...baseKeys)
     ],
     setFirstPageData(response)
   );
 };
-var GetGroupAnnouncements = async ({
-  groupId,
+var GetGroupActivities = async ({
   pageParam,
   pageSize,
   orderBy,
   search,
+  groupId,
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/groups/${groupId}/announcements`, {
+  const { data } = await clientApi.get(`/groups/${groupId}/activities`, {
     params: {
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
@@ -1945,10 +1701,10 @@ var GetGroupAnnouncements = async ({
   });
   return data;
 };
-var useGetGroupAnnouncements = (groupId = "", params = {}, options = {}) => {
+var useGetGroupActivities = (groupId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    GROUP_ANNOUNCEMENTS_QUERY_KEY(groupId),
-    (params2) => GetGroupAnnouncements({ groupId, ...params2 }),
+    GROUP_ACTIVITIES_QUERY_KEY(groupId),
+    (params2) => GetGroupActivities({ groupId, ...params2 }),
     params,
     {
       ...options,
@@ -1957,20 +1713,22 @@ var useGetGroupAnnouncements = (groupId = "", params = {}, options = {}) => {
   );
 };
 
-// src/queries/groups/useGetGroupMedia.ts
-var GROUP_MEDIA_QUERY_KEY = (groupId, type) => [...GROUP_QUERY_KEY(groupId), "MEDIA", type || "all"];
-var SET_GROUP_MEDIA_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+// src/queries/groups/useGetGroupAnnouncements.ts
+var GROUP_ANNOUNCEMENTS_QUERY_KEY = (groupId) => [
+  ...GROUP_QUERY_KEY(groupId),
+  "ANNOUNCEMENTS"
+];
+var SET_GROUP_ANNOUNCEMENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
     [
-      ...GROUP_MEDIA_QUERY_KEY(...keyParams),
+      ...GROUP_ANNOUNCEMENTS_QUERY_KEY(...keyParams),
       ...GetBaseInfiniteQueryKeys(...baseKeys)
     ],
     setFirstPageData(response)
   );
 };
-var GetGroupMedia = async ({
+var GetGroupAnnouncements = async ({
   groupId,
-  type,
   pageParam,
   pageSize,
   orderBy,
@@ -1978,9 +1736,8 @@ var GetGroupMedia = async ({
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/groups/${groupId}/media`, {
+  const { data } = await clientApi.get(`/groups/${groupId}/announcements`, {
     params: {
-      type: type || void 0,
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
       orderBy: orderBy || void 0,
@@ -1989,10 +1746,10 @@ var GetGroupMedia = async ({
   });
   return data;
 };
-var useGetGroupMedia = (groupId = "", type, params = {}, options = {}) => {
+var useGetGroupAnnouncements = (groupId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    GROUP_MEDIA_QUERY_KEY(groupId, type),
-    (params2) => GetGroupMedia({ groupId, type, ...params2 }),
+    GROUP_ANNOUNCEMENTS_QUERY_KEY(groupId),
+    (params2) => GetGroupAnnouncements({ groupId, ...params2 }),
     params,
     {
       ...options,
@@ -2001,78 +1758,46 @@ var useGetGroupMedia = (groupId = "", type, params = {}, options = {}) => {
   );
 };
 
-// src/queries/events/useGetEvents.ts
-var EVENTS_QUERY_KEY = (past) => {
-  const keys = ["EVENTS"];
-  if (typeof past !== "undefined") {
-    keys.push(past ? "PAST" : "UPCOMING");
-  }
-  return keys;
-};
-var SET_EVENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+// src/queries/groups/useGetGroupMedia.ts
+var GROUP_MEDIA_QUERY_KEY = (groupId, type) => [...GROUP_QUERY_KEY(groupId), "MEDIA", type || "all"];
+var SET_GROUP_MEDIA_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
     [
-      ...EVENTS_QUERY_KEY(...keyParams),
+      ...GROUP_MEDIA_QUERY_KEY(...keyParams),
       ...GetBaseInfiniteQueryKeys(...baseKeys)
     ],
     setFirstPageData(response)
   );
 };
-var GetEvents = async ({
+var GetGroupMedia = async ({
+  groupId,
+  type,
   pageParam,
   pageSize,
   orderBy,
   search,
-  past,
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/events`, {
+  const { data } = await clientApi.get(`/groups/${groupId}/media`, {
     params: {
+      type: type || void 0,
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
       orderBy: orderBy || void 0,
-      search: search || void 0,
-      past: past !== void 0 ? past : void 0
+      search: search || void 0
     }
   });
   return data;
 };
-var useGetEvents = (past = false, params = {}, options = {}) => {
+var useGetGroupMedia = (groupId = "", type, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    EVENTS_QUERY_KEY(past),
-    (params2) => GetEvents({ past, ...params2 }),
+    GROUP_MEDIA_QUERY_KEY(groupId, type),
+    (params2) => GetGroupMedia({ groupId, type, ...params2 }),
     params,
-    options
-  );
-};
-
-// src/queries/events/useGetEvent.ts
-var EVENT_QUERY_KEY = (eventId) => [
-  ...EVENTS_QUERY_KEY(),
-  eventId
-];
-var SET_EVENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
-  client.setQueryData(
-    [...EVENT_QUERY_KEY(...keyParams), ...GetBaseSingleQueryKeys(...baseKeys)],
-    response
-  );
-};
-var GetEvent = async ({
-  eventId,
-  clientApiParams
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/events/${eventId}`);
-  return data;
-};
-var useGetEvent = (eventId = "", options = {}) => {
-  return useConnectedSingleQuery(
-    EVENT_QUERY_KEY(eventId),
-    (params) => GetEvent({ eventId, ...params }),
     {
       ...options,
-      enabled: !!eventId && (options?.enabled ?? true)
+      enabled: !!groupId && (options?.enabled ?? true)
     }
   );
 };
@@ -2099,9 +1824,7 @@ var GetGroupEvents = async ({
   search,
   groupId,
   past,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/${groupId}/events`, {
@@ -2113,14 +1836,6 @@ var GetGroupEvents = async ({
       past: past || false
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (eventId) => EVENT_QUERY_KEY(eventId),
-      locale
-    );
-  }
   return data;
 };
 var useGetGroupEvents = (groupId = "", past = false, params = {}, options = {}) => {
@@ -2205,9 +1920,7 @@ var GetGroupSponsors = async ({
   orderBy,
   search,
   groupId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/${groupId}/sponsors`, {
@@ -2218,14 +1931,6 @@ var GetGroupSponsors = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId) => ACCOUNT_QUERY_KEY(accountId),
-      locale
-    );
-  }
   return data;
 };
 var useGetGroupSponsors = (groupId = "", params = {}, options = {}) => {
@@ -2264,9 +1969,7 @@ var GetGroupRequests = async ({
   search,
   status,
   groupId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/${groupId}/requests`, {
@@ -2278,14 +1981,6 @@ var GetGroupRequests = async ({
       status: status || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (groupId2) => GROUP_REQUEST_QUERY_KEY(groupId2, data.data.id),
-      locale
-    );
-  }
   return data;
 };
 var useGetGroupRequests = (groupId = "", status, params = {}, options = {}) => {
@@ -2429,9 +2124,7 @@ var GetGroupsFeatured = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/featured`, {
@@ -2442,14 +2135,6 @@ var GetGroupsFeatured = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (groupId) => GROUP_QUERY_KEY(groupId),
-      locale
-    );
-  }
   return data;
 };
 var useGetGroupsFeatured = (params = {}, options = {}) => {
@@ -2475,9 +2160,7 @@ var GetGroupsInvited = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/invited`, {
@@ -2486,17 +2169,9 @@ var GetGroupsInvited = async ({
       pageSize: pageSize || void 0,
       orderBy: orderBy || void 0,
       search: search || void 0,
-      rejected
+      rejected: rejected !== void 0 ? rejected : void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (groupId) => GROUP_QUERY_KEY(groupId),
-      locale
-    );
-  }
   return data;
 };
 var useGetGroupsInvited = (rejected, params = {}, options = {}) => {
@@ -2517,9 +2192,7 @@ var GetGroupsRequested = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/requested`, {
@@ -2530,14 +2203,6 @@ var GetGroupsRequested = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (groupId) => GROUP_QUERY_KEY(groupId),
-      locale
-    );
-  }
   return data;
 };
 var useGetGroupsRequested = (params = {}, options = {}) => {
@@ -2549,84 +2214,148 @@ var useGetGroupsRequested = (params = {}, options = {}) => {
   );
 };
 
-// src/queries/events/useGetEventActivities.ts
-var EVENT_ACTIVITIES_QUERY_KEY = (eventId) => [
-  ...ACTIVITIES_QUERY_KEY(),
-  ...EVENT_QUERY_KEY(eventId)
-];
-var SET_EVENT_ACTIVITIES_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+// src/queries/events/useGetEvents.ts
+var EVENTS_QUERY_KEY = (past) => {
+  const keys = ["EVENTS"];
+  if (typeof past !== "undefined") {
+    keys.push(past ? "PAST" : "UPCOMING");
+  }
+  return keys;
+};
+var SET_EVENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
     [
-      ...EVENT_ACTIVITIES_QUERY_KEY(...keyParams),
+      ...EVENTS_QUERY_KEY(...keyParams),
       ...GetBaseInfiniteQueryKeys(...baseKeys)
     ],
     setFirstPageData(response)
   );
 };
-var GetEventActivities = async ({
-  eventId,
+var GetEvents = async ({
   pageParam,
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  past,
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/events/${eventId}/activities`, {
+  const { data } = await clientApi.get(`/events`, {
     params: {
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
       orderBy: orderBy || void 0,
-      search: search || void 0
+      search: search || void 0,
+      past: past !== void 0 ? past : void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
-var useGetEventActivities = (eventId = "", params = {}, options = {}) => {
+var useGetEvents = (past = false, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    EVENT_ACTIVITIES_QUERY_KEY(eventId),
-    (params2) => GetEventActivities({ eventId, ...params2 }),
+    EVENTS_QUERY_KEY(past),
+    (params2) => GetEvents({ past, ...params2 }),
     params,
-    {
-      ...options,
-      enabled: !!eventId && (options?.enabled ?? true)
-    }
+    options
   );
 };
 
-// src/queries/events/useGetEventFAQSections.ts
-var EVENT_FAQ_SECTIONS_QUERY_KEY = (eventId) => [
-  ...EVENT_QUERY_KEY(eventId),
-  "FAQ_SECTIONS"
+// src/queries/events/useGetEvent.ts
+var EVENT_QUERY_KEY = (eventId) => [
+  ...EVENTS_QUERY_KEY(),
+  eventId
 ];
-var SET_EVENT_FAQ_SECTIONS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+var SET_EVENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
-    [
-      ...EVENT_FAQ_SECTIONS_QUERY_KEY(...keyParams),
-      ...GetBaseInfiniteQueryKeys(...baseKeys)
-    ],
-    setFirstPageData(response)
+    [...EVENT_QUERY_KEY(...keyParams), ...GetBaseSingleQueryKeys(...baseKeys)],
+    response
   );
 };
-var GetEventFaqSections = async ({
+var GetEvent = async ({
   eventId,
-  pageParam,
-  pageSize,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(`/events/${eventId}`);
+  return data;
+};
+var useGetEvent = (eventId = "", options = {}) => {
+  return useConnectedSingleQuery(
+    EVENT_QUERY_KEY(eventId),
+    (params) => GetEvent({ eventId, ...params }),
+    {
+      ...options,
+      enabled: !!eventId && (options?.enabled ?? true)
+    }
+  );
+};
+
+// src/queries/events/useGetEventActivities.ts
+var EVENT_ACTIVITIES_QUERY_KEY = (eventId) => [
+  ...ACTIVITIES_QUERY_KEY(),
+  ...EVENT_QUERY_KEY(eventId)
+];
+var SET_EVENT_ACTIVITIES_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+  client.setQueryData(
+    [
+      ...EVENT_ACTIVITIES_QUERY_KEY(...keyParams),
+      ...GetBaseInfiniteQueryKeys(...baseKeys)
+    ],
+    setFirstPageData(response)
+  );
+};
+var GetEventActivities = async ({
+  eventId,
+  pageParam,
+  pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(`/events/${eventId}/activities`, {
+    params: {
+      page: pageParam || void 0,
+      pageSize: pageSize || void 0,
+      orderBy: orderBy || void 0,
+      search: search || void 0
+    }
+  });
+  return data;
+};
+var useGetEventActivities = (eventId = "", params = {}, options = {}) => {
+  return useConnectedInfiniteQuery(
+    EVENT_ACTIVITIES_QUERY_KEY(eventId),
+    (params2) => GetEventActivities({ eventId, ...params2 }),
+    params,
+    {
+      ...options,
+      enabled: !!eventId && (options?.enabled ?? true)
+    }
+  );
+};
+
+// src/queries/events/useGetEventFAQSections.ts
+var EVENT_FAQ_SECTIONS_QUERY_KEY = (eventId) => [
+  ...EVENT_QUERY_KEY(eventId),
+  "FAQ_SECTIONS"
+];
+var SET_EVENT_FAQ_SECTIONS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+  client.setQueryData(
+    [
+      ...EVENT_FAQ_SECTIONS_QUERY_KEY(...keyParams),
+      ...GetBaseInfiniteQueryKeys(...baseKeys)
+    ],
+    setFirstPageData(response)
+  );
+};
+var GetEventFaqSections = async ({
+  eventId,
+  pageParam,
+  pageSize,
+  orderBy,
+  search,
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/faqs`, {
@@ -2637,14 +2366,6 @@ var GetEventFaqSections = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (sectionId) => EVENT_FAQ_SECTION_QUERY_KEY(eventId, sectionId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventFaqSections = (eventId = "", params = {}, options = {}) => {
@@ -2711,9 +2432,7 @@ var GetEventFaqs = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
@@ -2727,14 +2446,6 @@ var GetEventFaqs = async ({
       }
     }
   );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (faqId) => EVENT_FAQ_SECTION_QUESTION_QUERY_KEY(eventId, sectionId, faqId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventFaqs = (eventId = "", sectionId = "", params = {}, options = {}) => {
@@ -2806,9 +2517,7 @@ var GetEventPages = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/pages`, {
@@ -2819,14 +2528,6 @@ var GetEventPages = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (pageId) => EVENT_PAGE_QUERY_KEY(eventId, pageId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventPages = (eventId = "", params = {}, options = {}) => {
@@ -2933,9 +2634,7 @@ var GetEventRegistrants = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/registrants`, {
@@ -2946,14 +2645,6 @@ var GetEventRegistrants = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId) => ACCOUNT_QUERY_KEY(accountId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventRegistrants = (eventId = "", params = {}, options = {}) => {
@@ -3057,9 +2748,7 @@ var GetEventSpeakers = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/speakers`, {
@@ -3070,14 +2759,6 @@ var GetEventSpeakers = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (speakerId) => EVENT_SPEAKER_QUERY_KEY(eventId, speakerId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventSpeakers = (eventId = "", params = {}, options = {}) => {
@@ -3145,9 +2826,7 @@ var GetEventSponsors = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/sponsors`, {
@@ -3158,14 +2837,6 @@ var GetEventSponsors = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (sponsorId) => ACCOUNT_QUERY_KEY(sponsorId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventSponsors = (eventId = "", params = {}, options = {}) => {
@@ -3239,9 +2910,7 @@ var GetEventActivations = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/events/${eventId}/activations`, {
@@ -3252,14 +2921,6 @@ var GetEventActivations = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activationId) => EVENT_ACTIVATION_QUERY_KEY(eventId, activationId),
-      locale
-    );
-  }
   return data;
 };
 var useGetEventActivations = (eventId = "", params = {}, options = {}) => {
@@ -3627,9 +3288,7 @@ var GetAllGroupEvents = async ({
   orderBy,
   search,
   past,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/groups/events`, {
@@ -3641,14 +3300,6 @@ var GetAllGroupEvents = async ({
       past: past !== void 0 ? past : void 0
     }
   });
-  if (queryClient) {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (eventId) => EVENT_QUERY_KEY(eventId),
-      locale
-    );
-  }
   return data;
 };
 var useGetAllGroupEvents = (past = false, params = {}, options = {}) => {
@@ -3676,9 +3327,7 @@ var GetChannels = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/channels`, {
@@ -3689,14 +3338,6 @@ var GetChannels = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (channelId) => CHANNEL_QUERY_KEY(channelId),
-      locale
-    );
-  }
   return data;
 };
 var useGetChannels = (params = {}, options = {}) => {
@@ -3761,9 +3402,7 @@ var GetChannelCollections = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/channels/${channelId}/collections`, {
@@ -3774,14 +3413,6 @@ var GetChannelCollections = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (collectionId) => CHANNEL_COLLECTION_QUERY_KEY(channelId, collectionId),
-      locale
-    );
-  }
   return data;
 };
 var useGetChannelCollections = (channelId, params = {}, options = {}) => {
@@ -3826,28 +3457,67 @@ var useGetChannelCollection = (channelId = "", collectionId = "", options = {})
   );
 };
 
-// src/queries/contents/useGetContents.ts
-var CONTENTS_QUERY_KEY = (type, featured, interest, past) => {
-  const key = ["CONTENTS"];
-  if (type) key.push(type);
+// src/queries/channels/collections/useGetChannelCollectionContents.ts
+var CHANNEL_COLLECTION_CONTENTS_QUERY_KEY = (channelId, collectionId) => [
+  ...CHANNEL_COLLECTION_QUERY_KEY(channelId, collectionId),
+  "CONTENTS"
+];
+var GetChannelCollectionContents = async ({
+  channelId,
+  collectionId,
+  pageParam,
+  pageSize,
+  orderBy,
+  search,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(
+    `/channels/${channelId}/collections/${collectionId}/contents`,
+    {
+      params: {
+        page: pageParam || void 0,
+        pageSize: pageSize || void 0,
+        orderBy: orderBy || void 0,
+        search: search || void 0
+      }
+    }
+  );
+  return data;
+};
+var useGetChannelCollectionContents = (channelId, collectionId, params = {}, options = {}) => {
+  return useConnectedInfiniteQuery(
+    CHANNEL_COLLECTION_CONTENTS_QUERY_KEY(channelId, collectionId),
+    (params2) => GetChannelCollectionContents({ channelId, collectionId, ...params2 }),
+    params,
+    {
+      ...options,
+      enabled: !!channelId && !!collectionId && (options?.enabled ?? true)
+    }
+  );
+};
+
+// src/queries/channels/content/useGetChannelContents.ts
+var CHANNEL_CONTENTS_QUERY_KEY = (channelId, type, featured, past) => {
+  const key = [...CHANNEL_QUERY_KEY(channelId), "CONTENTS"];
   if (featured) key.push("FEATURED");
-  if (interest) key.push(interest);
   if (typeof past !== "undefined") key.push(past ? "PAST" : "UPCOMING");
+  if (type) key.push(type);
   return key;
 };
-var SET_CONTENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+var SET_CHANNEL_CONTENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
   client.setQueryData(
     [
-      ...CONTENTS_QUERY_KEY(...keyParams),
+      ...CHANNEL_CONTENTS_QUERY_KEY(...keyParams),
       ...GetBaseInfiniteQueryKeys(...baseKeys)
     ],
     setFirstPageData(response)
   );
 };
-var GetContents = async ({
+var GetChannelContents = async ({
+  channelId,
   type,
   featured,
-  interest,
   past,
   pageParam,
   pageSize,
@@ -3856,11 +3526,10 @@ var GetContents = async ({
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/contents`, {
+  const { data } = await clientApi.get(`/channels/${channelId}/contents`, {
     params: {
       type: type || void 0,
-      featured: typeof featured !== "undefined" ? featured ? "true" : "false" : void 0,
-      interest: interest || void 0,
+      featured: featured || void 0,
       past,
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
@@ -3870,185 +3539,21 @@ var GetContents = async ({
   });
   return data;
 };
-var useGetContents = (type, featured, interest, past, params = {}, options = {}) => {
+var useGetChannelContents = (channelId = "", type, featured, past, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    CONTENTS_QUERY_KEY(type, featured, interest, past),
-    (params2) => GetContents({ type, featured, interest, past, ...params2 }),
+    CHANNEL_CONTENTS_QUERY_KEY(channelId, type, featured, past),
+    (params2) => GetChannelContents({
+      ...params2,
+      channelId: channelId || "",
+      type,
+      featured,
+      past
+    }),
     params,
-    options
-  );
-};
-
-// src/queries/contents/useGetContent.ts
-var CONTENT_QUERY_KEY = (contentId) => [
-  ...CONTENTS_QUERY_KEY(),
-  contentId
-];
-var SET_CONTENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
-  client.setQueryData(
-    [
-      ...CONTENT_QUERY_KEY(...keyParams),
-      ...GetBaseSingleQueryKeys(...baseKeys)
-    ],
-    response
-  );
-};
-var GetContent = async ({
-  contentId,
-  clientApiParams
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/contents/${contentId}`);
-  return data;
-};
-var useGetContent = (contentId = "", options = {}) => {
-  return useConnectedSingleQuery_default(
-    CONTENT_QUERY_KEY(contentId),
-    (params) => GetContent({ contentId, ...params }),
-    {
-      ...options,
-      enabled: !!contentId && options.enabled
-    }
-  );
-};
-
-// src/queries/contents/useGetContentInterests.ts
-var CONTENT_INTERESTS_QUERY_KEY = () => {
-  const key = ["CONTENTS_INTERESTS"];
-  return key;
-};
-var GetContentInterests = async ({
-  pageParam,
-  pageSize,
-  orderBy,
-  search,
-  clientApiParams
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/contents/interests`, {
-    params: {
-      page: pageParam || void 0,
-      pageSize: pageSize || void 0,
-      orderBy: orderBy || void 0,
-      search: search || void 0
-    }
-  });
-  return data;
-};
-var useGetContentInterests = (params = {}, options = {}) => {
-  return useConnectedInfiniteQuery(
-    CONTENT_INTERESTS_QUERY_KEY(),
-    (params2) => GetContentInterests({ ...params2 }),
-    params,
-    options
-  );
-};
-
-// src/queries/contents/useGetSubscribedContents.ts
-var SUBSCRIBED_CONTENTS_QUERY_KEY = (type, interest) => {
-  const key = ["SUBSCRIBED_CONTENTS"];
-  if (type) key.push(type);
-  if (interest) key.push(interest);
-  return key;
-};
-var GetSubscribedContents = async ({
-  type,
-  interest,
-  pageParam,
-  pageSize,
-  orderBy,
-  search,
-  clientApiParams
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/contents/subscribed`, {
-    params: {
-      type: type || void 0,
-      interest: interest || void 0,
-      page: pageParam || void 0,
-      pageSize: pageSize || void 0,
-      orderBy: orderBy || void 0,
-      search: search || void 0
-    }
-  });
-  return data;
-};
-var useGetSubscribedContents = (type, interest, params = {}, options = {}) => {
-  return useConnectedInfiniteQuery(
-    SUBSCRIBED_CONTENTS_QUERY_KEY(interest),
-    (params2) => GetSubscribedContents({ interest, ...params2 }),
-    params,
-    options
-  );
-};
-
-// src/queries/channels/content/useGetChannelContents.ts
-var CHANNEL_CONTENTS_QUERY_KEY = (channelId, type, featured, past) => {
-  const key = [...CHANNEL_QUERY_KEY(channelId), "CONTENTS"];
-  if (featured) key.push("FEATURED");
-  if (typeof past !== "undefined") key.push(past ? "PAST" : "UPCOMING");
-  if (type) key.push(type);
-  return key;
-};
-var SET_CHANNEL_CONTENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
-  client.setQueryData(
-    [
-      ...CHANNEL_CONTENTS_QUERY_KEY(...keyParams),
-      ...GetBaseInfiniteQueryKeys(...baseKeys)
-    ],
-    setFirstPageData(response)
-  );
-};
-var GetChannelContents = async ({
-  channelId,
-  type,
-  featured,
-  past,
-  pageParam,
-  pageSize,
-  orderBy,
-  search,
-  queryClient,
-  clientApiParams,
-  locale
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/channels/${channelId}/contents`, {
-    params: {
-      type: type || void 0,
-      featured: featured || void 0,
-      past,
-      page: pageParam || void 0,
-      pageSize: pageSize || void 0,
-      orderBy: orderBy || void 0,
-      search: search || void 0
-    }
-  });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (contentId) => CHANNEL_CONTENT_QUERY_KEY(channelId, contentId),
-      locale
-    );
-  }
-  return data;
-};
-var useGetChannelContents = (channelId = "", type, featured, past, params = {}, options = {}) => {
-  return useConnectedInfiniteQuery(
-    CHANNEL_CONTENTS_QUERY_KEY(channelId, type, featured, past),
-    (params2) => GetChannelContents({
-      ...params2,
-      channelId: channelId || "",
-      type,
-      featured,
-      past
-    }),
-    params,
-    {
-      ...options,
-      enabled: !!channelId && (options?.enabled ?? true)
-    }
+    {
+      ...options,
+      enabled: !!channelId && (options?.enabled ?? true)
+    }
   );
 };
 
@@ -4106,9 +3611,7 @@ var GetChannelContentActivities = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
@@ -4122,14 +3625,6 @@ var GetChannelContentActivities = async ({
       }
     }
   );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetChannelContentActivities = (channelId = "", contentId = "", params = {}, options = {}) => {
@@ -4221,62 +3716,6 @@ var useGetChannelContentGuests = (channelId, contentId, params = {}, options = {
   );
 };
 
-// src/queries/channels/collections/useGetChannelCollectionContents.ts
-var CHANNEL_COLLECTION_CONTENTS_QUERY_KEY = (channelId, collectionId) => [
-  ...CHANNEL_COLLECTION_QUERY_KEY(channelId, collectionId),
-  "CONTENTS"
-];
-var GetChannelCollectionContents = async ({
-  channelId,
-  collectionId,
-  pageParam,
-  pageSize,
-  orderBy,
-  search,
-  queryClient,
-  clientApiParams,
-  locale
-}) => {
-  const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(
-    `/channels/${channelId}/collections/${collectionId}/contents`,
-    {
-      params: {
-        page: pageParam || void 0,
-        pageSize: pageSize || void 0,
-        orderBy: orderBy || void 0,
-        search: search || void 0
-      }
-    }
-  );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (contentId) => CHANNEL_CONTENT_QUERY_KEY(channelId, contentId),
-      locale
-    );
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (contentId) => CONTENT_QUERY_KEY(contentId),
-      locale
-    );
-  }
-  return data;
-};
-var useGetChannelCollectionContents = (channelId, collectionId, params = {}, options = {}) => {
-  return useConnectedInfiniteQuery(
-    CHANNEL_COLLECTION_CONTENTS_QUERY_KEY(channelId, collectionId),
-    (params2) => GetChannelCollectionContents({ channelId, collectionId, ...params2 }),
-    params,
-    {
-      ...options,
-      enabled: !!channelId && !!collectionId && (options?.enabled ?? true)
-    }
-  );
-};
-
 // src/queries/channels/managed/useGetManagedChannels.ts
 var MANAGED_CHANNELS_QUERY_KEY = () => [
   "CHANNELS",
@@ -4296,9 +3735,7 @@ var GetManagedChannels = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/channels/managed`, {
@@ -4309,14 +3746,6 @@ var GetManagedChannels = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (channelId) => MANAGED_CHANNEL_QUERY_KEY(channelId),
-      locale
-    );
-  }
   return data;
 };
 var useGetManagedChannels = (params = {}, options = {}) => {
@@ -4378,9 +3807,7 @@ var GetManagedChannelCollections = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
@@ -4394,14 +3821,6 @@ var GetManagedChannelCollections = async ({
       }
     }
   );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (collectionId) => MANAGED_CHANNEL_COLLECTION_QUERY_KEY(channelId, collectionId),
-      locale
-    );
-  }
   return data;
 };
 var useGetManagedChannelCollections = (channelId, params = {}, options = {}) => {
@@ -4449,6 +3868,50 @@ var useGetManagedChannelCollection = (channelId = "", collectionId = "", options
   );
 };
 
+// src/queries/channels/managed/collections/useGetManagedChannelCollectionContents.ts
+var MANAGED_CHANNEL_COLLECTION_CONTENTS_QUERY_KEY = (channelId, collectionId) => [
+  ...MANAGED_CHANNEL_COLLECTION_QUERY_KEY(channelId, collectionId),
+  "CONTENTS"
+];
+var GetManagedChannelCollectionContents = async ({
+  channelId,
+  collectionId,
+  pageParam,
+  pageSize,
+  orderBy,
+  search,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(
+    `/channels/managed/${channelId}/collections/${collectionId}/contents`,
+    {
+      params: {
+        page: pageParam || void 0,
+        pageSize: pageSize || void 0,
+        orderBy: orderBy || void 0,
+        search: search || void 0
+      }
+    }
+  );
+  return data;
+};
+var useGetManagedChannelCollectionContents = (channelId, collectionId, params = {}, options = {}) => {
+  return useConnectedInfiniteQuery(
+    MANAGED_CHANNEL_COLLECTION_CONTENTS_QUERY_KEY(channelId, collectionId),
+    (params2) => GetManagedChannelCollectionContents({
+      channelId,
+      collectionId,
+      ...params2
+    }),
+    params,
+    {
+      ...options,
+      enabled: !!channelId && !!collectionId && (options?.enabled ?? true)
+    }
+  );
+};
+
 // src/queries/channels/managed/content/useGetManagedChannelContents.ts
 var MANAGED_CHANNEL_CONTENTS_QUERY_KEY = (channelId) => [...MANAGED_CHANNEL_QUERY_KEY(channelId), "CONTENTS"];
 var SET_MANAGED_CHANNEL_CONTENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
@@ -4466,9 +3929,7 @@ var GetManagedChannelContents = async ({
   orderBy,
   search,
   channelId,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
@@ -4482,14 +3943,6 @@ var GetManagedChannelContents = async ({
       }
     }
   );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (contentId) => MANAGED_CHANNEL_CONTENT_QUERY_KEY(channelId, contentId),
-      locale
-    );
-  }
   return data;
 };
 var useGetManagedChannelContents = (channelId = "", params = {}, options = {}) => {
@@ -4558,9 +4011,7 @@ var GetManagedChannelContentActivities = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
@@ -4574,14 +4025,6 @@ var GetManagedChannelContentActivities = async ({
       }
     }
   );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetManagedChannelContentActivities = (channelId = "", contentId = "", params = {}, options = {}) => {
@@ -4676,25 +4119,28 @@ var useGetManagedChannelContentGuests = (channelId, contentId, params = {}, opti
   );
 };
 
-// src/queries/channels/managed/collections/useGetManagedChannelCollectionContents.ts
-var MANAGED_CHANNEL_COLLECTION_CONTENTS_QUERY_KEY = (channelId, collectionId) => [
-  ...MANAGED_CHANNEL_COLLECTION_QUERY_KEY(channelId, collectionId),
-  "CONTENTS"
-];
-var GetManagedChannelCollectionContents = async ({
-  channelId,
-  collectionId,
+// src/queries/channels/managed/useGetManagedChannelSubscribers.ts
+var MANAGED_CHANNEL_SUBSCRIBERS_QUERY_KEY = (channelId) => [...MANAGED_CHANNEL_QUERY_KEY(channelId), "SUBSCRIBERS"];
+var SET_MANAGED_CHANNEL_SUBSCRIBERS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+  client.setQueryData(
+    [
+      ...MANAGED_CHANNEL_SUBSCRIBERS_QUERY_KEY(...keyParams),
+      ...GetBaseInfiniteQueryKeys(...baseKeys)
+    ],
+    setFirstPageData(response)
+  );
+};
+var GetManagedChannelSubscribers = async ({
   pageParam,
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  channelId,
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
-    `/channels/managed/${channelId}/collections/${collectionId}/contents`,
+    `/channels/managed/${channelId}/subscribers`,
     {
       params: {
         page: pageParam || void 0,
@@ -4704,60 +4150,33 @@ var GetManagedChannelCollectionContents = async ({
       }
     }
   );
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (contentId) => MANAGED_CHANNEL_CONTENT_QUERY_KEY(channelId, contentId),
-      locale
-    );
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (contentId) => CONTENT_QUERY_KEY(contentId),
-      locale
-    );
-  }
   return data;
 };
-var useGetManagedChannelCollectionContents = (channelId, collectionId, params = {}, options = {}) => {
+var useGetManagedChannelSubscribers = (channelId = "", params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    MANAGED_CHANNEL_COLLECTION_CONTENTS_QUERY_KEY(channelId, collectionId),
-    (params2) => GetManagedChannelCollectionContents({
-      channelId,
-      collectionId,
-      ...params2
-    }),
+    MANAGED_CHANNEL_SUBSCRIBERS_QUERY_KEY(channelId),
+    (params2) => GetManagedChannelSubscribers({ ...params2, channelId: channelId || "" }),
     params,
     {
       ...options,
-      enabled: !!channelId && !!collectionId && (options?.enabled ?? true)
+      enabled: !!channelId && (options?.enabled ?? true)
     }
   );
 };
 
-// src/queries/channels/managed/useGetManagedChannelSubscribers.ts
-var MANAGED_CHANNEL_SUBSCRIBERS_QUERY_KEY = (channelId) => [...MANAGED_CHANNEL_QUERY_KEY(channelId), "SUBSCRIBERS"];
-var SET_MANAGED_CHANNEL_SUBSCRIBERS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
-  client.setQueryData(
-    [
-      ...MANAGED_CHANNEL_SUBSCRIBERS_QUERY_KEY(...keyParams),
-      ...GetBaseInfiniteQueryKeys(...baseKeys)
-    ],
-    setFirstPageData(response)
-  );
-};
-var GetManagedChannelSubscribers = async ({
+// src/queries/channels/managed/useGetManagedChannelInterests.ts
+var MANAGED_CHANNEL_INTERESTS_QUERY_KEY = (channelId) => [...MANAGED_CHANNEL_QUERY_KEY(channelId), "INTERESTS"];
+var GetManagedChannelInterests = async ({
+  channelId,
   pageParam,
   pageSize,
   orderBy,
   search,
-  channelId,
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(
-    `/channels/managed/${channelId}/subscribers`,
+    `/channels/managed/${channelId}/interests`,
     {
       params: {
         page: pageParam || void 0,
@@ -4769,10 +4188,10 @@ var GetManagedChannelSubscribers = async ({
   );
   return data;
 };
-var useGetManagedChannelSubscribers = (channelId = "", params = {}, options = {}) => {
+var useGetManagedChannelInterests = (channelId, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    MANAGED_CHANNEL_SUBSCRIBERS_QUERY_KEY(channelId),
-    (params2) => GetManagedChannelSubscribers({ ...params2, channelId: channelId || "" }),
+    MANAGED_CHANNEL_INTERESTS_QUERY_KEY(channelId),
+    (params2) => GetManagedChannelInterests({ channelId, ...params2 }),
     params,
     {
       ...options,
@@ -4781,9 +4200,44 @@ var useGetManagedChannelSubscribers = (channelId = "", params = {}, options = {}
   );
 };
 
-// src/queries/channels/managed/useGetManagedChannelInterests.ts
-var MANAGED_CHANNEL_INTERESTS_QUERY_KEY = (channelId) => [...MANAGED_CHANNEL_QUERY_KEY(channelId), "INTERESTS"];
-var GetManagedChannelInterests = async ({
+// src/queries/channels/useGetSubscribedChannels.ts
+var SUBSCRIBED_CHANNELS_QUERY_KEY = () => [
+  ...CHANNELS_QUERY_KEY(),
+  "SUBSCRIBED"
+];
+var GetSubscribedChannels = async ({
+  pageParam,
+  pageSize,
+  orderBy,
+  search,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(`/channels/subscribed`, {
+    params: {
+      page: pageParam || void 0,
+      pageSize: pageSize || void 0,
+      orderBy: orderBy || void 0,
+      search: search || void 0
+    }
+  });
+  return data;
+};
+var useGetSubscribedChannels = (params = {}, options = {}) => {
+  return useConnectedInfiniteQuery(
+    SUBSCRIBED_CHANNELS_QUERY_KEY(),
+    (params2) => GetSubscribedChannels({ ...params2 }),
+    params,
+    options
+  );
+};
+
+// src/queries/channels/useGetChannelInterests.ts
+var CHANNEL_INTERESTS_QUERY_KEY = (channelId) => [
+  ...CHANNEL_QUERY_KEY(channelId),
+  "INTERESTS"
+];
+var GetChannelInterests = async ({
   channelId,
   pageParam,
   pageSize,
@@ -4792,47 +4246,128 @@ var GetManagedChannelInterests = async ({
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(
-    `/channels/managed/${channelId}/interests`,
-    {
-      params: {
-        page: pageParam || void 0,
-        pageSize: pageSize || void 0,
-        orderBy: orderBy || void 0,
-        search: search || void 0
-      }
-    }
-  );
+  const { data } = await clientApi.get(`/channels/${channelId}/interests`, {
+    params: {
+      page: pageParam || void 0,
+      pageSize: pageSize || void 0,
+      orderBy: orderBy || void 0,
+      search: search || void 0
+    }
+  });
+  return data;
+};
+var useGetChannelInterests = (channelId, params = {}, options = {}) => {
+  return useConnectedInfiniteQuery(
+    CHANNEL_INTERESTS_QUERY_KEY(channelId),
+    (params2) => GetChannelInterests({ channelId, ...params2 }),
+    params,
+    {
+      ...options,
+      enabled: !!channelId && (options?.enabled ?? true)
+    }
+  );
+};
+
+// src/queries/contents/useGetContents.ts
+var CONTENTS_QUERY_KEY = (type, featured, interest, past) => {
+  const key = ["CONTENTS"];
+  if (type) key.push(type);
+  if (featured) key.push("FEATURED");
+  if (interest) key.push(interest);
+  if (typeof past !== "undefined") key.push(past ? "PAST" : "UPCOMING");
+  return key;
+};
+var SET_CONTENTS_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+  client.setQueryData(
+    [
+      ...CONTENTS_QUERY_KEY(...keyParams),
+      ...GetBaseInfiniteQueryKeys(...baseKeys)
+    ],
+    setFirstPageData(response)
+  );
+};
+var GetContents = async ({
+  type,
+  featured,
+  interest,
+  past,
+  pageParam,
+  pageSize,
+  orderBy,
+  search,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(`/contents`, {
+    params: {
+      type: type || void 0,
+      featured: typeof featured !== "undefined" ? featured ? "true" : "false" : void 0,
+      interest: interest || void 0,
+      past,
+      page: pageParam || void 0,
+      pageSize: pageSize || void 0,
+      orderBy: orderBy || void 0,
+      search: search || void 0
+    }
+  });
+  return data;
+};
+var useGetContents = (type, featured, interest, past, params = {}, options = {}) => {
+  return useConnectedInfiniteQuery(
+    CONTENTS_QUERY_KEY(type, featured, interest, past),
+    (params2) => GetContents({ type, featured, interest, past, ...params2 }),
+    params,
+    options
+  );
+};
+
+// src/queries/contents/useGetContent.ts
+var CONTENT_QUERY_KEY = (contentId) => [
+  ...CONTENTS_QUERY_KEY(),
+  contentId
+];
+var SET_CONTENT_QUERY_DATA = (client, keyParams, response, baseKeys = ["en"]) => {
+  client.setQueryData(
+    [
+      ...CONTENT_QUERY_KEY(...keyParams),
+      ...GetBaseSingleQueryKeys(...baseKeys)
+    ],
+    response
+  );
+};
+var GetContent = async ({
+  contentId,
+  clientApiParams
+}) => {
+  const clientApi = await GetClientAPI(clientApiParams);
+  const { data } = await clientApi.get(`/contents/${contentId}`);
   return data;
 };
-var useGetManagedChannelInterests = (channelId, params = {}, options = {}) => {
-  return useConnectedInfiniteQuery(
-    MANAGED_CHANNEL_INTERESTS_QUERY_KEY(channelId),
-    (params2) => GetManagedChannelInterests({ channelId, ...params2 }),
-    params,
+var useGetContent = (contentId = "", options = {}) => {
+  return useConnectedSingleQuery_default(
+    CONTENT_QUERY_KEY(contentId),
+    (params) => GetContent({ contentId, ...params }),
     {
       ...options,
-      enabled: !!channelId && (options?.enabled ?? true)
+      enabled: !!contentId && options.enabled
     }
   );
 };
 
-// src/queries/channels/useGetSubscribedChannels.ts
-var SUBSCRIBED_CHANNELS_QUERY_KEY = () => [
-  ...CHANNELS_QUERY_KEY(),
-  "SUBSCRIBED"
-];
-var GetSubscribedChannels = async ({
+// src/queries/contents/useGetContentInterests.ts
+var CONTENT_INTERESTS_QUERY_KEY = () => {
+  const key = ["CONTENTS_INTERESTS"];
+  return key;
+};
+var GetContentInterests = async ({
   pageParam,
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/channels/subscribed`, {
+  const { data } = await clientApi.get(`/contents/interests`, {
     params: {
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
@@ -4840,32 +4375,27 @@ var GetSubscribedChannels = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (channelId) => CHANNEL_QUERY_KEY(channelId),
-      locale
-    );
-  }
   return data;
 };
-var useGetSubscribedChannels = (params = {}, options = {}) => {
+var useGetContentInterests = (params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    SUBSCRIBED_CHANNELS_QUERY_KEY(),
-    (params2) => GetSubscribedChannels({ ...params2 }),
+    CONTENT_INTERESTS_QUERY_KEY(),
+    (params2) => GetContentInterests({ ...params2 }),
     params,
     options
   );
 };
 
-// src/queries/channels/useGetChannelInterests.ts
-var CHANNEL_INTERESTS_QUERY_KEY = (channelId) => [
-  ...CHANNEL_QUERY_KEY(channelId),
-  "INTERESTS"
-];
-var GetChannelInterests = async ({
-  channelId,
+// src/queries/contents/useGetSubscribedContents.ts
+var SUBSCRIBED_CONTENTS_QUERY_KEY = (type, interest) => {
+  const key = ["SUBSCRIBED_CONTENTS"];
+  if (type) key.push(type);
+  if (interest) key.push(interest);
+  return key;
+};
+var GetSubscribedContents = async ({
+  type,
+  interest,
   pageParam,
   pageSize,
   orderBy,
@@ -4873,8 +4403,10 @@ var GetChannelInterests = async ({
   clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
-  const { data } = await clientApi.get(`/channels/${channelId}/interests`, {
+  const { data } = await clientApi.get(`/contents/subscribed`, {
     params: {
+      type: type || void 0,
+      interest: interest || void 0,
       page: pageParam || void 0,
       pageSize: pageSize || void 0,
       orderBy: orderBy || void 0,
@@ -4883,15 +4415,12 @@ var GetChannelInterests = async ({
   });
   return data;
 };
-var useGetChannelInterests = (channelId, params = {}, options = {}) => {
+var useGetSubscribedContents = (type, interest, params = {}, options = {}) => {
   return useConnectedInfiniteQuery(
-    CHANNEL_INTERESTS_QUERY_KEY(channelId),
-    (params2) => GetChannelInterests({ channelId, ...params2 }),
+    SUBSCRIBED_CONTENTS_QUERY_KEY(interest),
+    (params2) => GetSubscribedContents({ interest, ...params2 }),
     params,
-    {
-      ...options,
-      enabled: !!channelId && (options?.enabled ?? true)
-    }
+    options
   );
 };
 
@@ -5051,9 +4580,7 @@ var GetSelfAddresses = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/addresses`, {
@@ -5064,14 +4591,6 @@ var GetSelfAddresses = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => SELF_ADDRESS_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfAddresses = (params = {}, options = {}) => {
@@ -5126,9 +4645,7 @@ var GetSelfLeads = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/leads`, {
@@ -5140,14 +4657,6 @@ var GetSelfLeads = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => SELF_LEAD_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfLeads = (status, params = {}, options = {}) => {
@@ -5231,9 +4740,7 @@ var GetSelfChatChannels = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/chat/channels`, {
@@ -5244,20 +4751,6 @@ var GetSelfChatChannels = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (channelId) => SELF_CHAT_CHANNEL_QUERY_KEY(channelId),
-      locale,
-      (member) => {
-        return {
-          ...member,
-          id: member.channelId.toString()
-        };
-      }
-    );
-  }
   return data;
 };
 var useGetSelfChatChannels = (params = {}, options = {}) => {
@@ -5891,9 +5384,7 @@ var GetSelfSubscriptions = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/subscriptions`, {
@@ -5905,14 +5396,6 @@ var GetSelfSubscriptions = async ({
       status: status || void 0
     }
   });
-  if (queryClient) {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (subscriptionId) => SELF_SUBSCRIPTION_QUERY_KEY(subscriptionId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfSubscriptions = (status, params = {}, options = {}) => {
@@ -6658,9 +6141,7 @@ var GetSelfActivities = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/activities`, {
@@ -6671,14 +6152,6 @@ var GetSelfActivities = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfActivities = (params = {}, options = {}) => {
@@ -6799,9 +6272,7 @@ var GetSelfDelegateOf = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/delegateof`, {
@@ -6812,14 +6283,6 @@ var GetSelfDelegateOf = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId) => ACCOUNT_QUERY_KEY(accountId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfDelegateOf = (params = {}, options = {}) => {
@@ -6845,9 +6308,7 @@ var GetSelfDelegates = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/delegates`, {
@@ -6858,14 +6319,6 @@ var GetSelfDelegates = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (accountId) => ACCOUNT_QUERY_KEY(accountId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfDelegates = (params = {}, options = {}) => {
@@ -6893,9 +6346,7 @@ var GetSelfEvents = async ({
   orderBy,
   search,
   past,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/events`, {
@@ -6907,14 +6358,6 @@ var GetSelfEvents = async ({
       past: past || false
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (eventId) => EVENT_QUERY_KEY(eventId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfEvents = (past = false, params = {}, options = {}) => {
@@ -6942,9 +6385,7 @@ var GetSelfEventSessions = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/events/${eventId}/sessions`, {
@@ -6956,14 +6397,6 @@ var GetSelfEventSessions = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (sessionId) => EVENT_SESSION_QUERY_KEY(eventId, sessionId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfEventSessions = (eventId, params = {}, options = {}) => {
@@ -6989,9 +6422,7 @@ var GetSelfFeed = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/activities/feed`, {
@@ -7002,14 +6433,6 @@ var GetSelfFeed = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfFeed = (params = {}, options = {}) => {
@@ -7171,9 +6594,7 @@ var GetSelfPushDevices = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/self/push-devices`, {
@@ -7184,14 +6605,6 @@ var GetSelfPushDevices = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (pushDeviceId) => SELF_PUSH_DEVICE_QUERY_KEY(pushDeviceId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfPushDevices = (params = {}, options = {}) => {
@@ -7293,9 +6706,7 @@ var GetSeriesList = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/series`, {
@@ -7306,14 +6717,6 @@ var GetSeriesList = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (seriesId) => SERIES_QUERY_KEY(seriesId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSeriesList = (params = {}, options = {}) => {
@@ -7379,9 +6782,7 @@ var GetSeriesEvents = async ({
   orderBy,
   search,
   past,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/series/${seriesId}/events`, {
@@ -7393,14 +6794,6 @@ var GetSeriesEvents = async ({
       past: past !== void 0 ? past : void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (eventId) => EVENT_QUERY_KEY(eventId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSeriesEvents = (seriesId = "", past, params = {}, options = {}) => {
@@ -7431,9 +6824,7 @@ var GetLevels = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/levels`, {
@@ -7444,14 +6835,6 @@ var GetLevels = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (levelId) => LEVEL_QUERY_KEY(levelId),
-      locale
-    );
-  }
   return data;
 };
 var useGetLevels = (params = {}, options = {}) => {
@@ -7513,9 +6896,7 @@ var GetLevelSponsors = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/levels/${levelId}/accounts`, {
@@ -7526,14 +6907,6 @@ var GetLevelSponsors = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (sponsorId) => ACCOUNT_QUERY_KEY(sponsorId),
-      locale
-    );
-  }
   return data;
 };
 var useGetLevelSponsors = (levelId = "", params = {}, options = {}) => {
@@ -7623,9 +6996,7 @@ var GetSelfEventListings = async ({
   orderBy,
   search,
   past,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/listings`, {
@@ -7637,14 +7008,6 @@ var GetSelfEventListings = async ({
       past: typeof past == "boolean" ? past : void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (eventId) => LISTING_QUERY_KEY(eventId),
-      locale
-    );
-  }
   return data;
 };
 var useGetSelfEventListings = (past = false, params = {}, options = {}) => {
@@ -8145,14 +7508,12 @@ var INTEREST_ACTIVITIES_QUERY_KEY = (interest) => [
   ...INTEREST_QUERY_KEY(interest)
 ];
 var GetInterestActivities = async ({
+  interest,
   pageParam,
   pageSize,
   orderBy,
   search,
-  interest,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/interests/${interest}/activities`, {
@@ -8163,14 +7524,6 @@ var GetInterestActivities = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (activityId) => ACTIVITY_QUERY_KEY(activityId),
-      locale
-    );
-  }
   return data;
 };
 var useGetInterestActivities = (interest = "", params = {}, options = {}) => {
@@ -8479,9 +7832,7 @@ var GetIntegrations = async ({
   pageSize,
   orderBy,
   search,
-  queryClient,
-  clientApiParams,
-  locale
+  clientApiParams
 }) => {
   const clientApi = await GetClientAPI(clientApiParams);
   const { data } = await clientApi.get(`/integrations`, {
@@ -8492,14 +7843,6 @@ var GetIntegrations = async ({
       search: search || void 0
     }
   });
-  if (queryClient && data.status === "ok") {
-    CacheIndividualQueries(
-      data,
-      queryClient,
-      (integrationId) => INTEGRATION_QUERY_KEY(integrationId),
-      locale
-    );
-  }
   return data;
 };
 var useGetIntegrations = (params = {}, options = {}) => {
@@ -12940,7 +12283,6 @@ export {
   CONTENT_INTERESTS_QUERY_KEY,
   CONTENT_QUERY_KEY,
   CUSTOM_ERROR_CODES,
-  CacheIndividualQueries,
   CancelBooking,
   CancelGroupInvitation,
   CancelGroupRequest,