Fix commands showing up multiple times Part 2

2 files changed, 202 insertions, 1 deletions

diff --git a/src/api/Commands/index.ts b/src/api/Commands/index.ts
index 9fe2eb4..f31043c 100644
--- a/src/api/Commands/index.ts
+++ b/src/api/Commands/index.ts
@@ -136,7 +136,7 @@ export function registerCommand<C extends Command>(command: C, plugin: string) {
         throw new Error(`Command '${command.name}' already exists.`);
 
     command.isVencordCommand = true;
-    command.id ??= `-${BUILT_IN.length}`;
+    command.id ??= `-${BUILT_IN.length + 1}`;
     command.applicationId ??= "-1"; // BUILT_IN;
     command.type ??= ApplicationCommandType.CHAT_INPUT;
     command.inputType ??= ApplicationCommandInputType.BUILT_IN_TEXT;
diff --git a/src/plugins/whoReacted.tsx b/src/plugins/whoReacted.tsx
new file mode 100644
index 0000000..b94f78e
--- /dev/null
+++ b/src/plugins/whoReacted.tsx
@@ -0,0 +1,201 @@
+/*
+ * 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 ErrorBoundary from "../components/ErrorBoundary";
+import { Devs } from "../utils/constants";
+import { LazyComponent, lazyWebpack } from "../utils/misc";
+import definePlugin from "../utils/types";
+import { filters, findByCode } from "../webpack";
+import { ChannelStore, React, Tooltip } from "../webpack/common";
+
+const UserSummaryItem = LazyComponent(() => findByCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
+const AvatarStyles = lazyWebpack(filters.byProps("moreUsers", "emptyUser", "avatarContainer", "clickableAvatar"));
+
+const ReactionStore = lazyWebpack(filters.byProps("getReactions"));
+
+function makeRenderMoreUsers(users: User[]) {
+    return function renderMoreUsers(_label: string, _count: number) {
+        return (
+            <Tooltip text={users.slice(5).map(u => u.username).join(", ")} >
+                {({ onMouseEnter, onMouseLeave }) => (
+                    <div
+                        className={AvatarStyles.moreUsers}
+                        onMouseEnter={onMouseEnter}
+                        onMouseLeave={onMouseLeave}
+                    >
+                        +{users.length - 5}
+                    </div>
+                )}
+            </Tooltip >
+        );
+    };
+}
+
+export default definePlugin({
+    name: "WhoReacted",
+    description: "Renders the Avatars of reactors",
+    authors: [Devs.Ven],
+
+    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)"
+        }
+    }],
+
+    renderUsers(props: RootObject) {
+        return (
+            <ErrorBoundary noop>
+                <this._renderUsers {...props} />
+            </ErrorBoundary>
+        );
+    },
+
+    _renderUsers({ message, emoji }: RootObject) {
+        const reactions = ReactionStore.getReactions(message.channel_id, message.id, emoji);
+        const users = Object.values(reactions) as User[];
+
+        return (
+            <div
+                style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
+            >
+                <UserSummaryItem
+                    users={users}
+                    count={users.length}
+                    guildId={ChannelStore.getChannel(message.channel_id)?.guild_id}
+                    renderIcon={false}
+                    max={5}
+                    showDefaultAvatarsForNullUsers
+                    showUserPopout
+                    renderMoreUsers={makeRenderMoreUsers(users)}
+                />
+            </div>
+        );
+    }
+});
+
+
+export interface GuildMemberAvatar { }
+
+export interface Author {
+    id: string;
+    username: string;
+    discriminator: string;
+    avatar: string;
+    avatarDecoration?: any;
+    email: string;
+    verified: boolean;
+    bot: boolean;
+    system: boolean;
+    mfaEnabled: boolean;
+    mobile: boolean;
+    desktop: boolean;
+    premiumType: number;
+    flags: number;
+    publicFlags: number;
+    purchasedFlags: number;
+    premiumUsageFlags: number;
+    phone: string;
+    nsfwAllowed: boolean;
+    guildMemberAvatars: GuildMemberAvatar;
+}
+
+export interface Emoji {
+    id: string;
+    name: string;
+}
+
+export interface Reaction {
+    emoji: Emoji;
+    count: number;
+    burst_user_ids: any[];
+    burst_count: number;
+    burst_colors: any[];
+    burst_me: boolean;
+    me: boolean;
+}
+
+export interface Message {
+    id: string;
+    type: number;
+    channel_id: string;
+    author: Author;
+    content: string;
+    deleted: boolean;
+    editHistory: any[];
+    attachments: any[];
+    embeds: any[];
+    mentions: any[];
+    mentionRoles: any[];
+    mentionChannels: any[];
+    mentioned: boolean;
+    pinned: boolean;
+    mentionEveryone: boolean;
+    tts: boolean;
+    codedLinks: any[];
+    giftCodes: any[];
+    timestamp: string;
+    editedTimestamp?: any;
+    state: string;
+    nonce?: any;
+    blocked: boolean;
+    call?: any;
+    bot: boolean;
+    webhookId?: any;
+    reactions: Reaction[];
+    applicationId?: any;
+    application?: any;
+    activity?: any;
+    messageReference?: any;
+    flags: number;
+    isSearchHit: boolean;
+    stickers: any[];
+    stickerItems: any[];
+    components: any[];
+    loggingName?: any;
+    interaction?: any;
+    interactionData?: any;
+    interactionError?: any;
+}
+
+export interface Emoji {
+    id: string;
+    name: string;
+    animated: boolean;
+}
+
+export interface RootObject {
+    message: Message;
+    readOnly: boolean;
+    isLurking: boolean;
+    isPendingMember: boolean;
+    useChatFontScaling: boolean;
+    emoji: Emoji;
+    count: number;
+    burst_user_ids: any[];
+    burst_count: number;
+    burst_colors: any[];
+    burst_me: boolean;
+    me: boolean;
+    type: number;
+    hideEmoji: boolean;
+    remainingBurstCurrency: number;
+}