Skip to content

Commit

Permalink
fix: creation date in subscription folders for galxe (#406)
Browse files Browse the repository at this point in the history
* validate creation date

* clean up

* fixes

* fixes
  • Loading branch information
paulclindo authored Aug 12, 2024
1 parent dddd0af commit dc23075
Showing 1 changed file with 32 additions and 3 deletions.
35 changes: 32 additions & 3 deletions apps/shinkai-desktop/src/pages/galxe-subscriptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { CheckCircledIcon, CircleIcon } from '@radix-ui/react-icons';
import { useTranslation } from '@shinkai_network/shinkai-i18n';
import { SmartInbox } from '@shinkai_network/shinkai-message-ts/models/ShinkaiMessage';
import { useGetInboxes } from '@shinkai_network/shinkai-node-state/lib/queries/getInboxes/useGetInboxes';
import { useGetMySubscriptions } from '@shinkai_network/shinkai-node-state/lib/queries/getMySubscriptions/useGetMySubscriptions';
import { useGetVRPathSimplified } from '@shinkai_network/shinkai-node-state/lib/queries/getVRPathSimplified/useGetVRPathSimplified';
import {
Button,
Expand Down Expand Up @@ -69,6 +70,34 @@ export const GalxeSusbcriptions = () => {
profile_identity_sk: auth?.profile_identity_sk ?? '',
});

const { data: subscriptions } = useGetMySubscriptions({
nodeAddress: auth?.node_address ?? '',
shinkaiIdentity: auth?.shinkai_identity ?? '',
profile: auth?.profile ?? '',
my_device_encryption_sk: auth?.my_device_encryption_sk ?? '',
my_device_identity_sk: auth?.my_device_identity_sk ?? '',
node_encryption_pk: auth?.node_encryption_pk ?? '',
profile_encryption_sk: auth?.profile_encryption_sk ?? '',
profile_identity_sk: auth?.profile_identity_sk ?? '',
});

const filteredSubscriptions = subscriptions
?.map((subscription) => {
const matchingFolder = subscriptionFolder?.child_folders?.find(
(folder) =>
folder.path.split('/')?.[2] ===
subscription.shared_folder.replace(/^\/+/, ''),
);

return matchingFolder
? {
...subscription,
folderPath: matchingFolder.path,
}
: null;
})
.filter((item) => !!item);

const isUserSubscribedToKnowledge =
(subscriptionFolder?.child_folders ?? [])?.length > 0;

Expand All @@ -88,11 +117,11 @@ export const GalxeSusbcriptions = () => {
const { data: subscriptionsProof } = useGalxeGenerateProofQuery(
auth?.node_signature_pk || '',
JSON.stringify({
subscriptions: subscriptionFolder?.child_folders?.map((folder) => {
subscriptions: filteredSubscriptions?.map((folder) => {
return {
identity: auth?.shinkai_identity,
createdAt: folder.created_datetime,
folder: folder.path,
createdAt: folder.date_created,
folder: folder.folderPath,
inboxes: inboxesWithSubscriptions.map((inbox) => ({
createdAt: inbox.datetime_created,
})),
Expand Down

0 comments on commit dc23075

Please sign in to comment.