useKey

src/js/components/user/Badge.tsx

@@ -1,32 +1,33 @@
 import { JSX } from 'preact';
 
-import Key from '../../nostr/Key';
+import { useKey } from '@/hooks/useKey';
+
 import SocialNetwork from '../../nostr/SocialNetwork';
 import { translate as t } from '../../translations/Translation.mjs';
 import Icons from '../../utils/Icons';
 
 export default function Badge(props): JSX.Element | null {
-  const myPub = Key.getPubKey();
-  const hexAddress = Key.toNostrHexAddress(props.pub);
-  if (hexAddress === myPub) {
+  const { hexKey, isMe, myPubKey } = useKey(props.pub);
+
+  if(!props.pub) return null; // If no pub key, don't render anything
+
+  if (isMe) {
     return (
       <span class="mx-2 text-iris-blue tooltip" data-tip={t('you')}>
         {Icons.checkmark}
       </span>
     );
   }
-  if (!hexAddress) {
-    return null;
-  }
-  const following = SocialNetwork.isFollowing(myPub, hexAddress);
+
+  const following = SocialNetwork.isFollowing(myPubKey, hexKey);
   if (following) {
     return (
       <span class="ml-2 text-iris-blue tooltip" data-tip={t('following')}>
         {Icons.checkmark}
       </span>
     );
   } else {
-    const count = SocialNetwork.followedByFriendsCount(hexAddress);
+    const count = SocialNetwork.followedByFriendsCount(hexKey);
     if (count > 0) {
       const className = count > 10 ? 'text-iris-orange' : '';
       return (

src/js/hooks/useKey.tsx

@@ -0,0 +1,30 @@
+import { useEffect, useState } from "preact/hooks"
+
+import Key from "@/nostr/Key";
+import { BECH32, ID, STR } from "@/utils/UniqueIds";
+
+function createKeyData(str: string | undefined, prefix: string = 'npub') {
+  const myPubKey = Key.getPubKey();
+  const uid = ID(str || myPubKey);
+  const hexKey = STR(uid);
+  const bech32Key = BECH32(uid, prefix);
+  return {
+    key: str,
+    uid,
+    bech32Key,
+    hexKey,
+    isMe: hexKey === myPubKey,
+    myPubKey
+  };
+}
+
+export function useKey(str: string | undefined, prefix: string = 'npub') {
+  const [keyData, setKeyData] = useState(createKeyData(str, prefix));
+
+  useEffect(() => {
+    const data = createKeyData(str, prefix);
+    setKeyData(data);
+  }, [str, prefix]);
+
+  return keyData;
+}

src/js/utils/UniqueIds.ts

@@ -1,16 +1,23 @@
+import Key from "@/nostr/Key";
+
 // should this be a class instead? convert all strings to internal representation, enable comparison
 export type UID = number;
 
+
 // save space by mapping strs to internal unique ids
 export class UniqueIds {
   static strToUniqueId = new Map<string, UID>();
   static uniqueIdToStr = new Map<UID, string>();
   static currentUniqueId = 0;
 
   static id(str: string): UID {
-    if (str.startsWith('npub')) {
-      throw new Error('use hex instead of npub ' + str);
+    if(!str) throw new Error('ID(str) is undefined');
+
+    if (str.startsWith('npub') || str.startsWith('note') || str.startsWith('nsec')) {
+      str = Key.toNostrHexAddress(str) as string; // Convert to hex
+      if(!str) throw new Error('ID(str) is invalid or empty');
     }
+
     const existing = UniqueIds.strToUniqueId.get(str);
     if (existing) {
       return existing;
@@ -32,7 +39,13 @@
   static has(str: string): boolean {
     return UniqueIds.strToUniqueId.has(str);
   }
+
+  static bech32(id: number, prefix: string = 'npub'): string {
+    return Key.toNostrBech32Address(UniqueIds.str(id), prefix) || '';
+  }
+
 }
 
 export const STR = UniqueIds.str;
 export const ID = UniqueIds.id;
+export const BECH32 = UniqueIds.bech32;