refactor: move directory

src/components/DeprecatedRepost.tsx

@@ -3,9 +3,9 @@ import { Show, Switch, Match, type Component } from 'solid-js';
 import { Event as NostrEvent } from 'nostr-tools';
 import ArrowPathRoundedSquare from 'heroicons/24/outline/arrow-path-rounded-square.svg';
 
-import useConfig from '@/clients/useConfig';
-import useEvent from '@/clients/useEvent';
-import useProfile from '@/clients/useProfile';
+import useConfig from '@/nostr/useConfig';
+import useEvent from '@/nostr/useEvent';
+import useProfile from '@/nostr/useProfile';
 
 import UserDisplayName from '@/components/UserDisplayName';
 import TextNote from '@/components/TextNote';

src/components/SideBar.tsx

@@ -4,9 +4,9 @@ import PencilSquare from 'heroicons/24/solid/pencil-square.svg';
 
 import NotePostForm from '@/components/NotePostForm';
 
-import useConfig from '@/clients/useConfig';
-import useCommands from '@/clients/useCommands';
-import usePubkey from '@/clients/usePubkey';
+import useConfig from '@/nostr/useConfig';
+import useCommands from '@/nostr/useCommands';
+import usePubkey from '@/nostr/usePubkey';
 import { useHandleCommand } from '@/hooks/useCommandBus';
 import ensureNonNull from '@/utils/ensureNonNull';
 

src/components/TextNote.tsx

@@ -8,12 +8,12 @@ import ArrowPathRoundedSquare from 'heroicons/24/outline/arrow-path-rounded-squa
 import ChatBubbleLeft from 'heroicons/24/outline/chat-bubble-left.svg';
 import EllipsisHorizontal from 'heroicons/24/outline/ellipsis-horizontal.svg';
 
-import useProfile from '@/clients/useProfile';
-import useConfig from '@/clients/useConfig';
-import usePubkey from '@/clients/usePubkey';
-import useCommands from '@/clients/useCommands';
-import useReactions from '@/clients/useReactions';
-import useDeprecatedReposts from '@/clients/useDeprecatedReposts';
+import useProfile from '@/nostr/useProfile';
+import useConfig from '@/nostr/useConfig';
+import usePubkey from '@/nostr/usePubkey';
+import useCommands from '@/nostr/useCommands';
+import useReactions from '@/nostr/useReactions';
+import useDeprecatedReposts from '@/nostr/useDeprecatedReposts';
 import useDatePulser from '@/hooks/useDatePulser';
 import { formatRelative } from '@/utils/formatDate';
 import ColumnItem from '@/components/ColumnItem';

src/components/UserDisplayName.tsx

@@ -1,7 +1,7 @@
 import { Component, Switch, Match } from 'solid-js';
 
