mirror of
https://github.com/luminous-devs/lume.git
synced 2024-10-02 18:00:47 +00:00
update
This commit is contained in:
parent
8439428ce1
commit
2bfa1db816
@ -1,7 +1,7 @@
|
|||||||
import { useQuery, useQueryClient } from '@tanstack/react-query';
|
import { useQuery, useQueryClient } from '@tanstack/react-query';
|
||||||
import { message } from '@tauri-apps/plugin-dialog';
|
|
||||||
import { normalizeRelayUrl } from 'nostr-fetch';
|
import { normalizeRelayUrl } from 'nostr-fetch';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
|
import { toast } from 'sonner';
|
||||||
import { VList } from 'virtua';
|
import { VList } from 'virtua';
|
||||||
|
|
||||||
import { useStorage } from '@libs/storage/provider';
|
import { useStorage } from '@libs/storage/provider';
|
||||||
@ -37,10 +37,14 @@ export function RelayList() {
|
|||||||
const url = normalizeRelayUrl(relayUrl);
|
const url = normalizeRelayUrl(relayUrl);
|
||||||
const res = await db.createRelay(url);
|
const res = await db.createRelay(url);
|
||||||
|
|
||||||
if (!res) await message("You're aldready connected to this relay");
|
if (res) {
|
||||||
|
toast.info('Connected. You need to restart app to take effect');
|
||||||
queryClient.invalidateQueries({
|
queryClient.invalidateQueries({
|
||||||
queryKey: ['user-relay'],
|
queryKey: ['user-relay'],
|
||||||
});
|
});
|
||||||
|
} else {
|
||||||
|
toast.warning("You're aldready connected to this relay");
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
@ -26,44 +26,48 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
|
|||||||
const svgURI =
|
const svgURI =
|
||||||
'data:image/svg+xml;utf8,' + encodeURIComponent(minidenticon(pubkey, 90, 50));
|
'data:image/svg+xml;utf8,' + encodeURIComponent(minidenticon(pubkey, 90, 50));
|
||||||
|
|
||||||
const follow = async (pubkey: string) => {
|
const follow = async () => {
|
||||||
try {
|
try {
|
||||||
|
if (!ndk.signer) return navigate('/new/privkey');
|
||||||
|
setFollowed(true);
|
||||||
|
|
||||||
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
||||||
const contacts = await user.follows();
|
const contacts = await user.follows();
|
||||||
const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
|
const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
|
||||||
|
|
||||||
if (add) {
|
if (!add) {
|
||||||
setFollowed(true);
|
toast.success('You already follow this user');
|
||||||
} else {
|
setFollowed(false);
|
||||||
toast('You already follow this user');
|
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (e) {
|
||||||
console.log(error);
|
toast.error(e);
|
||||||
|
setFollowed(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const unfollow = async (pubkey: string) => {
|
const unfollow = async () => {
|
||||||
try {
|
try {
|
||||||
if (!ndk.signer) return navigate('/new/privkey');
|
if (!ndk.signer) return navigate('/new/privkey');
|
||||||
|
setFollowed(false);
|
||||||
|
|
||||||
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
||||||
const contacts = await user.follows();
|
const contacts = await user.follows();
|
||||||
contacts.delete(new NDKUser({ pubkey: pubkey }));
|
contacts.delete(new NDKUser({ pubkey: pubkey }));
|
||||||
|
|
||||||
let list: string[][];
|
const list = [...contacts].map((item) => [
|
||||||
contacts.forEach((el) => list.push(['p', el.pubkey, el.relayUrls?.[0] || '', '']));
|
'p',
|
||||||
|
item.pubkey,
|
||||||
|
item.relayUrls?.[0] || '',
|
||||||
|
'',
|
||||||
|
]);
|
||||||
const event = new NDKEvent(ndk);
|
const event = new NDKEvent(ndk);
|
||||||
event.content = '';
|
event.content = '';
|
||||||
event.kind = NDKKind.Contacts;
|
event.kind = NDKKind.Contacts;
|
||||||
event.tags = list;
|
event.tags = list;
|
||||||
|
|
||||||
const publishedRelays = await event.publish();
|
await event.publish();
|
||||||
if (publishedRelays) {
|
} catch (e) {
|
||||||
setFollowed(false);
|
toast.error(e);
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -139,23 +143,23 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
|
|||||||
{followed ? (
|
{followed ? (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => unfollow(pubkey)}
|
onClick={unfollow}
|
||||||
className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
|
className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-500 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
|
||||||
>
|
>
|
||||||
Unfollow
|
Unfollow
|
||||||
</button>
|
</button>
|
||||||
) : (
|
) : (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => follow(pubkey)}
|
onClick={follow}
|
||||||
className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
|
className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-500 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
|
||||||
>
|
>
|
||||||
Follow
|
Follow
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
<Link
|
<Link
|
||||||
to={`/chats/${pubkey}`}
|
to={`/chats/${pubkey}`}
|
||||||
className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
|
className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-neutral-200 text-sm font-medium text-neutral-900 backdrop-blur-xl hover:bg-blue-500 hover:text-neutral-100 dark:bg-neutral-800 dark:text-neutral-100 dark:hover:bg-blue-600 dark:hover:text-neutral-100"
|
||||||
>
|
>
|
||||||
Message
|
Message
|
||||||
</Link>
|
</Link>
|
||||||
|
@ -1,7 +1,8 @@
|
|||||||
import NDK, { NDKNip46Signer, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
|
import NDK, { NDKNip46Signer, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
|
||||||
import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
|
import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
|
||||||
import { message } from '@tauri-apps/plugin-dialog';
|
import { ask } from '@tauri-apps/plugin-dialog';
|
||||||
import { fetch } from '@tauri-apps/plugin-http';
|
import { fetch } from '@tauri-apps/plugin-http';
|
||||||
|
import { relaunch } from '@tauri-apps/plugin-process';
|
||||||
import { NostrFetcher } from 'nostr-fetch';
|
import { NostrFetcher } from 'nostr-fetch';
|
||||||
import { useEffect, useMemo, useState } from 'react';
|
import { useEffect, useMemo, useState } from 'react';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
@ -78,6 +79,7 @@ export const NDKInstance = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function initNDK() {
|
async function initNDK() {
|
||||||
|
try {
|
||||||
const outboxSetting = await db.getSettingValue('outbox');
|
const outboxSetting = await db.getSettingValue('outbox');
|
||||||
const bunkerSetting = await db.getSettingValue('nsecbunker');
|
const bunkerSetting = await db.getSettingValue('nsecbunker');
|
||||||
const signer = await getSigner(!!parseInt(bunkerSetting));
|
const signer = await getSigner(!!parseInt(bunkerSetting));
|
||||||
@ -93,35 +95,41 @@ export const NDKInstance = () => {
|
|||||||
});
|
});
|
||||||
instance.signer = signer;
|
instance.signer = signer;
|
||||||
|
|
||||||
try {
|
|
||||||
// connect
|
// connect
|
||||||
await instance.connect(2000);
|
await instance.connect();
|
||||||
|
|
||||||
// update account's metadata
|
// update account's metadata
|
||||||
if (db.account) {
|
if (db.account) {
|
||||||
const user = instance.getUser({ pubkey: db.account.pubkey });
|
const user = instance.getUser({ pubkey: db.account.pubkey });
|
||||||
|
if (user) {
|
||||||
const follows = [...(await user.follows())].map((user) => user.pubkey);
|
const follows = [...(await user.follows())].map((user) => user.pubkey);
|
||||||
const relayList = await user.relayList();
|
const relayList = await user.relayList();
|
||||||
|
|
||||||
// update user's follows
|
// update user's follows
|
||||||
await db.updateAccount('follows', JSON.stringify(follows));
|
await db.updateAccount('follows', JSON.stringify(follows));
|
||||||
|
|
||||||
// update user's relay list
|
if (relayList)
|
||||||
if (relayList) {
|
// update user's relays
|
||||||
for (const relay of relayList.relays) {
|
for (const relay of relayList.relays) {
|
||||||
await db.createRelay(relay);
|
await db.createRelay(relay);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (error) {
|
|
||||||
await message(`NDK instance init failed: ${error}`, {
|
|
||||||
title: 'Lume',
|
|
||||||
type: 'error',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
setNDK(instance);
|
setNDK(instance);
|
||||||
setRelayUrls(explicitRelayUrls);
|
setRelayUrls(explicitRelayUrls);
|
||||||
|
} catch (e) {
|
||||||
|
const yes = await ask(
|
||||||
|
`Something wrong, Lume is not working as expected, do you want to relaunch app?`,
|
||||||
|
{
|
||||||
|
title: 'Lume',
|
||||||
|
type: 'error',
|
||||||
|
okLabel: 'Yes',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
if (yes) relaunch();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
@ -438,7 +438,7 @@ export class LumeStorage {
|
|||||||
[relay, this.account.id]
|
[relay, this.account.id]
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!existRelays.length) return;
|
if (existRelays.length) return;
|
||||||
|
|
||||||
return await this.db.execute(
|
return await this.db.execute(
|
||||||
'INSERT OR IGNORE INTO relays (account_id, relay, purpose) VALUES ($1, $2, $3);',
|
'INSERT OR IGNORE INTO relays (account_id, relay, purpose) VALUES ($1, $2, $3);',
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
|
import { NDKUser } from '@nostr-dev-kit/ndk';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import { toast } from 'sonner';
|
import { toast } from 'sonner';
|
||||||
@ -6,7 +6,7 @@ import { toast } from 'sonner';
|
|||||||
import { useNDK } from '@libs/ndk/provider';
|
import { useNDK } from '@libs/ndk/provider';
|
||||||
import { useStorage } from '@libs/storage/provider';
|
import { useStorage } from '@libs/storage/provider';
|
||||||
|
|
||||||
import { FollowIcon, UnfollowIcon } from '@shared/icons';
|
import { FollowIcon } from '@shared/icons';
|
||||||
|
|
||||||
import { shortenKey } from '@utils/shortenKey';
|
import { shortenKey } from '@utils/shortenKey';
|
||||||
|
|
||||||
@ -16,53 +16,30 @@ export interface Profile {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function NostrBandUserProfile({ data }: { data: Profile }) {
|
export function NostrBandUserProfile({ data }: { data: Profile }) {
|
||||||
const embedProfile = data.profile ? JSON.parse(data.profile.content) : null;
|
|
||||||
const profile = embedProfile;
|
|
||||||
|
|
||||||
const { db } = useStorage();
|
const { db } = useStorage();
|
||||||
const { ndk } = useNDK();
|
const { ndk } = useNDK();
|
||||||
|
|
||||||
const [followed, setFollowed] = useState(false);
|
const [followed, setFollowed] = useState(false);
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
|
const profile = data.profile ? JSON.parse(data.profile.content) : null;
|
||||||
|
|
||||||
const follow = async (pubkey: string) => {
|
const follow = async (pubkey: string) => {
|
||||||
try {
|
try {
|
||||||
|
if (!ndk.signer) return navigate('/new/privkey');
|
||||||
|
setFollowed(true);
|
||||||
|
|
||||||
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
||||||
const contacts = await user.follows();
|
const contacts = await user.follows();
|
||||||
const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
|
const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
|
||||||
|
|
||||||
if (add) {
|
if (!add) {
|
||||||
setFollowed(true);
|
toast.success('You already follow this user');
|
||||||
} else {
|
|
||||||
toast('You already follow this user');
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.log(error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const unfollow = async (pubkey: string) => {
|
|
||||||
try {
|
|
||||||
if (!ndk.signer) return navigate('/new/privkey');
|
|
||||||
|
|
||||||
const user = ndk.getUser({ pubkey: db.account.pubkey });
|
|
||||||
const contacts = await user.follows();
|
|
||||||
contacts.delete(new NDKUser({ pubkey: pubkey }));
|
|
||||||
|
|
||||||
let list: string[][];
|
|
||||||
contacts.forEach((el) => list.push(['p', el.pubkey, el.relayUrls?.[0] || '', '']));
|
|
||||||
|
|
||||||
const event = new NDKEvent(ndk);
|
|
||||||
event.content = '';
|
|
||||||
event.kind = NDKKind.Contacts;
|
|
||||||
event.tags = list;
|
|
||||||
|
|
||||||
const publishedRelays = await event.publish();
|
|
||||||
if (publishedRelays) {
|
|
||||||
setFollowed(false);
|
setFollowed(false);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (e) {
|
||||||
console.log(error);
|
toast.error(e);
|
||||||
|
setFollowed(false);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -100,15 +77,7 @@ export function NostrBandUserProfile({ data }: { data: Profile }) {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="inline-flex items-center gap-2">
|
<div className="inline-flex items-center gap-2">
|
||||||
{followed ? (
|
{!followed ? (
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
onClick={() => unfollow(data.pubkey)}
|
|
||||||
className="inline-flex h-8 w-8 items-center justify-center rounded-md bg-neutral-200 text-neutral-900 backdrop-blur-xl hover:bg-blue-600 hover:text-white dark:bg-neutral-800 dark:text-neutral-100 dark:hover:text-white"
|
|
||||||
>
|
|
||||||
<UnfollowIcon className="h-4 w-4" />
|
|
||||||
</button>
|
|
||||||
) : (
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => follow(data.pubkey)}
|
onClick={() => follow(data.pubkey)}
|
||||||
@ -116,7 +85,7 @@ export function NostrBandUserProfile({ data }: { data: Profile }) {
|
|||||||
>
|
>
|
||||||
<FollowIcon className="h-4 w-4" />
|
<FollowIcon className="h-4 w-4" />
|
||||||
</button>
|
</button>
|
||||||
)}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 line-clamp-5 whitespace-pre-line break-all text-neutral-900 dark:text-neutral-100">
|
<div className="mt-2 line-clamp-5 whitespace-pre-line break-all text-neutral-900 dark:text-neutral-100">
|
||||||
|
Loading…
Reference in New Issue
Block a user