From 4ac6d97ec8eb9fefd5fe23fa0ac48701b439062b Mon Sep 17 00:00:00 2001 From: AntonMacG Date: Mon, 13 Nov 2023 10:17:33 +0000 Subject: [PATCH] Fixed validation fail if at least one ID was valid --- src/plugins/replyPingControl/index.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/replyPingControl/index.ts b/src/plugins/replyPingControl/index.ts index a6aaf7f90..a2a66e7fa 100644 --- a/src/plugins/replyPingControl/index.ts +++ b/src/plugins/replyPingControl/index.ts @@ -24,12 +24,13 @@ export const settings = definePluginSettings({ default: "", disabled: () => settings.store.alwaysPingOnReply, onChange: newValue => { - const newWhitelist = parseWhitelist(newValue); + const originalIDs = newValue.split(",").map(id => id.trim()).filter(id => id !== ""); + const validatedIDs = originalIDs.filter(isValidUserId); - if (newWhitelist.length === 0 && newValue.trim() !== "") { + if (originalIDs.length !== validatedIDs.length) { showToast("Invalid User ID: One or more User IDs in the whitelist are invalid. Please check your input."); } else { - cachedWhitelist = newWhitelist; + cachedWhitelist = validatedIDs; showToast("Whitelist Updated: Reply ping whitelist has been successfully updated."); } } @@ -78,7 +79,7 @@ export default definePlugin({ function parseWhitelist(value: string) { return value.split(",") .map(id => id.trim()) - .filter(id => id !== "" && isValidUserId(id)); + .filter(id => id !== ""); } function isValidUserId(id: string) {