From e2a95563051e46919f14f04f924c084010769cb2 Mon Sep 17 00:00:00 2001 From: "plebeius.eth" Date: Sun, 2 Jul 2023 11:45:56 +0200 Subject: [PATCH] fix plebbitOptions, improve error messages --- src/components/modals/ModerationModal.jsx | 4 +- src/components/modals/ReplyModal.jsx | 4 +- src/components/modals/SettingsModal.jsx | 48 ++++++++++++------- src/components/views/All.jsx | 4 +- src/components/views/AllCatalog.jsx | 4 +- src/components/views/Board.jsx | 8 ++-- src/components/views/Catalog.jsx | 8 ++-- src/components/views/Subscriptions.jsx | 4 +- src/components/views/SubscriptionsCatalog.jsx | 4 +- src/components/views/Thread.jsx | 6 +-- 10 files changed, 55 insertions(+), 39 deletions(-) diff --git a/src/components/modals/ModerationModal.jsx b/src/components/modals/ModerationModal.jsx index 44caad8d..296b74bc 100755 --- a/src/components/modals/ModerationModal.jsx +++ b/src/components/modals/ModerationModal.jsx @@ -63,7 +63,7 @@ const ModerationModal = ({ isOpen, closeModal, deletePost }) => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -113,7 +113,7 @@ const ModerationModal = ({ isOpen, closeModal, deletePost }) => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); diff --git a/src/components/modals/ReplyModal.jsx b/src/components/modals/ReplyModal.jsx index a73ed331..e185ebac 100755 --- a/src/components/modals/ReplyModal.jsx +++ b/src/components/modals/ReplyModal.jsx @@ -115,7 +115,7 @@ const ReplyModal = ({ isOpen, closeModal }) => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -136,7 +136,7 @@ const ReplyModal = ({ isOpen, closeModal }) => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); diff --git a/src/components/modals/SettingsModal.jsx b/src/components/modals/SettingsModal.jsx index f60d28bc..844e42ed 100755 --- a/src/components/modals/SettingsModal.jsx +++ b/src/components/modals/SettingsModal.jsx @@ -36,6 +36,17 @@ const SettingsModal = ({ isOpen, closeModal }) => { const importRef = useRef(); const nameRef = useRef(); + const defaultGatewayUrls = [ + 'https://ipfs.io', + 'https://ipfsgateway.xyz', + 'https://cloudflare-ipfs.com', + 'https://plebpubsub.live' + ]; + const defaultPubsubHttpClientsOptions = [ + 'https://pubsubprovider.xyz/api/v0', + 'https://plebpubsub.live/api/v0' + ]; + const isValidURL = (url) => { try { new URL(url); @@ -46,14 +57,26 @@ const SettingsModal = ({ isOpen, closeModal }) => { }; const handleSavePlebbitOptions = async () => { - const gatewayUrls = gatewayRef.current.value.split('\n').filter(url => url.trim()); - const ipfsClientsOptions = ipfsRef.current.value.split('\n').filter(url => url.trim()) || undefined; - const pubsubClientsOptions = pubsubRef.current.value.split('\n').filter(url => url.trim()); + let gatewayUrls = gatewayRef.current.value.split('\n').filter(url => url.trim()); + let ipfsClientsOptions = ipfsRef.current.value.split('\n').filter(url => url.trim()); + let pubsubClientsOptions = pubsubRef.current.value.split('\n').filter(url => url.trim()); + + if (!gatewayUrls.length) { + gatewayUrls = defaultGatewayUrls; + } + + if (!ipfsClientsOptions.length) { + ipfsClientsOptions = undefined; + } + + if (!pubsubClientsOptions.length) { + pubsubClientsOptions = defaultPubsubHttpClientsOptions; + } const invalidUrls = [ - ...gatewayUrls, + ...gatewayUrls || defaultGatewayUrls, ...(ipfsClientsOptions || []), - ...pubsubClientsOptions, + ...pubsubClientsOptions || defaultPubsubHttpClientsOptions, ].filter((url) => !isValidURL(url)); if (invalidUrls.length > 0) { @@ -72,7 +95,7 @@ const SettingsModal = ({ isOpen, closeModal }) => { localStorage.setItem("successToast", "Settings Saved"); window.location.reload(); } catch (error) { - setNewErrorMessage(error.message); + setNewErrorMessage(error.message); console.log(error); } }; @@ -81,13 +104,6 @@ const SettingsModal = ({ isOpen, closeModal }) => { setNewErrorMessage(null); setNewSuccessMessage(null); - const defaultGatewayUrls = [ - 'https://ipfs.io', - 'https://ipfsgateway.xyz', - 'https://cloudflare-ipfs.com' - ]; - const defaultPubsubHttpClientsOptions = ['https://pubsubprovider.xyz/api/v0']; - gatewayRef.current.value = defaultGatewayUrls.join('\n'); ipfsRef.current.value = ""; pubsubRef.current.value = defaultPubsubHttpClientsOptions.join('\n'); @@ -105,7 +121,7 @@ const SettingsModal = ({ isOpen, closeModal }) => { localStorage.setItem("successToast", "Settings Reset"); window.location.reload(); } catch (error) { - setNewErrorMessage(error.message); + setNewErrorMessage(error.message); console.log(error); } }; @@ -169,7 +185,7 @@ const SettingsModal = ({ isOpen, closeModal }) => { setNewSuccessMessage("Account Imported"); } catch (error) { - setNewErrorMessage(error.message); + setNewErrorMessage(error.message); console.log(error); } }; @@ -190,7 +206,7 @@ const SettingsModal = ({ isOpen, closeModal }) => { }}); setNewSuccessMessage("Account Name Saved"); } catch (error) { - setNewErrorMessage(error.message); + setNewErrorMessage(error.message); console.log(error); } }; diff --git a/src/components/views/All.jsx b/src/components/views/All.jsx index 66c6d8d0..5a7dea04 100755 --- a/src/components/views/All.jsx +++ b/src/components/views/All.jsx @@ -298,7 +298,7 @@ const All = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -355,7 +355,7 @@ const All = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); diff --git a/src/components/views/AllCatalog.jsx b/src/components/views/AllCatalog.jsx index 63fa7b1c..515b1104 100755 --- a/src/components/views/AllCatalog.jsx +++ b/src/components/views/AllCatalog.jsx @@ -160,7 +160,7 @@ const AllCatalog = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -209,7 +209,7 @@ const AllCatalog = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); diff --git a/src/components/views/Board.jsx b/src/components/views/Board.jsx index ff9561dd..e6a91ea5 100755 --- a/src/components/views/Board.jsx +++ b/src/components/views/Board.jsx @@ -323,7 +323,7 @@ const Board = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -344,7 +344,7 @@ const Board = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); @@ -497,7 +497,7 @@ const Board = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); @@ -620,7 +620,7 @@ const Board = () => { await unsubscribe(selectedAddress); } } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } }; diff --git a/src/components/views/Catalog.jsx b/src/components/views/Catalog.jsx index 40b175cf..bba78daf 100755 --- a/src/components/views/Catalog.jsx +++ b/src/components/views/Catalog.jsx @@ -208,7 +208,7 @@ const Catalog = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -229,7 +229,7 @@ const Catalog = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); @@ -381,7 +381,7 @@ const Catalog = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); @@ -485,7 +485,7 @@ const Catalog = () => { await unsubscribe(selectedAddress); } } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } }; diff --git a/src/components/views/Subscriptions.jsx b/src/components/views/Subscriptions.jsx index 9cd3f77f..c093a71d 100755 --- a/src/components/views/Subscriptions.jsx +++ b/src/components/views/Subscriptions.jsx @@ -299,7 +299,7 @@ const Subscriptions = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -349,7 +349,7 @@ const Subscriptions = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); diff --git a/src/components/views/SubscriptionsCatalog.jsx b/src/components/views/SubscriptionsCatalog.jsx index 34ee696a..7bbb5a3c 100755 --- a/src/components/views/SubscriptionsCatalog.jsx +++ b/src/components/views/SubscriptionsCatalog.jsx @@ -157,7 +157,7 @@ const SubscriptionsCatalog = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -206,7 +206,7 @@ const SubscriptionsCatalog = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); diff --git a/src/components/views/Thread.jsx b/src/components/views/Thread.jsx index 599e2629..708a73e0 100755 --- a/src/components/views/Thread.jsx +++ b/src/components/views/Thread.jsx @@ -280,7 +280,7 @@ const Thread = () => { challengeAnswers = await getChallengeAnswersFromUser(challenges) } catch (error) { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); } if (challengeAnswers) { await comment.publishChallengeAnswers(challengeAnswers) @@ -301,7 +301,7 @@ const Thread = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, }); @@ -454,7 +454,7 @@ const Thread = () => { onChallenge, onChallengeVerification, onError: (error) => { - setNewErrorMessage(error); + setNewErrorMessage(error.message); console.log(error); }, });