- 
-
- )}
-
- 0}>
+
diff --git a/src/core/useConfig.ts b/src/core/useConfig.ts
index 4d6388f..ec8b040 100644
--- a/src/core/useConfig.ts
+++ b/src/core/useConfig.ts
@@ -78,8 +78,8 @@ const InitialConfig = (): Config => ({
customEmojis: {},
dateFormat: 'relative',
keepOpenPostForm: false,
- useEmojiReaction: false,
- showEmojiReaction: false,
+ useEmojiReaction: true,
+ showEmojiReaction: true,
showMedia: true,
hideCount: false,
mutedPubkeys: [],
@@ -92,7 +92,7 @@ const deserializer = (json: string): Config =>
({
...InitialConfig(),
...JSON.parse(json),
- } as Config);
+ }) as Config;
const storage = createStorageWithSerializer(() => window.localStorage, serializer, deserializer);
const [config, setConfig] = createStoreWithStorage('RabbitConfig', InitialConfig(), storage);
diff --git a/src/hooks/useModalState.ts b/src/hooks/useModalState.ts
index 6246c57..b28839a 100644
--- a/src/hooks/useModalState.ts
+++ b/src/hooks/useModalState.ts
@@ -1,6 +1,7 @@
import { createSignal } from 'solid-js';
type ModalState =
+ | { type: 'Login' }
| { type: 'Profile'; pubkey: string }
| { type: 'ProfileEdit' }
| { type: 'UserTimeline'; pubkey: string }
@@ -11,6 +12,9 @@ type ModalState =
const [modalState, setModalState] = createSignal({ type: 'Closed' });
const useModalState = () => {
+ const showLogin = () => {
+ setModalState({ type: 'Login' });
+ };
const showProfile = (pubkey: string) => {
setModalState({ type: 'Profile', pubkey });
};
@@ -29,6 +33,7 @@ const useModalState = () => {
return {
modalState,
setModalState,
+ showLogin,
showProfile,
showProfileEdit,
showAddColumn,
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 949247e..6bb2381 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1,6 +1,10 @@
import ja from '@/locales/ja';
export default {
+ general: {
+ loading: 'Loading',
+ updating: 'Updating',
+ },
posting: {
placeholder: "What's happening?",
contentWarning: 'Content warning',
@@ -34,8 +38,6 @@ export default {
following: 'Following',
followers: 'Followers',
loadFollowers: 'Load',
- loading: 'Loading',
- updating: 'Updating',
editProfile: 'Edit',
follow: 'Follow',
unfollow: 'Unfollow',
diff --git a/src/locales/ja.ts b/src/locales/ja.ts
index a777da0..5cb7e84 100644
--- a/src/locales/ja.ts
+++ b/src/locales/ja.ts
@@ -1,4 +1,8 @@
export default {
+ general: {
+ loading: '読み込み中',
+ updating: '更新中',
+ },
posting: {
placeholder: 'いまどうしてる？',
contentWarning: 'コンテンツ警告を設定',
@@ -32,8 +36,6 @@ export default {
following: 'フォロー',
followers: 'フォロワー',
loadFollowers: '読み込む',
- loading: '読み込み中',
- updating: '更新中',
editProfile: '編集',
follow: 'フォロー',
unfollow: 'フォロー解除',
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index 5ab3cd1..7719c4d 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -6,6 +6,7 @@ import Columns from '@/components/column/Columns';
import GlobalModal from '@/components/modal/GlobalModal';
import SideBar from '@/components/SideBar';
import useConfig from '@/core/useConfig';
+import useModalState from '@/hooks/useModalState';
import usePersistStatus from '@/hooks/usePersistStatus';
import { useMountShortcutKeys } from '@/hooks/useShortcutKeys';
import usePool from '@/nostr/usePool';
diff --git a/src/pages/Permalink.tsx b/src/pages/Permalink.tsx
new file mode 100644
index 0000000..efee4fb
--- /dev/null
+++ b/src/pages/Permalink.tsx
@@ -0,0 +1,55 @@
+import { createEffect, onMount } from 'solid-js';
+
+import { useNavigate, useParams } from '@solidjs/router';
+import { nip19 } from 'nostr-tools';
+
+import GlobalModal from '@/components/modal/GlobalModal';
+import SideBar from '@/components/SideBar';
+import useModalState from '@/hooks/useModalState';
+import usePersistStatus from '@/hooks/usePersistStatus';
+
+const Permalink = () => {
+ const navigate = useNavigate();
+ const params = useParams();
+ const { modalState, showProfile } = useModalState();
+ const { persistStatus } = usePersistStatus();
+
+ const navigateTop = () => {
+ if (persistStatus().loggedIn) {
+ navigate('/');
+ } else {
+ navigate('/hello');
+ }
+ };
+
+ onMount(() => {
+ if (params.id != null) {
+ try {
+ const decoded = nip19.decode(params.id);
+ if (decoded.type === 'npub') {
+ showProfile(decoded.data);
+ }
+ } catch (err) {
+ window.alert('Invalid ID');
+ navigateTop();
+ }
+ } else {
+ navigateTop();
+ }
+ });
+
+ createEffect(() => {
+ if (modalState().type === 'Closed') {
+ navigateTop();
+ }
+ });
+
+ return (
+
- 0}>
-
- 0}>
+
+
+
-
- {(pictureUrl) => (
- 
- )}
-
-
+
+
+ )}
+
+
+
@@ -284,7 +288,7 @@ const ProfileDisplay: Component = (props) => {
- {i18n()('profile.loading')}
+ {i18n()('general.loading')}
@@ -323,105 +327,106 @@ const ProfileDisplay: Component = (props) => {
-
-
-
+
+
+
+ {(pictureUrl) => (
+
+ )}
+
+
+ {i18n()('profile.loading')}
+ {i18n()('general.loading')}
{i18n()('profile.followsYou')}
-
-
- 0}>
-
-
- {profile()?.display_name}
-
- 0}>
-
- 0}>
-
-
- @{profile()?.name}
-
- {nip05Identifier()?.ident}
-
-
-
-
-
-
-
-
-
-
-
- {npub()}
-
- {profile()?.about}
-
-
+
+
+
+ {i18n()('general.loading')}
+ 0}>
+
+
+ {profile()?.display_name}
+
+ 0}>
+
+ 0}>
+
+
+ @{profile()?.name}
+
+ {nip05Identifier()?.ident}
+
+
+
+
+
+
+
+
+
+
+
+ {npub()}
+
+ {profile()?.about}
+
+
+
+
+ 0}>
-
+
+
読み込み中}
+ when={showFollowers()}
+ fallback={
+
+ }
+ keyed
>
- {userFollowingPubkeys().length}
+
-
-
-
-
- フォロワー
-
- フォロワー
-
- setShowFollowers(true)}
- >
- 読み込む
-
- }
- keyed
- >
-
-
- -
-
-
-
-
- - -
- )}
-
-
+
-
+
+
+ + +
+ )}
+
+
+ );
+};
+
+export default Permalink;