- {state.userNPub && state.profile ? (
- state.profile.image && (
+ {session?.pubkey && profile ? (
+ profile.image && (
)
) : (
diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx
index 871ff15..6464ad5 100644
--- a/src/components/Login/Login.tsx
+++ b/src/components/Login/Login.tsx
@@ -1,7 +1,6 @@
import { useState } from 'react';
import './Login.css';
import { useBunkerLogin, useExtensionLogin } from '../../ngine/context';
-import { useGlobalState } from '../../utils/globalState';
import React from 'react';
type LoginProps = {
@@ -10,7 +9,6 @@ type LoginProps = {
const Login = ({ onClose }: LoginProps) => {
const [address, setAddress] = useState('');
- const [_, setState] = useGlobalState();
const bunkerLogin = useBunkerLogin();
const extensionLogin = useExtensionLogin();
/*
@@ -43,7 +41,6 @@ const Login = ({ onClose }: LoginProps) => {
const loginWithAddress = async () => {
const user = await bunkerLogin(address);
if (user) {
- setState({ userNPub: user.npub, profile: user.profile });
onClose();
} else {
console.error('Error loging in');
@@ -54,7 +51,6 @@ const Login = ({ onClose }: LoginProps) => {
const user = await extensionLogin();
console.log(user);
if (user) {
- setState({ userNPub: user.npub, profile: user.profile });
onClose();
} else {
console.error('Error loging in');
diff --git a/src/components/MasonryView/MasonryImage.tsx b/src/components/MasonryView/MasonryImage.tsx
index 31f2ef1..3e1302d 100644
--- a/src/components/MasonryView/MasonryImage.tsx
+++ b/src/components/MasonryView/MasonryImage.tsx
@@ -7,6 +7,7 @@ import LazyLoad from 'react-lazy-load';
import uniq from 'lodash/uniq';
import { timeDifference } from '../../utils/time';
import { unixNow } from '../../ngine/time';
+import { NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk';
interface MasonryImageProps {
image: NostrImage;
@@ -35,7 +36,7 @@ const MasonryImage = ({ image, onClick, index }: MasonryImageProps) => {
};
const mediaIsVideo = isVideo(image.url);
- const profile = useProfile(image.authorId);
+ const profile = useProfile(image.authorId, NDKSubscriptionCacheUsage.CACHE_FIRST);
const showAuthor = currentSettings.npubs == undefined || currentSettings.npubs.length != 1; // if we are looking at a single profile, don't show the author
diff --git a/src/components/MasonryView/MasonryView.tsx b/src/components/MasonryView/MasonryView.tsx
index 9669149..4718721 100644
--- a/src/components/MasonryView/MasonryView.tsx
+++ b/src/components/MasonryView/MasonryView.tsx
@@ -5,12 +5,13 @@ import { Settings } from '../../utils/useNav';
import AuthorProfile from '../AuthorProfile/AuthorProfile';
import { useSwipeable } from 'react-swipeable';
import { Helmet } from 'react-helmet';
-import useProfile from '../../utils/useProfile';
+import useActiveProfile from '../../utils/useActiveProfile';
import { ViewMode } from '../SlideShow';
import { useGlobalState } from '../../utils/globalState';
import MasonryImage from './MasonryImage';
import useWindowSize from '../../utils/useWindowSize';
import { topics } from '../env';
+import useTitle from '../../utils/useTitle';
type MasonryViewProps = {
settings: Settings;
@@ -25,7 +26,8 @@ type MImage = NostrImage & {
};
const MasonryView = ({ settings, images, currentImage, setCurrentImage, setViewMode }: MasonryViewProps) => {
- const { activeProfile, title, profileNpub } = useProfile(settings);
+ const { activeProfile, activeNpub } = useActiveProfile(settings);
+ const title = useTitle(settings, activeProfile);
const [_, setState] = useGlobalState();
const { width } = useWindowSize();
@@ -119,7 +121,7 @@ const MasonryView = ({ settings, images, currentImage, setCurrentImage, setViewM
0);
// console.log(JSON.stringify([state?.activeImage?.content, state?.activeImage?.tags]));
@@ -68,7 +70,7 @@ const ScrollView = ({ settings, images, currentImage, setCurrentImage, setViewMo
();
+
+ const session = useSession();
+ const profile = useProfile(session?.pubkey || ' ');
+ const userNPub = session ? nip19.npubEncode(session?.pubkey) as string : undefined;
+
const { zapClick, heartClick, zapState, heartState, repostClick, repostState } = useZapsAndReations(
state.activeImage,
- state.userNPub
+ userNPub
);
const navigate = useNavigate();
const listAuthors = useAuthorsFromList(settings.list);
@@ -325,7 +331,7 @@ const SlideShow = () => {
{state.showNavButtons && (
- {state.userNPub && state.activeImage && (
+ {session?.pubkey && state.activeImage && (
<>
- {(state.profile?.lud06 || state.profile?.lud16) && (
+ {(profile?.lud06 || profile?.lud16) && (
diff --git a/src/components/SlideView/index.tsx b/src/components/SlideView/index.tsx
index 1df0900..2466459 100644
--- a/src/components/SlideView/index.tsx
+++ b/src/components/SlideView/index.tsx
@@ -8,8 +8,9 @@ import { Helmet } from 'react-helmet';
import IconPause from '../Icons/IconPause';
import IconSpinner from '../Icons/IconSpinner';
import { Settings } from '../../utils/useNav';
-import useProfile from '../../utils/useProfile';
+import useActiveProfile from '../../utils/useActiveProfile';
import { ViewMode } from '../SlideShow';
+import useTitle from '../../utils/useTitle';
type SlideViewProps = {
settings: Settings;
@@ -27,7 +28,8 @@ const SlideView = ({ settings, images, setViewMode }: SlideViewProps) => {
const [activeNpub, setActiveNpub] = useState(undefined);
const [slideShowStarted, setSlideShowStarted] = useState(false);
const [activeContent, setActiveContent] = useState(undefined);
- const { activeProfile, title } = useProfile(settings);
+ const { activeProfile } = useActiveProfile(settings);
+ const title = useTitle(settings, activeProfile);
const queueNextImage = (waitTime: number) => {
clearTimeout(viewTimeoutHandle.current);
diff --git a/src/ngine/context.tsx b/src/ngine/context.tsx
index b082b7f..bb87091 100644
--- a/src/ngine/context.tsx
+++ b/src/ngine/context.tsx
@@ -173,9 +173,8 @@ export const NgineProvider = ({ ndk, links, children, enableFiatRates = false }:
const pubkey = asURL.pathname.replace(/^\/\//, '');
return { relays, pubkey };
} else {
- console.log(url);
- //const user = await NDKUser.fromNip05(url, ndk, true); // TODO needs PR FIX in NDK
- const user = await getNip05For(url);
+ // const user = await NDKUser.fromNip05(url, ndk, true); // TODO needs PR FIX in NDK
+ const user = await getNip05For(url); // WORKAROUND local implementation
if (user) {
const pubkey = user.pubkey;
const relays = user.nip46 && user.nip46.length > 0 ? user.nip46 : ['wss://relay.nsecbunker.com'];
@@ -187,16 +186,30 @@ export const NgineProvider = ({ ndk, links, children, enableFiatRates = false }:
}
}
+ function createOrLoadPrivateKeySigner() {
+ const LS_NIP46_KEY = 'nip64key';
+ const existingKey = localStorage.getItem(LS_NIP46_KEY);
+ if (existingKey) {
+ return new NDKPrivateKeySigner(existingKey);
+ } else {
+ const generatedSigner = NDKPrivateKeySigner.generate();
+ const generatedKey = generatedSigner.privateKey;
+ if (generatedKey) {
+ localStorage.setItem(LS_NIP46_KEY, generatedKey);
+ }
+ return generatedSigner;
+ }
+ }
+
async function nip46Login(url: string) {
const settings = await getNostrConnectSettings(url);
if (settings) {
- console.log(settings);
const { pubkey, relays } = settings;
const bunkerNDK = new NDK({
explicitRelayUrls: relays,
});
await bunkerNDK.connect();
- const localSigner = NDKPrivateKeySigner.generate();
+ const localSigner = createOrLoadPrivateKeySigner();
console.log('localSigner', localSigner);
const signer = new NDKNip46Signer(bunkerNDK, pubkey, localSigner);
console.log('signer', signer);
diff --git a/src/utils/globalState.tsx b/src/utils/globalState.tsx
index 4b31403..82794dc 100644
--- a/src/utils/globalState.tsx
+++ b/src/utils/globalState.tsx
@@ -1,16 +1,12 @@
import { NostrImage } from '@/components/nostrImageDownload';
-import { NDKUserProfile } from '@nostr-dev-kit/ndk';
import React, { createContext, useContext, useReducer } from 'react';
// Interface for our state
interface GlobalState {
- userNPub?: string;
- profile?: NDKUserProfile;
- showNavButtons: boolean;
+ showNavButtons: boolean; // can be removed when the settings dialog is refactored.
activeImage?: NostrImage;
}
const initialState: GlobalState = {
- userNPub: undefined,
showNavButtons: true,
};
diff --git a/src/utils/useActiveProfile.ts b/src/utils/useActiveProfile.ts
new file mode 100644
index 0000000..d03423a
--- /dev/null
+++ b/src/utils/useActiveProfile.ts
@@ -0,0 +1,17 @@
+import { Settings } from './useNav';
+import { NostrImage } from '../components/nostrImageDownload';
+import { nip19 } from 'nostr-tools';
+import { NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk';
+import useProfile from '../ngine/hooks/useProfile';
+
+const useActiveProfile = (settings: Settings, activeImage?: NostrImage) => {
+ const activeNpub = settings.npubs.length == 1 ? settings.npubs[0] : activeImage && activeImage?.author;
+ const activePubKeyHex = activeNpub ? (nip19.decode(activeNpub).data as string) : '';
+ const activeProfile = useProfile(activePubKeyHex, NDKSubscriptionCacheUsage.CACHE_FIRST);
+ return {
+ activeProfile,
+ activeNpub,
+ };
+};
+
+export default useActiveProfile;
diff --git a/src/utils/useLists.ts b/src/utils/useLists.ts
index 3632564..bf3b43b 100644
--- a/src/utils/useLists.ts
+++ b/src/utils/useLists.ts
@@ -4,11 +4,10 @@ import { nip19 } from 'nostr-tools';
const KIND_PEOPLE_LIST = 30000;
-const usePeopleLists = (npub?: string) => {
- const pubkey = npub && (nip19.decode(npub).data as string);
+const usePeopleLists = (pubkey?: string) => {
const { events } = useEvents(
{ kinds: [KIND_PEOPLE_LIST], authors: pubkey ? [pubkey] : [], limit: 50 },
- { disable: !npub }
+ { disable: !pubkey }
);
const peopleLists = useMemo(() => {
diff --git a/src/utils/useProfile.ts b/src/utils/useTitle.ts
similarity index 56%
rename from src/utils/useProfile.ts
rename to src/utils/useTitle.ts
index 50c1059..6136687 100644
--- a/src/utils/useProfile.ts
+++ b/src/utils/useTitle.ts
@@ -1,24 +1,14 @@
import { appName, topics } from '../components/env';
import { useEffect, useState } from 'react';
-import { Settings } from './useNav';
-import { NostrImage } from '../components/nostrImageDownload';
-import useProfileNgine from '../ngine/hooks/useProfile';
-import { nip19 } from 'nostr-tools';
-import { NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk';
import { useLocation, useParams } from 'react-router-dom';
+import { Settings } from './useNav';
+import { NDKUserProfile } from '@nostr-dev-kit/ndk';
-// TODO maybe remove profile and only build title here?? useTitle?
-
-const useProfile = (settings: Settings, activeImage?: NostrImage) => {
+const useTitle = (settings: Settings, activeProfile?: NDKUserProfile) => {
const [title, setTitle] = useState(appName);
const location = useLocation();
const { topic } = useParams();
- const profileNpub = settings.npubs.length == 1 ? settings.npubs[0] : activeImage && activeImage?.author;
-
- const pubKeyHex = profileNpub ? (nip19.decode(profileNpub).data as string) : '';
- const activeProfile = useProfileNgine(pubKeyHex, NDKSubscriptionCacheUsage.ONLY_RELAY);
-
useEffect(() => {
if (settings.npubs.length > 0 && activeProfile && (activeProfile.displayName || activeProfile.name)) {
setTitle((activeProfile.displayName || activeProfile.name) + ` | ${appName}`);
@@ -33,12 +23,7 @@ const useProfile = (settings: Settings, activeImage?: NostrImage) => {
}
}, [activeProfile, settings.npubs, settings.tags, topic, location]);
- return {
- activeProfile,
- title,
- profileNpub,
- pubKeyHex,
- };
+ return title;
};
-export default useProfile;
+export default useTitle;