{users.map((user, index) => (
-
+
))}
{profile.display_name || ''}
-
+
@{profile.username || ''}
diff --git a/src/components/contexts/database.tsx b/src/components/contexts/database.tsx
index 4167102e..31b7aaee 100644
--- a/src/components/contexts/database.tsx
+++ b/src/components/contexts/database.tsx
@@ -1,5 +1,5 @@
-import { writeStorage } from '@rehooks/local-storage';
-import { createContext, useEffect, useState } from 'react';
+import { deleteFromStorage, writeStorage } from '@rehooks/local-storage';
+import { createContext, useCallback, useEffect, useState } from 'react';
import Database from 'tauri-plugin-sql-api';
export const DatabaseContext = createContext({});
@@ -9,36 +9,46 @@ const db = typeof window !== 'undefined' ? await Database.load('sqlite:lume.db')
export default function DatabaseProvider({ children }: { children: React.ReactNode }) {
const [done, setDone] = useState(false);
- useEffect(() => {
- const getRelays = async () => {
- const arr = [];
- const result: any[] = await db.select('SELECT relay_url FROM relays WHERE relay_status = "1"');
+ const getRelays = useCallback(async () => {
+ const result: any[] = await db.select('SELECT relay_url FROM relays WHERE relay_status = "1"');
+ const arr = [];
+ result.forEach((item: { relay_url: string }) => {
+ arr.push(item.relay_url);
+ });
+ // delete old item then save new item to local storage
+ deleteFromStorage('relays');
+ writeStorage('relays', arr);
+ // return
+ return;
+ }, []);
- result.forEach((item: { relay_url: string }) => {
- arr.push(item.relay_url);
- });
-
- writeStorage('relays', arr);
- };
-
- const getAccount = async () => {
- const result = await db.select(`SELECT * FROM accounts LIMIT 1`);
+ const getAccount = useCallback(async () => {
+ const result = await db.select(`SELECT * FROM accounts LIMIT 1`);
+ // delete old item then save new item to local storage
+ deleteFromStorage('current-user');
+ if (result[0]) {
writeStorage('current-user', result[0]);
+ } else {
+ writeStorage('current-user', null);
+ }
+ // return first record
+ return result[0];
+ }, []);
- return result[0];
- };
-
- const getFollows = async (id: string) => {
- const arr = [];
- const result: any[] = await db.select(`SELECT pubkey FROM follows WHERE account = "${id}"`);
-
- result.forEach((item: { pubkey: string }) => {
- arr.push(item.pubkey);
- });
-
- writeStorage('follows', arr);
- };
+ const getFollows = useCallback(async (id: string) => {
+ const result: any[] = await db.select(`SELECT pubkey FROM follows WHERE account = "${id}"`);
+ const arr = [];
+ result.forEach((item: { pubkey: string }) => {
+ arr.push(item.pubkey);
+ });
+ // delete old item then save new item to local storage
+ deleteFromStorage('follows');
+ writeStorage('follows', arr);
+ // return
+ return;
+ }, []);
+ useEffect(() => {
getRelays().catch(console.error);
getAccount()
.then((res) => {
@@ -48,9 +58,11 @@ export default function DatabaseProvider({ children }: { children: React.ReactNo
setDone(true);
})
.catch(console.error);
- }, []);
+ }, [getAccount, getFollows, getRelays]);
- if (done === true) {
- return
{children};
+ if (!done) {
+ return <>;
}
+
+ return
{children};
}
diff --git a/src/components/note/atoms/reaction.tsx b/src/components/note/atoms/reaction.tsx
index c7013e8d..c328c64e 100644
--- a/src/components/note/atoms/reaction.tsx
+++ b/src/components/note/atoms/reaction.tsx
@@ -15,7 +15,7 @@ export default function Reaction({ eventID, eventPubkey }: { eventID: string; ev
const [isReact, setIsReact] = useState(false);
const [currentUser]: any = useLocalStorage('current-user');
- const pubkey = currentUser.pubkey;
+ const pubkey = currentUser.id;
const privkey = currentUser.privkey;
/*
diff --git a/src/layouts/user.tsx b/src/layouts/user.tsx
index a488b282..968f5b0c 100644
--- a/src/layouts/user.tsx
+++ b/src/layouts/user.tsx
@@ -24,14 +24,14 @@ export default function UserLayout({ children }: { children: React.ReactNode })