+
+ );
+ }
+
+ return (
+
+
+
+
+ );
+}
diff --git a/src/shared/titleBar.tsx b/src/shared/titleBar.tsx
index b15838f3..fe3fbb92 100644
--- a/src/shared/titleBar.tsx
+++ b/src/shared/titleBar.tsx
@@ -26,7 +26,7 @@ export function TitleBar({ id, title }: { id?: string; title?: string }) {
) : null}
) : (
-
+
+
+
+
+ {createdAt}
+
+ + {renderText(kind)} +
+
+
+
+
+
+
+
+
+ {renderKind(data)}
+
+
+
{title}
)}
diff --git a/src/shared/user.tsx b/src/shared/user.tsx
index 98cf7a13..da963d08 100644
--- a/src/shared/user.tsx
+++ b/src/shared/user.tsx
@@ -28,6 +28,7 @@ export const User = memo(function User({
| 'default'
| 'simple'
| 'mention'
+ | 'notify'
| 'repost'
| 'chat'
| 'large'
@@ -51,7 +52,7 @@ export const User = memo(function User({
);
}
- if (variant === 'mention') {
+ if (variant === 'mention' || variant === 'notify') {
return (
@@ -86,7 +87,7 @@ export const User = memo(function User({
@@ -104,6 +105,36 @@ export const User = memo(function User({
);
}
+ if (variant === 'notify') {
+ return (
+
+
+
+
+
+
+
+ {user?.name ||
+ user?.display_name ||
+ user?.displayName ||
+ displayNpub(pubkey, 16)}
+
+
+ );
+ }
+
if (variant === 'large') {
return (
diff --git a/src/shared/widgets/index.ts b/src/shared/widgets/index.ts
index 3dd176af..0402c585 100644
--- a/src/shared/widgets/index.ts
+++ b/src/shared/widgets/index.ts
@@ -6,6 +6,7 @@ export * from './local/thread';
export * from './local/files';
export * from './local/articles';
export * from './local/follows';
+export * from './local/notification';
export * from './global/articles';
export * from './global/files';
export * from './global/hashtag';
diff --git a/src/shared/widgets/local/notification.tsx b/src/shared/widgets/local/notification.tsx
new file mode 100644
index 00000000..842cab39
--- /dev/null
+++ b/src/shared/widgets/local/notification.tsx
@@ -0,0 +1,81 @@
+import { NDKEvent } from '@nostr-dev-kit/ndk';
+import { useCallback, useEffect } from 'react';
+import { VList } from 'virtua';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { LoaderIcon } from '@shared/icons';
+import { NotifyNote } from '@shared/notification/notifyNote';
+import { TitleBar } from '@shared/titleBar';
+import { WidgetWrapper } from '@shared/widgets';
+
+import { useActivities } from '@stores/activities';
+
+import { useNostr } from '@utils/hooks/useNostr';
+import { Widget } from '@utils/types';
+
+export function LocalNotificationWidget({ params }: { params: Widget }) {
+ const { db } = useStorage();
+ const { getAllActivities } = useNostr();
+
+ const [activities, setActivities] = useActivities((state) => [
+ state.activities,
+ state.setActivities,
+ ]);
+
+ const renderEvent = useCallback(
+ (event: NDKEvent) => {
+ const rootEventId = event.tags.find((el) => el[0] === 'e')?.[1];
+ if (!rootEventId) return null;
+ if (event.pubkey === db.account.pubkey) return null;
+ return (
+
+
+ Loading...
+
+
+
+ ) : activities.length < 1 ? (
+
+ 🎉
+
+ Hmm! Nothing new yet.
+
+
+ ) : (
+
+ {activities.map((event) => renderEvent(event))}
+
+ )}
+
+
+ );
+}
diff --git a/src/stores/activities.ts b/src/stores/activities.ts
index 21a1b0f7..1087dd82 100644
--- a/src/stores/activities.ts
+++ b/src/stores/activities.ts
@@ -3,29 +3,20 @@ import { create } from 'zustand';
interface ActivitiesState {
activities: Array;
- totalNewActivities: number;
- setActivities: (events: NDKEvent[], lastLogin: number) => void;
+ setActivities: (events: NDKEvent[]) => void;
addActivity: (event: NDKEvent) => void;
- clearTotalNewActivities: () => void;
}
export const useActivities = create((set) => ({
activities: null,
- totalNewActivities: 0,
- setActivities: (events: NDKEvent[], lastLogin: number) => {
- const totalLatest = events.filter((ev) => ev.created_at > lastLogin)?.length ?? 0;
+ setActivities: (events: NDKEvent[]) => {
set(() => ({
activities: events,
- totalNewActivities: totalLatest,
}));
},
addActivity: (event: NDKEvent) => {
set((state) => ({
activities: state.activities ? [event, ...state.activities] : [event],
- totalNewActivities: state.totalNewActivities++,
}));
},
- clearTotalNewActivities: () => {
- set(() => ({ totalNewActivities: 0 }));
- },
}));
diff --git a/src/stores/widgets.ts b/src/stores/widgets.ts
index 68fe3562..1b6f3adb 100644
--- a/src/stores/widgets.ts
+++ b/src/stores/widgets.ts
@@ -24,6 +24,7 @@ export const WidgetKinds = {
user: 104,
thread: 105,
follows: 106,
+ notification: 107,
},
global: {
feeds: 1000,
@@ -109,6 +110,11 @@ export const DefaultWidgets: Array = [
{
title: 'Other',
data: [
+ {
+ kind: WidgetKinds.local.notification,
+ title: 'Notification',
+ description: 'Everything happens around you',
+ },
{
kind: WidgetKinds.other.learnNostr,
title: 'Learn Nostr',
@@ -125,9 +131,14 @@ export const useWidgets = create()(
isFetched: false,
fetchWidgets: async (db: LumeStorage) => {
const dbWidgets = await db.getWidgets();
- console.log('db widgets: ', dbWidgets);
- // default: add network widget
+ dbWidgets.unshift({
+ id: '9998',
+ title: 'Notification',
+ content: '',
+ kind: WidgetKinds.local.notification,
+ });
+
dbWidgets.unshift({
id: '9999',
title: '',
diff --git a/src/utils/createBlobFromFile.ts b/src/utils/createBlobFromFile.ts
deleted file mode 100644
index 0825c099..00000000
--- a/src/utils/createBlobFromFile.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { readBinaryFile } from '@tauri-apps/plugin-fs';
-
-export async function createBlobFromFile(path: string): Promise {
- const file = await readBinaryFile(path);
- const blob = new Blob([file]);
- const arr = new Uint8Array(await blob.arrayBuffer());
- return arr;
-}
diff --git a/src/utils/hooks/useNostr.ts b/src/utils/hooks/useNostr.ts
index 5af41258..706ba5a6 100644
--- a/src/utils/hooks/useNostr.ts
+++ b/src/utils/hooks/useNostr.ts
@@ -1,6 +1,4 @@
import { NDKEvent, NDKFilter, NDKKind, NDKSubscription } from '@nostr-dev-kit/ndk';
-import { message, open } from '@tauri-apps/plugin-dialog';
-import { fetch } from '@tauri-apps/plugin-http';
import { LRUCache } from 'lru-cache';
import { NostrEventExt } from 'nostr-fetch';
import { useMemo } from 'react';
@@ -10,7 +8,7 @@ import { useStorage } from '@libs/storage/provider';
import { nHoursAgo } from '@utils/date';
import { getMultipleRandom } from '@utils/transform';
-import { NDKEventWithReplies, NostrBuildResponse } from '@utils/types';
+import { NDKEventWithReplies } from '@utils/types';
export function useNostr() {
const { db } = useStorage();
@@ -53,9 +51,6 @@ export function useNostr() {
list.forEach((item) => {
tags.push(['p', item]);
});
-
- // publish event
- publish({ content: '', kind: NDKKind.Contacts, tags: tags });
};
const removeContact = async (pubkey: string) => {
@@ -66,30 +61,17 @@ export function useNostr() {
list.forEach((item) => {
tags.push(['p', item]);
});
-
- // publish event
- publish({ content: '', kind: NDKKind.Contacts, tags: tags });
};
- const fetchActivities = async () => {
+ const getAllActivities = async (limit?: number) => {
try {
- const events = await fetcher.fetchAllEvents(
- relayUrls,
- {
- kinds: [
- NDKKind.Text,
- NDKKind.Contacts,
- NDKKind.Repost,
- NDKKind.Reaction,
- NDKKind.Zap,
- ],
- '#p': [db.account.pubkey],
- },
- { since: nHoursAgo(24) },
- { sort: true }
- );
+ const events = await ndk.fetchEvents({
+ kinds: [NDKKind.Text, NDKKind.Repost, NDKKind.Reaction, NDKKind.Zap],
+ '#p': [db.account.pubkey],
+ limit: limit ?? 100,
+ });
- return events as unknown as NDKEvent[];
+ return [...events];
} catch (e) {
console.error('Error fetching activities', e);
}
@@ -289,28 +271,6 @@ export function useNostr() {
return relayMap;
};
- const publish = async ({
- content,
- kind,
- tags,
- }: {
- content: string;
- kind: NDKKind | number;
- tags: string[][];
- }): Promise => {
- const event = new NDKEvent(ndk);
- event.content = content;
- event.kind = kind;
- event.created_at = Math.floor(Date.now() / 1000);
- event.pubkey = db.account.pubkey;
- event.tags = tags;
-
- await event.sign();
- await event.publish();
-
- return event;
- };
-
const createZap = async (event: NDKEvent, amount: number, message?: string) => {
// @ts-expect-error, NostrEvent to NDKEvent
const ndkEvent = new NDKEvent(ndk, event);
@@ -319,87 +279,6 @@ export function useNostr() {
return res;
};
- const upload = async (file: null | string, nip94?: boolean) => {
- try {
- let filepath = file;
-
- if (!file) {
- const selected = await open({
- multiple: false,
- filters: [
- {
- name: 'Media',
- extensions: [
- 'png',
- 'jpeg',
- 'jpg',
- 'gif',
- 'mp4',
- 'mp3',
- 'webm',
- 'mkv',
- 'avi',
- 'mov',
- ],
- },
- ],
- });
- if (Array.isArray(selected)) {
- // user selected multiple files
- } else if (selected === null) {
- return {
- url: null,
- error: 'Cancelled',
- };
- } else {
- filepath = selected.path;
- }
- }
-
- const formData = new FormData();
- formData.append('file', filepath);
-
- const res: NostrBuildResponse = await fetch(
- 'https://nostr.build/api/v2/upload/files',
- {
- method: 'POST',
- headers: { 'Content-Type': 'multipart/form-data' },
- body: formData,
- }
- );
-
- if (res.ok) {
- const data = res.data.data[0];
- const url = data.url;
-
- if (nip94) {
- const tags = [
- ['url', url],
- ['x', data.sha256 ?? ''],
- ['m', data.mime ?? 'application/octet-stream'],
- ['size', data.size.toString() ?? '0'],
- ['dim', `${data.dimensions.width}x${data.dimensions.height}` ?? '0'],
- ['blurhash', data.blurhash ?? ''],
- ];
-
- await publish({ content: '', kind: 1063, tags: tags });
- }
-
- return {
- url: url,
- error: null,
- };
- }
-
- return {
- url: null,
- error: 'Upload failed',
- };
- } catch (e) {
- await message(e, { title: 'Lume', type: 'error' });
- }
- };
-
return {
sub,
addContact,
@@ -409,11 +288,9 @@ export function useNostr() {
getContactsByPubkey,
getEventsByPubkey,
getAllRelaysByUsers,
- fetchActivities,
+ getAllActivities,
fetchNIP04Messages,
fetchAllReplies,
- publish,
createZap,
- upload,
};
}
+
+
+
+
+
+
+ );
+ }
+
if (variant === 'large') {
return (
+ {user?.name || + user?.display_name || + user?.displayName || + displayNpub(pubkey, 16)} +
+
diff --git a/src/shared/widgets/index.ts b/src/shared/widgets/index.ts
index 3dd176af..0402c585 100644
--- a/src/shared/widgets/index.ts
+++ b/src/shared/widgets/index.ts
@@ -6,6 +6,7 @@ export * from './local/thread';
export * from './local/files';
export * from './local/articles';
export * from './local/follows';
+export * from './local/notification';
export * from './global/articles';
export * from './global/files';
export * from './global/hashtag';
diff --git a/src/shared/widgets/local/notification.tsx b/src/shared/widgets/local/notification.tsx
new file mode 100644
index 00000000..842cab39
--- /dev/null
+++ b/src/shared/widgets/local/notification.tsx
@@ -0,0 +1,81 @@
+import { NDKEvent } from '@nostr-dev-kit/ndk';
+import { useCallback, useEffect } from 'react';
+import { VList } from 'virtua';
+
+import { useStorage } from '@libs/storage/provider';
+
+import { LoaderIcon } from '@shared/icons';
+import { NotifyNote } from '@shared/notification/notifyNote';
+import { TitleBar } from '@shared/titleBar';
+import { WidgetWrapper } from '@shared/widgets';
+
+import { useActivities } from '@stores/activities';
+
+import { useNostr } from '@utils/hooks/useNostr';
+import { Widget } from '@utils/types';
+
+export function LocalNotificationWidget({ params }: { params: Widget }) {
+ const { db } = useStorage();
+ const { getAllActivities } = useNostr();
+
+ const [activities, setActivities] = useActivities((state) => [
+ state.activities,
+ state.setActivities,
+ ]);
+
+ const renderEvent = useCallback(
+ (event: NDKEvent) => {
+ const rootEventId = event.tags.find((el) => el[0] === 'e')?.[1];
+ if (!rootEventId) return null;
+ if (event.pubkey === db.account.pubkey) return null;
+ return (
+
+
+ );
+}
diff --git a/src/stores/activities.ts b/src/stores/activities.ts
index 21a1b0f7..1087dd82 100644
--- a/src/stores/activities.ts
+++ b/src/stores/activities.ts
@@ -3,29 +3,20 @@ import { create } from 'zustand';
interface ActivitiesState {
activities: Array;
- totalNewActivities: number;
- setActivities: (events: NDKEvent[], lastLogin: number) => void;
+ setActivities: (events: NDKEvent[]) => void;
addActivity: (event: NDKEvent) => void;
- clearTotalNewActivities: () => void;
}
export const useActivities = create((set) => ({
activities: null,
- totalNewActivities: 0,
- setActivities: (events: NDKEvent[], lastLogin: number) => {
- const totalLatest = events.filter((ev) => ev.created_at > lastLogin)?.length ?? 0;
+ setActivities: (events: NDKEvent[]) => {
set(() => ({
activities: events,
- totalNewActivities: totalLatest,
}));
},
addActivity: (event: NDKEvent) => {
set((state) => ({
activities: state.activities ? [event, ...state.activities] : [event],
- totalNewActivities: state.totalNewActivities++,
}));
},
- clearTotalNewActivities: () => {
- set(() => ({ totalNewActivities: 0 }));
- },
}));
diff --git a/src/stores/widgets.ts b/src/stores/widgets.ts
index 68fe3562..1b6f3adb 100644
--- a/src/stores/widgets.ts
+++ b/src/stores/widgets.ts
@@ -24,6 +24,7 @@ export const WidgetKinds = {
user: 104,
thread: 105,
follows: 106,
+ notification: 107,
},
global: {
feeds: 1000,
@@ -109,6 +110,11 @@ export const DefaultWidgets: Array = [
{
title: 'Other',
data: [
+ {
+ kind: WidgetKinds.local.notification,
+ title: 'Notification',
+ description: 'Everything happens around you',
+ },
{
kind: WidgetKinds.other.learnNostr,
title: 'Learn Nostr',
@@ -125,9 +131,14 @@ export const useWidgets = create()(
isFetched: false,
fetchWidgets: async (db: LumeStorage) => {
const dbWidgets = await db.getWidgets();
- console.log('db widgets: ', dbWidgets);
- // default: add network widget
+ dbWidgets.unshift({
+ id: '9998',
+ title: 'Notification',
+ content: '',
+ kind: WidgetKinds.local.notification,
+ });
+
dbWidgets.unshift({
id: '9999',
title: '',
diff --git a/src/utils/createBlobFromFile.ts b/src/utils/createBlobFromFile.ts
deleted file mode 100644
index 0825c099..00000000
--- a/src/utils/createBlobFromFile.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { readBinaryFile } from '@tauri-apps/plugin-fs';
-
-export async function createBlobFromFile(path: string): Promise {
- const file = await readBinaryFile(path);
- const blob = new Blob([file]);
- const arr = new Uint8Array(await blob.arrayBuffer());
- return arr;
-}
diff --git a/src/utils/hooks/useNostr.ts b/src/utils/hooks/useNostr.ts
index 5af41258..706ba5a6 100644
--- a/src/utils/hooks/useNostr.ts
+++ b/src/utils/hooks/useNostr.ts
@@ -1,6 +1,4 @@
import { NDKEvent, NDKFilter, NDKKind, NDKSubscription } from '@nostr-dev-kit/ndk';
-import { message, open } from '@tauri-apps/plugin-dialog';
-import { fetch } from '@tauri-apps/plugin-http';
import { LRUCache } from 'lru-cache';
import { NostrEventExt } from 'nostr-fetch';
import { useMemo } from 'react';
@@ -10,7 +8,7 @@ import { useStorage } from '@libs/storage/provider';
import { nHoursAgo } from '@utils/date';
import { getMultipleRandom } from '@utils/transform';
-import { NDKEventWithReplies, NostrBuildResponse } from '@utils/types';
+import { NDKEventWithReplies } from '@utils/types';
export function useNostr() {
const { db } = useStorage();
@@ -53,9 +51,6 @@ export function useNostr() {
list.forEach((item) => {
tags.push(['p', item]);
});
-
- // publish event
- publish({ content: '', kind: NDKKind.Contacts, tags: tags });
};
const removeContact = async (pubkey: string) => {
@@ -66,30 +61,17 @@ export function useNostr() {
list.forEach((item) => {
tags.push(['p', item]);
});
-
- // publish event
- publish({ content: '', kind: NDKKind.Contacts, tags: tags });
};
- const fetchActivities = async () => {
+ const getAllActivities = async (limit?: number) => {
try {
- const events = await fetcher.fetchAllEvents(
- relayUrls,
- {
- kinds: [
- NDKKind.Text,
- NDKKind.Contacts,
- NDKKind.Repost,
- NDKKind.Reaction,
- NDKKind.Zap,
- ],
- '#p': [db.account.pubkey],
- },
- { since: nHoursAgo(24) },
- { sort: true }
- );
+ const events = await ndk.fetchEvents({
+ kinds: [NDKKind.Text, NDKKind.Repost, NDKKind.Reaction, NDKKind.Zap],
+ '#p': [db.account.pubkey],
+ limit: limit ?? 100,
+ });
- return events as unknown as NDKEvent[];
+ return [...events];
} catch (e) {
console.error('Error fetching activities', e);
}
@@ -289,28 +271,6 @@ export function useNostr() {
return relayMap;
};
- const publish = async ({
- content,
- kind,
- tags,
- }: {
- content: string;
- kind: NDKKind | number;
- tags: string[][];
- }): Promise => {
- const event = new NDKEvent(ndk);
- event.content = content;
- event.kind = kind;
- event.created_at = Math.floor(Date.now() / 1000);
- event.pubkey = db.account.pubkey;
- event.tags = tags;
-
- await event.sign();
- await event.publish();
-
- return event;
- };
-
const createZap = async (event: NDKEvent, amount: number, message?: string) => {
// @ts-expect-error, NostrEvent to NDKEvent
const ndkEvent = new NDKEvent(ndk, event);
@@ -319,87 +279,6 @@ export function useNostr() {
return res;
};
- const upload = async (file: null | string, nip94?: boolean) => {
- try {
- let filepath = file;
-
- if (!file) {
- const selected = await open({
- multiple: false,
- filters: [
- {
- name: 'Media',
- extensions: [
- 'png',
- 'jpeg',
- 'jpg',
- 'gif',
- 'mp4',
- 'mp3',
- 'webm',
- 'mkv',
- 'avi',
- 'mov',
- ],
- },
- ],
- });
- if (Array.isArray(selected)) {
- // user selected multiple files
- } else if (selected === null) {
- return {
- url: null,
- error: 'Cancelled',
- };
- } else {
- filepath = selected.path;
- }
- }
-
- const formData = new FormData();
- formData.append('file', filepath);
-
- const res: NostrBuildResponse = await fetch(
- 'https://nostr.build/api/v2/upload/files',
- {
- method: 'POST',
- headers: { 'Content-Type': 'multipart/form-data' },
- body: formData,
- }
- );
-
- if (res.ok) {
- const data = res.data.data[0];
- const url = data.url;
-
- if (nip94) {
- const tags = [
- ['url', url],
- ['x', data.sha256 ?? ''],
- ['m', data.mime ?? 'application/octet-stream'],
- ['size', data.size.toString() ?? '0'],
- ['dim', `${data.dimensions.width}x${data.dimensions.height}` ?? '0'],
- ['blurhash', data.blurhash ?? ''],
- ];
-
- await publish({ content: '', kind: 1063, tags: tags });
- }
-
- return {
- url: url,
- error: null,
- };
- }
-
- return {
- url: null,
- error: 'Upload failed',
- };
- } catch (e) {
- await message(e, { title: 'Lume', type: 'error' });
- }
- };
-
return {
sub,
addContact,
@@ -409,11 +288,9 @@ export function useNostr() {
getContactsByPubkey,
getEventsByPubkey,
getAllRelaysByUsers,
- fetchActivities,
+ getAllActivities,
fetchNIP04Messages,
fetchAllReplies,
- publish,
createZap,
- upload,
};
}
+ {!activities ? (
+
+ {activities.map((event) => renderEvent(event))}
+
+ )}
+
+
+
+ ) : activities.length < 1 ? (
+
+
+ + Loading... +
+
+
+ ) : (
+ 🎉
++ Hmm! Nothing new yet. +
+