Loading...
) : (
- data.map((pleb) => (
+ follows.map((follow) => (
-
-
-
-
- {pleb.displayName || pleb.name}
-
-
- {pleb.nip05 ||
- pleb.npub.substring(0, 16).concat("...")}
-
-
-
+
diff --git a/src/app/root.tsx b/src/app/root.tsx
index 1cfa6b32..53de7eb1 100644
--- a/src/app/root.tsx
+++ b/src/app/root.tsx
@@ -6,6 +6,7 @@ import {
createNote,
getChannels,
getLastLogin,
+ updateLastLogin,
} from "@libs/storage";
import { NDKFilter } from "@nostr-dev-kit/ndk";
import { LoaderIcon, LumeIcon } from "@shared/icons";
@@ -142,6 +143,7 @@ export function Root() {
const chats = await fetchChats();
// const channels = await fetchChannelMessages();
if (chats) {
+ await updateLastLogin(dateToUnix());
navigate("/app/space", { replace: true });
}
}
diff --git a/src/app/space/components/blocks/feed.tsx b/src/app/space/components/blocks/feed.tsx
index 0a623f76..2d835c0f 100644
--- a/src/app/space/components/blocks/feed.tsx
+++ b/src/app/space/components/blocks/feed.tsx
@@ -11,7 +11,6 @@ import { useVirtualizer } from "@tanstack/react-virtual";
import { useEffect, useRef } from "react";
const ITEM_PER_PAGE = 10;
-const TIME = Math.floor(Date.now() / 1000);
export function FeedBlock({ params }: { params: any }) {
const queryClient = useQueryClient();
@@ -21,7 +20,6 @@ export function FeedBlock({ params }: { params: any }) {
queryFn: async ({ pageParam = 0 }) => {
return await getNotesByAuthors(
params.content,
- TIME,
ITEM_PER_PAGE,
pageParam,
);
diff --git a/src/app/space/components/blocks/following.tsx b/src/app/space/components/blocks/following.tsx
index a5e572ee..1e81d4c4 100644
--- a/src/app/space/components/blocks/following.tsx
+++ b/src/app/space/components/blocks/following.tsx
@@ -9,7 +9,6 @@ import { useVirtualizer } from "@tanstack/react-virtual";
import { useEffect, useRef } from "react";
const ITEM_PER_PAGE = 10;
-const TIME = Math.floor(Date.now() / 1000);
export function FollowingBlock({ block }: { block: number }) {
// subscribe for live update
@@ -29,7 +28,7 @@ export function FollowingBlock({ block }: { block: number }) {
}: any = useInfiniteQuery({
queryKey: ["newsfeed-circle"],
queryFn: async ({ pageParam = 0 }) => {
- return await getNotes(TIME, ITEM_PER_PAGE, pageParam);
+ return await getNotes(ITEM_PER_PAGE, pageParam);
},
getNextPageParam: (lastPage) => lastPage.nextCursor,
});
@@ -64,7 +63,7 @@ export function FollowingBlock({ block }: { block: number }) {
const refreshFirstPage = () => {
// refetch
- refetch({ refetchPage: (page, index) => index === 0 });
+ refetch({ refetchPage: (_, index: number) => index === 0 });
// scroll to top
rowVirtualizer.scrollToIndex(1);
// stop notify
diff --git a/src/libs/ndk.tsx b/src/libs/ndk.tsx
index 5bd0b90a..f8862ce1 100644
--- a/src/libs/ndk.tsx
+++ b/src/libs/ndk.tsx
@@ -1,4 +1,3 @@
-import { createReplyNote } from "./storage";
import NDK, {
NDKConstructorParams,
NDKEvent,
@@ -15,21 +14,10 @@ export async function initNDK(relays?: string[]): Promise
{
const opts: NDKConstructorParams = {};
const defaultRelays = new Set(relays || FULL_RELAYS);
- /*
- for (const relay of defaultRelays) {
- const url = new URL(relay);
- url.protocol = url.protocol = url.protocol.replace("wss", "https");
- const res = await fetch(url.href, { method: "HEAD", timeout: 5 });
- if (!res.ok) {
- defaultRelays.delete(relay);
- }
- }
- */
-
opts.explicitRelayUrls = [...defaultRelays];
const ndk = new NDK(opts);
- await ndk.connect();
+ await ndk.connect(500);
return ndk;
}
@@ -57,15 +45,10 @@ export async function prefetchEvents(
}
export function usePublish() {
- const { account } = useAccount();
const ndk = useContext(RelayContext);
+ const { account } = useAccount();
- if (!ndk.signer) {
- const signer = new NDKPrivateKeySigner(account?.privkey);
- ndk.signer = signer;
- }
-
- const publish = ({
+ const publish = async ({
content,
kind,
tags,
@@ -73,8 +56,9 @@ export function usePublish() {
content: string;
kind: NDKKind;
tags: string[][];
- }): NDKEvent => {
+ }): Promise => {
const event = new NDKEvent(ndk);
+ const signer = new NDKPrivateKeySigner(account.privkey);
event.content = content;
event.kind = kind;
@@ -82,7 +66,8 @@ export function usePublish() {
event.pubkey = account.pubkey;
event.tags = tags;
- event.publish();
+ await event.sign(signer);
+ await event.publish();
return event;
};
diff --git a/src/libs/storage.tsx b/src/libs/storage.tsx
index 2d18fd25..2bab3ebc 100644
--- a/src/libs/storage.tsx
+++ b/src/libs/storage.tsx
@@ -1,6 +1,4 @@
-import { NDKTag, NDKUserProfile } from "@nostr-dev-kit/ndk";
import { getParentID } from "@utils/transform";
-import { nip19 } from "nostr-tools";
import Database from "tauri-plugin-sql-api";
let db: null | Database = null;
@@ -73,55 +71,6 @@ export async function updateAccount(
);
}
-// get all plebs
-export async function getPlebs() {
- const db = await connect();
- return await db.select("SELECT * FROM plebs ORDER BY created_at DESC;");
-}
-
-// get pleb by pubkey
-export async function getPleb(npub: string) {
- const db = await connect();
- const result = await db.select(`SELECT * FROM plebs WHERE npub = "${npub}";`);
-
- if (result) {
- return result[0];
- } else {
- return null;
- }
-}
-
-// create pleb
-export async function createPleb(key: string, data: NDKUserProfile) {
- const db = await connect();
- const now = Math.floor(Date.now() / 1000);
- let npub: string;
-
- if (key.substring(0, 4) === "npub") {
- npub = key;
- } else {
- npub = nip19.npubEncode(key);
- }
-
- return await db.execute(
- "INSERT OR REPLACE INTO plebs (npub, name, displayName, image, banner, bio, nip05, lud06, lud16, about, zapService, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);",
- [
- npub,
- data.name,
- data.displayName,
- data.image,
- data.banner,
- data.bio,
- data.nip05,
- data.lud06,
- data.lud16,
- data.about,
- data.zapService,
- now,
- ],
- );
-}
-
// count total notes
export async function countTotalChannels() {
const db = await connect();
@@ -139,14 +88,14 @@ export async function countTotalNotes() {
}
// get all notes
-export async function getNotes(time: number, limit: number, offset: number) {
+export async function getNotes(limit: number, offset: number) {
const db = await connect();
const totalNotes = await countTotalNotes();
const nextCursor = offset + limit;
const notes: any = { data: null, nextCursor: 0 };
const query: any = await db.select(
- `SELECT * FROM notes WHERE created_at <= "${time}" AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`,
+ `SELECT * FROM notes WHERE kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`,
);
notes["data"] = query;
@@ -169,7 +118,6 @@ export async function getNotesByPubkey(pubkey: string) {
// get all notes by authors
export async function getNotesByAuthors(
authors: string,
- time: number,
limit: number,
offset: number,
) {
@@ -181,7 +129,7 @@ export async function getNotesByAuthors(
const notes: any = { data: null, nextCursor: 0 };
const query: any = await db.select(
- `SELECT * FROM notes WHERE created_at <= "${time}" AND pubkey IN (${finalArray}) AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`,
+ `SELECT * FROM notes WHERE pubkey IN (${finalArray}) AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`,
);
notes["data"] = query;
diff --git a/src/shared/composer/types/post.tsx b/src/shared/composer/types/post.tsx
index 039ef952..53af1c96 100644
--- a/src/shared/composer/types/post.tsx
+++ b/src/shared/composer/types/post.tsx
@@ -97,7 +97,7 @@ export function Post() {
const refID = getRef();
- const submit = () => {
+ const submit = async () => {
let tags: string[][] = [];
let kind: number;
@@ -130,7 +130,7 @@ export function Post() {
const serializedContent = serialize(content);
// publish message
- publish({ content: serializedContent, kind, tags });
+ await publish({ content: serializedContent, kind, tags });
// close modal
toggle(false);
diff --git a/src/shared/editProfileModal.tsx b/src/shared/editProfileModal.tsx
index e48e98a3..11b4dc06 100644
--- a/src/shared/editProfileModal.tsx
+++ b/src/shared/editProfileModal.tsx
@@ -1,38 +1,51 @@
import { Dialog, Transition } from "@headlessui/react";
import { usePublish } from "@libs/ndk";
-import { getPleb } from "@libs/storage";
+import { NDKEvent } from "@nostr-dev-kit/ndk";
import { AvatarUploader } from "@shared/avatarUploader";
import { BannerUploader } from "@shared/bannerUploader";
-import { CancelIcon, LoaderIcon } from "@shared/icons";
+import {
+ CancelIcon,
+ CheckCircleIcon,
+ LoaderIcon,
+ UnverifiedIcon,
+} from "@shared/icons";
import { Image } from "@shared/image";
import { DEFAULT_AVATAR } from "@stores/constants";
+import { useQueryClient } from "@tanstack/react-query";
+import { fetch } from "@tauri-apps/api/http";
import { useAccount } from "@utils/hooks/useAccount";
-import { Fragment, useState } from "react";
+import { Fragment, useEffect, useState } from "react";
import { useForm } from "react-hook-form";
export function EditProfileModal() {
+ const queryClient = useQueryClient();
const publish = usePublish();
const [isOpen, setIsOpen] = useState(false);
const [loading, setLoading] = useState(false);
const [picture, setPicture] = useState(DEFAULT_AVATAR);
- const [banner, setBanner] = useState(null);
+ const [banner, setBanner] = useState("");
+ const [nip05, setNIP05] = useState({ verified: false, text: "" });
const { account } = useAccount();
const {
register,
handleSubmit,
reset,
- formState: { isValid },
+ setError,
+ formState: { isValid, errors },
} = useForm({
defaultValues: async () => {
- const res = await getPleb(account.npub);
- if (res.picture) {
+ const res: any = queryClient.getQueryData(["user", account.pubkey]);
+ if (res.image) {
setPicture(res.image);
}
if (res.banner) {
setBanner(res.banner);
}
+ if (res.nip05) {
+ setNIP05((prev) => ({ ...prev, text: res.nip05 }));
+ }
return res;
},
});
@@ -45,24 +58,72 @@ export function EditProfileModal() {
setIsOpen(true);
};
- const onSubmit = (data: any) => {
+ const verifyNIP05 = async (data: string) => {
+ if (data) {
+ const url = data.split("@");
+ const username = url[0];
+ const service = url[1];
+ const verifyURL = `https://${service}/.well-known/nostr.json?name=${username}`;
+
+ const res: any = await fetch(verifyURL, {
+ method: "GET",
+ timeout: 30,
+ headers: {
+ "Content-Type": "application/json; charset=utf-8",
+ },
+ });
+
+ if (!res.ok) return false;
+ if (res.data.names[username] === account.pubkey) {
+ setNIP05((prev) => ({ ...prev, verified: true }));
+ return true;
+ } else {
+ return false;
+ }
+ }
+ };
+
+ const onSubmit = async (data: any) => {
// start loading
setLoading(true);
- // publish
- const event = publish({
- content: JSON.stringify({
- ...data,
- display_name: data.name,
- bio: data.about,
- image: data.picture,
- }),
- kind: 0,
- tags: [],
- });
+ let event: NDKEvent;
- if (event) {
+ const content = {
+ ...data,
+ username: data.name,
+ display_name: data.name,
+ bio: data.about,
+ image: data.picture,
+ };
+
+ if (data.nip05) {
+ const verify = await verifyNIP05(data.nip05);
+ if (verify) {
+ event = await publish({
+ content: JSON.stringify({ ...content, nip05: data.nip05 }),
+ kind: 0,
+ tags: [],
+ });
+ } else {
+ setNIP05((prev) => ({ ...prev, verified: false }));
+ setError("nip05", {
+ type: "manual",
+ message: "Can't verify your Lume ID / NIP-05, please check again",
+ });
+ }
+ } else {
+ event = await publish({
+ content: JSON.stringify(content),
+ kind: 0,
+ tags: [],
+ });
+ }
+
+ if (event.id) {
setTimeout(() => {
+ // invalid cache
+ queryClient.invalidateQueries(["user", account.pubkey]);
// reset form
reset();
// reset state
@@ -71,9 +132,17 @@ export function EditProfileModal() {
setPicture(DEFAULT_AVATAR);
setBanner(null);
}, 1200);
+ } else {
+ setLoading(false);
}
};
+ useEffect(() => {
+ if (!nip05.verified && /\S+@\S+\.\S+/.test(nip05.text)) {
+ verifyNIP05(nip05.text);
+ }
+ }, [nip05.text]);
+
return (
<>