diff --git a/src/plugins/textReplace.tsx b/src/plugins/textReplace.tsx index b685f80..21aa753 100644 --- a/src/plugins/textReplace.tsx +++ b/src/plugins/textReplace.tsx @@ -35,6 +35,7 @@ interface TextReplaceProps { title: string; rulesArray: Rule[]; rulesKey: string; + update: () => void; } const makeEmptyRule: () => Rule = () => ({ @@ -51,19 +52,26 @@ const settings = definePluginSettings({ replace: { type: OptionType.COMPONENT, description: "", - component: () => - <> - - - + component: () => { + const update = useForceUpdater(); + return ( + <> + + + + + ); + } }, }); @@ -111,11 +119,9 @@ function Input({ initialValue, onChange, placeholder }: { ); } -function TextReplace({ title, rulesArray, rulesKey }: TextReplaceProps) { +function TextReplace({ title, rulesArray, rulesKey, update }: TextReplaceProps) { const isRegexRules = title === "Using Regex"; - const update = useForceUpdater(); - async function onClickRemove(index: number) { rulesArray.splice(index, 1); @@ -191,12 +197,57 @@ function TextReplace({ title, rulesArray, rulesKey }: TextReplaceProps) { ); } +function TextReplaceTesting() { + const [value, setValue] = useState(""); + return ( + <> + Test Rules + + + + ); +} + +function applyRules(content: string): string { + if (content.length === 0) + return content; + + // pad so that rules can use " word " to only match whole "word" + content = " " + content + " "; + + if (stringRules) { + for (const rule of stringRules) { + if (!rule.find || !rule.replace) continue; + if (rule.onlyIfIncludes && !content.includes(rule.onlyIfIncludes)) continue; + + content = content.replaceAll(rule.find, rule.replace); + } + } + + if (regexRules) { + for (const rule of regexRules) { + if (!rule.find || !rule.replace) continue; + if (rule.onlyIfIncludes && !content.includes(rule.onlyIfIncludes)) continue; + + try { + const regex = stringToRegex(rule.find); + content = content.replace(regex, rule.replace); + } catch (e) { + new Logger("TextReplace").error(`Invalid regex: ${rule.find}`); + } + } + } + + content = content.trim(); + return content; +} + const TEXT_REPLACE_RULES_CHANNEL_ID = "1102784112584040479"; export default definePlugin({ name: "TextReplace", - description: "Replace text in your messages. You can find pre-made rules in the #textreplace-rules channel in the Vencord Server", - authors: [Devs.Samu, Devs.AutumnVN], + description: "Replace text in your messages. You can find pre-made rules in the #textreplace-rules channel in Vencord's Server", + authors: [Devs.AutumnVN, Devs.TheKodeToad], dependencies: ["MessageEventsAPI"], settings, @@ -208,34 +259,7 @@ export default definePlugin({ this.preSend = addPreSendListener((channelId, msg) => { // Channel used for sharing rules, applying rules here would be messy if (channelId === TEXT_REPLACE_RULES_CHANNEL_ID) return; - - // pad so that rules can use " word " to only match whole "word" - msg.content = " " + msg.content + " "; - - if (stringRules) { - for (const rule of stringRules) { - if (!rule.find || !rule.replace) continue; - if (rule.onlyIfIncludes && !msg.content.includes(rule.onlyIfIncludes)) continue; - - msg.content = msg.content.replaceAll(rule.find, rule.replace); - } - } - - if (regexRules) { - for (const rule of regexRules) { - if (!rule.find || !rule.replace) continue; - if (rule.onlyIfIncludes && !msg.content.includes(rule.onlyIfIncludes)) continue; - - try { - const regex = stringToRegex(rule.find); - msg.content = msg.content.replace(regex, rule.replace); - } catch (e) { - new Logger("TextReplace").error(`Invalid regex: ${rule.find}`); - } - } - } - - msg.content = msg.content.trim(); + msg.content = applyRules(msg.content); }); },