diff --git a/package.json b/package.json index 41e32315..d22befa3 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,6 @@ "@tauri-apps/plugin-clipboard-manager": "github:tauri-apps/tauri-plugin-clipboard-manager#v2", "@tauri-apps/plugin-dialog": "github:tauri-apps/tauri-plugin-dialog#v2", "@tauri-apps/plugin-fs": "github:tauri-apps/tauri-plugin-fs#v2", - "@tauri-apps/plugin-http": "github:tauri-apps/tauri-plugin-http#v2", "@tauri-apps/plugin-notification": "github:tauri-apps/tauri-plugin-notification#v2", "@tauri-apps/plugin-os": "github:tauri-apps/tauri-plugin-os#v2", "@tauri-apps/plugin-process": "github:tauri-apps/tauri-plugin-process#v2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3faabcda..8a3c6c20 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,9 +55,6 @@ dependencies: '@tauri-apps/plugin-fs': specifier: github:tauri-apps/tauri-plugin-fs#v2 version: github.com/tauri-apps/tauri-plugin-fs/c90fd8bcad3be92f34a0642d67ab1a6ad9f73dee - '@tauri-apps/plugin-http': - specifier: github:tauri-apps/tauri-plugin-http#v2 - version: github.com/tauri-apps/tauri-plugin-http/50bc7956907eef54a20255b62ea57ff4c2e8585a '@tauri-apps/plugin-notification': specifier: github:tauri-apps/tauri-plugin-notification#v2 version: github.com/tauri-apps/tauri-plugin-notification/66c0779854575ec7860eadcd98673c39627e81a6 @@ -7159,14 +7156,6 @@ packages: '@tauri-apps/api': 2.0.0-alpha.6 dev: false - github.com/tauri-apps/tauri-plugin-http/50bc7956907eef54a20255b62ea57ff4c2e8585a: - resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-http/tar.gz/50bc7956907eef54a20255b62ea57ff4c2e8585a} - name: '@tauri-apps/plugin-http' - version: 2.0.0-alpha.1 - dependencies: - '@tauri-apps/api': 2.0.0-alpha.6 - dev: false - github.com/tauri-apps/tauri-plugin-notification/66c0779854575ec7860eadcd98673c39627e81a6: resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-notification/tar.gz/66c0779854575ec7860eadcd98673c39627e81a6} name: '@tauri-apps/plugin-notification' diff --git a/src/app/auth/components/user.tsx b/src/app/auth/components/user.tsx index fa580f7f..66175688 100644 --- a/src/app/auth/components/user.tsx +++ b/src/app/auth/components/user.tsx @@ -27,7 +27,7 @@ export function User({ pubkey, fallback }: { pubkey: string; fallback?: string } />
- {user?.name || user?.display_name || user?.nip05} + {user?.name || user?.display_name}
{displayNpub(pubkey, 16)} diff --git a/src/app/auth/components/userRelay.tsx b/src/app/auth/components/userRelay.tsx index 68a61fa0..83bc4b15 100644 --- a/src/app/auth/components/userRelay.tsx +++ b/src/app/auth/components/userRelay.tsx @@ -28,7 +28,7 @@ export function UserRelay({ pubkey }: { pubkey: string }) { className="h-5 w-5 shrink-0 rounded object-cover" /> - {user?.name || user?.display_name || user?.nip05 || displayNpub(pubkey, 16)} + {user?.name || user?.display_name || displayNpub(pubkey, 16)}{user?.bio || user?.about}
diff --git a/src/app/notifications/components/user.tsx b/src/app/notifications/components/user.tsx index 0a52fc50..4400088a 100644 --- a/src/app/notifications/components/user.tsx +++ b/src/app/notifications/components/user.tsx @@ -25,7 +25,7 @@ export function NotiUser({ pubkey }: { pubkey: string }) { className="h-11 w-11 shrink-0 rounded-lg object-cover" /> - {user?.nip05 || user?.name || user?.display_name || displayNpub(pubkey, 16)} + {user?.name || user?.display_name || displayNpub(pubkey, 16)}- {user?.name || user?.display_name || user?.nip05} + {user?.name || user?.display_name}
{displayNpub(db.account.pubkey, 16)} diff --git a/src/shared/composer/user.tsx b/src/shared/composer/user.tsx index 2dccbfed..772a8714 100644 --- a/src/shared/composer/user.tsx +++ b/src/shared/composer/user.tsx @@ -1,6 +1,7 @@ import { Image } from '@shared/image'; import { useProfile } from '@utils/hooks/useProfile'; +import { displayNpub } from '@utils/shortenKey'; export function ComposerUser({ pubkey }: { pubkey: string }) { const { user } = useProfile(pubkey); @@ -13,9 +14,7 @@ export function ComposerUser({ pubkey }: { pubkey: string }) { className="h-10 w-10 shrink-0 rounded-lg" />{nip05}
+Reply as
- {user?.nip05 || user?.name || displayNpub(pubkey, 16)} + {user?.name || displayNpub(pubkey, 16)}
diff --git a/src/shared/userProfile.tsx b/src/shared/userProfile.tsx index bd304540..7212bba0 100644 --- a/src/shared/userProfile.tsx +++ b/src/shared/userProfile.tsx @@ -6,6 +6,7 @@ import { UserStats } from '@app/users/components/stats'; import { useStorage } from '@libs/storage/provider'; import { Image } from '@shared/image'; +import { NIP05 } from '@shared/nip05'; import { useNostr } from '@utils/hooks/useNostr'; import { useProfile } from '@utils/hooks/useProfile'; @@ -58,9 +59,17 @@ export function UserProfile({ pubkey }: { pubkey: string }) {