From ff0a0facafe20811834b75e26a997292f0e56321 Mon Sep 17 00:00:00 2001
From: austinkelsay <austinkelsay@yahoo.com>
Date: Sun, 21 Jul 2024 11:11:24 -0500
Subject: [PATCH] Fix bitcoin connect init bug, fix resource fetching and
 publishing flows in useNostr, added delete for drafts

---
 src/components/profile/BitcoinConnect.js |  29 +--
 src/hooks/useNostr.js                    | 221 +++++++++++------------
 src/pages/draft/[slug]/index.js          |  90 ++++++---
 3 files changed, 189 insertions(+), 151 deletions(-)

diff --git a/src/components/profile/BitcoinConnect.js b/src/components/profile/BitcoinConnect.js
index 277eee1..f8fd4ca 100644
--- a/src/components/profile/BitcoinConnect.js
+++ b/src/components/profile/BitcoinConnect.js
@@ -9,21 +9,24 @@ const Button = dynamic(
   }
 );
 
+let initialized = false;
+
+export async function initializeBitcoinConnect() {
+  if (!initialized) {
+    const { init } = await import('@getalby/bitcoin-connect-react');
+    init({
+      appName: "PlebDevs",
+      filters: ["nwc"],
+      showBalance: false
+    });
+    initialized = true;
+  }
+}
+
 const BitcoinConnectButton = () => {
-
   useEffect(() => {
-    const initializeBitcoinConnect = async () => {
-      // Initialize Bitcoin Connect
-      const { init } = await import('@getalby/bitcoin-connect-react');
-      init({
-        appName: "PlebDevs",
-        filters: ["nwc"],
-        showBalance: false
-      });
-    };
-
     initializeBitcoinConnect();
-  }, []); // Empty dependency array to run only once on component mount
+  }, []);
 
   return (
     <Button onConnect={(provider) => {
@@ -32,4 +35,4 @@ const BitcoinConnectButton = () => {
   );
 }
 
-export default BitcoinConnectButton;
+export default BitcoinConnectButton;
\ No newline at end of file
diff --git a/src/hooks/useNostr.js b/src/hooks/useNostr.js
index fbf9d47..6f13052 100644
--- a/src/hooks/useNostr.js
+++ b/src/hooks/useNostr.js
@@ -3,6 +3,8 @@ import axios from 'axios';
 import { nip57, nip19 } from 'nostr-tools';
 import { NostrContext } from '@/context/NostrContext';
 import { lnurlEncode } from '@/utils/lnurl';
+import { parseEvent } from '@/utils/nostr';
+import { v4 as uuidv4 } from 'uuid';
 
 const defaultRelays = [
     "wss://nos.lol/",
@@ -228,29 +230,29 @@ export function useNostr() {
 
     const fetchKind0 = useCallback(
         async (publicKey) => {
-          return new Promise((resolve) => {
-            const timeout = setTimeout(() => {
-              resolve(null); // Resolve with null if no event is received within the timeout
-            }, 10000); // 10 seconds timeout
-      
-            subscribe(
-              [{ authors: [publicKey], kinds: [0] }],
-              {
-                onevent: (event) => {
-                  clearTimeout(timeout);
-                  resolve(JSON.parse(event.content));
-                },
-                onerror: (error) => {
-                  clearTimeout(timeout);
-                  console.error('Error fetching kind 0:', error);
-                  resolve(null);
-                },
-              }
-            );
-          });
+            return new Promise((resolve) => {
+                const timeout = setTimeout(() => {
+                    resolve(null); // Resolve with null if no event is received within the timeout
+                }, 10000); // 10 seconds timeout
+
+                subscribe(
+                    [{ authors: [publicKey], kinds: [0] }],
+                    {
+                        onevent: (event) => {
+                            clearTimeout(timeout);
+                            resolve(JSON.parse(event.content));
+                        },
+                        onerror: (error) => {
+                            clearTimeout(timeout);
+                            console.error('Error fetching kind 0:', error);
+                            resolve(null);
+                        },
+                    }
+                );
+            });
         },
         [subscribe]
-      );
+    );
 
     const zapEvent = useCallback(
         async (event, amount, comment) => {
@@ -340,37 +342,36 @@ export function useNostr() {
         const filter = [{ kinds: [30023, 30402], authors: [AUTHOR_PUBKEY] }];
         const hasRequiredTags = (tags) => {
             const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs");
-            // Check if 'resource' tag exists
             const hasResource = tags.some(([tag, value]) => tag === "t" && value === "resource");
-            // Return true if both tags exist
             return hasPlebDevs && hasResource;
         };
 
         return new Promise((resolve, reject) => {
             let resources = [];
-
             const subscription = subscribe(
                 filter,
                 {
                     onevent: (event) => {
                         if (hasRequiredTags(event.tags)) {
+                            console.log('event:', event);
                             resources.push(event);
                         }
                     },
                     onerror: (error) => {
                         console.error('Error fetching resources:', error);
-                        subscription?.close();
-                        resolve(resources);
+                        // Don't resolve here, just log the error
                     },
                     onclose: () => {
-                        resolve(resources);
+                        // Don't resolve here either
                     },
                 },
                 2000 // Adjust the timeout value as needed
             );
 
+            // Set a timeout to resolve the promise after collecting events
             setTimeout(() => {
                 subscription?.close();
+                console.log('Resolving with resources:', resources);
                 resolve(resources);
             }, 2000); // Adjust the timeout value as needed
         });
@@ -378,32 +379,33 @@ export function useNostr() {
 
     const fetchWorkshops = useCallback(async () => {
         const filter = [{ kinds: [30023, 30402], authors: [AUTHOR_PUBKEY] }];
+        console.log('filter:', filter);
         const hasRequiredTags = (tags) => {
             const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs");
-
             const hasWorkshop = tags.some(([tag, value]) => tag === "t" && value === "workshop");
-
             return hasPlebDevs && hasWorkshop;
         };
 
         return new Promise((resolve, reject) => {
             let workshops = [];
-
             const subscription = subscribe(
                 filter,
                 {
                     onevent: (event) => {
+                        console.log('Received workshop event:', event);
                         if (hasRequiredTags(event.tags)) {
+                            console.log('Workshop event passed tag check, adding to workshops');
                             workshops.push(event);
+                        } else {
+                            console.log('Workshop event did not pass tag check');
                         }
                     },
                     onerror: (error) => {
                         console.error('Error fetching workshops:', error);
-                        subscription?.close();
-                        resolve(workshops);
+                        // Don't resolve here, just log the error
                     },
                     onclose: () => {
-                        resolve(workshops);
+                        // Don't resolve here either
                     },
                 },
                 2000 // Adjust the timeout value as needed
@@ -411,6 +413,7 @@ export function useNostr() {
 
             setTimeout(() => {
                 subscription?.close();
+                console.log('Resolving with workshops:', workshops);
                 resolve(workshops);
             }, 2000); // Adjust the timeout value as needed
         });
@@ -420,30 +423,30 @@ export function useNostr() {
         const filter = [{ kinds: [30023], authors: [AUTHOR_PUBKEY] }];
         const hasRequiredTags = (tags) => {
             const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs");
-
             const hasCourse = tags.some(([tag, value]) => tag === "t" && value === "course");
-
             return hasPlebDevs && hasCourse;
         };
 
         return new Promise((resolve, reject) => {
             let courses = [];
-
             const subscription = subscribe(
                 filter,
                 {
                     onevent: (event) => {
+                        console.log('Received course event:', event);
                         if (hasRequiredTags(event.tags)) {
+                            console.log('Course event passed tag check, adding to courses');
                             courses.push(event);
+                        } else {
+                            console.log('Course event did not pass tag check');
                         }
                     },
                     onerror: (error) => {
                         console.error('Error fetching courses:', error);
-                        subscription?.close();
-                        resolve(courses);
+                        // Don't resolve here, just log the error
                     },
                     onclose: () => {
-                        resolve(courses);
+                        // Don't resolve here either
                     },
                 },
                 2000 // Adjust the timeout value as needed
@@ -451,6 +454,7 @@ export function useNostr() {
 
             setTimeout(() => {
                 subscription?.close();
+                console.log('Resolving with courses:', courses);
                 resolve(courses);
             }, 2000); // Adjust the timeout value as needed
         });
@@ -458,92 +462,87 @@ export function useNostr() {
 
     const publishResource = useCallback(
         async (resourceEvent) => {
-          const published = await publish(resourceEvent);
-      
-          if (published) {
-            const { id, kind, pubkey, content, title, summary, image, published_at, d, topics } = parseEvent(resourceEvent);
+            const published = await publish(resourceEvent);
 
-            const user = window.localStorage.getItem('user');
-            const userId = JSON.parse(user).id;
-      
-            const payload = {
-              
-            };
-      
-            if (payload && payload.user) {
-              try {
-                const response = await axios.post('/api/resources', payload);
-                
-                if (response.status === 201) {
-                  try {
-                    const deleteResponse = await axios.delete(`/api/drafts/${resourceEvent.id}`);
-                    
-                    if (deleteResponse.status === 204) {
-                      return true;
+            if (published) {
+                const { id, kind, pubkey, content, title, summary, image, published_at, d, topics } = parseEvent(resourceEvent);
+
+                const user = window.localStorage.getItem('user');
+                const userId = JSON.parse(user).id;
+
+                const payload = {
+                    id: uuidv4(),
+                    user: {
+                        connect: { id: userId } // This is the correct way to connect to an existing user
+                    },
+                    noteId: id
+                };
+
+                if (payload && payload.user) {
+                    try {
+                        const response = await axios.post('/api/resources', payload);
+
+                        if (response.status === 201) {
+                            return true;
+                        }
+                    } catch (error) {
+                        console.error('Error creating resource:', error);
+                        return false;
                     }
-                  } catch (error) {
-                    console.error('Error deleting draft:', error);
-                    return false;
-                  }
                 }
-              } catch (error) {
-                console.error('Error creating resource:', error);
-                return false;
-              }
             }
-          }
-      
-          return false;
+
+            return false;
         },
         [publish]
-      );
+    );
 
 
-      const publishCourse = useCallback(
+    const publishCourse = useCallback(
         async (courseEvent) => {
-          const published = await publish(courseEvent);
-      
-          if (published) {
-            const user = window.localStorage.getItem('user');
-            const pubkey = JSON.parse(user).pubkey;
-      
-            const payload = {
-              title: courseEvent.title,
-              summary: courseEvent.summary,
-              type: 'course',
-              content: courseEvent.content,
-              image: courseEvent.image,
-              user: pubkey,
-              topics: [...courseEvent.topics.map(topic => topic.trim().toLowerCase()), 'plebdevs', 'course']
-            };
-      
-            if (payload && payload.user) {
-              try {
-                const response = await axios.post('/api/courses', payload);
-                
-                if (response.status === 201) {
-                  try {
-                    const deleteResponse = await axios.delete(`/api/drafts/${courseEvent.id}`);
-                    
-                    if (deleteResponse.status === 204) {
-                      return true;
+            const published = await publish(courseEvent);
+
+            if (published) {
+                const user = window.localStorage.getItem('user');
+                const pubkey = JSON.parse(user).pubkey;
+
+                const payload = {
+                    title: courseEvent.title,
+                    summary: courseEvent.summary,
+                    type: 'course',
+                    content: courseEvent.content,
+                    image: courseEvent.image,
+                    user: pubkey,
+                    topics: [...courseEvent.topics.map(topic => topic.trim().toLowerCase()), 'plebdevs', 'course']
+                };
+
+                if (payload && payload.user) {
+                    try {
+                        const response = await axios.post('/api/courses', payload);
+
+                        if (response.status === 201) {
+                            try {
+                                const deleteResponse = await axios.delete(`/api/drafts/${courseEvent.id}`);
+
+                                if (deleteResponse.status === 204) {
+                                    return true;
+                                }
+                            } catch (error) {
+                                console.error('Error deleting draft:', error);
+                                return false;
+                            }
+                        }
+                    } catch (error) {
+                        console.error('Error creating course:', error);
+                        return false;
                     }
-                  } catch (error) {
-                    console.error('Error deleting draft:', error);
-                    return false;
-                  }
                 }
-              } catch (error) {
-                console.error('Error creating course:', error);
-                return false;
-              }
             }
-          }
-      
-          return false;
+
+            return false;
         },
         [publish]
-      );
+    );
 
     return { subscribe, publish, fetchSingleEvent, fetchZapsForEvent, fetchKind0, fetchResources, fetchWorkshops, fetchCourses, zapEvent, fetchZapsForEvents, publishResource, publishCourse };
 }
\ No newline at end of file
diff --git a/src/pages/draft/[slug]/index.js b/src/pages/draft/[slug]/index.js
index c4e74eb..06df9aa 100644
--- a/src/pages/draft/[slug]/index.js
+++ b/src/pages/draft/[slug]/index.js
@@ -72,10 +72,42 @@ export default function Details() {
             const { unsignedEvent, type } = await buildEvent(draft);
 
             if (unsignedEvent) {
-                await publishEvent(unsignedEvent, type);
+                const published = await publishEvent(unsignedEvent, type);
+                // if successful, delete the draft, redirect to profile
+                if (published) {
+                    axios.delete(`/api/drafts/${draft.id}`)
+                        .then(res => {
+                            if (res.status === 204) {
+                                showToast('success', 'Success', 'Draft deleted successfully.');
+                                router.push(`/profile`);
+                            } else {
+                                showToast('error', 'Error', 'Failed to delete draft.');
+                            }
+                        })
+                        .catch(err => {
+                            console.error(err);
+                        });
+                }
+            } else {
+                showToast('error', 'Error', 'Failed to broadcast resource. Please try again.');
             }
-        } else {
-            showToast('error', 'Error', 'Failed to broadcast resource. Please try again.');
+        }
+    }
+
+    const handleDelete = async () => {
+        if (draft) {
+            await axios.delete(`/api/drafts/${draft.id}`)
+                .then(res => {
+                    if (res.status === 204) {
+                        showToast('success', 'Success', 'Draft deleted successfully.');
+                        router.push(`/profile`);
+                    } else {
+                        showToast('error', 'Error', 'Failed to delete draft.');
+                    }
+                })
+                .catch(err => {
+                    console.error(err);
+                });
         }
     }
 
@@ -127,28 +159,31 @@ export default function Details() {
             published = await publishCourse(signedEvent);
         }
 
+        console.log('published:', published);
+
         if (published) {
             // check if the event is published
             const publishedEvent = await fetchSingleEvent(signedEvent.id);
-            
+
             console.log('publishedEvent:', publishedEvent);
-            
+
             if (publishedEvent) {
                 // show success message
                 showToast('success', 'Success', `${type} published successfully.`);
                 // delete the draft
+                console.log('draft:', draft);
                 await axios.delete(`/api/drafts/${draft.id}`)
-                .then(res => {
-                    if (res.status === 204) {
-                        showToast('success', 'Success', 'Draft deleted successfully.');
-                        router.push(`/profile`);
-                    } else {
-                        showToast('error', 'Error', 'Failed to delete draft.');
-                    }
-                })
-                .catch(err => {
-                    console.error(err);
-                });
+                    .then(res => {
+                        if (res.status === 204) {
+                            showToast('success', 'Success', 'Draft deleted successfully.');
+                            router.push(`/profile`);
+                        } else {
+                            showToast('error', 'Error', 'Failed to delete draft.');
+                        }
+                    })
+                    .catch(err => {
+                        console.error(err);
+                    });
             }
         }
     }
@@ -163,7 +198,7 @@ export default function Details() {
             case 'resource':
                 if (draft?.price) {
                     // encrypt the content with NEXT_PUBLIC_APP_PRIV_KEY to NEXT_PUBLIC_APP_PUBLIC_KEY
-                    encryptedContent = await nip04.encrypt(process.env.NEXT_PUBLIC_APP_PRIV_KEY ,process.env.NEXT_PUBLIC_APP_PUBLIC_KEY, draft.content);
+                    encryptedContent = await nip04.encrypt(process.env.NEXT_PUBLIC_APP_PRIV_KEY, process.env.NEXT_PUBLIC_APP_PUBLIC_KEY, draft.content);
                 }
                 event = {
                     kind: draft?.price ? 30402 : 30023, // Determine kind based on if price is present
@@ -185,7 +220,7 @@ export default function Details() {
             case 'workshop':
                 if (draft?.price) {
                     // encrypt the content with NEXT_PUBLIC_APP_PRIV_KEY to NEXT_PUBLIC_APP_PUBLIC_KEY
-                    encryptedContent = await nip04.encrypt(process.env.NEXT_PUBLIC_APP_PRIV_KEY ,process.env.NEXT_PUBLIC_APP_PUBLIC_KEY, draft.content);
+                    encryptedContent = await nip04.encrypt(process.env.NEXT_PUBLIC_APP_PRIV_KEY, process.env.NEXT_PUBLIC_APP_PUBLIC_KEY, draft.content);
                 }
                 event = {
                     kind: draft?.price ? 30402 : 30023,
@@ -254,12 +289,12 @@ export default function Details() {
                             />
                             {user && user?.pubkey && (
                                 <p className='text-lg'>
-                                Created by{' '}
-                                <a href={`https://nostr.com/${hexToNpub(user?.pubkey)}`} rel='noreferrer noopener' target='_blank' className='text-blue-500 hover:underline'>
-                                    {user?.username || user?.pubkey.slice(0, 10)}{'... '}
-                                </a>
-                            </p>
-                                )}
+                                    Created by{' '}
+                                    <a href={`https://nostr.com/${hexToNpub(user?.pubkey)}`} rel='noreferrer noopener' target='_blank' className='text-blue-500 hover:underline'>
+                                        {user?.username || user?.pubkey.slice(0, 10)}{'... '}
+                                    </a>
+                                </p>
+                            )}
                         </div>
                     </div>
                     <div className='flex flex-col max-tab:mt-12 max-mob:mt-12'>
@@ -281,9 +316,10 @@ export default function Details() {
                 </div>
             </div>
             <div className='w-[75vw] mx-auto flex flex-row justify-end mt-12'>
-                <div className='w-[15vw] flex flex-row justify-between'>
-                    <Button onClick={() => router.push(`/draft/${draft?.id}/edit`)} label="Edit" severity='warning' outlined className="w-auto my-2" />
-                    <Button onClick={handleSubmit} label="Publish" severity='success' outlined className="w-auto my-2" />
+                <div className='w-fit flex flex-row justify-between'>
+                    <Button onClick={handleSubmit} label="Publish" severity='success' outlined className="w-auto m-2" />
+                    <Button onClick={() => router.push(`/draft/${draft?.id}/edit`)} label="Edit" severity='warning' outlined className="w-auto m-2" />
+                    <Button onClick={handleDelete} label="Delete" severity='danger' outlined className="w-auto m-2 mr-0" />
                 </div>
             </div>
             <div className='w-[75vw] mx-auto mt-12 p-12 border-t-2 border-gray-300 max-tab:p-0 max-mob:p-0 max-tab:max-w-[100vw] max-mob:max-w-[100vw]'>