saulteafarmer/plebdevs
1
0
Fork 0
mirror of https://github.com/AustinKelsay/plebdevs.git synced 2025-06-06 18:31:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bitcoin connect init bug, fix resource fetching and publishing flows in useNostr, added delete for drafts

Browse Source
This commit is contained in:
austinkelsay 2024-07-21 11:11:24 -05:00
parent a9a443fed1
commit ff0a0facaf
3 changed files with 189 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/profile/BitcoinConnect.js
View File

@ -9,21 +9,24 @@ const Button = dynamic(
} }
); );
const BitcoinConnectButton = () => { let initialized = false;
useEffect(() => { export async function initializeBitcoinConnect() {
const initializeBitcoinConnect = async () => { if (!initialized) {
// Initialize Bitcoin Connect
const { init } = await import('@getalby/bitcoin-connect-react'); const { init } = await import('@getalby/bitcoin-connect-react');
init({ init({
appName: "PlebDevs", appName: "PlebDevs",
filters: ["nwc"], filters: ["nwc"],
showBalance: false showBalance: false
}); });
}; initialized = true;
}
}
const BitcoinConnectButton = () => {
useEffect(() => {
initializeBitcoinConnect(); initializeBitcoinConnect();
}, []); // Empty dependency array to run only once on component mount }, []);
return ( return (
<Button onConnect={(provider) => { <Button onConnect={(provider) => {

55
src/hooks/useNostr.js
View File

@ -3,6 +3,8 @@ import axios from 'axios';
import { nip57, nip19 } from 'nostr-tools'; import { nip57, nip19 } from 'nostr-tools';
import { NostrContext } from '@/context/NostrContext'; import { NostrContext } from '@/context/NostrContext';
import { lnurlEncode } from '@/utils/lnurl'; import { lnurlEncode } from '@/utils/lnurl';
import { parseEvent } from '@/utils/nostr';
import { v4 as uuidv4 } from 'uuid';
const defaultRelays = [ const defaultRelays = [
"wss://nos.lol/", "wss://nos.lol/",
@ -340,37 +342,36 @@ export function useNostr() {
const filter = [{ kinds: [30023, 30402], authors: [AUTHOR_PUBKEY] }]; const filter = [{ kinds: [30023, 30402], authors: [AUTHOR_PUBKEY] }];
const hasRequiredTags = (tags) => { const hasRequiredTags = (tags) => {
const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs"); 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"); const hasResource = tags.some(([tag, value]) => tag === "t" && value === "resource");
// Return true if both tags exist
return hasPlebDevs && hasResource; return hasPlebDevs && hasResource;
}; };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let resources = []; let resources = [];
const subscription = subscribe( const subscription = subscribe(
filter, filter,
{ {
onevent: (event) => { onevent: (event) => {
if (hasRequiredTags(event.tags)) { if (hasRequiredTags(event.tags)) {
console.log('event:', event);
resources.push(event); resources.push(event);
} }
}, },
onerror: (error) => { onerror: (error) => {
console.error('Error fetching resources:', error); console.error('Error fetching resources:', error);
subscription?.close(); // Don't resolve here, just log the error
resolve(resources);
}, },
onclose: () => { onclose: () => {
resolve(resources); // Don't resolve here either
}, },
}, },
2000 // Adjust the timeout value as needed 2000 // Adjust the timeout value as needed
); );
// Set a timeout to resolve the promise after collecting events
setTimeout(() => { setTimeout(() => {
subscription?.close(); subscription?.close();
console.log('Resolving with resources:', resources);
resolve(resources); resolve(resources);
}, 2000); // Adjust the timeout value as needed }, 2000); // Adjust the timeout value as needed
}); });
@ -378,32 +379,33 @@ export function useNostr() {
const fetchWorkshops = useCallback(async () => { const fetchWorkshops = useCallback(async () => {
const filter = [{ kinds: [30023, 30402], authors: [AUTHOR_PUBKEY] }]; const filter = [{ kinds: [30023, 30402], authors: [AUTHOR_PUBKEY] }];
console.log('filter:', filter);
const hasRequiredTags = (tags) => { const hasRequiredTags = (tags) => {
const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs"); const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs");
const hasWorkshop = tags.some(([tag, value]) => tag === "t" && value === "workshop"); const hasWorkshop = tags.some(([tag, value]) => tag === "t" && value === "workshop");
return hasPlebDevs && hasWorkshop; return hasPlebDevs && hasWorkshop;
}; };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let workshops = []; let workshops = [];
const subscription = subscribe( const subscription = subscribe(
filter, filter,
{ {
onevent: (event) => { onevent: (event) => {
console.log('Received workshop event:', event);
if (hasRequiredTags(event.tags)) { if (hasRequiredTags(event.tags)) {
console.log('Workshop event passed tag check, adding to workshops');
workshops.push(event); workshops.push(event);
} else {
console.log('Workshop event did not pass tag check');
} }
}, },
onerror: (error) => { onerror: (error) => {
console.error('Error fetching workshops:', error); console.error('Error fetching workshops:', error);
subscription?.close(); // Don't resolve here, just log the error
resolve(workshops);
}, },
onclose: () => { onclose: () => {
resolve(workshops); // Don't resolve here either
}, },
}, },
2000 // Adjust the timeout value as needed 2000 // Adjust the timeout value as needed
@ -411,6 +413,7 @@ export function useNostr() {
setTimeout(() => { setTimeout(() => {
subscription?.close(); subscription?.close();
console.log('Resolving with workshops:', workshops);
resolve(workshops); resolve(workshops);
}, 2000); // Adjust the timeout value as needed }, 2000); // Adjust the timeout value as needed
}); });
@ -420,30 +423,30 @@ export function useNostr() {
const filter = [{ kinds: [30023], authors: [AUTHOR_PUBKEY] }]; const filter = [{ kinds: [30023], authors: [AUTHOR_PUBKEY] }];
const hasRequiredTags = (tags) => { const hasRequiredTags = (tags) => {
const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs"); const hasPlebDevs = tags.some(([tag, value]) => tag === "t" && value === "plebdevs");
const hasCourse = tags.some(([tag, value]) => tag === "t" && value === "course"); const hasCourse = tags.some(([tag, value]) => tag === "t" && value === "course");
return hasPlebDevs && hasCourse; return hasPlebDevs && hasCourse;
}; };
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let courses = []; let courses = [];
const subscription = subscribe( const subscription = subscribe(
filter, filter,
{ {
onevent: (event) => { onevent: (event) => {
console.log('Received course event:', event);
if (hasRequiredTags(event.tags)) { if (hasRequiredTags(event.tags)) {
console.log('Course event passed tag check, adding to courses');
courses.push(event); courses.push(event);
} else {
console.log('Course event did not pass tag check');
} }
}, },
onerror: (error) => { onerror: (error) => {
console.error('Error fetching courses:', error); console.error('Error fetching courses:', error);
subscription?.close(); // Don't resolve here, just log the error
resolve(courses);
}, },
onclose: () => { onclose: () => {
resolve(courses); // Don't resolve here either
}, },
}, },
2000 // Adjust the timeout value as needed 2000 // Adjust the timeout value as needed
@ -451,6 +454,7 @@ export function useNostr() {
setTimeout(() => { setTimeout(() => {
subscription?.close(); subscription?.close();
console.log('Resolving with courses:', courses);
resolve(courses); resolve(courses);
}, 2000); // Adjust the timeout value as needed }, 2000); // Adjust the timeout value as needed
}); });
@ -467,7 +471,11 @@ export function useNostr() {
const userId = JSON.parse(user).id; const userId = JSON.parse(user).id;
const payload = { 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) { if (payload && payload.user) {
@ -475,17 +483,8 @@ export function useNostr() {
const response = await axios.post('/api/resources', payload); const response = await axios.post('/api/resources', payload);
if (response.status === 201) { if (response.status === 201) {
try {
const deleteResponse = await axios.delete(`/api/drafts/${resourceEvent.id}`);
if (deleteResponse.status === 204) {
return true; return true;
} }
} catch (error) {
console.error('Error deleting draft:', error);
return false;
}
}
} catch (error) { } catch (error) {
console.error('Error creating resource:', error); console.error('Error creating resource:', error);
return false; return false;

44
src/pages/draft/[slug]/index.js
View File

@ -72,12 +72,44 @@ export default function Details() {
const { unsignedEvent, type } = await buildEvent(draft); const { unsignedEvent, type } = await buildEvent(draft);
if (unsignedEvent) { 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 { } else {
showToast('error', 'Error', 'Failed to broadcast resource. Please try again.'); 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);
});
}
}
const publishEvent = async (event, type) => { const publishEvent = async (event, type) => {
const dTag = event.tags.find(tag => tag[0] === 'd')[1]; const dTag = event.tags.find(tag => tag[0] === 'd')[1];
@ -127,6 +159,8 @@ export default function Details() {
published = await publishCourse(signedEvent); published = await publishCourse(signedEvent);
} }
console.log('published:', published);
if (published) { if (published) {
// check if the event is published // check if the event is published
const publishedEvent = await fetchSingleEvent(signedEvent.id); const publishedEvent = await fetchSingleEvent(signedEvent.id);
@ -137,6 +171,7 @@ export default function Details() {
// show success message // show success message
showToast('success', 'Success', `${type} published successfully.`); showToast('success', 'Success', `${type} published successfully.`);
// delete the draft // delete the draft
console.log('draft:', draft);
await axios.delete(`/api/drafts/${draft.id}`) await axios.delete(`/api/drafts/${draft.id}`)
.then(res => { .then(res => {
if (res.status === 204) { if (res.status === 204) {
@ -281,9 +316,10 @@ export default function Details() {
</div> </div>
</div> </div>
<div className='w-[75vw] mx-auto flex flex-row justify-end mt-12'> <div className='w-[75vw] mx-auto flex flex-row justify-end mt-12'>
<div className='w-[15vw] flex flex-row justify-between'> <div className='w-fit 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 m-2" />
<Button onClick={handleSubmit} label="Publish" severity='success' outlined className="w-auto my-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> </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]'> <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]'>