update channel

src/utils/hooks/useChannelMetadata.tsx

@@ -1,15 +1,15 @@
-import { RelayContext } from '@lume/shared/relaysProvider';
 import { READONLY_RELAYS } from '@lume/stores/constants';
 import { updateChannelMetadata } from '@lume/utils/storage';
 import { getChannel } from '@lume/utils/storage';
 
-import { useCallback, useContext, useEffect, useState } from 'react';
+import { RelayPool } from 'nostr-relaypool';
+import { useCallback, useEffect, useState } from 'react';
 
 export const useChannelMetadata = (id: string, channelPubkey: string) => {
-  const pool: any = useContext(RelayContext);
   const [metadata, setMetadata] = useState(null);
 
   const fetchFromRelay = useCallback(() => {
+    const pool = new RelayPool(READONLY_RELAYS);
     const unsubscribe = pool.subscribe(
       [
         {
@@ -53,7 +53,7 @@ export const useChannelMetadata = (id: string, channelPubkey: string) => {
     return () => {
       unsubscribe();
     };
-  }, [channelPubkey, id, pool]);
+  }, [channelPubkey, id]);
 
   const getChannelFromDB = useCallback(async () => {
     return await getChannel(id);

src/utils/hooks/useChannelProfile.tsx

@@ -1,12 +1,9 @@
-import { RelayContext } from '@lume/shared/relaysProvider';
-import { READONLY_RELAYS } from '@lume/stores/constants';
+import { FULL_RELAYS } from '@lume/stores/constants';
 
-import { useContext } from 'react';
+import { RelayPool } from 'nostr-relaypool';
 import useSWRSubscription from 'swr/subscription';
 
 export const useChannelProfile = (id: string, channelPubkey: string) => {
-  const pool: any = useContext(RelayContext);
-
   const { data } = useSWRSubscription(
     id
       ? [
@@ -21,9 +18,10 @@ export const useChannelProfile = (id: string, channelPubkey: string) => {
         ]
       : null,
     (key, { next }) => {
+      const pool = new RelayPool(FULL_RELAYS);
       const unsubscribe = pool.subscribe(
         key,
-        READONLY_RELAYS,
+        FULL_RELAYS,
         (event: { kind: number; pubkey: string; content: string }) => {
           switch (event.kind) {
             case 40:
@@ -41,7 +39,6 @@ export const useChannelProfile = (id: string, channelPubkey: string) => {
         undefined,
         {
           unsubscribeOnEose: true,
-          logAllEvents: false,
         }
       );
 

src/utils/hooks/useProfile.tsx

@@ -3,12 +3,11 @@ import useSWR from 'swr';
 const fetcher = (url: string) => fetch(url).then((r: any) => r.json());
 
 export const useProfile = (pubkey: string) => {
-  const { data, error } = useSWR(`https://rbr.bio/${pubkey}/metadata.json`, fetcher);
-  if (error) {
-    return error;
-  }
-  if (data) {
-    return JSON.parse(data.content);
-  }
-  return null;
+  const { data, error, isLoading } = useSWR(`https://us.rbr.bio/${pubkey}/metadata.json`, fetcher);
+
+  return {
+    user: data ? JSON.parse(data.content ? data.content : null) : null,
+    isLoading,
+    isError: error,
+  };
 };

src/utils/parser.tsx

@@ -1,60 +1,9 @@
-import { ImagePreview } from '@lume/shared/note/preview/image';
-import { VideoPreview } from '@lume/shared/note/preview/video';
-import { YoutubePreview } from '@lume/shared/note/preview/youtube';
-import { NoteQuote } from '@lume/shared/note/quote';
-import { UserMention } from '@lume/shared/user/mention';
+import ImagePreview from '@lume/shared/preview/image';
+import VideoPreview from '@lume/shared/preview/video';
+import YoutubePreview from '@lume/shared/preview/youtube';
 
-import destr from 'destr';
 import reactStringReplace from 'react-string-replace';
 
-export const contentParser = (noteContent: any, noteTags: any) => {
-  let parsedContent = noteContent.trim();
-
-  // get data tags
-  const tags = destr(noteTags);
-  // handle urls
-  parsedContent = reactStringReplace(parsedContent, /(https?:\/\/\S+)/g, (match, i) => {
-    if (match.match(/\.(jpg|jpeg|gif|png|webp)$/i)) {
-      // image url
-      return <ImagePreview key={match + i} url={match} size="large" />;
-    } else if (match.match(/(http:|https:)?(\/\/)?(www\.)?(youtube.com|youtu.be)\/(watch|embed)?(\?v=|\/)?(\S+)?/)) {
-      // youtube
-      return <YoutubePreview key={match + i} url={match} />;
-    } else if (match.match(/\.(mp4|webm)$/i)) {
-      // video
-      return <VideoPreview key={match + i} url={match} />;
-    } else {
-      return (
-        <a key={match + i} href={match} className="cursor-pointer text-fuchsia-500" target="_blank" rel="noreferrer">
-          {match}
-        </a>
-      );
-    }
-  });
-  // handle #-hashtags
-  parsedContent = reactStringReplace(parsedContent, /#(\w+)/g, (match, i) => (
-    <span key={match + i} className="cursor-pointer text-fuchsia-500">
-      #{match}
-    </span>
-  ));
-  // handle mentions
-  if (tags && tags.length > 0) {
-    parsedContent = reactStringReplace(parsedContent, /\#\[(\d+)\]/gm, (match, i) => {
-      if (tags[match][0] === 'p') {
-        // @-mentions
-        return <UserMention key={tags[match][1] + i} pubkey={tags[match][1]} />;
-      } else if (tags[match][0] === 'e') {
-        // note-quotes
-        return <NoteQuote key={tags[match][1] + i} id={tags[match][1]} />;
-      } else {
-        return;
-      }
-    });
-  }
-
-  return parsedContent;
-};
-
 export const messageParser = (noteContent: any) => {
   let parsedContent = noteContent.trim();