-import useConfig from '@/clients/useConfig';
-import useProfile, { type Profile } from '@/clients/useProfile';
+import useConfig from '@/nostr/useConfig';
+import useProfile, { type Profile } from '@/nostr/useProfile';
 
 type UserNameDisplayProps = {
   pubkey: string;

src/components/notification/Reaction.tsx

@@ -5,9 +5,9 @@ import HeartSolid from 'heroicons/24/solid/heart.svg';
 import UserDisplayName from '@/components/UserDisplayName';
 import TextNote from '@/components/TextNote';
 
-import useConfig from '@/clients/useConfig';
-import useProfile from '@/clients/useProfile';
-import useEvent from '@/clients/useEvent';
+import useConfig from '@/nostr/useConfig';
+import useProfile from '@/nostr/useProfile';
+import useEvent from '@/nostr/useEvent';
 
 type ReactionProps = {
   event: NostrEvent;

src/components/textNote/GeneralUserMentionDisplay.tsx

@@ -1,6 +1,6 @@
 import type { MentionedUser } from '@/core/parseTextNote';
-import useProfile from '@/clients/useProfile';
-import useConfig from '@/clients/useConfig';
+import useProfile from '@/nostr/useProfile';
+import useConfig from '@/nostr/useConfig';
 import { Show } from 'solid-js';
 
 export type GeneralUserMentionDisplayProps = {

src/components/textNote/ImageDisplay.tsx

@@ -23,7 +23,7 @@ const ImageDisplay: Component<ImageDisplayProps> = (props) => {
   const url = () => new URL(props.url);
 
   return (
-    <a href={props.url} target="_blank" rel="noopener noreferrer">
+    <a class="my-2 inline-block" href={props.url} target="_blank" rel="noopener noreferrer">
       <img
         class="inline-block max-h-64 max-w-full rounded object-contain shadow"
         src={fixUrl(url())}

src/nostr/useBatchedEvent.ts

@@ -1,9 +1,9 @@
 import { createMemo } from 'solid-js';
 import { type Event as NostrEvent, type Filter } from 'nostr-tools';
 
-import useConfig from '@/clients/useConfig';
-import useBatch, { type Task } from '@/clients/useBatch';
-import useSubscription from '@/clients/useSubscription';
+import useConfig from '@/nostr/useConfig';
+import useBatch, { type Task } from '@/nostr/useBatch';
+import useSubscription from '@/nostr/useSubscription';
 
 export type UseBatchedEventProps<TaskArgs> = {
   interval?: number;

src/nostr/useBatchedEvents.ts

@@ -1,9 +1,9 @@
 import { createSignal, createMemo, type Signal, type Accessor } from 'solid-js';
 import { type Event as NostrEvent, type Filter } from 'nostr-tools';
 
-import useConfig from '@/clients/useConfig';
-import useBatch, { type Task } from '@/clients/useBatch';
-import useSubscription from '@/clients/useSubscription';
+import useConfig from '@/nostr/useConfig';
+import useBatch, { type Task } from '@/nostr/useBatch';
+import useSubscription from '@/nostr/useSubscription';
 
 export type UseBatchedEventsProps<TaskArgs> = {
   interval?: number;

src/nostr/useCachedEvents.ts

@@ -1,5 +1,5 @@
 import { createQuery } from '@tanstack/solid-query';
-import { type UseSubscriptionProps } from '@/clients/useSubscription';
+import { type UseSubscriptionProps } from '@/nostr/useSubscription';
 import type { Event as NostrEvent, Filter, SimplePool, SubscriptionOptions } from 'nostr-tools';
 import usePool from './usePool';
 

src/nostr/useCommands.ts

@@ -1,7 +1,7 @@
 import { getEventHash, type Event as NostrEvent, type Pub } from 'nostr-tools';
 
 import '@/types/nostr.d';
-import usePool from '@/clients/usePool';
+import usePool from '@/nostr/usePool';
 
 const currentDate = (): number => Math.floor(Date.now() / 1000);
 

src/nostr/useDeprecatedReposts.ts

@@ -2,7 +2,7 @@ import { createMemo, type Accessor } from 'solid-js';
 import { type Event as NostrEvent } from 'nostr-tools';
 import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
 
-import useBatchedEvents, { type BatchedEvents } from '@/clients/useBatchedEvents';
+import useBatchedEvents, { type BatchedEvents } from '@/nostr/useBatchedEvents';
 import timeout from '@/utils/timeout';
 
 export type UseDeprecatedRepostsProps = {

src/nostr/useEvent.ts

@@ -3,7 +3,7 @@ import { type Event as NostrEvent } from 'nostr-tools';
 import { createQuery, type CreateQueryResult } from '@tanstack/solid-query';
 import timeout from '@/utils/timeout';
 
-import useBatchedEvent from '@/clients/useBatchedEvent';
+import useBatchedEvent from '@/nostr/useBatchedEvent';
 
 export type UseEventProps = {
   // TODO リレーURLを考慮したい

src/nostr/useFollowings.ts

@@ -1,5 +1,5 @@
 import { createMemo } from 'solid-js';
-import useCachedEvents from '@/clients/useCachedEvents';
+import useCachedEvents from '@/nostr/useCachedEvents';
 
 type UseFollowingsProps = {
   relayUrls: string[];

src/nostr/useProfile.ts

@@ -2,7 +2,7 @@ import { createMemo, type Accessor } from 'solid-js';
 import { type Event as NostrEvent, type Filter } from 'nostr-tools';
 import { createQuery, type CreateQueryResult } from '@tanstack/solid-query';
 
-import useBatchedEvent from '@/clients/useBatchedEvent';
+import useBatchedEvent from '@/nostr/useBatchedEvent';
 import timeout from '@/utils/timeout';
 
 // TODO zodにする

src/nostr/useReactions.ts

@@ -2,7 +2,7 @@ import { createMemo, type Accessor } from 'solid-js';
 import { type Event as NostrEvent } from 'nostr-tools';
 import { createQuery, useQueryClient, type CreateQueryResult } from '@tanstack/solid-query';
 
-import useBatchedEvents, { type BatchedEvents } from '@/clients/useBatchedEvents';
+import useBatchedEvents, { type BatchedEvents } from '@/nostr/useBatchedEvents';
 import timeout from '@/utils/timeout';
 
 export type UseReactionsProps = {

src/nostr/useSubscription.ts

@@ -1,6 +1,6 @@
 import { createSignal, createEffect, onCleanup } from 'solid-js';
 import type { Event as NostrEvent, Filter, SubscriptionOptions } from 'nostr-tools';
-import usePool from '@/clients/usePool';
+import usePool from '@/nostr/usePool';
 
 export type UseSubscriptionProps = {
   relayUrls: string[];

src/pages/Home.tsx

@@ -6,11 +6,11 @@ import SideBar from '@/components/SideBar';
 import Timeline from '@/components/Timeline';
 import Notification from '@/components/Notification';
 
-import usePool from '@/clients/usePool';
-import useConfig from '@/clients/useConfig';
-import useSubscription from '@/clients/useSubscription';
-import useFollowings from '@/clients/useFollowings';
-import usePubkey from '@/clients/usePubkey';
+import usePool from '@/nostr/usePool';
+import useConfig from '@/nostr/useConfig';
+import useSubscription from '@/nostr/useSubscription';
+import useFollowings from '@/nostr/useFollowings';
+import usePubkey from '@/nostr/usePubkey';
 
 import { useMountShortcutKeys } from '@/hooks/useShortcutKeys';
 import useLoginStatus from '@/hooks/useLoginStatus';