Merge branch 'main' into patch-5

7 files changed, 381 insertions, 5 deletions

diff --git a/src/plugins/TimeBarAllActivities.ts b/src/plugins/TimeBarAllActivities.ts
new file mode 100644
index 0000000..d4fe639
--- /dev/null
+++ b/src/plugins/TimeBarAllActivities.ts
@@ -0,0 +1,35 @@
+/*
+ * 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: "TimeBarAllActivities",
+    description: "Adds the Spotify time bar to all activities if they have start and end timestamps",
+    authors: [Devs.obscurity],
+    patches: [
+        {
+            find: "renderTimeBar=function",
+            replacement: {
+                match: /renderTimeBar=function\((.{1,3})\){.{0,50}?var/,
+                replace: "renderTimeBar=function($1){var"
+            }
+        }
+    ],
+});
diff --git a/src/plugins/arRPC.tsx b/src/plugins/arRPC.tsx
new file mode 100644
index 0000000..a9b2f3c
--- /dev/null
+++ b/src/plugins/arRPC.tsx
@@ -0,0 +1,106 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 OpenAsar
+ *
+ * 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 { popNotice, showNotice } from "../api/Notices";
+import { Link } from "../components/Link";
+import { Devs } from "../utils/constants";
+import { lazyWebpack } from "../utils/misc";
+import definePlugin from "../utils/types";
+import { filters, mapMangledModuleLazy } from "../webpack";
+import { FluxDispatcher, Forms, Toasts } from "../webpack/common";
+
+const assetManager = mapMangledModuleLazy(
+    "getAssetImage: size must === [number, number] for Twitch",
+    {
+        getAsset: filters.byCode("apply("),
+    }
+);
+
+const rpcManager = lazyWebpack(filters.byCode(".APPLICATION_RPC("));
+
+async function lookupAsset(applicationId: string, key: string): Promise<string> {
+    return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
+}
+
+const apps: any = {};
+async function lookupApp(applicationId: string): Promise<string> {
+    const socket: any = {};
+    await rpcManager.lookupApp(socket, applicationId);
+    return socket.application;
+}
+
+let ws: WebSocket;
+export default definePlugin({
+    name: "WebRichPresence (arRPC)",
+    description: "Client plugin for arRPC to enable RPC on Discord Web (experimental)",
+    authors: [Devs.Ducko],
+    target: "WEB",
+
+    settingsAboutComponent: () => (
+        <>
+            <Forms.FormTitle tag="h3">How to use arRPC</Forms.FormTitle>
+            <Forms.FormText>
+                <Link href="https://github.com/OpenAsar/arrpc/tree/main#server">Follow the instructions in the GitHub repo</Link> to get the server running, and then enable the plugin.
+            </Forms.FormText>
+        </>
+    ),
+
+    async start() {
+        if (ws) ws.close();
+        ws = new WebSocket("ws://127.0.0.1:1337"); // try to open WebSocket
+
+        ws.onmessage = async e => { // on message, set status to data
+            const data = JSON.parse(e.data);
+
+            if (data.activity?.assets?.large_image) data.activity.assets.large_image = await lookupAsset(data.activity.application_id, data.activity.assets.large_image);
+            if (data.activity?.assets?.small_image) data.activity.assets.small_image = await lookupAsset(data.activity.application_id, data.activity.assets.small_image);
+
+            const appId = data.activity.application_id;
+            if (!apps[appId]) apps[appId] = await lookupApp(appId);
+
+            const app = apps[appId];
+            if (!data.activity.name) data.activity.name = app.name;
+
+            FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...data });
+        };
+
+        const connectionSuccessful = await new Promise(res => setTimeout(() => res(ws.readyState === WebSocket.OPEN), 1000)); // check if open after 1s
+        if (!connectionSuccessful) {
+            showNotice("Failed to connect to arRPC, is it running?", "Retry", () => { // show notice about failure to connect, with retry/ignore
+                popNotice();
+                this.start();
+            });
+            return;
+        }
+
+        Toasts.show({ // show toast on success
+            message: "Connected to arRPC",
+            type: Toasts.Type.SUCCESS,
+            id: Toasts.genId(),
+            options: {
+                duration: 1000,
+                position: Toasts.Position.BOTTOM
+            }
+        });
+    },
+
+    stop() {
+        FluxDispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", activity: null }); // clear status
+        ws.close(); // close WebSocket
+    }
+});
diff --git a/src/plugins/fakeNitro.ts b/src/plugins/fakeNitro.ts
index 3ec8dc5..c682324 100644
--- a/src/plugins/fakeNitro.ts
+++ b/src/plugins/fakeNitro.ts
@@ -60,7 +60,7 @@ migratePluginSettings("FakeNitro", "NitroBypass");
 
 export default definePlugin({
     name: "FakeNitro",
-    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven],
+    authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity],
     description: "Allows you to stream in nitro quality and send fake emojis/stickers.",
     dependencies: ["MessageEventsAPI"],
 
@@ -125,6 +125,12 @@ export default definePlugin({
             default: true,
             restartNeeded: true,
         },
+        emojiSize: {
+            description: "Size of the emojis when sending",
+            type: OptionType.SLIDER,
+            default: 48,
+            markers: [32, 48, 64, 128, 160, 256, 512],
+        },
         enableStickerBypass: {
             description: "Allow sending fake stickers",
             type: OptionType.BOOLEAN,
@@ -270,7 +276,7 @@ export default definePlugin({
                     if (emoji.guildId === guildId && !emoji.animated) continue;
 
                     const emojiString = `<${emoji.animated ? "a" : ""}:${emoji.originalName || emoji.name}:${emoji.id}>`;
-                    const url = emoji.url.replace(/\?size=\d+/, "?size=48");
+                    const url = emoji.url.replace(/\?size=\d+/, `?size=${Settings.plugins.FakeNitro.emojiSize}`);
                     messageObj.content = messageObj.content.replace(emojiString, (match, offset, origStr) => {
                         return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
                     });
@@ -289,7 +295,7 @@ export default definePlugin({
                     if (emoji == null || (emoji.guildId === guildId && !emoji.animated)) continue;
                     if (!emoji.require_colons) continue;
 
-                    const url = emoji.url.replace(/\?size=\d+/, "?size=48");
+                    const url = emoji.url.replace(/\?size=\d+/, `?size=${Settings.plugins.FakeNitro.emojiSize}`);
                     messageObj.content = messageObj.content.replace(emojiStr, (match, offset, origStr) => {
                         return `${getWordBoundary(origStr, offset - 1)}${url}${getWordBoundary(origStr, offset + match.length)}`;
                     });
diff --git a/src/plugins/noUnblockToJump.ts b/src/plugins/noUnblockToJump.ts
new file mode 100644
index 0000000..e0194ca
--- /dev/null
+++ b/src/plugins/noUnblockToJump.ts
@@ -0,0 +1,50 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Sofia Lima
+ *
+ * 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: "NoUnblockToJump",
+    description: "Allows you to jump to messages of blocked users without unblocking them",
+    authors: [Devs.dzshn],
+    patches: [
+        {
+            find: '.id,"Search Results"',
+            replacement: {
+                match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
+                replace: "if(false)$1"
+            }
+        },
+        {
+            find: "renderJumpButton=function()",
+            replacement: {
+                match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
+                replace: "if(false)$1"
+            }
+        },
+        {
+            find: "flash:!0,returnMessageId",
+            replacement: {
+                match: /.\?(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
+                replace: "false?$1"
+            }
+        }
+    ]
+});
diff --git a/src/plugins/oneko.ts b/src/plugins/oneko.ts
new file mode 100644
index 0000000..67db2d7
--- /dev/null
+++ b/src/plugins/oneko.ts
@@ -0,0 +1,40 @@
+/*
+ * 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: "oneko",
+    description: "cat follow mouse (real)",
+    // Listing adryd here because this literally just evals her script
+    authors: [Devs.Ven, Devs.adryd],
+
+    start() {
+        fetch("https://raw.githubusercontent.com/adryd325/oneko.js/14bab15a755d0e35cd4ae19c931d96d306f99f42/oneko.js")
+            .then(x => x.text())
+            .then(s => s.replace("./oneko.gif", "https://raw.githubusercontent.com/adryd325/oneko.js/14bab15a755d0e35cd4ae19c931d96d306f99f42/oneko.gif"))
+            .then(eval);
+    },
+
+    stop() {
+        clearInterval(window.onekoInterval);
+        delete window.onekoInterval;
+        document.getElementById("oneko")?.remove();
+    }
+});
diff --git a/src/plugins/platformIndicators.tsx b/src/plugins/platformIndicators.tsx
new file mode 100644
index 0000000..2b44973
--- /dev/null
+++ b/src/plugins/platformIndicators.tsx
@@ -0,0 +1,139 @@
+/*
+ * 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 { User } from "discord-types/general";
+
+import { Settings } from "../api/settings";
+import ErrorBoundary from "../components/ErrorBoundary";
+import { Devs } from "../utils/constants";
+import { lazyWebpack } from "../utils/misc";
+import definePlugin, { OptionType } from "../utils/types";
+import { filters } from "../webpack";
+import { PresenceStore, Tooltip } from "../webpack/common";
+
+function Icon(path: string, viewBox = "0 0 24 24") {
+    return ({ color, tooltip }: { color: string; tooltip: string; }) => (
+        <Tooltip text={tooltip} >
+            {(tooltipProps: any) => (
+                <svg
+                    {...tooltipProps}
+                    height="18"
+                    width="18"
+                    viewBox={viewBox}
+                    fill={color}
+                >
+                    <path d={path} />
+                </svg>
+            )}
+        </Tooltip>
+    );
+}
+
+const Icons = {
+    desktop: Icon("M4 2.5c-1.103 0-2 .897-2 2v11c0 1.104.897 2 2 2h7v2H7v2h10v-2h-4v-2h7c1.103 0 2-.896 2-2v-11c0-1.103-.897-2-2-2H4Zm16 2v9H4v-9h16Z"),
+    web: Icon("M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2Zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93Zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39Z"),
+    mobile: Icon("M15.5 1h-8A2.5 2.5 0 0 0 5 3.5v17A2.5 2.5 0 0 0 7.5 23h8a2.5 2.5 0 0 0 2.5-2.5v-17A2.5 2.5 0 0 0 15.5 1zm-4 21c-.83 0-1.5-.67-1.5-1.5s.67-1.5 1.5-1.5 1.5.67 1.5 1.5-.67 1.5-1.5 1.5zm4.5-4H7V4h9v14z"),
+    console: Icon("M14.8 2.7 9 3.1V47h3.3c1.7 0 6.2.3 10 .7l6.7.6V2l-4.2.2c-2.4.1-6.9.3-10 .5zm1.8 6.4c1 1.7-1.3 3.6-2.7 2.2C12.7 10.1 13.5 8 15 8c.5 0 1.2.5 1.6 1.1zM16 33c0 6-.4 10-1 10s-1-4-1-10 .4-10 1-10 1 4 1 10zm15-8v23.3l3.8-.7c2-.3 4.7-.6 6-.6H43V3h-2.2c-1.3 0-4-.3-6-.6L31 1.7V25z", "0 0 50 50"),
+};
+type Platform = keyof typeof Icons;
+
+const getStatusColor = lazyWebpack(filters.byCode("STATUS_YELLOW", "TWITCH", "STATUS_GREY"));
+
+const PlatformIcon = ({ platform, status }: { platform: Platform, status: string; }) => {
+    const tooltip = platform[0].toUpperCase() + platform.slice(1);
+    const Icon = Icons[platform] ?? Icons.desktop;
+
+    return <Icon color={getStatusColor(status)} tooltip={tooltip} />;
+};
+
+const PlatformIndicator = ({ user }: { user: User; }) => {
+    if (!user || user.bot) return null;
+
+    const status = PresenceStore.getState()?.clientStatuses?.[user.id] as Record<Platform, string>;
+    if (!status) return null;
+
+    const icons = Object.entries(status).map(([platform, status]) => (
+        <PlatformIcon
+            key={platform}
+            platform={platform as Platform}
+            status={status}
+        />
+    ));
+
+    if (!icons.length) return null;
+
+    return (
+        <div
+            className="vc-platform-indicator"
+            style={{
+                display: "flex", alignItems: "center", marginLeft: "4px"
+            }}
+        >
+            {icons}
+        </div>
+    );
+};
+
+export default definePlugin({
+    name: "PlatformIndicators",
+    description: "Adds platform indicators (Desktop, Mobile, Web...) to users",
+    authors: [Devs.kemo],
+
+    patches: [
+        {
+            // Server member list decorators
+            find: "this.renderPremium()",
+            replacement: {
+                match: /this.renderPremium\(\)[^\]]*?\]/,
+                replace: "$&.concat(Vencord.Plugins.plugins.PlatformIndicators.renderPlatformIndicators(this.props))"
+            }
+        },
+        {
+            // Dm list decorators
+            find: "PrivateChannel.renderAvatar",
+            replacement: {
+                match: /(subText:(.{1,3})\..+?decorators:)(.+?:null)/,
+                replace: "$1[$3].concat(Vencord.Plugins.plugins.PlatformIndicators.renderPlatformIndicators($2.props))"
+            }
+        },
+        {
+            // User badges
+            find: "Messages.PROFILE_USER_BADGES",
+            predicate: () => Settings.plugins.PlatformIndicators.showAsBadges,
+            replacement: {
+                match: /(Messages\.PROFILE_USER_BADGES,role:"group",children:)(.+?\.key\)\}\)\))/,
+                replace: "$1[Vencord.Plugins.plugins.PlatformIndicators.renderPlatformIndicators(e)].concat($2)"
+            }
+        }
+    ],
+
+    renderPlatformIndicators: ({ user }: { user: User; }) => (
+        <ErrorBoundary noop>
+            <PlatformIndicator user={user} />
+        </ErrorBoundary>
+    ),
+
+    options: {
+        showAsBadges: {
+            description: "Show platform icons in user badges",
+            type: OptionType.BOOLEAN,
+            default: true,
+            restartNeeded: true,
+        }
+    }
+});
diff --git a/src/plugins/whoReacted.tsx b/src/plugins/whoReacted.tsx
index b94f78e..0079983 100644
--- a/src/plugins/whoReacted.tsx
+++ b/src/plugins/whoReacted.tsx
@@ -56,8 +56,8 @@ export default definePlugin({
     patches: [{
         find: ",reactionRef:",
         replacement: {
-            match: /(=(.{1,3})\.hideEmoji),(.+?)\?null:\(0,.{1,3}\.jsxs?\)\(.{1,10},\{.{0,20}reactionCount.+?\}\)/,
-            replace: "$1,whoReactedProps=$2,$3?null:Vencord.Plugins.plugins.WhoReacted.renderUsers(whoReactedProps)"
+            match: /((.)=(.{1,3})\.hideCount)(,.+?reactionCount.+?\}\))/,
+            replace: "$1,whoReactedProps=$3$4,$2?null:Vencord.Plugins.plugins.WhoReacted.renderUsers(whoReactedProps)"
         }
     }],