+ + + ) +} + +export default MixCloudEmbed; \ No newline at end of file diff --git a/src/Element/Nip5Service.tsx b/src/Element/Nip5Service.tsx index d1b32a1..e3d06ab 100644 --- a/src/Element/Nip5Service.tsx +++ b/src/Element/Nip5Service.tsx @@ -13,7 +13,7 @@ import { import AsyncButton from "Element/AsyncButton"; import LNURLTip from "Element/LNURLTip"; import Copy from "Element/Copy"; -import useProfile from "Feed/ProfileFeed"; +import { useUserProfile }from "Feed/ProfileFeed"; import useEventPublisher from "Feed/EventPublisher"; import { debounce, hexToBech32 } from "Util"; import { UserMetadata } from "Nostr"; @@ -31,7 +31,7 @@ type ReduxStore = any; export default function Nip5Service(props: Nip05ServiceProps) { const navigate = useNavigate(); const pubkey = useSelector
- {(mentions?.length ?? 0) > 0 ? (
- <>
- {pubMentions}
- {others}
-
- ) : replyId ? (
- hexToBech32("note", replyId)?.substring(0, 12) // todo: link
- ) : ""}
+ {(mentions?.length ?? 0) > 0 ? (
+ <>
+ {pubMentions}
+ {others}
+
+ ) : replyId ? (
+ hexToBech32("note", replyId)?.substring(0, 12) // todo: link
+ ) : ""}
)
}
@@ -166,13 +178,16 @@ export default function Note(props: NoteProps) {
goToEvent(e, ev.Id)}>
{transformBody()}
+ {extendable && !showMore && (
+
+
)}
{options.showFooter ?
+ (s => s.login.publicKey);
const { mute, block } = useModeration();
const prefs = useSelector(s => s.login.preferences);
- const author = useProfile(ev.RootPubKey)?.get(ev.RootPubKey);
+ const author = useUserProfile(ev.RootPubKey);
const publisher = useEventPublisher();
const [reply, setReply] = useState(false);
const [tip, setTip] = useState(false);
diff --git a/src/Element/NoteToSelf.tsx b/src/Element/NoteToSelf.tsx
index 74b893c..9ad1fef 100644
--- a/src/Element/NoteToSelf.tsx
+++ b/src/Element/NoteToSelf.tsx
@@ -3,7 +3,7 @@ import "./NoteToSelf.css";
import { Link, useNavigate } from "react-router-dom";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faBook, faCertificate } from "@fortawesome/free-solid-svg-icons"
-import useProfile from "Feed/ProfileFeed";
+import { useUserProfile } from "Feed/ProfileFeed";
import Nip05 from "Element/Nip05";
import { profileLink } from "Util";
@@ -15,7 +15,7 @@ export interface NoteToSelfProps {
};
function NoteLabel({pubkey, link}:NoteToSelfProps) {
- const user = useProfile(pubkey)?.get(pubkey);
+ const user = useUserProfile(pubkey);
return (
(s => s.login.notifications);
const readNotifications = useSelector(s => s.login.readNotifications);
const dms = useSelector(s => s.login.dms);
+ const { isMuted } = useModeration();
+ const filteredDms = dms.filter(a => !isMuted(a.pubkey))
const prefs = useSelector(s => s.login.preferences);
+ const pub = useEventPublisher();
useLoginFeed();
+ useEffect(() => {
+ System.nip42Auth = pub.nip42Auth
+ },[pub])
+
useEffect(() => {
if (relays) {
for (let [k, v] of Object.entries(relays)) {
System.ConnectToRelay(k, v);
}
for (let [k, v] of System.Sockets) {
- if (!relays[k]) {
+ if (!relays[k] && !SearchRelays.has(k)) {
System.DisconnectRelay(k);
}
}
@@ -82,14 +94,17 @@ export default function Layout() {
function accountHeader() {
const unreadNotifications = notifications?.filter(a => (a.created_at * 1000) > readNotifications).length;
- const unreadDms = key ? totalUnread(dms, key) : 0;
+ const unreadDms = key ? totalUnread(filteredDms, key) : 0;
return (
{content()}
)
diff --git a/src/Element/NoteCreator.tsx b/src/Element/NoteCreator.tsx
index b4c07f1..48acc69 100644
--- a/src/Element/NoteCreator.tsx
+++ b/src/Element/NoteCreator.tsx
@@ -8,7 +8,7 @@ import Plus from "Icons/Plus";
import useEventPublisher from "Feed/EventPublisher";
import { openFile } from "Util";
import VoidUpload from "Feed/VoidUpload";
-import { FileExtensionRegex } from "Const";
+import { FileExtensionRegex, VoidCatHost } from "Const";
import Textarea from "Element/Textarea";
import Modal from "Element/Modal";
import { default as NEvent } from "Nostr/Event";
@@ -52,7 +52,7 @@ export function NoteCreator(props: NoteCreatorProps) {
let ext = file.name.match(FileExtensionRegex);
// extension tricks note parser to embed the content
- let url = rx.file.meta?.url ?? `https://void.cat/d/${rx.file.id}${ext ? `.${ext[1]}` : ""}`;
+ let url = rx.file.meta?.url ?? `${VoidCatHost}/d/${rx.file.id}${ext ? `.${ext[1]}` : ""}`;
setNote(n => `${n}\n${url}`);
} else if (rx?.errorMessage) {
diff --git a/src/Element/NoteFooter.tsx b/src/Element/NoteFooter.tsx
index 42db172..05217be 100644
--- a/src/Element/NoteFooter.tsx
+++ b/src/Element/NoteFooter.tsx
@@ -14,7 +14,7 @@ import useEventPublisher from "Feed/EventPublisher";
import { getReactions, hexToBech32, normalizeReaction, Reaction } from "Util";
import { NoteCreator } from "Element/NoteCreator";
import LNURLTip from "Element/LNURLTip";
-import useProfile from "Feed/ProfileFeed";
+import { useUserProfile } from "Feed/ProfileFeed";
import { default as NEvent } from "Nostr/Event";
import { RootState } from "State/Store";
import { HexKey, TaggedRawEvent } from "Nostr";
@@ -33,7 +33,7 @@ export default function NoteFooter(props: NoteFooterProps) {
const login = useSelector
Note to Self })
;
}
+ case "wav":
+ case "mp3":
+ case "ogg": {
+ return
+ }
case "mp4":
case "mov":
case "mkv":
@@ -75,6 +83,8 @@ function transformHttpLink(a: string, pref: UserPreferences) {
return {content}
+ const disableMarkdownLinks = useCallback(() => (tree: any) => {
+ visit(tree, (node, index, parent) => {
+ if (
+ parent &&
+ typeof index === 'number' &&
+ (node.type === 'link' ||
+ node.type === 'linkReference' ||
+ node.type === 'image' ||
+ node.type === 'imageReference' ||
+ node.type === 'definition')
+ ) {
+ node.type = 'text';
+ node.value = content.slice(node.position.start.offset, node.position.end.offset).replace(/\)$/, ' )');
+ return SKIP;
+ }
+ })
+ }, [content]);
+ return {content}
}
diff --git a/src/Element/Textarea.tsx b/src/Element/Textarea.tsx
index 79397df..c71a92f 100644
--- a/src/Element/Textarea.tsx
+++ b/src/Element/Textarea.tsx
@@ -2,7 +2,6 @@ import "@webscopeio/react-textarea-autocomplete/style.css";
import "./Textarea.css";
import { useState } from "react";
-import { useLiveQuery } from "dexie-react-hooks";
import ReactTextareaAutocomplete from "@webscopeio/react-textarea-autocomplete";
import emoji from "@jukben/emoji-search";
import TextareaAutosize from "react-textarea-autosize";
@@ -10,8 +9,8 @@ import TextareaAutosize from "react-textarea-autosize";
import Avatar from "Element/Avatar";
import Nip05 from "Element/Nip05";
import { hexToBech32 } from "Util";
-import { db } from "Db";
-import { MetadataCache } from "Db/User";
+import { MetadataCache } from "State/Users";
+import { useQuery } from "State/Users/Hooks";
interface EmojiItemProps {
name: string
@@ -45,16 +44,7 @@ const UserItem = (metadata: MetadataCache) => {
const Textarea = ({ users, onChange, ...rest }: any) => {
const [query, setQuery] = useState('')
- const allUsers = useLiveQuery(
- () => db.users
- .where("npub").startsWithIgnoreCase(query)
- .or("name").startsWithIgnoreCase(query)
- .or("display_name").startsWithIgnoreCase(query)
- .or("nip05").startsWithIgnoreCase(query)
- .limit(5)
- .toArray(),
- [query],
- );
+ const allUsers = useQuery(query)
const userDataProvider = (token: string) => {
setQuery(token)
diff --git a/src/Element/Timeline.tsx b/src/Element/Timeline.tsx
index 0324309..e9e1a88 100644
--- a/src/Element/Timeline.tsx
+++ b/src/Element/Timeline.tsx
@@ -10,6 +10,7 @@ import LoadMore from "Element/LoadMore";
import Note from "Element/Note";
import NoteReaction from "Element/NoteReaction";
import useModeration from "Hooks/useModeration";
+import ProfilePreview from "./ProfilePreview";
export interface TimelineProps {
postsOnly: boolean,
@@ -41,6 +42,9 @@ export default function Timeline({ subject, postsOnly = false, method, ignoreMod
function eventElement(e: TaggedRawEvent) {
switch (e.kind) {
+ case EventKind.SetMetadata: {
+ return ,
signEvent: (event: RawEvent) => Promise,
- getRelays: () => Promise<[[string, { read: boolean, write: boolean }]]>,
+ getRelays: () => Promise>,
nip04: {
encrypt: (pubkey: HexKey, content: string) => Promise,
decrypt: (pubkey: HexKey, content: string) => Promise
@@ -72,12 +72,22 @@ export default function useEventPublisher() {
return match;
}
const content = msg.replace(/@npub[a-z0-9]+/g, replaceNpub)
- .replace(/note[a-z0-9]+/g, replaceNoteId)
- .replace(HashtagRegex, replaceHashtag);
+ .replace(/note[a-z0-9]+/g, replaceNoteId)
+ .replace(HashtagRegex, replaceHashtag);
ev.Content = content;
}
return {
+ nip42Auth: async (challenge: string, relay:string) => {
+ if(pubKey) {
+ const ev = NEvent.ForPubKey(pubKey);
+ ev.Kind = EventKind.Auth;
+ ev.Content = "";
+ ev.Tags.push(new Tag(["relay", relay], 0));
+ ev.Tags.push(new Tag(["challenge", challenge], 1));
+ return await signEvent(ev);
+ }
+ },
broadcast: (ev: NEvent | undefined) => {
if (ev) {
console.debug("Sending event: ", ev);
@@ -90,8 +100,8 @@ export default function useEventPublisher() {
* When they open the site again we wont see that updated relay list and so it will appear to reset back to the previous state
*/
broadcastForBootstrap: (ev: NEvent | undefined) => {
- if(ev) {
- for(let [k, _] of DefaultRelays) {
+ if (ev) {
+ for (let [k, _] of DefaultRelays) {
System.WriteOnceToRelay(k, ev);
}
}
@@ -205,6 +215,9 @@ export default function useEventPublisher() {
temp.add(pkAdd);
}
for (let pk of temp) {
+ if (pk.length !== 64) {
+ continue;
+ }
ev.Tags.push(new Tag(["p", pk], ev.Tags.length));
}
@@ -217,7 +230,7 @@ export default function useEventPublisher() {
ev.Kind = EventKind.ContactList;
ev.Content = JSON.stringify(relays);
for (let pk of follows) {
- if (pk === pkRemove) {
+ if (pk === pkRemove || pk.length !== 64) {
continue;
}
ev.Tags.push(new Tag(["p", pk], ev.Tags.length));
diff --git a/src/Feed/LoginFeed.ts b/src/Feed/LoginFeed.ts
index cfc8a2a..d7b5e46 100644
--- a/src/Feed/LoginFeed.ts
+++ b/src/Feed/LoginFeed.ts
@@ -7,12 +7,14 @@ import EventKind from "Nostr/EventKind";
import Event from "Nostr/Event";
import { Subscriptions } from "Nostr/Subscriptions";
import { addDirectMessage, setFollows, setRelays, setMuted, setBlocked, sendNotification } from "State/Login";
-import type { RootState } from "State/Store";
-import { db } from "Db";
-import { barierNip07 } from "Feed/EventPublisher";
+import { RootState } from "State/Store";
+import { mapEventToProfile, MetadataCache } from "State/Users";
+import { getDb } from "State/Users/Db";
import useSubscription from "Feed/Subscription";
+import { getDisplayName } from "Element/ProfileImage";
+import { barierNip07 } from "Feed/EventPublisher";
import { getMutedKeys, getNewest } from "Feed/MuteList";
-import { mapEventToProfile, MetadataCache } from "Db/User";
+import { MentionRegex } from "Const";
import useModeration from "Hooks/useModeration";
/**
@@ -105,9 +107,10 @@ export default function useLoginFeed() {
return acc;
}, { created: 0, profile: null as MetadataCache | null });
if (maxProfile.profile) {
- let existing = await db.users.get(maxProfile.profile.pubkey);
+ const db = getDb()
+ let existing = await db.find(maxProfile.profile.pubkey);
if ((existing?.created ?? 0) < maxProfile.created) {
- await db.users.put(maxProfile.profile);
+ await db.put(maxProfile.profile);
}
}
})().catch(console.warn);
@@ -152,6 +155,7 @@ export default function useLoginFeed() {
}, [dispatch, dmsFeed.store]);
}
+
async function decryptBlocked(raw: TaggedRawEvent, pubKey: HexKey, privKey?: HexKey) {
const ev = new Event(raw)
if (pubKey && privKey) {
diff --git a/src/Feed/ProfileFeed.ts b/src/Feed/ProfileFeed.ts
index b439f81..c866941 100644
--- a/src/Feed/ProfileFeed.ts
+++ b/src/Feed/ProfileFeed.ts
@@ -1,27 +1,13 @@
import { useLiveQuery } from "dexie-react-hooks";
-import { useEffect } from "react";
-import { db } from "Db";
-import { MetadataCache } from "Db/User";
+import { useEffect, useMemo } from "react";
+import { RootState } from "State/Store";
+import { MetadataCache } from "State/Users";
+import { useKey, useKeys } from "State/Users/Hooks";
import { HexKey } from "Nostr";
import { System } from "Nostr/System";
-export default function useProfile(pubKey?: HexKey | Array | undefined): Map | undefined {
- const user = useLiveQuery(async () => {
- let userList = new Map();
- if (pubKey) {
- if (Array.isArray(pubKey)) {
- let ret = await db.users.bulkGet(pubKey);
- let filtered = ret.filter(a => a !== undefined).map(a => a!);
- return new Map(filtered.map(a => [a.pubkey, a]))
- } else {
- let ret = await db.users.get(pubKey);
- if (ret) {
- userList.set(ret.pubkey, ret);
- }
- }
- }
- return userList;
- }, [pubKey]);
+export function useUserProfile(pubKey: HexKey): MetadataCache | undefined {
+ const users = useKey(pubKey);
useEffect(() => {
if (pubKey) {
@@ -30,5 +16,19 @@ export default function useProfile(pubKey?: HexKey | Array | undefined):
}
}, [pubKey]);
- return user;
-}
\ No newline at end of file
+ return users;
+}
+
+
+export function useUserProfiles(pubKeys: Array): Map | undefined {
+ const users = useKeys(pubKeys);
+
+ useEffect(() => {
+ if (pubKeys) {
+ System.TrackMetadata(pubKeys);
+ return () => System.UntrackMetadata(pubKeys);
+ }
+ }, [pubKeys]);
+
+ return users;
+}
diff --git a/src/Feed/TimelineFeed.ts b/src/Feed/TimelineFeed.ts
index fe25942..0fc9c67 100644
--- a/src/Feed/TimelineFeed.ts
+++ b/src/Feed/TimelineFeed.ts
@@ -13,7 +13,7 @@ export interface TimelineFeedOptions {
}
export interface TimelineSubject {
- type: "pubkey" | "hashtag" | "global" | "ptag",
+ type: "pubkey" | "hashtag" | "global" | "ptag" | "keyword",
items: string[]
}
@@ -47,6 +47,11 @@ export default function useTimelineFeed(subject: TimelineSubject, options: Timel
sub.PTags = new Set(subject.items);
break;
}
+ case "keyword": {
+ sub.Kinds.add(EventKind.SetMetadata);
+ sub.Search = subject.items[0];
+ break;
+ }
}
return sub;
}, [subject.type, subject.items]);
@@ -72,6 +77,7 @@ export default function useTimelineFeed(subject: TimelineSubject, options: Timel
latestSub.Authors = sub.Authors;
latestSub.HashTags = sub.HashTags;
latestSub.Kinds = sub.Kinds;
+ latestSub.Search = sub.Search;
latestSub.Limit = 1;
latestSub.Since = Math.floor(new Date().getTime() / 1000);
sub.AddSubscription(latestSub);
@@ -123,7 +129,7 @@ export default function useTimelineFeed(subject: TimelineSubject, options: Timel
if (main.store.notes.length > 0) {
setTrackingEvent(s => {
let ids = main.store.notes.map(a => a.id);
- if(ids.some(a => !s.includes(a))) {
+ if (ids.some(a => !s.includes(a))) {
return Array.from(new Set([...s, ...ids]));
}
return s;
@@ -165,4 +171,4 @@ export default function useTimelineFeed(subject: TimelineSubject, options: Timel
latest.clear();
}
};
-}
\ No newline at end of file
+}
diff --git a/src/Feed/VoidUpload.ts b/src/Feed/VoidUpload.ts
index 8bb2ae4..53c4aeb 100644
--- a/src/Feed/VoidUpload.ts
+++ b/src/Feed/VoidUpload.ts
@@ -1,4 +1,5 @@
import * as secp from "@noble/secp256k1";
+import { VoidCatHost } from "Const";
/**
* Upload file to void.cat
@@ -8,7 +9,7 @@ export default async function VoidUpload(file: File | Blob, filename: string) {
const buf = await file.arrayBuffer();
const digest = await crypto.subtle.digest("SHA-256", buf);
- let req = await fetch(`https://void.cat/upload`, {
+ let req = await fetch(`${VoidCatHost}/upload`, {
mode: "cors",
method: "POST",
body: buf,
@@ -17,7 +18,8 @@ export default async function VoidUpload(file: File | Blob, filename: string) {
"V-Content-Type": file.type,
"V-Filename": filename,
"V-Full-Digest": secp.utils.bytesToHex(new Uint8Array(digest)),
- "V-Description": "Upload from https://snort.social"
+ "V-Description": "Upload from https://snort.social",
+ "V-Strip-Metadata": "true"
}
});
diff --git a/src/Icons/Envelope.tsx b/src/Icons/Envelope.tsx
index 8e4d072..7ed1bc5 100644
--- a/src/Icons/Envelope.tsx
+++ b/src/Icons/Envelope.tsx
@@ -1,6 +1,8 @@
-const Envelope = () => {
+import type IconProps from './IconProps'
+
+const Envelope = (props: IconProps) => {
return (
-
+ {today && (Total today (UTC): {today.donations.toLocaleString()} sats)}
+
{inView && <>
@@ -34,4 +35,4 @@ export default function ProfilePreview(props: ProfilePreviewProps) {
}
)
-}
\ No newline at end of file
+}
diff --git a/src/Element/Relay.tsx b/src/Element/Relay.tsx
index 4a00c1d..3fdc656 100644
--- a/src/Element/Relay.tsx
+++ b/src/Element/Relay.tsx
@@ -63,7 +63,7 @@ export default function Relay(props: RelayProps) {
- navigate(name)}>
+ navigate(state!.id)}>
diff --git a/src/Element/Text.css b/src/Element/Text.css
index 8903a42..06204bd 100644
--- a/src/Element/Text.css
+++ b/src/Element/Text.css
@@ -57,7 +57,7 @@
margin: 20px;
}
-.text img, .text video, .text iframe {
+.text img, .text video, .text iframe, .text audio {
max-width: 100%;
max-height: 500px;
margin: 10px auto;
diff --git a/src/Element/Text.tsx b/src/Element/Text.tsx
index e74a5ce..e720098 100644
--- a/src/Element/Text.tsx
+++ b/src/Element/Text.tsx
@@ -1,22 +1,24 @@
import './Text.css'
-import { useMemo } from "react";
+import { useMemo, useCallback } from "react";
import { Link } from "react-router-dom";
import ReactMarkdown from "react-markdown";
+import { visit, SKIP } from "unist-util-visit";
import { TwitterTweetEmbed } from "react-twitter-embed";
-import { UrlRegex, FileExtensionRegex, MentionRegex, InvoiceRegex, YoutubeUrlRegex, TweetUrlRegex, HashtagRegex, TidalRegex, SoundCloudRegex } from "Const";
+import { UrlRegex, FileExtensionRegex, MentionRegex, InvoiceRegex, YoutubeUrlRegex, TweetUrlRegex, HashtagRegex, TidalRegex, SoundCloudRegex, MixCloudRegex } from "Const";
import { eventLink, hexToBech32 } from "Util";
import Invoice from "Element/Invoice";
import Hashtag from "Element/Hashtag";
import Tag from "Nostr/Tag";
-import { MetadataCache } from "Db/User";
+import { MetadataCache } from "State/Users";
import Mention from "Element/Mention";
import TidalEmbed from "Element/TidalEmbed";
import { useSelector } from 'react-redux';
import { RootState } from 'State/Store';
import { UserPreferences } from 'State/Login';
import SoundCloudEmbed from 'Element/SoundCloudEmded'
+import MixCloudEmbed from './MixCloudEmbed';
function transformHttpLink(a: string, pref: UserPreferences) {
try {
@@ -28,6 +30,7 @@ function transformHttpLink(a: string, pref: UserPreferences) {
const tweetId = TweetUrlRegex.test(a) && RegExp.$2;
const tidalId = TidalRegex.test(a) && RegExp.$1;
const soundcloundId = SoundCloudRegex.test(a) && RegExp.$1;
+ const mixcloudId = MixCloudRegex.test(a) && RegExp.$1;
const extension = FileExtensionRegex.test(url.pathname.toLowerCase()) && RegExp.$1;
if (extension) {
switch (extension) {
@@ -39,6 +42,11 @@ function transformHttpLink(a: string, pref: UserPreferences) {
case "webp": {
return Primary Developers
{Developers.map(a =>Contributors
diff --git a/src/Pages/Layout.css b/src/Pages/Layout.css index a445f31..25922ec 100644 --- a/src/Pages/Layout.css +++ b/src/Pages/Layout.css @@ -42,3 +42,15 @@ header .pfp .avatar-wrapper { top: 0; right: 0; } + +.search { + margin: 0 10px 0 10px; +} + +.search input { + margin: 0 5px 0 5px; +} + +.search .btn { + display: none; +} diff --git a/src/Pages/Layout.tsx b/src/Pages/Layout.tsx index ce98a53..5cb2ac9 100644 --- a/src/Pages/Layout.tsx +++ b/src/Pages/Layout.tsx @@ -1,18 +1,23 @@ import "./Layout.css"; -import { useEffect } from "react" +import { useEffect, useMemo } from "react" import { useDispatch, useSelector } from "react-redux"; import { Outlet, useNavigate } from "react-router-dom"; -import Envelope from "Icons/Envelope" -import Bell from "Icons/Bell" +import Envelope from "Icons/Envelope"; +import Bell from "Icons/Bell"; +import Search from "Icons/Search"; import { RootState } from "State/Store"; -import { init, setPreferences, UserPreferences } from "State/Login"; +import { init, UserPreferences } from "State/Login"; import { HexKey, RawEvent, TaggedRawEvent } from "Nostr"; import { RelaySettings } from "Nostr/Connection"; import { System } from "Nostr/System" import ProfileImage from "Element/ProfileImage"; import useLoginFeed from "Feed/LoginFeed"; import { totalUnread } from "Pages/MessagesPage"; +import { SearchRelays } from 'Const'; +import useEventPublisher from "Feed/EventPublisher"; +import useModeration from "Hooks/useModeration"; + export default function Layout() { const dispatch = useDispatch(); @@ -23,16 +28,23 @@ export default function Layout() { const notifications = useSelector
- ();
+ const [keyword, setKeyword] = useState(params.keyword);
+
+ useEffect(() => {
+ if (keyword) {
+ // "navigate" changing only url
+ router.navigate(`/search/${encodeURIComponent(keyword)}`)
+ }
+ }, [keyword]);
+
+ useEffect(() => {
+ return debounce(500, () => setKeyword(search));
+ }, [search]);
+
+ useEffect(() => {
+ let addedRelays: string[] = [];
+ for (let [k, v] of SearchRelays) {
+ if (!System.Sockets.has(k)) {
+ System.ConnectToRelay(k, v);
+ addedRelays.push(k);
+ }
+ }
+ return () => {
+ for (let r of addedRelays) {
+ System.DisconnectRelay(r);
+ }
+ }
+ }, []);
+
+ return (
+ <>
+ (s => s.login.publicKey);
const privKey = useSelector(s => s.login.privateKey);
- const user = useProfile(id)?.get(id || "");
+ const user = useUserProfile(id!);
const publisher = useEventPublisher();
const [name, setName] = useState();
@@ -63,6 +64,7 @@ export default function ProfileSettings() {
delete userCopy["loaded"];
delete userCopy["created"];
delete userCopy["pubkey"];
+ delete userCopy["npub"];
console.debug(userCopy);
let ev = await publisher.metadata(userCopy);
@@ -85,14 +87,14 @@ export default function ProfileSettings() {
async function setNewAvatar() {
const rsp = await uploadFile();
if (rsp) {
- setPicture(rsp.meta?.url ?? `https://void.cat/d/${rsp.id}`);
+ setPicture(rsp.meta?.url ?? `${VoidCatHost}/d/${rsp.id}`);
}
}
async function setNewBanner() {
const rsp = await uploadFile();
if (rsp) {
- setBanner(rsp.meta?.url ?? `https://void.cat/d/${rsp.id}`);
+ setBanner(rsp.meta?.url ?? `${VoidCatHost}/d/${rsp.id}`);
}
}
diff --git a/src/Pages/settings/RelayInfo.tsx b/src/Pages/settings/RelayInfo.tsx
index 2dd6aa7..ce52fa4 100644
--- a/src/Pages/settings/RelayInfo.tsx
+++ b/src/Pages/settings/RelayInfo.tsx
@@ -10,16 +10,16 @@ const RelayInfo = () => {
const params = useParams();
const navigate = useNavigate();
const dispatch = useDispatch();
- const addr: string = `wss://${params.addr}`;
- const con = System.Sockets.get(addr) ?? System.Sockets.get(`${addr}/`);
- const stats = useRelayState(con?.Address ?? addr);
+ const conn = Array.from(System.Sockets.values()).find(a => a.Id === params.id);
+ console.debug(conn);
+ const stats = useRelayState(conn?.Address ?? "");
return (
<>
navigate("/messages")}>
+
{bio()}
diff --git a/src/Pages/SearchPage.tsx b/src/Pages/SearchPage.tsx
new file mode 100644
index 0000000..7e51e1f
--- /dev/null
+++ b/src/Pages/SearchPage.tsx
@@ -0,0 +1,51 @@
+import { useParams } from "react-router-dom";
+import Timeline from "Element/Timeline";
+import { useEffect, useState } from "react";
+import { debounce } from "Util";
+import { router } from "index";
+import { SearchRelays } from "Const";
+import { System } from "Nostr/System";
+
+const SearchPage = () => {
+ const params: any = useParams();
+ const [search, setSearch] = useState navigate("/search")}>
+
+ navigate("/messages")}>
- goToNotifications(e)}>
+
diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx
index d32ce7c..b1b02ea 100644
--- a/src/Pages/Login.tsx
+++ b/src/Pages/Login.tsx
@@ -4,7 +4,7 @@ import { useNavigate } from "react-router-dom";
import * as secp from '@noble/secp256k1';
import { RootState } from "State/Store";
-import { setPrivateKey, setPublicKey } from "State/Login";
+import { setPrivateKey, setPublicKey, setRelays } from "State/Login";
import { EmailRegex } from "Const";
import { bech32ToHex } from "Util";
import { HexKey } from "Nostr";
@@ -73,6 +73,14 @@ export default function LoginPage() {
async function doNip07Login() {
let pubKey = await window.nostr.getPublicKey();
dispatch(setPublicKey(pubKey));
+
+ if ("getRelays" in window.nostr) {
+ let relays = await window.nostr.getRelays();
+ dispatch(setRelays({
+ relays: relays,
+ createdAt: 1
+ }));
+ }
}
function altLogins() {
diff --git a/src/Pages/NewUserPage.tsx b/src/Pages/NewUserPage.tsx
index fdd8c61..f7b7d13 100644
--- a/src/Pages/NewUserPage.tsx
+++ b/src/Pages/NewUserPage.tsx
@@ -31,14 +31,21 @@ export default function NewUserPage() {
setError("");
try {
let rsp = await fetch(`${TwitterFollowsApi}?username=${twitterUsername}`);
+ let data = await rsp.json();
if (rsp.ok) {
- setFollows(await rsp.json());
+ if (Array.isArray(data) && data.length === 0) {
+ setError(`No nostr users found for "${twitterUsername}"`);
+ } else {
+ setFollows(data);
+ }
+ } else if ("error" in data) {
+ setError(data.error);
} else {
- setError("Failed to load follows, is your profile public?");
+ setError("Failed to load follows, please try again later");
}
} catch (e) {
console.warn(e);
- setError("Failed to load follows, is your profile public?");
+ setError("Failed to load follows, please try again later");
}
}
diff --git a/src/Pages/ProfilePage.tsx b/src/Pages/ProfilePage.tsx
index d86b9be..fb3ca50 100644
--- a/src/Pages/ProfilePage.tsx
+++ b/src/Pages/ProfilePage.tsx
@@ -6,7 +6,8 @@ import { useNavigate, useParams } from "react-router-dom";
import Link from "Icons/Link";
import Zap from "Icons/Zap";
-import useProfile from "Feed/ProfileFeed";
+import Envelope from "Icons/Envelope";
+import { useUserProfile } from "Feed/ProfileFeed";
import FollowButton from "Element/FollowButton";
import { extractLnAddress, parseId, hexToBech32 } from "Util";
import Avatar from "Element/Avatar";
@@ -38,7 +39,7 @@ export default function ProfilePage() {
const params = useParams();
const navigate = useNavigate();
const id = useMemo(() => parseId(params.id!), [params]);
- const user = useProfile(id)?.get(id);
+ const user = useUserProfile(id);
const loggedOut = useSelector(s => s.login.loggedOut);
const loginPubKey = useSelector(s => s.login.publicKey);
const follows = useSelector(s => s.login.follows);
@@ -79,16 +80,6 @@ export default function ProfilePage() {
)}
- {lnurl && (
- setShowLnQr(false)} />
)
@@ -154,14 +145,27 @@ export default function ProfilePage() {
) : (
- !loggedOut && (
- <>
-
- goToNotifications(e)}>
@@ -101,7 +116,6 @@ export default function Layout() {
if (typeof isInit !== "boolean") {
return null;
}
-
return (
setShowLnQr(true)}>
-
-
- )}
Search
+
+ setSearch(e.target.value)} />
+
+ {keyword && navigate("/settings/relays")}>Relays
-
diff --git a/src/State/Login.ts b/src/State/Login.ts
index a7fac58..9387882 100644
--- a/src/State/Login.ts
+++ b/src/State/Login.ts
@@ -9,6 +9,8 @@ const PrivateKeyItem = "secret";
const PublicKeyItem = "pubkey";
const NotificationsReadItem = "notifications-read";
const UserPreferencesKey = "preferences";
+const RelayListKey = "last-relays";
+const FollowList = "last-follows";
export interface NotificationRequest {
title: string
@@ -46,7 +48,7 @@ export interface UserPreferences {
/**
* Show debugging menus to help diagnose issues
*/
- showDebugMenus: boolean
+ showDebugMenus: boolean
}
export interface LoginStore {
@@ -142,7 +144,7 @@ const InitState = {
dms: [],
dmInteraction: 0,
preferences: {
- enableReactions: false,
+ enableReactions: true,
autoLoadMedia: true,
theme: "system",
confirmReposts: false,
@@ -175,8 +177,6 @@ const LoginSlice = createSlice({
state.loggedOut = true;
}
- state.relays = Object.fromEntries(DefaultRelays.entries());
-
// check pub key only
let pubKey = window.localStorage.getItem(PublicKeyItem);
if (pubKey && !state.privateKey) {
@@ -184,6 +184,18 @@ const LoginSlice = createSlice({
state.loggedOut = false;
}
+ let lastRelayList = window.localStorage.getItem(RelayListKey);
+ if (lastRelayList) {
+ state.relays = JSON.parse(lastRelayList);
+ } else {
+ state.relays = Object.fromEntries(DefaultRelays.entries());
+ }
+
+ let lastFollows = window.localStorage.getItem(FollowList);
+ if (lastFollows) {
+ state.follows = JSON.parse(lastFollows);
+ }
+
// notifications
let readNotif = parseInt(window.localStorage.getItem(NotificationsReadItem) ?? "0");
if (!isNaN(readNotif)) {
@@ -224,10 +236,12 @@ const LoginSlice = createSlice({
state.relays = Object.fromEntries(filtered.entries());
state.latestRelays = createdAt;
+ window.localStorage.setItem(RelayListKey, JSON.stringify(state.relays));
},
removeRelay: (state, action: PayloadAction) => {
delete state.relays[action.payload];
state.relays = { ...state.relays };
+ window.localStorage.setItem(RelayListKey, JSON.stringify(state.relays));
},
setFollows: (state, action: PayloadAction) => {
const { keys, createdAt } = action.payload
@@ -239,16 +253,25 @@ const LoginSlice = createSlice({
let update = Array.isArray(keys) ? keys : [keys];
let changes = false;
- for (let pk of update) {
+ for (let pk of update.filter(a => a.length === 64)) {
if (!existing.has(pk)) {
existing.add(pk);
changes = true;
}
}
+ for (let pk of existing) {
+ if (!update.includes(pk)) {
+ existing.delete(pk);
+ changes = true;
+ }
+ }
+
if (changes) {
state.follows = Array.from(existing);
state.latestFollows = createdAt;
}
+
+ window.localStorage.setItem(FollowList, JSON.stringify(state.follows));
},
setMuted(state, action: PayloadAction<{createdAt: number, keys: HexKey[]}>) {
const { createdAt, keys } = action.payload
@@ -290,10 +313,10 @@ const LoginSlice = createSlice({
state.dmInteraction += 1;
},
logout: (state) => {
- window.localStorage.clear();
Object.assign(state, InitState);
state.loggedOut = true;
state.relays = Object.fromEntries(DefaultRelays.entries());
+ window.localStorage.clear();
},
markNotificationsRead: (state) => {
state.readNotifications = new Date().getTime();
diff --git a/src/State/Store.ts b/src/State/Store.ts
index 1c99761..74a82d6 100644
--- a/src/State/Store.ts
+++ b/src/State/Store.ts
@@ -1,13 +1,15 @@
import { configureStore } from "@reduxjs/toolkit";
import { reducer as LoginReducer } from "State/Login";
+import { reducer as UsersReducer } from "State/Users";
const store = configureStore({
reducer: {
- login: LoginReducer
+ login: LoginReducer,
+ users: UsersReducer,
}
});
export type RootState = ReturnType
export type AppDispatch = typeof store.dispatch
-export default store;
\ No newline at end of file
+export default store;
diff --git a/src/State/Users.ts b/src/State/Users.ts
new file mode 100644
index 0000000..9f92183
--- /dev/null
+++ b/src/State/Users.ts
@@ -0,0 +1,75 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit'
+import { HexKey, TaggedRawEvent, UserMetadata } from "Nostr";
+import { hexToBech32 } from "../Util";
+
+export interface MetadataCache extends UserMetadata {
+ /**
+ * When the object was saved in cache
+ */
+ loaded: number,
+
+ /**
+ * When the source metadata event was created
+ */
+ created: number,
+
+ /**
+ * The pubkey of the owner of this metadata
+ */
+ pubkey: HexKey
+
+ /**
+ * The bech32 encoded pubkey
+ */
+ npub: string
+};
+
+export function mapEventToProfile(ev: TaggedRawEvent) {
+ try {
+ let data: UserMetadata = JSON.parse(ev.content);
+ return {
+ pubkey: ev.pubkey,
+ npub: hexToBech32("npub", ev.pubkey),
+ created: ev.created_at,
+ loaded: new Date().getTime(),
+ ...data
+ } as MetadataCache;
+ } catch (e) {
+ console.error("Failed to parse JSON", ev, e);
+ }
+}
+
+export interface UsersDb {
+ isAvailable(): Promise
+ query(str: string): Promise
+ find(key: HexKey): Promise
+ add(user: MetadataCache): Promise
+ put(user: MetadataCache): Promise
+ bulkAdd(users: MetadataCache[]): Promise
+ bulkGet(keys: HexKey[]): Promise
+ bulkPut(users: MetadataCache[]): Promise
+ update(key: HexKey, fields: Record): Promise
+}
+
+export interface UsersStore {
+ /**
+ * A list of seen users
+ */
+ users: Record,
+};
+
+const InitState = { users: {} } as UsersStore;
+
+const UsersSlice = createSlice({
+ name: "Users",
+ initialState: InitState,
+ reducers: {
+ setUsers(state, action: PayloadAction>) {
+ state.users = action.payload
+ }
+ }
+});
+
+export const { setUsers } = UsersSlice.actions
+
+export const reducer = UsersSlice.reducer;
diff --git a/src/State/Users/Db.ts b/src/State/Users/Db.ts
new file mode 100644
index 0000000..a2e5bf5
--- /dev/null
+++ b/src/State/Users/Db.ts
@@ -0,0 +1,149 @@
+import { HexKey } from "Nostr";
+import { db as idb } from "Db";
+
+import { UsersDb, MetadataCache, setUsers } from "State/Users";
+import store from "State/Store";
+
+class IndexedDb implements UsersDb {
+ isAvailable() {
+ if ("indexedDB" in window) {
+ return new Promise((resolve) => {
+ const req = window.indexedDB.open("dummy", 1)
+ req.onsuccess = (ev) => {
+ resolve(true)
+ }
+ req.onerror = (ev) => {
+ resolve(false)
+ }
+ })
+ }
+ return Promise.resolve(false)
+ }
+
+ find(key: HexKey) {
+ return idb.users.get(key);
+ }
+
+ query(q: string) {
+ return idb.users
+ .where("npub").startsWithIgnoreCase(q)
+ .or("name").startsWithIgnoreCase(q)
+ .or("display_name").startsWithIgnoreCase(q)
+ .or("nip05").startsWithIgnoreCase(q)
+ .limit(5)
+ .toArray()
+ }
+
+ bulkGet(keys: HexKey[]) {
+ return idb.users.bulkGet(keys).then(ret => ret.filter(a => a !== undefined).map(a => a!));
+ }
+
+ add(user: MetadataCache) {
+ return idb.users.add(user)
+ }
+
+ put(user: MetadataCache) {
+ return idb.users.put(user)
+ }
+
+ bulkAdd(users: MetadataCache[]) {
+ return idb.users.bulkAdd(users)
+ }
+
+ bulkPut(users: MetadataCache[]) {
+ return idb.users.bulkPut(users)
+ }
+
+ update(key: HexKey, fields: Record) {
+ return idb.users.update(key, fields)
+ }
+}
+
+function groupByPubkey(acc: Record, user: MetadataCache) {
+ return { ...acc, [user.pubkey]: user }
+}
+
+class ReduxUsersDb implements UsersDb {
+ async isAvailable() { return true }
+
+ async query(q: string) {
+ const state = store.getState()
+ const { users } = state.users
+ return Object.values(users).filter(user => {
+ const profile = user as MetadataCache
+ return profile.name?.includes(q)
+ || profile.npub?.includes(q)
+ || profile.display_name?.includes(q)
+ || profile.nip05?.includes(q)
+ })
+ }
+
+ async find(key: HexKey) {
+ const state = store.getState()
+ const { users } = state.users
+ return users[key]
+ }
+
+
+ async add(user: MetadataCache) {
+ const state = store.getState()
+ const { users } = state.users
+ store.dispatch(setUsers({...users, [user.pubkey]: user }))
+ }
+
+
+ async put(user: MetadataCache) {
+ const state = store.getState()
+ const { users } = state.users
+ store.dispatch(setUsers({...users, [user.pubkey]: user }))
+ }
+
+ async bulkAdd(newUserProfiles: MetadataCache[]) {
+ const state = store.getState()
+ const { users } = state.users
+ const newUsers = newUserProfiles.reduce(groupByPubkey, {})
+ store.dispatch(setUsers({...users, ...newUsers }))
+ }
+
+ async bulkGet(keys: HexKey[]) {
+ const state = store.getState()
+ const { users } = state.users
+ const ids = new Set([...keys])
+ return Object.values(users).filter(user => {
+ return ids.has(user.pubkey)
+ })
+ }
+
+ async update(key: HexKey, fields: Record) {
+ const state = store.getState()
+ const { users } = state.users
+ const current = users[key]
+ const updated = {...current, ...fields }
+ store.dispatch(setUsers({...users, [key]: updated }))
+ }
+
+ async bulkPut(newUsers: MetadataCache[]) {
+ const state = store.getState()
+ const { users } = state.users
+ const newProfiles = newUsers.reduce(groupByPubkey, {})
+ store.dispatch(setUsers({ ...users, ...newProfiles }))
+ }
+}
+
+
+const indexedDb = new IndexedDb()
+export const inMemoryDb = new ReduxUsersDb()
+
+let db: UsersDb = inMemoryDb
+indexedDb.isAvailable().then((available) => {
+ if (available) {
+ console.debug('Using Indexed DB')
+ db = indexedDb;
+ } else {
+ console.debug('Using in-memory DB')
+ }
+})
+
+export function getDb() {
+ return db
+}
diff --git a/src/State/Users/Hooks.ts b/src/State/Users/Hooks.ts
new file mode 100644
index 0000000..95d94e6
--- /dev/null
+++ b/src/State/Users/Hooks.ts
@@ -0,0 +1,59 @@
+import { useSelector } from "react-redux"
+import { useLiveQuery } from "dexie-react-hooks";
+import { MetadataCache } from "State/Users";
+import { getDb, inMemoryDb } from "State/Users/Db";
+import type { RootState } from "State/Store"
+import { HexKey } from "Nostr";
+
+export function useQuery(query: string, limit: number = 5) {
+ const db = getDb()
+
+ const allUsers = useLiveQuery(
+ () => db.query(query)
+ .catch((err) => {
+ console.error(err)
+ return inMemoryDb.query(query)
+ }),
+ [query],
+ )
+
+ return allUsers
+}
+
+export function useKey(pubKey: HexKey) {
+ const db = getDb()
+ const { users } = useSelector((state: RootState) => state.users)
+ const defaultUser = users[pubKey]
+
+ const user = useLiveQuery(async () => {
+ if (pubKey) {
+ try {
+ return await db.find(pubKey);
+ } catch (error) {
+ console.error(error)
+ return defaultUser
+ }
+ }
+ }, [pubKey, defaultUser]);
+
+ return user
+}
+
+export function useKeys(pubKeys: HexKey[]): Map {
+ const db = getDb()
+ const dbUsers = useLiveQuery(async () => {
+ if (pubKeys) {
+ try {
+ const ret = await db.bulkGet(pubKeys);
+ return new Map(ret.map(a => [a.pubkey, a]))
+ } catch (error) {
+ console.error(error)
+ const ret = await inMemoryDb.bulkGet(pubKeys);
+ return new Map(ret.map(a => [a.pubkey, a]))
+ }
+ }
+ return new Map()
+ }, [pubKeys]);
+
+ return dbUsers!
+}
diff --git a/src/index.css b/src/index.css
index afe45b1..52a8d06 100644
--- a/src/index.css
+++ b/src/index.css
@@ -130,8 +130,7 @@ button:disabled {
}
.light button:disabled {
- color: var(--font-secondary-color);
- border-color: var(--font-secondary-color);
+ color: var(--font-color);
}
button:hover {
@@ -168,6 +167,17 @@ button.transparent:hover {
background-color: var(--gray-secondary);
}
+button.icon {
+ border: none;
+ background: none;
+ color: var(--font-color);
+}
+
+button.icon:hover {
+ color: white;
+ background: var(--highlight);
+}
+
.btn {
padding: 10px;
border-radius: 5px;
@@ -393,10 +403,35 @@ body.scroll-lock {
margin-bottom: 10px;
}
+.mb20 {
+ margin-bottom: 20px;
+}
+
.mr-auto {
margin-right: auto;
}
+.tabs {
+ display: flex;
+ align-content: center;
+ text-align: center;
+ margin: 10px 0;
+ overflow-x: auto;
+}
+
+.tabs>div {
+ margin-right: 10px;
+ cursor: pointer;
+}
+
+.tabs>div:last-child {
+ margin: 0;
+}
+
+.tabs .active {
+ font-weight: 700;
+}
+
.error {
color: var(--error);
}
@@ -410,27 +445,12 @@ body.scroll-lock {
}
.tabs {
- display: flex;
- align-content: center;
- text-align: center;
- margin-top: 10px;
- overflow-x: auto;
+ padding: 0;
+ align-items: center;
+ justify-content: flex-start;
margin-bottom: 16px;
}
-.tabs > * {
- margin-right: 10px;
- cursor: pointer;
-}
-
-.tabs > *:last-child {
- margin: 0;
-}
-
-.tabs .active {
- font-weight: 700;
-}
-
.tab {
border-bottom: 1px solid var(--gray-secondary);
font-weight: 700;
diff --git a/src/index.tsx b/src/index.tsx
index 3fa5bdc..9546433 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -27,6 +27,7 @@ import MessagesPage from 'Pages/MessagesPage';
import ChatPage from 'Pages/ChatPage';
import DonatePage from 'Pages/DonatePage';
import HashTagsPage from 'Pages/HashTagsPage';
+import SearchPage from 'Pages/SearchPage';
/**
* HTTP query provider
@@ -35,7 +36,7 @@ const HTTP = new QueryClient()
serviceWorkerRegistration.register();
-const router = createBrowserRouter([
+export const router = createBrowserRouter([
{
element:
{stats?.info?.name ?? addr}
+{stats?.info?.name}
{stats?.info?.description}
{stats?.info?.pubkey && (<> @@ -45,7 +45,7 @@ const RelayInfo = () => { )} {
- dispatch(removeRelay(con!.Address));
+ dispatch(removeRelay(conn!.Address));
navigate("/settings/relays")
}}>Remove