diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/apiContextMenu.ts | 12 | ||||
| -rw-r--r-- | src/plugins/emoteCloner.tsx | 4 | ||||
| -rw-r--r-- | src/plugins/reverseImageSearch.tsx | 4 | ||||
| -rw-r--r-- | src/plugins/silentMessageToggle.tsx | 85 |
4 files changed, 94 insertions, 11 deletions
diff --git a/src/plugins/apiContextMenu.ts b/src/plugins/apiContextMenu.ts index 69dfde4..1874f5f 100644 --- a/src/plugins/apiContextMenu.ts +++ b/src/plugins/apiContextMenu.ts @@ -38,13 +38,11 @@ function listener(exports: any, id: number) { noWarn: true, find: "navId:", replacement: [{ - /** Regex explanation - * Use of https://blog.stevenlevithan.com/archives/mimic-atomic-groups to mimick atomic groups: (?=(...))\1 - * Match ${id} and look behind it for the first match of `<variable name>=`: ${id}(?=(\i)=.+?) - * Match rest of the code until it finds `<variable name>.${key},{`: .+?\2\.${key},{ - */ - match: RegExp(`(?=(${id}(?<=(\\i)=.+?).+?\\2\\.${key},{))\\1`, "g"), - replace: "$&contextMenuApiArguments:arguments," + match: RegExp(`${id}(?<=(\\i)=.+?).+$`), + replace: (code, varName) => { + const regex = RegExp(`${key},{(?<=${varName}\\.${key},{)`, "g"); + return code.replace(regex, "$&contextMenuApiArguments:arguments,"); + } }] }); diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx index 7db5efd..eba77c7 100644 --- a/src/plugins/emoteCloner.tsx +++ b/src/plugins/emoteCloner.tsx @@ -233,8 +233,8 @@ export default definePlugin({ { find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL", replacement: { - match: /(?<=favoriteableType:\i,)(?<=(\i)\.getAttribute\("data-type"\).+?)/, - replace: (_, target) => `emoteClonerDataAlt:${target}.alt,` + match: /favoriteableType:\i,(?<=(\i)\.getAttribute\("data-type"\).+?)/, + replace: (m, target) => `${m}emoteClonerDataAlt:${target}.alt,` } } ], diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx index 6335fbd..47954ba 100644 --- a/src/plugins/reverseImageSearch.tsx +++ b/src/plugins/reverseImageSearch.tsx @@ -81,8 +81,8 @@ export default definePlugin({ { find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL", replacement: { - match: /(?<=favoriteableType:\i,)(?<=(\i)\.getAttribute\("data-type"\).+?)/, - replace: (_, target) => `reverseImageSearchType:${target}.getAttribute("data-role"),` + match: /favoriteableType:\i,(?<=(\i)\.getAttribute\("data-type"\).+?)/, + replace: (m, target) => `${m}reverseImageSearchType:${target}.getAttribute("data-role"),` } } ], diff --git a/src/plugins/silentMessageToggle.tsx b/src/plugins/silentMessageToggle.tsx new file mode 100644 index 0000000..09fb4e7 --- /dev/null +++ b/src/plugins/silentMessageToggle.tsx @@ -0,0 +1,85 @@ +/* + * Vencord, a modification for Discord's desktop app + * Copyright (c) 2023 Vendicated and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. +*/ + +import { addPreSendListener, removePreSendListener, SendListener } from "@api/MessageEvents"; +import ErrorBoundary from "@components/ErrorBoundary"; +import { Devs } from "@utils/constants"; +import definePlugin from "@utils/types"; +import { Button, ButtonLooks, ButtonWrapperClasses, React, Tooltip } from "@webpack/common"; + +function SilentMessageToggle() { + const [enabled, setEnabled] = React.useState(false); + + React.useEffect(() => { + const listener: SendListener = (_, message) => { + if (enabled) { + setEnabled(false); + if (!message.content.startsWith("@silent ")) message.content = "@silent " + message.content; + } + }; + + addPreSendListener(listener); + return () => void removePreSendListener(listener); + }, [enabled]); + + return ( + <Tooltip text="Toggle Silent Message"> + {tooltipProps => ( + <Button + {...tooltipProps} + onClick={() => setEnabled(prev => !prev)} + size="" + look={ButtonLooks.BLANK} + innerClassName={ButtonWrapperClasses.button} + style={{ margin: "0px 8px" }} + > + <div className={ButtonWrapperClasses.buttonWrapper}> + <svg + width="24" + height="24" + viewBox="0 0 24 24" + > + <g fill="currentColor"> + <path d="M18 10.7101C15.1085 9.84957 13 7.17102 13 4C13 3.69264 13.0198 3.3899 13.0582 3.093C12.7147 3.03189 12.3611 3 12 3C8.686 3 6 5.686 6 9V14C6 15.657 4.656 17 3 17V18H21V17C19.344 17 18 15.657 18 14V10.7101ZM8.55493 19C9.24793 20.19 10.5239 21 11.9999 21C13.4759 21 14.7519 20.19 15.4449 19H8.55493Z" /> + <path d="M18.2624 5.50209L21 2.5V1H16.0349V2.49791H18.476L16 5.61088V7H21V5.50209H18.2624Z" /> + {!enabled && <line x1="22" y1="2" x2="2" y2="22" stroke="var(--red-500)" stroke-width="2.5" />} + </g> + </svg> + </div> + </Button> + )} + </Tooltip> + ); +} + +export default definePlugin({ + name: "SilentMessageToggle", + authors: [Devs.Nuckyz], + description: "Adds a button to the chat bar to toggle sending a silent message.", + patches: [ + { + find: ".activeCommandOption", + replacement: { + match: /"gift"\)\);(?<=(\i)\.push.+?)/, + replace: (m, array) => `${m}${array}.push($self.SilentMessageToggle());` + } + } + ], + + SilentMessageToggle: ErrorBoundary.wrap(SilentMessageToggle, { noop: true }), +}); |