From ef353f1d66dbf1d14e528830d267aac518ed1beb Mon Sep 17 00:00:00 2001 From: Ven Date: Sat, 1 Oct 2022 02:27:28 +0200 Subject: [PATCH] Better authors field (#18) --- src/Vencord.ts | 2 +- src/plugins/STFU.ts | 3 ++- src/plugins/apiMessageEvents.ts | 3 ++- src/plugins/apiNotices.ts | 3 ++- src/plugins/banger.ts | 5 ++++- src/plugins/betterGifAltText.ts | 5 +++-- src/plugins/clickableRoleDot.ts | 3 ++- src/plugins/experiments.ts | 3 ++- src/plugins/folderSvgIcon.ts | 5 ++++- src/plugins/ify.ts | 3 ++- src/plugins/messageActions.ts | 3 ++- src/plugins/nitroBypass.ts | 3 ++- src/plugins/noTrack.ts | 3 ++- src/plugins/settings.ts | 3 ++- src/plugins/silentTyping.ts | 3 ++- src/plugins/unindent.ts | 3 ++- src/plugins/viewIcons.tsx | 3 ++- src/utils/IpcEvents.ts | 2 +- src/utils/constants.ts | 20 ++++++++++++++++++++ src/utils/types.ts | 7 ++++++- src/{utils => webpack}/patchWebpack.ts | 6 +++--- src/webpack/webpack.ts | 6 +++--- 22 files changed, 71 insertions(+), 26 deletions(-) rename src/{utils => webpack}/patchWebpack.ts (98%) diff --git a/src/Vencord.ts b/src/Vencord.ts index cb06182a5..2798e7071 100644 --- a/src/Vencord.ts +++ b/src/Vencord.ts @@ -7,7 +7,7 @@ import { startAllPlugins } from "./plugins"; export { Settings }; -import "./utils/patchWebpack"; +import "./webpack/patchWebpack"; import "./utils/quickCss"; import { checkForUpdates, UpdateLogger } from './utils/updater'; import { onceReady } from "./webpack"; diff --git a/src/plugins/STFU.ts b/src/plugins/STFU.ts index afa29f501..96325fff8 100644 --- a/src/plugins/STFU.ts +++ b/src/plugins/STFU.ts @@ -1,9 +1,10 @@ import definePlugin from "../utils/types"; +import { Devs } from '../utils/constants'; export default definePlugin({ name: "STFU", description: "Disables the 'HOLD UP' banner in the console", - author: "Vendicated", + authors: [Devs.Ven], patches: [{ find: "setDevtoolsCallbacks", replacement: { diff --git a/src/plugins/apiMessageEvents.ts b/src/plugins/apiMessageEvents.ts index 98144e218..154e60150 100644 --- a/src/plugins/apiMessageEvents.ts +++ b/src/plugins/apiMessageEvents.ts @@ -1,9 +1,10 @@ +import { Devs } from "../utils/constants"; import definePlugin from "../utils/types"; export default definePlugin({ name: "MessageEventsAPI", description: "Api required by anything using message events.", - author: "ArjixWasTaken", + authors: [Devs.Arjix], patches: [ { find: "sendMessage:function", diff --git a/src/plugins/apiNotices.ts b/src/plugins/apiNotices.ts index d58ac4b30..1b4f11517 100644 --- a/src/plugins/apiNotices.ts +++ b/src/plugins/apiNotices.ts @@ -1,9 +1,10 @@ +import { Devs } from "../utils/constants"; import definePlugin from "../utils/types"; export default definePlugin({ name: "ApiNotices", description: "Fixes notices being automatically dismissed", - author: "Vendicated", + authors: [Devs.Ven], required: true, patches: [ { diff --git a/src/plugins/banger.ts b/src/plugins/banger.ts index d87ef9968..2ca2921ed 100644 --- a/src/plugins/banger.ts +++ b/src/plugins/banger.ts @@ -3,7 +3,10 @@ import definePlugin from "../utils/types"; export default definePlugin({ name: "BANger", description: "Replaces the GIF in the ban dialogue with a custom one.", - author: "Xinto", + authors: [{ + name: "Xinto", + id: 423915768191647755n + }], patches: [ { find: "BanConfirm", diff --git a/src/plugins/betterGifAltText.ts b/src/plugins/betterGifAltText.ts index 475404225..08fa07b70 100644 --- a/src/plugins/betterGifAltText.ts +++ b/src/plugins/betterGifAltText.ts @@ -1,8 +1,9 @@ +import { Devs } from "../utils/constants"; import definePlugin from "../utils/types"; export default definePlugin({ name: "BetterGifAltText", - author: "Vendicated", + authors: [Devs.Ven], description: "Change GIF alt text from simply being 'GIF' to containing the gif tags / filename", patches: [ @@ -30,7 +31,7 @@ export default definePlugin({ let url: string = props.original || props.src; try { url = decodeURI(url); - } catch {} + } catch { } let name = url .slice(url.lastIndexOf("/") + 1) diff --git a/src/plugins/clickableRoleDot.ts b/src/plugins/clickableRoleDot.ts index 800a742c6..3fc4befd5 100644 --- a/src/plugins/clickableRoleDot.ts +++ b/src/plugins/clickableRoleDot.ts @@ -1,9 +1,10 @@ +import { Devs } from "../utils/constants"; import definePlugin from "../utils/types"; import { Toasts } from '../webpack/common'; export default definePlugin({ name: "ClickableRoleDot", - author: "Vendicated", + authors: [Devs.Ven], description: "Makes RoleDots (Accessibility Feature) copy colour to clipboard on click", patches: [ diff --git a/src/plugins/experiments.ts b/src/plugins/experiments.ts index 3406eecb0..37a59c7c9 100644 --- a/src/plugins/experiments.ts +++ b/src/plugins/experiments.ts @@ -1,8 +1,9 @@ +import { Devs } from "../utils/constants"; import definePlugin from '../utils/types'; export default definePlugin({ name: "Experiments", - author: "Vendicated, Megumin", + authors: [Devs.Ven, Devs.Megu], description: "Enable Experiments", patches: [{ find: "Object.defineProperties(this,{isDeveloper", diff --git a/src/plugins/folderSvgIcon.ts b/src/plugins/folderSvgIcon.ts index 1f91cab6b..208efaa51 100644 --- a/src/plugins/folderSvgIcon.ts +++ b/src/plugins/folderSvgIcon.ts @@ -3,7 +3,10 @@ import definePlugin from "../utils/types"; export default definePlugin({ name: "Folder SVG Icon", description: "Doesn't show the small guild icons in folders", - author: "botato", + authors: [{ + name: "botato", + id: 440990343899643943n + }], patches: [{ find: "().expandedFolderIconWrapper", replacement: [{ diff --git a/src/plugins/ify.ts b/src/plugins/ify.ts index e0d54816e..40a970883 100644 --- a/src/plugins/ify.ts +++ b/src/plugins/ify.ts @@ -1,9 +1,10 @@ +import { Devs } from "../utils/constants"; import definePlugin from "../utils/types"; export default definePlugin({ name: "Ify", description: "Disabes Spotify auto-pausing and premium checks", - author: "Cynosphere", + authors: [Devs.Cyn], patches: [ { find: '.displayName="SpotifyStore"', diff --git a/src/plugins/messageActions.ts b/src/plugins/messageActions.ts index 569d3a9b8..4df3853f5 100644 --- a/src/plugins/messageActions.ts +++ b/src/plugins/messageActions.ts @@ -1,4 +1,5 @@ import { addClickListener, removeClickListener } from '../api/MessageEvents'; +import { Devs } from "../utils/constants"; import definePlugin from "../utils/types"; import { find, findByProps } from "../webpack"; import { UserStore } from "../webpack/common"; @@ -10,7 +11,7 @@ const keyup = (e: KeyboardEvent) => e.key === "Backspace" && (isDeletePressed = export default definePlugin({ name: "MessageQuickActions", description: "Quick Delete, Quick edit", - author: "Vendicated", + authors: [Devs.Ven], dependencies: ["MessageEventsAPI"], start() { diff --git a/src/plugins/nitroBypass.ts b/src/plugins/nitroBypass.ts index d5c4d2218..ebed095b9 100644 --- a/src/plugins/nitroBypass.ts +++ b/src/plugins/nitroBypass.ts @@ -1,10 +1,11 @@ import { addPreSendListener, addPreEditListener, SendListener, removePreSendListener, removePreEditListener } from '../api/MessageEvents'; import { findByProps } from "../webpack"; import definePlugin from "../utils/types"; +import { Devs } from '../utils/constants'; export default definePlugin({ name: "Nitro Bypass", - author: "ArjixWasTaken", + authors: [Devs.Arjix], description: "Allows you to stream in nitro quality and send fake emojis.", dependencies: ["MessageEventsAPI"], patches: [ diff --git a/src/plugins/noTrack.ts b/src/plugins/noTrack.ts index 49f542e6a..13b52f89e 100644 --- a/src/plugins/noTrack.ts +++ b/src/plugins/noTrack.ts @@ -1,9 +1,10 @@ import definePlugin from "../utils/types"; +import { Devs } from '../utils/constants'; export default definePlugin({ name: "NoTrack", description: "Disable Discord's tracking and crash reporting", - author: "Cynosphere", + authors: [Devs.Cyn], required: true, patches: [ { diff --git a/src/plugins/settings.ts b/src/plugins/settings.ts index 1281f4edc..afefa91ec 100644 --- a/src/plugins/settings.ts +++ b/src/plugins/settings.ts @@ -1,10 +1,11 @@ import definePlugin from "../utils/types"; import gitHash from "git-hash"; +import { Devs } from '../utils/constants'; export default definePlugin({ name: "Settings", description: "Adds Settings UI and debug info", - author: "Vendicated", + authors: [Devs.Ven], required: true, patches: [{ find: "().versionHash", diff --git a/src/plugins/silentTyping.ts b/src/plugins/silentTyping.ts index df233a41e..56ef30d3b 100644 --- a/src/plugins/silentTyping.ts +++ b/src/plugins/silentTyping.ts @@ -1,8 +1,9 @@ import definePlugin from '../utils/types'; +import { Devs } from '../utils/constants'; export default definePlugin({ name: "SilentTyping", - author: "Vendicated", + authors: [Devs.Ven], description: "Hide that you are typing", patches: [{ find: "startTyping:", diff --git a/src/plugins/unindent.ts b/src/plugins/unindent.ts index 3cb34f34c..d97de1196 100644 --- a/src/plugins/unindent.ts +++ b/src/plugins/unindent.ts @@ -1,10 +1,11 @@ import definePlugin from "../utils/types"; import { addPreSendListener, addPreEditListener, MessageObject, removePreSendListener, removePreEditListener } from '../api/MessageEvents'; +import { Devs } from '../utils/constants'; export default definePlugin({ name: "Unindent", description: "Trims leading indentation from codeblocks", - author: "Vendicated", + authors: [Devs.Ven], patches: [ { find: "inQuote:", diff --git a/src/plugins/viewIcons.tsx b/src/plugins/viewIcons.tsx index f41ae85ae..2ac0ab1a5 100644 --- a/src/plugins/viewIcons.tsx +++ b/src/plugins/viewIcons.tsx @@ -1,10 +1,11 @@ +import { Devs } from "../utils/constants"; import IpcEvents from "../utils/IpcEvents"; import definePlugin from '../utils/types'; const OPEN_URL = "Vencord.Plugins.plugins.ViewIcons.openImage("; export default definePlugin({ name: "ViewIcons", - author: "Vendicated", + authors: [Devs.Ven], description: "Makes Avatars/Banners in user profiles clickable, and adds Guild Context Menu Entries to View Banner/Icon.", openImage(url: string) { diff --git a/src/utils/IpcEvents.ts b/src/utils/IpcEvents.ts index b0a53f2cf..24e52b996 100644 --- a/src/utils/IpcEvents.ts +++ b/src/utils/IpcEvents.ts @@ -8,7 +8,7 @@ function strEnum>(obj: T): T { o[key] = obj[key] as any; o[obj[key]] = key as any; }; - return o; + return Object.freeze(o); } export default strEnum({ diff --git a/src/utils/constants.ts b/src/utils/constants.ts index 3d60e2964..57cd9b72b 100644 --- a/src/utils/constants.ts +++ b/src/utils/constants.ts @@ -1,2 +1,22 @@ export const WEBPACK_CHUNK = "webpackChunkdiscord_app"; export const REACT_GLOBAL = "Vencord.Webpack.Common.React"; + +// Add yourself here if you made more than one plugin +export const Devs = Object.freeze({ + Ven: { + name: "Vendicated", + id: 343383572805058560n + }, + Arjix: { + name: "ArjixWasTaken", + id: 674710789138939916n + }, + Cyn: { + name: "Cynosphere", + id: 150745989836308480n + }, + Megu: { + name: "Megumin", + id: 545581357812678656n + } +}); diff --git a/src/utils/types.ts b/src/utils/types.ts index 05441e8ab..a6b79c5e3 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -14,6 +14,11 @@ export interface Patch { replacement: PatchReplacement | PatchReplacement[]; } +export interface PluginAuthor { + name: string; + id: BigInt; +} + export interface Plugin extends PluginDef { patches?: Patch[]; started: boolean; @@ -22,7 +27,7 @@ export interface Plugin extends PluginDef { interface PluginDef { name: string; description: string; - author: string; + authors: PluginAuthor[]; start?(): void; stop?(): void; patches?: Omit[]; diff --git a/src/utils/patchWebpack.ts b/src/webpack/patchWebpack.ts similarity index 98% rename from src/utils/patchWebpack.ts rename to src/webpack/patchWebpack.ts index 050896827..469b9302c 100644 --- a/src/utils/patchWebpack.ts +++ b/src/webpack/patchWebpack.ts @@ -1,6 +1,6 @@ -import { WEBPACK_CHUNK } from './constants'; -import Logger from "./logger"; -import { _initWebpack } from "../webpack"; +import { WEBPACK_CHUNK } from '../utils/constants'; +import Logger from "../utils/logger"; +import { _initWebpack } from "."; let webpackChunk: any[]; diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts index ea5a7e360..9be576a40 100644 --- a/src/webpack/webpack.ts +++ b/src/webpack/webpack.ts @@ -43,7 +43,7 @@ export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) { export function find(filter: FilterFn, getDefault = true) { if (typeof filter !== "function") - throw new Error("Invalid filter. Expected a function got", filter); + throw new Error("Invalid filter. Expected a function got " + typeof filter); for (const key in cache) { const mod = cache[key]; @@ -70,7 +70,7 @@ export function find(filter: FilterFn, getDefault = true) { // TODO fix export function findAll(filter: FilterFn, getDefault = true) { - if (typeof filter !== "function") throw new Error("Invalid filter. Expected a function got", filter); + if (typeof filter !== "function") throw new Error("Invalid filter. Expected a function got " + typeof filter); const ret = [] as any[]; for (const key in cache) { @@ -108,7 +108,7 @@ export function findByDisplayName(deezNuts: string) { export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn) { if (typeof filter === "string") filter = filters.byProps([filter]); else if (Array.isArray(filter)) filter = filters.byProps(filter); - else if (typeof filter !== "function") throw new Error("filter must be a string, string[] or function, got", filter); + else if (typeof filter !== "function") throw new Error("filter must be a string, string[] or function, got " + typeof filter); const existing = find(filter!); if (existing) return void callback(existing);