From 3f85ef6224a413b4f31c7be5835a2ac2702f332b Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Sat, 10 Jun 2023 08:01:13 +0700 Subject: [PATCH] update lib storage --- src/app/channel/components/createModal.tsx | 2 +- src/app/channel/components/mutedItem.tsx | 4 ++-- src/app/channel/components/updateModal.tsx | 2 +- src/app/channel/hooks/useChannelProfile.tsx | 2 +- src/app/channel/pages/index.page.tsx | 2 +- src/app/note/components/metadata.tsx | 2 +- src/app/note/pages/index.page.tsx | 2 +- src/app/prefetch/pages/index.page.tsx | 2 +- src/app/space/components/blocks/feed.tsx | 2 +- src/app/space/components/blocks/following.tsx | 2 +- src/{utils => libs}/storage.tsx | 0 src/renderer/shell.tsx | 2 +- src/shared/multiAccounts.tsx | 2 +- src/stores/accounts.tsx | 2 +- src/stores/channels.tsx | 2 +- src/stores/chats.tsx | 2 +- src/utils/hooks/useEvent.tsx | 2 +- src/utils/hooks/useProfile.tsx | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename src/{utils => libs}/storage.tsx (100%) diff --git a/src/app/channel/components/createModal.tsx b/src/app/channel/components/createModal.tsx index 52d5d698..9c2226c4 100644 --- a/src/app/channel/components/createModal.tsx +++ b/src/app/channel/components/createModal.tsx @@ -1,4 +1,5 @@ import { Dialog, Transition } from "@headlessui/react"; +import { createChannel } from "@libs/storage"; import { NDKEvent, NDKPrivateKeySigner } from "@nostr-dev-kit/ndk"; import { AvatarUploader } from "@shared/avatarUploader"; import { CancelIcon, PlusIcon } from "@shared/icons"; @@ -7,7 +8,6 @@ import { RelayContext } from "@shared/relayProvider"; import { useActiveAccount } from "@stores/accounts"; import { DEFAULT_AVATAR } from "@stores/constants"; import { dateToUnix } from "@utils/date"; -import { createChannel } from "@utils/storage"; import { Fragment, useContext, useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { navigate } from "vite-plugin-ssr/client/router"; diff --git a/src/app/channel/components/mutedItem.tsx b/src/app/channel/components/mutedItem.tsx index 554e8734..3570a8b8 100644 --- a/src/app/channel/components/mutedItem.tsx +++ b/src/app/channel/components/mutedItem.tsx @@ -9,7 +9,7 @@ export function MutedItem({ data }: { data: any }) { const [status, setStatus] = useState(data.status); const unmute = async () => { - const { updateItemInBlacklist } = await import("@utils/storage"); + const { updateItemInBlacklist } = await import("@libs/storage"); const res = await updateItemInBlacklist(data.content, 0); if (res) { setStatus(0); @@ -17,7 +17,7 @@ export function MutedItem({ data }: { data: any }) { }; const mute = async () => { - const { updateItemInBlacklist } = await import("@utils/storage"); + const { updateItemInBlacklist } = await import("@libs/storage"); const res = await updateItemInBlacklist(data.content, 1); if (res) { setStatus(1); diff --git a/src/app/channel/components/updateModal.tsx b/src/app/channel/components/updateModal.tsx index c2614a0b..3d3a674f 100644 --- a/src/app/channel/components/updateModal.tsx +++ b/src/app/channel/components/updateModal.tsx @@ -1,4 +1,5 @@ import { Dialog, Transition } from "@headlessui/react"; +import { getChannel } from "@libs/storage"; import { NDKEvent, NDKPrivateKeySigner } from "@nostr-dev-kit/ndk"; import { AvatarUploader } from "@shared/avatarUploader"; import { CancelIcon, EditIcon } from "@shared/icons"; @@ -7,7 +8,6 @@ import { RelayContext } from "@shared/relayProvider"; import { useActiveAccount } from "@stores/accounts"; import { DEFAULT_AVATAR } from "@stores/constants"; import { dateToUnix } from "@utils/date"; -import { getChannel } from "@utils/storage"; import { Fragment, useContext, useEffect, useState } from "react"; import { useForm } from "react-hook-form"; diff --git a/src/app/channel/hooks/useChannelProfile.tsx b/src/app/channel/hooks/useChannelProfile.tsx index 16c87b41..d9e3a4f0 100644 --- a/src/app/channel/hooks/useChannelProfile.tsx +++ b/src/app/channel/hooks/useChannelProfile.tsx @@ -1,5 +1,5 @@ +import { getChannel, updateChannelMetadata } from "@libs/storage"; import { RelayContext } from "@shared/relayProvider"; -import { getChannel, updateChannelMetadata } from "@utils/storage"; import { useContext } from "react"; import useSWR, { useSWRConfig } from "swr"; import useSWRSubscription from "swr/subscription"; diff --git a/src/app/channel/pages/index.page.tsx b/src/app/channel/pages/index.page.tsx index 6d3c6ece..12ead80a 100644 --- a/src/app/channel/pages/index.page.tsx +++ b/src/app/channel/pages/index.page.tsx @@ -4,12 +4,12 @@ import { ChannelMessageList } from "@app/channel/components/messageList"; import { ChannelMessageForm } from "@app/channel/components/messages/form"; import { ChannelMetadata } from "@app/channel/components/metadata"; import { ChannelUpdateModal } from "@app/channel/components/updateModal"; +import { getActiveBlacklist, getBlacklist } from "@libs/storage"; import { RelayContext } from "@shared/relayProvider"; import { useActiveAccount } from "@stores/accounts"; import { useChannelMessages } from "@stores/channels"; import { dateToUnix, getHourAgo } from "@utils/date"; import { usePageContext } from "@utils/hooks/usePageContext"; -import { getActiveBlacklist, getBlacklist } from "@utils/storage"; import { arrayObjToPureArr } from "@utils/transform"; import { useContext, useRef } from "react"; import useSWR from "swr"; diff --git a/src/app/note/components/metadata.tsx b/src/app/note/components/metadata.tsx index 0d537059..0c0a2b1c 100644 --- a/src/app/note/components/metadata.tsx +++ b/src/app/note/components/metadata.tsx @@ -1,10 +1,10 @@ import { NoteReply } from "@app/note/components/metadata/reply"; import { NoteRepost } from "@app/note/components/metadata/repost"; import { NoteZap } from "@app/note/components/metadata/zap"; +import { createReplyNote } from "@libs/storage"; import { NDKEvent } from "@nostr-dev-kit/ndk"; import { NDKSubscription } from "@nostr-dev-kit/ndk"; import { RelayContext } from "@shared/relayProvider"; -import { createReplyNote } from "@utils/storage"; import { decode } from "light-bolt11-decoder"; import { useContext, useState } from "react"; import useSWRSubscription from "swr/subscription"; diff --git a/src/app/note/pages/index.page.tsx b/src/app/note/pages/index.page.tsx index 76387a24..63ab27f3 100644 --- a/src/app/note/pages/index.page.tsx +++ b/src/app/note/pages/index.page.tsx @@ -2,9 +2,9 @@ import { Kind1 } from "@app/note/components/kind1"; import { NoteMetadata } from "@app/note/components/metadata"; import { RepliesList } from "@app/note/components/replies/list"; import { NoteDefaultUser } from "@app/note/components/user/default"; +import { getNoteByID } from "@libs/storage"; import { usePageContext } from "@utils/hooks/usePageContext"; import { noteParser } from "@utils/parser"; -import { getNoteByID } from "@utils/storage"; import useSWR from "swr"; const fetcher = ([, id]) => getNoteByID(id); diff --git a/src/app/prefetch/pages/index.page.tsx b/src/app/prefetch/pages/index.page.tsx index e84e6b8e..d205a98f 100644 --- a/src/app/prefetch/pages/index.page.tsx +++ b/src/app/prefetch/pages/index.page.tsx @@ -1,10 +1,10 @@ import { prefetchEvents } from "@libs/ndk"; +import { countTotalNotes, createNote } from "@libs/storage"; import { NDKFilter } from "@nostr-dev-kit/ndk"; import { LumeIcon } from "@shared/icons"; import { RelayContext } from "@shared/relayProvider"; import { useActiveAccount } from "@stores/accounts"; import { dateToUnix, getHourAgo } from "@utils/date"; -import { countTotalNotes, createNote } from "@utils/storage"; import { useContext, useEffect, useRef } from "react"; import { navigate } from "vite-plugin-ssr/client/router"; diff --git a/src/app/space/components/blocks/feed.tsx b/src/app/space/components/blocks/feed.tsx index 7af0d6b6..361ba637 100644 --- a/src/app/space/components/blocks/feed.tsx +++ b/src/app/space/components/blocks/feed.tsx @@ -1,10 +1,10 @@ import { NoteBase } from "@app/note/components/base"; import { NoteQuoteRepost } from "@app/note/components/quoteRepost"; import { NoteSkeleton } from "@app/note/components/skeleton"; +import { getNotesByAuthor } from "@libs/storage"; import { CancelIcon } from "@shared/icons"; import { useActiveAccount } from "@stores/accounts"; import { useVirtualizer } from "@tanstack/react-virtual"; -import { getNotesByAuthor } from "@utils/storage"; import { useEffect, useMemo, useRef } from "react"; import useSWRInfinite from "swr/infinite"; diff --git a/src/app/space/components/blocks/following.tsx b/src/app/space/components/blocks/following.tsx index 89a17555..e5fd2783 100644 --- a/src/app/space/components/blocks/following.tsx +++ b/src/app/space/components/blocks/following.tsx @@ -1,8 +1,8 @@ import { NoteBase } from "@app/note/components/base"; import { NoteQuoteRepost } from "@app/note/components/quoteRepost"; import { NoteSkeleton } from "@app/note/components/skeleton"; +import { getNotes } from "@libs/storage"; import { useVirtualizer } from "@tanstack/react-virtual"; -import { getNotes } from "@utils/storage"; import { useEffect, useMemo, useRef } from "react"; import useSWRInfinite from "swr/infinite"; diff --git a/src/utils/storage.tsx b/src/libs/storage.tsx similarity index 100% rename from src/utils/storage.tsx rename to src/libs/storage.tsx diff --git a/src/renderer/shell.tsx b/src/renderer/shell.tsx index 32937747..1d4e4e08 100644 --- a/src/renderer/shell.tsx +++ b/src/renderer/shell.tsx @@ -1,9 +1,9 @@ import { LayoutDefault } from "./layoutDefault"; import { PageContext } from "./types"; +import { updateLastLogin } from "@libs/storage"; import { RelayProvider } from "@shared/relayProvider"; import { dateToUnix } from "@utils/date"; import { PageContextProvider } from "@utils/hooks/usePageContext"; -import { updateLastLogin } from "@utils/storage"; import { useEffect } from "react"; export function Shell({ diff --git a/src/shared/multiAccounts.tsx b/src/shared/multiAccounts.tsx index c24d55ac..549ce1fd 100644 --- a/src/shared/multiAccounts.tsx +++ b/src/shared/multiAccounts.tsx @@ -1,8 +1,8 @@ +import { getAccounts, getActiveAccount } from "@libs/storage"; import { ActiveAccount } from "@shared/accounts/active"; import { InactiveAccount } from "@shared/accounts/inactive"; import { BellIcon, PlusIcon } from "@shared/icons"; import { APP_VERSION } from "@stores/constants"; -import { getAccounts, getActiveAccount } from "@utils/storage"; import useSWR from "swr"; const allFetcher = () => getAccounts(); diff --git a/src/stores/accounts.tsx b/src/stores/accounts.tsx index ddc37151..59a50f4f 100644 --- a/src/stores/accounts.tsx +++ b/src/stores/accounts.tsx @@ -6,7 +6,7 @@ import { getLastLogin, removeBlockFromDB, updateAccount, -} from "@utils/storage"; +} from "@libs/storage"; import { create } from "zustand"; import { createJSONStorage, persist } from "zustand/middleware"; import { immer } from "zustand/middleware/immer"; diff --git a/src/stores/channels.tsx b/src/stores/channels.tsx index c4d2e635..9430f1af 100644 --- a/src/stores/channels.tsx +++ b/src/stores/channels.tsx @@ -1,4 +1,4 @@ -import { getChannels } from "@utils/storage"; +import { getChannels } from "@libs/storage"; import { create } from "zustand"; import { immer } from "zustand/middleware/immer"; diff --git a/src/stores/chats.tsx b/src/stores/chats.tsx index 64df0a23..dfc438dc 100644 --- a/src/stores/chats.tsx +++ b/src/stores/chats.tsx @@ -1,4 +1,4 @@ -import { createChat, getChatMessages, getChatsByPubkey } from "@utils/storage"; +import { createChat, getChatMessages, getChatsByPubkey } from "@libs/storage"; import { create } from "zustand"; import { immer } from "zustand/middleware/immer"; diff --git a/src/utils/hooks/useEvent.tsx b/src/utils/hooks/useEvent.tsx index b10677a5..db15bbf5 100644 --- a/src/utils/hooks/useEvent.tsx +++ b/src/utils/hooks/useEvent.tsx @@ -1,5 +1,5 @@ +import { createNote, getNoteByID } from "@libs/storage"; import { RelayContext } from "@shared/relayProvider"; -import { createNote, getNoteByID } from "@utils/storage"; import { useContext } from "react"; import useSWR from "swr"; diff --git a/src/utils/hooks/useProfile.tsx b/src/utils/hooks/useProfile.tsx index 944c8cb0..aae64a57 100644 --- a/src/utils/hooks/useProfile.tsx +++ b/src/utils/hooks/useProfile.tsx @@ -1,6 +1,6 @@ +import { createPleb, getPleb } from "@libs/storage"; import NDK from "@nostr-dev-kit/ndk"; import { RelayContext } from "@shared/relayProvider"; -import { createPleb, getPleb } from "@utils/storage"; import { nip19 } from "nostr-tools"; import { useContext } from "react"; import useSWR from "swr";