diff --git a/src/shared/composer/mention/suggestion.tsx b/src/shared/composer/mention/suggestion.tsx
new file mode 100644
index 00000000..1d55ccb7
--- /dev/null
+++ b/src/shared/composer/mention/suggestion.tsx
@@ -0,0 +1,68 @@
+import { ReactRenderer } from '@tiptap/react';
+import tippy from 'tippy.js';
+
+import { MentionInlineList } from '@shared/composer';
+
+export const Suggestion = {
+ items: async ({ query }) => {
+ const users = [];
+ return users
+ .filter((item) => item.ident.toLowerCase().startsWith(query.toLowerCase()))
+ .slice(0, 5);
+ },
+
+ render: () => {
+ let component;
+ let popup;
+
+ return {
+ onStart: (props) => {
+ component = new ReactRenderer(MentionInlineList, {
+ props,
+ editor: props.editor,
+ });
+
+ if (!props.clientRect) {
+ return;
+ }
+
+ popup = tippy('body', {
+ getReferenceClientRect: props.clientRect,
+ appendTo: () => document.body,
+ content: component.element,
+ showOnCreate: true,
+ interactive: true,
+ trigger: 'manual',
+ placement: 'bottom-start',
+ });
+ },
+
+ onUpdate(props) {
+ component.updateProps(props);
+
+ if (!props.clientRect) {
+ return;
+ }
+
+ popup[0].setProps({
+ getReferenceClientRect: props.clientRect,
+ });
+ },
+
+ onKeyDown(props) {
+ if (props.event.key === 'Escape') {
+ popup[0].hide();
+
+ return true;
+ }
+
+ return component.ref?.onKeyDown(props);
+ },
+
+ onExit() {
+ popup[0].destroy();
+ component.destroy();
+ },
+ };
+ },
+};
diff --git a/src/shared/composer/user.tsx b/src/shared/composer/user.tsx
index 772a8714..83c37597 100644
--- a/src/shared/composer/user.tsx
+++ b/src/shared/composer/user.tsx
@@ -14,7 +14,7 @@ export function ComposerUser({ pubkey }: { pubkey: string }) {
className="h-10 w-10 shrink-0 rounded-lg"
/>
- {user?.name || user?.display_name || displayNpub(pubkey, 16)}
+ {user?.name || user?.display_name || user?.displayName || displayNpub(pubkey, 16)}
);
diff --git a/src/shared/notes/actions/zap.tsx b/src/shared/notes/actions/zap.tsx
index ebaabe9e..c4c219b7 100644
--- a/src/shared/notes/actions/zap.tsx
+++ b/src/shared/notes/actions/zap.tsx
@@ -60,7 +60,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
if (send) {
await sendNativeNotification(
`You've tipped ${compactNumber.format(send.amount)} sats to ${
- user?.display_name || user?.name
+ user?.name || user?.display_name || user?.displayName
}`
);
@@ -106,7 +106,7 @@ export function NoteZap({ id, pubkey }: { id: string; pubkey: string }) {
- Send tip to {user?.display_name || user?.name}
+ Send tip to {user?.name || user?.display_name || user?.displayName}
diff --git a/src/shared/notes/mentions/user.tsx b/src/shared/notes/mentions/user.tsx
index 028b35c3..f24e84e2 100644
--- a/src/shared/notes/mentions/user.tsx
+++ b/src/shared/notes/mentions/user.tsx
@@ -18,20 +18,24 @@ export function MentionUser({ pubkey }: { pubkey: string }) {
onClick={() =>
setWidget(db, {
kind: WidgetKinds.local.user,
- title: user?.name || user?.display_name,
+ title: user?.name || user?.display_name || user?.displayName,
content: pubkey,
})
}
onKeyDown={() =>
setWidget(db, {
kind: WidgetKinds.local.user,
- title: user?.name || user?.display_name,
+ title: user?.name || user?.display_name || user?.displayName,
content: pubkey,
})
}
className="break-words text-fuchsia-400 hover:text-fuchsia-500"
>
- {user?.name || user?.display_name || user?.username || displayNpub(pubkey, 16)}
+ {user?.name ||
+ user?.display_name ||
+ user?.displayName ||
+ user?.username ||
+ displayNpub(pubkey, 16)}
);
}
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 98f727d7..e4d91fb2 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -1,4 +1,4 @@
-import * as Popover from '@radix-ui/react-popover';
+import * as HoverCard from '@radix-ui/react-hover-card';
import { memo } from 'react';
import ReactMarkdown from 'react-markdown';
import { Link } from 'react-router-dom';
@@ -70,7 +70,10 @@ export const User = memo(function User({
- {user?.display_name || user?.name || displayNpub(pubkey, 16)}
+ {user?.name ||
+ user?.display_name ||
+ user?.displayName ||
+ displayNpub(pubkey, 16)}
·
{createdAt}
@@ -90,7 +93,7 @@ export const User = memo(function User({
- {user?.name || user?.display_name}
+ {user?.name || user?.display_name || user?.displayName}
- {user.website}
+ {user?.website}
) : null}
@@ -129,7 +132,7 @@ export const User = memo(function User({
/>
- {user?.name || user?.display_name}
+ {user?.name || user?.display_name || user?.displayName}
{user?.nip05 || user?.username || displayNpub(pubkey, 16)}
@@ -163,7 +166,10 @@ export const User = memo(function User({
/>
- {user?.display_name || user?.name || displayNpub(pubkey, 16)}
+ {user?.name ||
+ user?.display_name ||
+ user?.displayName ||
+ displayNpub(pubkey, 16)}
reposted
@@ -182,7 +188,7 @@ export const User = memo(function User({
/>
- {user?.display_name || user?.name}
+ {user?.name || user?.display_name || user?.displayName}
{createdAt}
@@ -195,9 +201,9 @@ export const User = memo(function User({
}
return (
-
+
-
+
-
+
- {user?.display_name || user?.name || displayNpub(pubkey, 16)}
+ {user?.name ||
+ user?.display_name ||
+ user?.displayName ||
+ displayNpub(pubkey, 16)}
·
{createdAt}
@@ -231,12 +240,15 @@ export const User = memo(function User({
- {user?.display_name || user?.name || user?.username}
+ {user?.name ||
+ user?.display_name ||
+ user?.displayName ||
+ user?.username}
- {user.nip05 ? (
+ {user?.nip05 ? (
) : (
@@ -266,8 +278,8 @@ export const User = memo(function User({
Message
-
-
-
+
+
+
);
});
diff --git a/src/stores/sidebar.ts b/src/stores/sidebar.ts
index 0bfeb0b0..58ed7056 100644
--- a/src/stores/sidebar.ts
+++ b/src/stores/sidebar.ts
@@ -14,7 +14,7 @@ export const useSidebar = create
()(
persist(
(set) => ({
feeds: true,
- chats: true,
+ chats: false,
integrations: true,
toggleFeeds: () => set((state) => ({ feeds: !state.feeds })),
toggleChats: () => set((state) => ({ chats: !state.chats })),
diff --git a/src/utils/hooks/useNostr.ts b/src/utils/hooks/useNostr.ts
index 1d09fc09..53ead8a2 100644
--- a/src/utils/hooks/useNostr.ts
+++ b/src/utils/hooks/useNostr.ts
@@ -36,10 +36,17 @@ export function useNostr() {
[]
);
- const sub = async (filter: NDKFilter, callback: (event: NDKEvent) => void) => {
+ const sub = async (
+ filter: NDKFilter,
+ callback: (event: NDKEvent) => void,
+ groupable?: boolean
+ ) => {
if (!ndk) throw new Error('NDK instance not found');
- const subEvent = ndk.subscribe(filter, { closeOnEose: false });
+ const subEvent = ndk.subscribe(filter, {
+ closeOnEose: false,
+ groupable: groupable ?? true,
+ });
subManager.set(JSON.stringify(filter), subEvent);
subEvent.addListener('event', (event: NDKEvent) => {
diff --git a/src/utils/hooks/useProfile.ts b/src/utils/hooks/useProfile.ts
index 4677bc59..6306c51a 100644
--- a/src/utils/hooks/useProfile.ts
+++ b/src/utils/hooks/useProfile.ts
@@ -1,4 +1,4 @@
-import { NDKKind, NDKUserProfile } from '@nostr-dev-kit/ndk';
+import { NDKUserProfile } from '@nostr-dev-kit/ndk';
import { useQuery } from '@tanstack/react-query';
import { useNDK } from '@libs/ndk/provider';
@@ -14,30 +14,20 @@ export function useProfile(pubkey: string, embed?: string) {
} = useQuery(
['user', pubkey],
async () => {
- if (!embed) {
- const cleanPubkey = pubkey.replace('-', '');
- const dbEvent = await db.getMetadataByPubkey(cleanPubkey);
- if (dbEvent) {
- return JSON.parse(dbEvent.content) as NDKUserProfile;
- }
-
- const events = await ndk.fetchEvents(
- {
- kinds: [NDKKind.Metadata],
- authors: [cleanPubkey],
- limit: 100,
- },
- { closeOnEose: true }
- );
- if (!events) throw new Error(`User not found: ${pubkey}`);
- const latestEvent = [...events].sort((a, b) => b.created_at - a.created_at)[0];
- await db.createMetadata(latestEvent);
-
- return JSON.parse(latestEvent.content) as NDKUserProfile;
- } else {
+ if (embed) {
const profile: NDKUserProfile = JSON.parse(embed);
return profile;
}
+
+ const cleanPubkey = pubkey.replace('-', '');
+ const user = ndk.getUser({ hexpubkey: cleanPubkey });
+
+ const profile = await user.fetchProfile({ closeOnEose: true });
+ if (!user.profile) return Promise.reject(new Error('profile not found'));
+
+ await db.createProfile(cleanPubkey, profile);
+
+ return user.profile;
},
{
enabled: !!ndk,