fix plebbitOptions, improve error messages

This commit is contained in:
plebeius.eth
2023-07-02 11:45:56 +02:00
parent 297569f3ed
commit e2a9556305
10 changed files with 55 additions and 39 deletions
+2 -2
View File
@@ -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);
},
});
+2 -2
View File
@@ -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);
},
});
+32 -16
View File
@@ -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);
}
};
+2 -2
View File
@@ -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);
},
});
+2 -2
View File
@@ -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);
},
});
+4 -4
View File
@@ -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);
}
};
+4 -4
View File
@@ -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);
}
};
+2 -2
View File
@@ -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);
},
});
@@ -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);
},
});
+3 -3
View File
@@ -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);
},
});