diff --git a/src/api/MessagePopover.tsx b/src/api/MessagePopover.tsx index 0a4a05402..eb68ed2d6 100644 --- a/src/api/MessagePopover.tsx +++ b/src/api/MessagePopover.tsx @@ -50,18 +50,18 @@ export function removeButton(identifier: string) { export function _buildPopoverElements( Component: React.ComponentType, - props: { message: Message; } + message: Message ) { const items: React.ReactNode[] = []; for (const [identifier, getItem] of buttons.entries()) { try { - const item = getItem(props.message); + const item = getItem(message); if (item) { item.key ??= identifier; items.push( - + ); } diff --git a/src/plugins/_api/messagePopover.ts b/src/plugins/_api/messagePopover.ts index 9998a46b0..57b9b1193 100644 --- a/src/plugins/_api/messagePopover.ts +++ b/src/plugins/_api/messagePopover.ts @@ -26,9 +26,8 @@ export default definePlugin({ patches: [{ find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL", replacement: { - // foo && !bar ? createElement(reactionStuffs)... createElement(blah,...makeElement(reply-other)) - match: /\i&&!\i\?\(0,\i\.jsxs?\)\(.{0,200}renderEmojiPicker:.{0,500}\?\(0,\i\.jsx\)\((\i\.\i).{0,200}\.\.\.(\i)\},"reply-other"/, - replace: "Vencord.Api.MessagePopover._buildPopoverElements($1,$2),$&" + match: /\.jsx\)\((\i\.\i),\{label:\i\.\i\.Messages\.MESSAGE_ACTION_REPLY.{0,200}?"reply-self".{0,50}?\}\):null(?=,.+?message:(\i))/, + replace: "$&,Vencord.Api.MessagePopover._buildPopoverElements($1,$2)" } }], }); diff --git a/src/plugins/maskedLinkPaste/README.md b/src/plugins/maskedLinkPaste/README.md deleted file mode 100644 index 30beccb64..000000000 --- a/src/plugins/maskedLinkPaste/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# MaskedLinkPaste - -Pasting a link while you have text selected will paste your link as a masked link at that location - -![](https://github.com/Vendicated/Vencord/assets/78964224/1d3be2c6-7957-44c9-92ec-551069d46c02) diff --git a/src/plugins/maskedLinkPaste/index.ts b/src/plugins/maskedLinkPaste/index.ts deleted file mode 100644 index bcd622edb..000000000 --- a/src/plugins/maskedLinkPaste/index.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Vencord, a Discord client mod - * Copyright (c) 2023 Vendicated and contributors - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -import { Devs } from "@utils/constants.js"; -import definePlugin from "@utils/types"; -import { findByPropsLazy } from "@webpack"; - -const linkRegex = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_+.~#?&//=]*)/; - -const SlateTransforms = findByPropsLazy("insertText", "selectCommandOption"); - -export default definePlugin({ - name: "MaskedLinkPaste", - authors: [Devs.TheSun], - description: "Pasting a link while having text selected will paste a hyperlink", - patches: [ - { - find: ".selection,preventEmojiSurrogates:", - replacement: { - match: /(?<=\i.delete.{0,50})(\i)\.insertText\((\i)\)/, - replace: "$self.handlePaste($1, $2, () => $&)" - } - } - ], - - handlePaste(editor, content: string, originalBehavior: () => void) { - if (content && linkRegex.test(content) && editor.operations?.[0]?.type === "remove_text") { - SlateTransforms.insertText( - editor, - `[${editor.operations[0].text}](${content})` - ); - } - else originalBehavior(); - } -}); diff --git a/src/plugins/youtubeAdblock.desktop/adguard.js b/src/plugins/youtubeAdblock.desktop/adguard.js index 722e4816e..8f809c3d3 100644 --- a/src/plugins/youtubeAdblock.desktop/adguard.js +++ b/src/plugins/youtubeAdblock.desktop/adguard.js @@ -19,7 +19,6 @@ * along with AdGuard's Block YouTube Ads. If not, see . */ -const LOGO_ID = "block-youtube-ads-logo"; const hiddenCSS = [ "#__ffYoutube1", "#__ffYoutube2", @@ -98,7 +97,7 @@ const hideElements = () => { } const rule = selectors.join(", ") + " { display: none!important; }"; const style = document.createElement("style"); - style.innerHTML = rule; + style.textContent = rule; document.head.appendChild(style); }; /** @@ -193,68 +192,25 @@ const jsonOverride = (propertyName, overrideValue) => { return obj; }; // Override Response.prototype.json - const nativeResponseJson = Response.prototype.json; - Response.prototype.json = new Proxy(nativeResponseJson, { - apply(...args) { + Response.prototype.json = new Proxy(Response.prototype.json, { + async apply(...args) { // Call the target function, get the original Promise - const promise = Reflect.apply(...args); + const result = await Reflect.apply(...args); // Create a new one and override the JSON inside - return new Promise((resolve, reject) => { - promise.then(data => { - overrideObject(data, propertyName, overrideValue); - resolve(data); - }).catch(error => reject(error)); - }); + overrideObject(result, propertyName, overrideValue); + return result; }, }); }; -const addAdGuardLogoStyle = () => { }; -const addAdGuardLogo = () => { - if (document.getElementById(LOGO_ID)) { - return; - } - const logo = document.createElement("span"); - logo.innerHTML = "__logo_text__"; - logo.setAttribute("id", LOGO_ID); - if (window.location.hostname === "m.youtube.com") { - const btn = document.querySelector("header.mobile-topbar-header > button"); - if (btn) { - btn.parentNode?.insertBefore(logo, btn.nextSibling); - addAdGuardLogoStyle(); - } - } else if (window.location.hostname === "www.youtube.com") { - const code = document.getElementById("country-code"); - if (code) { - code.innerHTML = ""; - code.appendChild(logo); - addAdGuardLogoStyle(); - } - } else if (window.location.hostname === "music.youtube.com") { - const el = document.querySelector(".ytmusic-nav-bar#left-content"); - if (el) { - el.appendChild(logo); - addAdGuardLogoStyle(); - } - } else if (window.location.hostname === "www.youtube-nocookie.com") { - const code = document.querySelector("#yt-masthead #logo-container .content-region"); - if (code) { - code.innerHTML = ""; - code.appendChild(logo); - addAdGuardLogoStyle(); - } - } -}; // Removes ads metadata from YouTube XHR requests jsonOverride("adPlacements", []); jsonOverride("playerAds", []); // Applies CSS that hides YouTube ad elements hideElements(); // Some changes should be re-evaluated on every page change -addAdGuardLogo(); hideDynamicAds(); autoSkipAds(); observeDomChanges(() => { - addAdGuardLogo(); hideDynamicAds(); autoSkipAds(); });