Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
thororen1234 2025-05-24 20:50:46 -04:00
commit 55412ab697
No known key found for this signature in database
7 changed files with 9 additions and 44 deletions

View file

@ -30,8 +30,8 @@ export default definePlugin({
replacement: [
// Main setting definition
{
match: /(?<=INFREQUENT_USER_ACTION.{0,20},)useSetting:/,
replace: "userSettingsAPIGroup:arguments[0],userSettingsAPIName:arguments[1],$&"
match: /\.updateAsync\(.+?(?=,useSetting:)/,
replace: "$&,userSettingsAPIGroup:arguments[0],userSettingsAPIName:arguments[1]"
},
// Selective wrapper
{

View file

@ -42,6 +42,7 @@ export default definePlugin({
description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
authors: [Devs.Ducko],
reporterTestable: ReporterTestable.None,
hidden: IS_VESKTOP || "legcord" in window,
settingsAboutComponent: () => (
<>
@ -73,9 +74,6 @@ export default definePlugin({
},
async start() {
// Legcord comes with its own arRPC implementation, so this plugin just confuses users
if ("legcord" in window) return;
if (ws) ws.close();
ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket

View file

@ -17,6 +17,7 @@
*/
import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
import { migratePluginSettings } from "@api/Settings";
import { CheckedTextInput } from "@components/CheckedTextInput";
import { Devs } from "@utils/constants";
import { Logger } from "@utils/Logger";
@ -165,7 +166,7 @@ async function doClone(guildId: string, data: Sticker | Emoji) {
message = JSON.parse(e.text).message;
} catch { }
new Logger("EmoteCloner").error("Failed to clone", data.name, "to", guildId, e);
new Logger("ExpressionCloner").error("Failed to clone", data.name, "to", guildId, e);
Toasts.show({
message: "Failed to clone: " + message,
type: Toasts.Type.FAILURE,
@ -364,10 +365,11 @@ const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { t
}
};
migratePluginSettings("ExpressionCloner", "EmoteCloner");
export default definePlugin({
name: "EmoteCloner",
name: "ExpressionCloner",
description: "Allows you to clone Emotes & Stickers to your own server (right click them)",
tags: ["StickerCloner"],
tags: ["StickerCloner", "EmoteCloner", "EmojiCloner"],
authors: [Devs.Ven, Devs.Nuckyz],
contextMenus: {
"message": messageContextMenuPatch,

View file

@ -1,35 +0,0 @@
/*
* Vencord, a modification for Discord's desktop app
* Copyright (c) 2022 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 { Devs } from "@utils/constants";
import definePlugin from "@utils/types";
export default definePlugin({
name: "NoRPC",
description: "Disables Discord's RPC server.",
authors: [Devs.Cyn],
patches: [
{
find: '.ensureModule("discord_rpc")',
replacement: {
match: /\.ensureModule\("discord_rpc"\)\.then\(\(.+?\)}\)}/,
replace: '.ensureModule("discord_rpc")}',
},
},
],
});

View file

@ -21,7 +21,7 @@ import definePlugin from "@utils/types";
export default definePlugin({
name: "NoUnblockToJump",
description: "Allows you to jump to messages of blocked users without unblocking them",
description: "Allows you to jump to messages of blocked or ignored users and likely spammers without unblocking them",
authors: [Devs.dzshn],
patches: [
{