mirrors/Vencord
1
0
Fork 1
mirror of https://github.com/Vendicated/Vencord.git synced 2025-01-10 09:56:24 +00:00
Code Activity

resolving conflict affects

Browse source
This commit is contained in:
programminglaboratorys 2024-06-24 04:48:55 +03:00 committed by GitHub
parent 3a916b37ca
commit 6cca09e571
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/_api/userSettingsDefinitions.ts
View file

@ -20,8 +20,8 @@ import { Devs } from "@utils/constants";
import definePlugin from "@utils/types"; import definePlugin from "@utils/types";
export default definePlugin({ export default definePlugin({
name: "UserSettingDefinitionsAPI", name: "UserSettingsAPI",
description: "Patches Discord's UserSettingDefinitions to expose their group and name.", description: "Patches Discord's UserSettings to expose their group and name.",
authors: [Devs.Nuckyz], authors: [Devs.Nuckyz],
patches: [ patches: [
@ -31,20 +31,20 @@ export default definePlugin({
// Main setting definition // Main setting definition
{ {
match: /(?<=INFREQUENT_USER_ACTION.{0,20},)useSetting:/, match: /(?<=INFREQUENT_USER_ACTION.{0,20},)useSetting:/,
replace: "userSettingDefinitionsAPIGroup:arguments[0],userSettingDefinitionsAPIName:arguments[1],$&" replace: "userSettingsAPIGroup:arguments[0],userSettingsAPIName:arguments[1],$&"
}, },
// Selective wrapper // Selective wrapper
{ {
match: /updateSetting:.{0,100}SELECTIVELY_SYNCED_USER_SETTINGS_UPDATE/, match: /updateSetting:.{0,100}SELECTIVELY_SYNCED_USER_SETTINGS_UPDATE/,
replace: "userSettingDefinitionsAPIGroup:arguments[0].userSettingDefinitionsAPIGroup,userSettingDefinitionsAPIName:arguments[0].userSettingDefinitionsAPIName,$&" replace: "userSettingsAPIGroup:arguments[0].userSettingsAPIGroup,userSettingsAPIName:arguments[0].userSettingsAPIName,$&"
}, },
// Override wrapper // Override wrapper
{ {
match: /updateSetting:.{0,60}USER_SETTINGS_OVERRIDE_CLEAR/, match: /updateSetting:.{0,60}USER_SETTINGS_OVERRIDE_CLEAR/,
replace: "userSettingDefinitionsAPIGroup:arguments[0].userSettingDefinitionsAPIGroup,userSettingDefinitionsAPIName:arguments[0].userSettingDefinitionsAPIName,$&" replace: "userSettingsAPIGroup:arguments[0].userSettingsAPIGroup,userSettingsAPIName:arguments[0].userSettingsAPIName,$&"
} }
] ]
} }
] ]
}); });

5
src/plugins/betterRoleContext/index.tsx
View file

@ -66,8 +66,9 @@ export default definePlugin({
description: "Adds options to copy role color / edit role / view role icon when right clicking roles in the user profile", description: "Adds options to copy role color / edit role / view role icon when right clicking roles in the user profile",
authors: [Devs.Ven, Devs.goodbee], authors: [Devs.Ven, Devs.goodbee],
dependencies: ["UserSettingsAPI"], dependencies: ["UserSettingsAPI"],
settings, settings,
start() { start() {
// DeveloperMode needs to be enabled for the context menu to be shown // DeveloperMode needs to be enabled for the context menu to be shown
DeveloperMode.updateSetting(true); DeveloperMode.updateSetting(true);
@ -121,4 +122,4 @@ export default definePlugin({
} }
} }
} }
}); });

3
src/plugins/ignoreActivities/index.tsx
View file

@ -209,6 +209,7 @@ export default definePlugin({
authors: [Devs.Nuckyz], authors: [Devs.Nuckyz],
description: "Ignore activities from showing up on your status ONLY. You can configure which ones are specifically ignored from the Registered Games and Activities tabs, or use the general settings below.", description: "Ignore activities from showing up on your status ONLY. You can configure which ones are specifically ignored from the Registered Games and Activities tabs, or use the general settings below.",
dependencies: ["UserSettingsAPI"], dependencies: ["UserSettingsAPI"],
settings, settings,
patches: [ patches: [
@ -306,4 +307,4 @@ export default definePlugin({
</ErrorBoundary> </ErrorBoundary>
); );
} }
}); });

3
src/plugins/messageLinkEmbeds/index.tsx
View file

@ -367,6 +367,7 @@ export default definePlugin({
description: "Adds a preview to messages that link another message", description: "Adds a preview to messages that link another message",
authors: [Devs.TheSun, Devs.Ven, Devs.RyanCaoDev], authors: [Devs.TheSun, Devs.Ven, Devs.RyanCaoDev],
dependencies: ["MessageAccessoriesAPI", "MessageUpdaterAPI", "UserSettingsAPI"], dependencies: ["MessageAccessoriesAPI", "MessageUpdaterAPI", "UserSettingsAPI"],
settings, settings,
start() { start() {
@ -390,4 +391,4 @@ export default definePlugin({
stop() { stop() {
removeAccessory("messageLinkEmbed"); removeAccessory("messageLinkEmbed");
} }
}); });