refactor discord types into separate npm package (#3520)

Co-authored-by: V <vendicated@riseup.net>
Co-authored-by: sadan <117494111+sadan4@users.noreply.github.com>
Co-authored-by: ezzud <contact@ezzud.fr>

package.json

@@ -53,8 +53,8 @@
         "@types/react": "^19.0.10",
         "@types/react-dom": "^19.0.4",
         "@types/yazl": "^2.4.5",
+        "@vencord/discord-types": "link:packages/discord-types",
         "diff": "^7.0.0",
-        "discord-types": "^1.3.26",
         "esbuild": "^0.25.1",
         "eslint": "9.20.1",
         "eslint-import-resolver-alias": "^1.1.2",

packages/discord-types/LICENSE

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

packages/discord-types/README.md

@@ -0,0 +1,42 @@
+# Discord Types
+
+This package provides TypeScript types for the Webpack modules of Discord's web app.
+
+While it was primarily created for Vencord, other client mods could also benefit from this, so it is published as a standalone package!
+
+## Installation
+
+```bash
+npm install -D @vencord/discord-types
+yarn add -D @vencord/discord-types
+pnpm add -D @vencord/discord-types
+```
+
+## Example Usage
+
+```ts
+import type { UserStore } from "@vencord/discord-types";
+
+const userStore: UserStore = findStore("UserStore"); // findStore is up to you to implement, this library only provides types and no runtime code
+```
+
+## Enums
+
+This library also exports some const enums that you can use from Typescript code:
+```ts
+import { ApplicationCommandType } from "@vencord/discord-types/enums";
+
+console.log(ApplicationCommandType.CHAT_INPUT); // 1
+```
+
+### License
+
+This package is licensed under the [LGPL-3.0](./LICENSE) (or later) license.
+
+A very short summary of the license is that you can use this package as a library in both open source and closed source projects,
+similar to an MIT-licensed project.
+However, if you modify the code of this package, you must release source code of your modified version under the same license.
+
+### Credit
+
+This package was inspired by Swishilicous' [discord-types](https://www.npmjs.com/package/discord-types) package.

packages/discord-types/enums/commands.ts

@@ -0,0 +1,27 @@
+export const enum ApplicationCommandOptionType {
+    SUB_COMMAND = 1,
+    SUB_COMMAND_GROUP = 2,
+    STRING = 3,
+    INTEGER = 4,
+    BOOLEAN = 5,
+    USER = 6,
+    CHANNEL = 7,
+    ROLE = 8,
+    MENTIONABLE = 9,
+    NUMBER = 10,
+    ATTACHMENT = 11,
+}
+
+export const enum ApplicationCommandInputType {
+    BUILT_IN = 0,
+    BUILT_IN_TEXT = 1,
+    BUILT_IN_INTEGRATION = 2,
+    BOT = 3,
+    PLACEHOLDER = 4,
+}
+
+export const enum ApplicationCommandType {
+    CHAT_INPUT = 1,
+    USER = 2,
+    MESSAGE = 3,
+}

packages/discord-types/enums/index.ts

@@ -0,0 +1 @@
+export * from "./commands";

packages/discord-types/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "@vencord/discord-types",
+    "author": "Vencord Contributors",
+    "description": "Typescript definitions for the webpack modules of the Discord Web app",
+    "version": "1.0.0",
+    "license": "LGPL-3.0-or-later",
+    "types": "src/index.d.ts",
+    "type": "module",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/Vendicated/Vencord.git",
+        "directory": "packages/discord-types"
+    },
+    "dependencies": {
+        "@types/react": "^19.0.10",
+        "moment": "^2.22.2",
+        "type-fest": "^4.41.0"
+    }
+}

packages/discord-types/src/classes.d.ts

@@ -0,0 +1,21 @@
+export interface ImageModalClasses {
+    image: string,
+    modal: string,
+}
+
+export interface ButtonWrapperClasses {
+    hoverScale: string;
+    buttonWrapper: string;
+    button: string;
+    iconMask: string;
+    buttonContent: string;
+    icon: string;
+    pulseIcon: string;
+    pulseButton: string;
+    notificationDot: string;
+    sparkleContainer: string;
+    sparkleStar: string;
+    sparklePlus: string;
+    sparkle: string;
+    active: string;
+}

packages/discord-types/src/common/Channel.d.ts

@@ -0,0 +1,83 @@
+import { DiscordRecord } from "./Record";
+
+export class Channel extends DiscordRecord {
+    constructor(channel: object);
+    application_id: number | undefined;
+    bitrate: number;
+    defaultAutoArchiveDuration: number | undefined;
+    flags: number;
+    guild_id: string;
+    icon: string;
+    id: string;
+    lastMessageId: string;
+    lastPinTimestamp: string | undefined;
+    member: unknown;
+    memberCount: number | undefined;
+    memberIdsPreview: string[] | undefined;
+    memberListId: unknown;
+    messageCount: number | undefined;
+    name: string;
+    nicks: Record<string, unknown>;
+    nsfw: boolean;
+    originChannelId: unknown;
+    ownerId: string;
+    parent_id: string;
+    permissionOverwrites: {
+        [role: string]: {
+            id: string;
+            type: number;
+            deny: bigint;
+            allow: bigint;
+        };
+    };
+    position: number;
+    rateLimitPerUser: number;
+    rawRecipients: {
+        id: string;
+        avatar: string;
+        username: string;
+        public_flags: number;
+        discriminator: string;
+    }[];
+    recipients: string[];
+    rtcRegion: string;
+    threadMetadata: {
+        locked: boolean;
+        archived: boolean;
+        invitable: boolean;
+        createTimestamp: string | undefined;
+        autoArchiveDuration: number;
+        archiveTimestamp: string | undefined;
+    };
+    topic: string;
+    type: number;
+    userLimit: number;
+    videoQualityMode: undefined;
+
+    get accessPermissions(): bigint;
+    get lastActiveTimestamp(): number;
+
+    computeLurkerPermissionsAllowList(): unknown;
+    getApplicationId(): unknown;
+    getGuildId(): string;
+    getRecipientId(): unknown;
+    hasFlag(flag: number): boolean;
+    isActiveThread(): boolean;
+    isArchivedThread(): boolean;
+    isCategory(): boolean;
+    isDM(): boolean;
+    isDirectory(): boolean;
+    isForumChannel(): boolean;
+    isGroupDM(): boolean;
+    isGuildStageVoice(): boolean;
+    isGuildVoice(): boolean;
+    isListenModeCapable(): boolean;
+    isManaged(): boolean;
+    isMultiUserDM(): boolean;
+    isNSFW(): boolean;
+    isOwner(): boolean;
+    isPrivate(): boolean;
+    isSystemDM(): boolean;
+    isThread(): boolean;
+    isVocal(): boolean;
+}

packages/discord-types/src/common/Guild.d.ts

@@ -0,0 +1,64 @@
+import { Role } from './Role';
+import { DiscordRecord } from './Record';
+
+// copy(Object.keys(findByProps("CREATOR_MONETIZABLE")).map(JSON.stringify).join("|"))
+export type GuildFeatures =
+    "INVITE_SPLASH" | "VIP_REGIONS" | "VANITY_URL" | "MORE_EMOJI" | "MORE_STICKERS" | "MORE_SOUNDBOARD" | "VERIFIED" | "COMMERCE" | "DISCOVERABLE" | "COMMUNITY" | "FEATURABLE" | "NEWS" | "HUB" | "PARTNERED" | "ANIMATED_ICON" | "BANNER" | "ENABLED_DISCOVERABLE_BEFORE" | "WELCOME_SCREEN_ENABLED" | "MEMBER_VERIFICATION_GATE_ENABLED" | "PREVIEW_ENABLED" | "ROLE_SUBSCRIPTIONS_ENABLED" | "ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE" | "CREATOR_MONETIZABLE" | "CREATOR_MONETIZABLE_PROVISIONAL" | "CREATOR_MONETIZABLE_WHITEGLOVE" | "CREATOR_MONETIZABLE_DISABLED" | "CREATOR_MONETIZABLE_RESTRICTED" | "CREATOR_STORE_PAGE" | "CREATOR_MONETIZABLE_PENDING_NEW_OWNER_ONBOARDING" | "PRODUCTS_AVAILABLE_FOR_PURCHASE" | "GUILD_WEB_PAGE_VANITY_URL" | "THREADS_ENABLED" | "THREADS_ENABLED_TESTING" | "NEW_THREAD_PERMISSIONS" | "ROLE_ICONS" | "TEXT_IN_STAGE_ENABLED" | "TEXT_IN_VOICE_ENABLED" | "HAS_DIRECTORY_ENTRY" | "ANIMATED_BANNER" | "LINKED_TO_HUB" | "EXPOSED_TO_ACTIVITIES_WTP_EXPERIMENT" | "GUILD_HOME_DEPRECATION_OVERRIDE" | "GUILD_HOME_TEST" | "GUILD_HOME_OVERRIDE" | "GUILD_ONBOARDING" | "GUILD_ONBOARDING_EVER_ENABLED" | "GUILD_ONBOARDING_HAS_PROMPTS" | "GUILD_SERVER_GUIDE" | "INTERNAL_EMPLOYEE_ONLY" | "AUTO_MODERATION" | "INVITES_DISABLED" | "BURST_REACTIONS" | "SOUNDBOARD" | "SHARD" | "ACTIVITY_FEED_ENABLED_BY_USER" | "ACTIVITY_FEED_DISABLED_BY_USER" | "SUMMARIES_ENABLED_GA" | "LEADERBOARD_ENABLED" | "SUMMARIES_ENABLED_BY_USER" | "SUMMARIES_OPT_OUT_EXPERIENCE" | "CHANNEL_ICON_EMOJIS_GENERATED" | "NON_COMMUNITY_RAID_ALERTS" | "RAID_ALERTS_DISABLED" | "AUTOMOD_TRIGGER_USER_PROFILE" | "ENABLED_MODERATION_EXPERIENCE_FOR_NON_COMMUNITY" | "GUILD_PRODUCTS_ALLOW_ARCHIVED_FILE" | "CLAN" | "MEMBER_VERIFICATION_MANUAL_APPROVAL" | "FORWARDING_DISABLED" | "MEMBER_VERIFICATION_ROLLOUT_TEST" | "AUDIO_BITRATE_128_KBPS" | "AUDIO_BITRATE_256_KBPS" | "AUDIO_BITRATE_384_KBPS" | "VIDEO_BITRATE_ENHANCED" | "MAX_FILE_SIZE_50_MB" | "MAX_FILE_SIZE_100_MB" | "GUILD_TAGS" | "ENHANCED_ROLE_COLORS" | "PREMIUM_TIER_3_OVERRIDE" | "REPORT_TO_MOD_PILOT" | "TIERLESS_BOOSTING_SYSTEM_MESSAGE";
+export type GuildPremiumFeatures =
+    "ANIMATED_ICON" | "STAGE_CHANNEL_VIEWERS_150" | "ROLE_ICONS" | "GUILD_TAGS" | "BANNER" | "MAX_FILE_SIZE_50_MB" | "VIDEO_QUALITY_720_60FPS" | "STAGE_CHANNEL_VIEWERS_50" | "VIDEO_QUALITY_1080_60FPS" | "MAX_FILE_SIZE_100_MB" | "VANITY_URL" | "VIDEO_BITRATE_ENHANCED" | "STAGE_CHANNEL_VIEWERS_300" | "AUDIO_BITRATE_128_KBPS" | "ANIMATED_BANNER" | "TIERLESS_BOOSTING" | "ENHANCED_ROLE_COLORS" | "INVITE_SPLASH" | "AUDIO_BITRATE_256_KBPS" | "AUDIO_BITRATE_384_KBPS";
+
+export class Guild extends DiscordRecord {
+    constructor(guild: object);
+    afkChannelId: string | undefined;
+    afkTimeout: number;
+    applicationCommandCounts: {
+        0: number;
+        1: number;
+        2: number;
+    };
+    application_id: unknown;
+    banner: string | undefined;
+    defaultMessageNotifications: number;
+    description: string | undefined;
+    discoverySplash: string | undefined;
+    explicitContentFilter: number;
+    features: Set<GuildFeatures>;
+    homeHeader: string | undefined;
+    hubType: unknown;
+    icon: string | undefined;
+    id: string;
+    joinedAt: Date;
+    latestOnboardingQuestionId: string | undefined;
+    maxMembers: number;
+    maxStageVideoChannelUsers: number;
+    maxVideoChannelUsers: number;
+    mfaLevel: number;
+    moderatorReporting: unknown;
+    name: string;
+    nsfwLevel: number;
+    ownerConfiguredContentLevel: number;
+    ownerId: string;
+    preferredLocale: string;
+    premiumFeatures: {
+        additionalEmojiSlots: number;
+        additionalSoundSlots: number;
+        additionalStickerSlots: number;
+        features: Array<GuildPremiumFeatures>;
+    };
+    premiumProgressBarEnabled: boolean;
+    premiumSubscriberCount: number;
+    premiumTier: number;
+    profile: {
+        badge: string | undefined;
+        tag: string | undefined;
+    } | undefined;
+    publicUpdatesChannelId: string | undefined;
+    roles: Record<string, Role>;
+    rulesChannelId: string | undefined;
+    safetyAlertsChannelId: string | undefined;
+    splash: string | undefined;
+    systemChannelFlags: number;
+    systemChannelId: string | undefined;
+    vanityURLCode: string | undefined;
+    verificationLevel: number;
+}

packages/discord-types/src/common/GuildMember.d.ts

@@ -0,0 +1,26 @@
+export interface GuildMember {
+    avatar: string | undefined;
+    avatarDecoration: string | undefined;
+    banner: string | undefined;
+    bio: string;
+    colorRoleId: string | undefined;
+    colorString: string;
+    colorStrings: {
+        primaryColor: string | undefined;
+        secondaryColor: string | undefined;
+        tertiaryColor: string | undefined;
+    };
+    communicationDisabledUntil: string | undefined;
+    flags: number;
+    fullProfileLoadedTimestamp: number;
+    guildId: string;
+    highestRoleId: string;
+    hoistRoleId: string;
+    iconRoleId: string;
+    isPending: boolean | undefined;
+    joinedAt: string | undefined;
+    nick: string | undefined;
+    premiumSince: string | undefined;
+    roles: string[];
+    userId: string;
+}

packages/discord-types/src/common/Record.d.ts

@@ -0,0 +1,12 @@
+type Updater = (value: any) => any;
+
+/**
+ * Common Record class extended by various Discord data structures, like User, Channel, Guild, etc.
+ */
+export class DiscordRecord {
+    toJS(): Record<string, any>;
+
+    set(key: string, value: any): this;
+    merge(data: Record<string, any>): this;
+    update(key: string, defaultValueOrUpdater: Updater | any, updater?: Updater): this;
+}

packages/discord-types/src/common/Role.d.ts

@@ -0,0 +1,33 @@
+export interface Role {
+    color: number;
+    colorString: string | undefined;
+    colorStrings: {
+        primaryColor: string | undefined;
+        secondaryColor: string | undefined;
+        tertiaryColor: string | undefined;
+    };
+    colors: {
+        primary_color: number | undefined;
+        secondary_color: number | undefined;
+        tertiary_color: number | undefined;
+    };
+    flags: number;
+    hoist: boolean;
+    icon: string | undefined;
+    id: string;
+    managed: boolean;
+    mentionable: boolean;
+    name: string;
+    originalPosition: number;
+    permissions: bigint;
+    position: number;
+    /**
+     * probably incomplete
+     */
+    tags: {
+        bot_id: string;
+        integration_id: string;
+        premium_subscriber: unknown;
+    } | undefined;
+    unicodeEmoji: string | undefined;
+}

packages/discord-types/src/common/User.d.ts

@@ -0,0 +1,66 @@
+// TODO: a lot of optional params can also be null, not just undef
+
+import { DiscordRecord } from "./Record";
+
+export class User extends DiscordRecord {
+    constructor(user: object);
+    accentColor: number;
+    avatar: string;
+    banner: string;
+    bio: string;
+    bot: boolean;
+    desktop: boolean;
+    discriminator: string;
+    email: string | undefined;
+    flags: number;
+    globalName: string | undefined;
+    guildMemberAvatars: Record<string, string>;
+    id: string;
+    mfaEnabled: boolean;
+    mobile: boolean;
+    nsfwAllowed: boolean | undefined;
+    phone: string | undefined;
+    premiumType: number | undefined;
+    premiumUsageFlags: number;
+    publicFlags: number;
+    purchasedFlags: number;
+    system: boolean;
+    username: string;
+    verified: boolean;
+    themeColors?: [number, number];
+
+    get createdAt(): Date;
+    get hasPremiumPerks(): boolean;
+    get tag(): string;
+    get usernameNormalized(): string;
+
+    addGuildAvatarHash(guildId: string, avatarHash: string): User;
+    getAvatarSource(guildId: string, canAnimate?: boolean): { uri: string; };
+    getAvatarURL(guildId?: string | null, t?: unknown, canAnimate?: boolean): string;
+    hasAvatarForGuild(guildId: string): boolean;
+    hasDisabledPremium(): boolean;
+    hasFlag(flag: number): boolean;
+    hasFreePremium(): boolean;
+    hasHadSKU(e: unknown): boolean;
+    hasPremiumUsageFlag(flag: number): boolean;
+    hasPurchasedFlag(flag: number): boolean;
+    hasUrgentMessages(): boolean;
+    isClaimed(): boolean;
+    isLocalBot(): boolean;
+    isNonUserBot(): boolean;
+    isPhoneVerified(): boolean;
+    isStaff(): boolean;
+    isSystemUser(): boolean;
+    isVerifiedBot(): boolean;
+    removeGuildAvatarHash(guildId: string): User;
+    toString(): string;
+}
+
+export interface UserJSON {
+    avatar: string;
+    avatarDecoration: unknown | undefined;
+    discriminator: string;
+    id: string;
+    publicFlags: number;
+    username: string;
+}

packages/discord-types/src/common/index.d.ts

@@ -0,0 +1,7 @@
+export * from "./Channel";
+export * from "./Guild";
+export * from "./GuildMember";
+export * from "./messages";
+export * from "./Role";
+export * from "./User";
+export * from "./Record";

packages/discord-types/src/common/messages/Commands.d.ts

@@ -0,0 +1,61 @@
+import { Channel } from "../Channel";
+import { Guild } from "../Guild";
+import { Promisable } from "type-fest";
+import { ApplicationCommandInputType, ApplicationCommandOptionType, ApplicationCommandType } from "../../../enums";
+
+export interface CommandContext {
+    channel: Channel;
+    guild?: Guild;
+}
+
+export interface CommandOption {
+    name: string;
+    displayName?: string;
+    type: ApplicationCommandOptionType;
+    description: string;
+    displayDescription?: string;
+    required?: boolean;
+    options?: CommandOption[];
+    choices?: Array<ChoicesOption>;
+}
+
+export interface ChoicesOption {
+    label: string;
+    value: string;
+    name: string;
+    displayName?: string;
+}
+
+export interface CommandReturnValue {
+    content: string;
+    // TODO: implement
+    // cancel?: boolean;
+}
+
+export interface CommandArgument {
+    type: ApplicationCommandOptionType;
+    name: string;
+    value: string;
+    focused: undefined;
+    options: CommandArgument[];
+}
+
+export interface Command {
+    id?: string;
+    applicationId?: string;
+    type?: ApplicationCommandType;
+    inputType?: ApplicationCommandInputType;
+    plugin?: string;
+
+    name: string;
+    untranslatedName?: string;
+    displayName?: string;
+    description: string;
+    untranslatedDescription?: string;
+    displayDescription?: string;
+
+    options?: CommandOption[];
+    predicate?(ctx: CommandContext): boolean;
+
+    execute(args: CommandArgument[], ctx: CommandContext): Promisable<void | CommandReturnValue>;
+}

packages/discord-types/src/common/messages/Embed.d.ts

@@ -0,0 +1,70 @@
+export interface Embed {
+    author?: {
+        name: string;
+        url: string;
+        iconURL: string | undefined;
+        iconProxyURL: string | undefined;
+    };
+    color: string;
+    fields: [];
+    id: string;
+    image?: {
+        height: number;
+        width: number;
+        url: string;
+        proxyURL: string;
+    };
+    provider?: {
+        name: string;
+        url: string | undefined;
+    };
+    rawDescription: string;
+    rawTitle: string;
+    referenceId: unknown;
+    timestamp: string;
+    thumbnail?: {
+        height: number;
+        proxyURL: string | undefined;
+        url: string;
+        width: number;
+    };
+    type: string;
+    url: string | undefined;
+    video?: {
+        height: number;
+        width: number;
+        url: string;
+        proxyURL: string | undefined;
+    };
+}
+
+export interface EmbedJSON {
+    author?: {
+        name: string;
+        url: string;
+        icon_url: string;
+        proxy_icon_url: string;
+    };
+    title: string;
+    color: string;
+    description: string;
+    type: string;
+    url: string | undefined;
+    provider?: {
+        name: string;
+        url: string;
+    };
+    timestamp: string;
+    thumbnail?: {
+        height: number;
+        width: number;
+        url: string;
+        proxy_url: string | undefined;
+    };
+    video?: {
+        height: number;
+        width: number;
+        url: string;
+        proxy_url: string | undefined;
+    };
+}

packages/discord-types/src/common/messages/Emoji.d.ts

@@ -0,0 +1,42 @@
+export type Emoji = CustomEmoji | UnicodeEmoji;
+
+export interface CustomEmoji {
+    type: 1;
+    allNamesString: string;
+    animated: boolean;
+    available: boolean;
+    guildId: string;
+    id: string;
+    managed: boolean;
+    name: string;
+    originalName?: string;
+    require_colons: boolean;
+    roles: string[];
+}
+
+export interface UnicodeEmoji {
+    type: 0;
+    diversityChildren: Record<any, any>;
+    emojiObject: {
+        names: string[];
+        surrogates: string;
+        unicodeVersion: number;
+    };
+    index: number;
+    surrogates: string;
+    uniqueName: string;
+    useSpriteSheet: boolean;
+    get allNamesString(): string;
+    get animated(): boolean;
+    get defaultDiversityChild(): any;
+    get hasDiversity(): boolean | undefined;
+    get hasDiversityParent(): boolean | undefined;
+    get hasMultiDiversity(): boolean | undefined;
+    get hasMultiDiversityParent(): boolean | undefined;
+    get managed(): boolean;
+    get name(): string;
+    get names(): string[];
+    get optionallyDiverseSequence(): string | undefined;
+    get unicodeVersion(): number;
+    get url(): string;
+}

packages/discord-types/src/common/messages/Message.d.ts

@@ -0,0 +1,191 @@
+import { CommandOption } from './Commands';
+import { User, UserJSON } from '../User';
+import { Embed, EmbedJSON } from './Embed';
+import { DiscordRecord } from "../Record";
+
+/**
+ * TODO: looks like discord has moved over to Date instead of Moment;
+ */
+export class Message extends DiscordRecord {
+    constructor(message: object);
+    activity: unknown;
+    application: unknown;
+    applicationId: string | unknown;
+    attachments: MessageAttachment[];
+    author: User;
+    blocked: boolean;
+    bot: boolean;
+    call: {
+        duration: moment.Duration;
+        endedTimestamp: moment.Moment;
+        participants: string[];
+    };
+    channel_id: string;
+    /**
+     * NOTE: not fully typed
+     */
+    codedLinks: {
+        code?: string;
+        type: string;
+    }[];
+    colorString: unknown;
+    components: unknown[];
+    content: string;
+    customRenderedContent: unknown;
+    editedTimestamp: Date;
+    embeds: Embed[];
+    flags: number;
+    giftCodes: string[];
+    id: string;
+    interaction: {
+        id: string;
+        name: string;
+        type: number;
+        user: User;
+    }[] | undefined;
+    interactionData: {
+        application_command: {
+            application_id: string;
+            default_member_permissions: unknown;
+            default_permission: boolean;
+            description: string;
+            dm_permission: unknown;
+            id: string;
+            name: string;
+            options: CommandOption[];
+            permissions: unknown[];
+            type: number;
+            version: string;
+        };
+        attachments: MessageAttachment[];
+        guild_id: string | undefined;
+        id: string;
+        name: string;
+        options: {
+            focused: unknown;
+            name: string;
+            type: number;
+            value: string;
+        }[];
+        type: number;
+        version: string;
+    }[];
+    interactionError: unknown[];
+    isSearchHit: boolean;
+    loggingName: unknown;
+    mentionChannels: string[];
+    mentionEveryone: boolean;
+    mentionRoles: string[];
+    mentioned: boolean;
+    mentions: string[];
+    messageReference: {
+        guild_id?: string;
+        channel_id: string;
+        message_id: string;
+    } | undefined;
+    nick: unknown; // probably a string
+    nonce: string | undefined;
+    pinned: boolean;
+    reactions: MessageReaction[];
+    state: string;
+    stickerItems: {
+        format_type: number;
+        id: string;
+        name: string;
+    }[];
+    stickers: unknown[];
+    timestamp: moment.Moment;
+    tts: boolean;
+    type: number;
+    webhookId: string | undefined;
+
+    /**
+     *  Doesn't actually update the original message; it just returns a new message instance with the added reaction.
+     */
+    addReaction(emoji: ReactionEmoji, fromCurrentUser: boolean): Message;
+    /**
+     * Searches each reaction and if the provided string has an index above -1 it'll return the reaction object.
+     */
+    getReaction(name: string): MessageReaction;
+    /**
+     * Doesn't actually update the original message; it just returns the message instance without the reaction searched with the provided emoji object.
+     */
+    removeReactionsForEmoji(emoji: ReactionEmoji): Message;
+    /**
+     * Doesn't actually update the original message; it just returns the message instance without the reaction.
+     */
+    removeReaction(emoji: ReactionEmoji, fromCurrentUser: boolean): Message;
+
+    getChannelId(): string;
+    hasFlag(flag: number): boolean;
+    isCommandType(): boolean;
+    isEdited(): boolean;
+    isSystemDM(): boolean;
+}
+
+/** A smaller Message object found in FluxDispatcher and elsewhere. */
+export interface MessageJSON {
+    attachments: MessageAttachment[];
+    author: UserJSON;
+    channel_id: string;
+    components: unknown[];
+    content: string;
+    edited_timestamp: string;
+    embeds: EmbedJSON[];
+    flags: number;
+    guild_id: string | undefined;
+    id: string;
+    loggingName: unknown;
+    member: {
+        avatar: string | undefined;
+        communication_disabled_until: string | undefined;
+        deaf: boolean;
+        hoisted_role: string | undefined;
+        is_pending: boolean;
+        joined_at: string;
+        mute: boolean;
+        nick: string | boolean;
+        pending: boolean;
+        premium_since: string | undefined;
+        roles: string[];
+    } | undefined;
+    mention_everyone: boolean;
+    mention_roles: string[];
+    mentions: UserJSON[];
+    message_reference: {
+        guild_id?: string;
+        channel_id: string;
+        message_id: string;
+    } | undefined;
+    nonce: string | undefined;
+    pinned: boolean;
+    referenced_message: MessageJSON | undefined;
+    state: string;
+    timestamp: string;
+    tts: boolean;
+    type: number;
+}
+
+export interface MessageAttachment {
+    filename: string;
+    id: string;
+    proxy_url: string;
+    size: number;
+    spoiler: boolean;
+    url: string;
+    content_type?: string;
+    width?: number;
+    height?: number;
+}
+
+export interface ReactionEmoji {
+    id: string | undefined;
+    name: string;
+    animated: boolean;
+}
+
+export interface MessageReaction {
+    count: number;
+    emoji: ReactionEmoji;
+    me: boolean;
+}

packages/discord-types/src/common/messages/index.d.ts

@@ -0,0 +1,4 @@
+export * from "./Commands";
+export * from "./Message";
+export * from "./Embed";
+export * from "./Emoji";

packages/discord-types/src/components.d.ts

@@ -1,25 +1,7 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 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 type { ComponentClass, ComponentPropsWithRef, ComponentType, CSSProperties, FunctionComponent, HtmlHTMLAttributes, HTMLProps, JSX, KeyboardEvent, MouseEvent, PointerEvent, PropsWithChildren, ReactNode, Ref, RefObject } from "react";
 
-
-export type TextVariant = "heading-sm/normal" | "heading-sm/medium" | "heading-sm/semibold" | "heading-sm/bold" | "heading-md/normal" | "heading-md/medium" | "heading-md/semibold" | "heading-md/bold" | "heading-lg/normal" | "heading-lg/medium" | "heading-lg/semibold" | "heading-lg/bold" | "heading-xl/normal" | "heading-xl/medium" | "heading-xl/bold" | "heading-xxl/normal" | "heading-xxl/medium" | "heading-xxl/bold" | "eyebrow" | "heading-deprecated-14/normal" | "heading-deprecated-14/medium" | "heading-deprecated-14/bold" | "text-xxs/normal" | "text-xxs/medium" | "text-xxs/semibold" | "text-xxs/bold" | "text-xs/normal" | "text-xs/medium" | "text-xs/semibold" | "text-xs/bold" | "text-sm/normal" | "text-sm/medium" | "text-sm/semibold" | "text-sm/bold" | "text-md/normal" | "text-md/medium" | "text-md/semibold" | "text-md/bold" | "text-lg/normal" | "text-lg/medium" | "text-lg/semibold" | "text-lg/bold" | "display-sm" | "display-md" | "display-lg" | "code";
+// copy(find(m => Array.isArray(m) && m.includes("heading-sm/normal")).map(JSON.stringify).join("|"))
+export type TextVariant = "heading-sm/normal" | "heading-sm/medium" | "heading-sm/semibold" | "heading-sm/bold" | "heading-sm/extrabold" | "heading-md/normal" | "heading-md/medium" | "heading-md/semibold" | "heading-md/bold" | "heading-md/extrabold" | "heading-lg/normal" | "heading-lg/medium" | "heading-lg/semibold" | "heading-lg/bold" | "heading-lg/extrabold" | "heading-xl/normal" | "heading-xl/medium" | "heading-xl/semibold" | "heading-xl/bold" | "heading-xl/extrabold" | "heading-xxl/normal" | "heading-xxl/medium" | "heading-xxl/semibold" | "heading-xxl/bold" | "heading-xxl/extrabold" | "eyebrow" | "heading-deprecated-12/normal" | "heading-deprecated-12/medium" | "heading-deprecated-12/semibold" | "heading-deprecated-12/bold" | "heading-deprecated-12/extrabold" | "redesign/heading-18/bold" | "text-xxs/normal" | "text-xxs/medium" | "text-xxs/semibold" | "text-xxs/bold" | "text-xs/normal" | "text-xs/medium" | "text-xs/semibold" | "text-xs/bold" | "text-sm/normal" | "text-sm/medium" | "text-sm/semibold" | "text-sm/bold" | "text-md/normal" | "text-md/medium" | "text-md/semibold" | "text-md/bold" | "text-lg/normal" | "text-lg/medium" | "text-lg/semibold" | "text-lg/bold" | "redesign/message-preview/normal" | "redesign/message-preview/medium" | "redesign/message-preview/semibold" | "redesign/message-preview/bold" | "redesign/channel-title/normal" | "redesign/channel-title/medium" | "redesign/channel-title/semibold" | "redesign/channel-title/bold" | "display-sm" | "display-md" | "display-lg" | "code";
 export type FormTextTypes = Record<"DEFAULT" | "INPUT_PLACEHOLDER" | "DESCRIPTION" | "LABEL_BOLD" | "LABEL_SELECTED" | "LABEL_DESCRIPTOR" | "ERROR" | "SUCCESS", string>;
 export type HeadingTag = `h${1 | 2 | 3 | 4 | 5 | 6}`;
 

packages/discord-types/src/flux.d.ts

@@ -0,0 +1,30 @@
+import { FluxStore } from "./stores/FluxStore";
+
+export class FluxEmitter {
+    constructor();
+
+    changeSentinel: number;
+    changedStores: Set<FluxStore>;
+    isBatchEmitting: boolean;
+    isDispatching: boolean;
+    isPaused: boolean;
+    pauseTimer: NodeJS.Timeout | null;
+    reactChangedStores: Set<FluxStore>;
+
+    batched(batch: (...args: any[]) => void): void;
+    destroy(): void;
+    emit(): void;
+    emitNonReactOnce(): void;
+    emitReactOnce(): void;
+    getChangeSentinel(): number;
+    getIsPaused(): boolean;
+    injectBatchEmitChanges(batch: (...args: any[]) => void): void;
+    markChanged(store: FluxStore): void;
+    pause(): void;
+    resume(): void;
+}
+
+export interface Flux {
+    Store: typeof FluxStore;
+    Emitter: FluxEmitter;
+}

packages/discord-types/src/index.d.ts

@@ -0,0 +1,9 @@
+export * from "./common";
+export * from "./classes";
+export * from "./components";
+export * from "./flux";
+export * from "./fluxEvents";
+export * from "./menu";
+export * from "./stores";
+export * from "./utils";
+export * as Webpack from "../webpack";

packages/discord-types/src/menu.d.ts

@@ -1,21 +1,3 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 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 type { ComponentType, CSSProperties, MouseEvent, PropsWithChildren, ReactNode, UIEvent } from "react";
 
 type RC<C> = ComponentType<PropsWithChildren<C & Record<string, any>>>;
@@ -73,7 +55,7 @@ export interface Menu {
         renderValue?(value: number): string,
     }>;
     MenuSearchControl: RC<{
-        query: string
+        query: string;
         onChange(query: string): void;
         placeholder?: string;
     }>;

packages/discord-types/src/stores/ChannelStore.d.ts

@@ -0,0 +1,24 @@
+import { Channel, FluxStore } from "..";
+
+export class ChannelStore extends FluxStore {
+    getChannel(channelId: string): Channel;
+    getBasicChannel(channelId: string): Channel | undefined;
+    hasChannel(channelId: string): boolean;
+
+    getChannelIds(guildId?: string | null): string[];
+    getMutableBasicGuildChannelsForGuild(guildId: string): Record<string, Channel>;
+    getMutableGuildChannelsForGuild(guildId: string): Record<string, Channel>;
+    getAllThreadsForGuild(guildId: string): Channel[];
+    getAllThreadsForParent(channelId: string): Channel[];
+
+    getDMFromUserId(userId: string): string;
+    getDMChannelFromUserId(userId: string): Channel | undefined;
+    getDMUserIds(): string[];
+    getMutableDMsByUserIds(): Record<string, string>;
+    getMutablePrivateChannels(): Record<string, Channel>;
+    getSortedPrivateChannels(): Channel[];
+
+    getGuildChannelsVersion(guildId: string): number;
+    getPrivateChannelsVersion(): number;
+    getInitialOverlayState(): Record<string, Channel>;
+}

packages/discord-types/src/stores/DraftStore.d.ts

@@ -0,0 +1,43 @@
+import { FluxStore } from "..";
+
+export enum DraftType {
+    ChannelMessage = 0,
+    ThreadSettings = 1,
+    FirstThreadMessage = 2,
+    ApplicationLauncherCommand = 3,
+    Poll = 4,
+    SlashCommand = 5,
+    ForwardContextMessage = 6
+}
+
+export interface Draft {
+    timestamp: number;
+    draft: string;
+}
+
+export interface ThreadSettingsDraft {
+    timestamp: number;
+    parentMessageId?: string;
+    name?: string;
+    isPrivate?: boolean;
+    parentChannelId?: string;
+    location?: string;
+}
+
+export type ChannelDrafts = {
+    [DraftType.ThreadSettings]: ThreadSettingsDraft;
+} & {
+    [key in Exclude<DraftType, DraftType.ThreadSettings>]: Draft;
+};
+
+export type UserDrafts = Partial<Record<string, ChannelDrafts>>;
+export type DraftState = Partial<Record<string, UserDrafts>>;
+
+export class DraftStore extends FluxStore {
+    getState(): DraftState;
+    getRecentlyEditedDrafts(type: DraftType): Array<Draft & { channelId: string; }>;
+    getDraft(channelId: string, type: DraftType): string;
+
+    getThreadSettings(channelId: string): ThreadSettingsDraft | null | undefined;
+    getThreadDraftWithParentMessageId(parentMessageId: string): ThreadSettingsDraft | null | undefined;
+}

packages/discord-types/src/stores/EmojiStore.d.ts

@@ -0,0 +1,57 @@
+import { Channel, CustomEmoji, Emoji, FluxStore } from "..";
+
+export class EmojiStore extends FluxStore {
+    getCustomEmojiById(id?: string | null): CustomEmoji | undefined;
+    getUsableCustomEmojiById(id?: string | null): CustomEmoji | undefined;
+    getGuilds(): Record<string, {
+        id: string;
+        get emojis(): CustomEmoji[];
+        get rawEmojis(): CustomEmoji[];
+        get usableEmojis(): CustomEmoji[];
+        get emoticons(): any[];
+        getEmoji(id: string): CustomEmoji | undefined;
+        isUsable(emoji: CustomEmoji): boolean;
+    }>;
+    getGuildEmoji(guildId?: string | null): CustomEmoji[];
+    getNewlyAddedEmoji(guildId?: string | null): CustomEmoji[];
+    getTopEmoji(guildId?: string | null): CustomEmoji[];
+    getTopEmojisMetadata(guildId?: string | null): {
+        emojiIds: string[];
+        topEmojisTTL: number;
+    };
+    hasPendingUsage(): boolean;
+    hasUsableEmojiInAnyGuild(): boolean;
+    searchWithoutFetchingLatest(data: any): any;
+    getSearchResultsOrder(...args: any[]): any;
+    getState(): {
+        pendingUsages: { key: string, timestamp: number; }[];
+    };
+    searchWithoutFetchingLatest(data: {
+        channel: Channel;
+        query: string;
+        count?: number;
+        intention: number;
+        includeExternalGuilds?: boolean;
+        matchComparator?(name: string): boolean;
+    }): Record<"locked" | "unlocked", Emoji[]>;
+
+    getDisambiguatedEmojiContext(): {
+        backfillTopEmojis: Record<any, any>;
+        customEmojis: Record<string, CustomEmoji>;
+        emojisById: Record<string, CustomEmoji>;
+        emojisByName: Record<string, CustomEmoji>;
+        emoticonRegex: RegExp | null;
+        emoticonsByName: Record<string, any>;
+        escapedEmoticonNames: string;
+        favoriteNamesAndIds?: any;
+        favorites?: any;
+        frequentlyUsed?: any;
+        groupedCustomEmojis: Record<string, CustomEmoji[]>;
+        guildId?: string;
+        isFavoriteEmojiWithoutFetchingLatest(e: Emoji): boolean;
+        newlyAddedEmoji: Record<string, CustomEmoji[]>;
+        topEmojis?: any;
+        unicodeAliases: Record<string, string>;
+        get favoriteEmojisWithoutFetchingLatest(): Emoji[];
+    };
+}

packages/discord-types/src/stores/FluxStore.d.ts

@@ -0,0 +1,44 @@
+import { FluxDispatcher, FluxEvents } from "..";
+
+type Callback = () => void;
+
+/*
+  For some reason, this causes type errors when you try to destructure it:
+  ```ts
+  interface FluxEvent {
+      type: FluxEvents;
+      [key: string]: any;
+  }
+  ```
+ */
+export type FluxEvent = any;
+
+export type ActionHandler = (event: FluxEvent) => void;
+export type ActionHandlers = Partial<Record<FluxEvents, ActionHandler>>;
+
+export class FluxStore {
+    constructor(dispatcher: FluxDispatcher, actionHandlers?: ActionHandlers);
+
+    getName(): string;
+
+    addChangeListener(callback: Callback): void;
+    /** Listener will be removed once the callback returns false. */
+    addConditionalChangeListener(callback: () => boolean, preemptive?: boolean): void;
+    addReactChangeListener(callback: Callback): void;
+    removeChangeListener(callback: Callback): void;
+    removeReactChangeListener(callback: Callback): void;
+
+    doEmitChanges(event: FluxEvent): void;
+    emitChange(): void;
+
+    getDispatchToken(): string;
+    initialize(): void;
+    initializeIfNeeded(): void;
+    /** this is a setter */
+    mustEmitChanges(actionHandler: ActionHandler | undefined): void;
+    registerActionHandlers(actionHandlers: ActionHandlers): void;
+    syncWith(stores: FluxStore[], callback: Callback, timeout?: number): void;
+    waitFor(...stores: FluxStore[]): void;
+
+    static getAll(): FluxStore[];
+}

packages/discord-types/src/stores/GuildMemberStore.d.ts

@@ -0,0 +1,27 @@
+import { FluxStore, GuildMember } from "..";
+
+export class GuildMemberStore extends FluxStore {
+    /** @returns Format: [guildId-userId: Timestamp (string)] */
+    getCommunicationDisabledUserMap(): Record<string, string>;
+    getCommunicationDisabledVersion(): number;
+
+    getMutableAllGuildsAndMembers(): Record<string, Record<string, GuildMember>>;
+
+    getMember(guildId: string, userId: string): GuildMember | null;
+    getTrueMember(guildId: string, userId: string): GuildMember | null;
+    getMemberIds(guildId: string): string[];
+    getMembers(guildId: string): GuildMember[];
+
+    getCachedSelfMember(guildId: string): GuildMember | null;
+    getSelfMember(guildId: string): GuildMember | null;
+    getSelfMemberJoinedAt(guildId: string): Date | null;
+
+    getNick(guildId: string, userId: string): string | null;
+    getNicknameGuildsMapping(userId: string): Record<string, string[]>;
+    getNicknames(userId: string): string[];
+
+    isMember(guildId: string, userId: string): boolean;
+    isMember(guildId: string, userId: string): boolean;
+    isGuestOrLurker(guildId: string, userId: string): boolean;
+    isCurrentUserGuest(guildId: string): boolean;
+}

packages/discord-types/src/stores/GuildRoleStore.d.ts

@@ -0,0 +1,7 @@
+import { FluxStore, Role } from "..";
+
+export class GuildRoleStore extends FluxStore {
+    getRole(guildId: string, roleId: string): Role;
+    getRoles(guildId: string): Record<string, Role>;
+    getAllGuildRoles(): Record<string, Record<string, Role>>;
+}

packages/discord-types/src/stores/GuildStore.d.ts

@@ -0,0 +1,8 @@
+import { Guild, FluxStore } from "..";
+
+export class GuildStore extends FluxStore {
+    getGuild(guildId: string): Guild;
+    getGuildCount(): number;
+    getGuilds(): Record<string, Guild>;
+    getGuildIds(): string[];
+}

packages/discord-types/src/stores/MessageStore.d.ts

@@ -0,0 +1,13 @@
+import { MessageJSON, FluxStore, Message } from "..";
+
+export class MessageStore extends FluxStore {
+    getMessage(channelId: string, messageId: string): Message;
+    /** @returns This return object is fucking huge; I'll type it later. */
+    getMessages(channelId: string): unknown;
+    getRawMessages(channelId: string): Record<string | number, MessageJSON>;
+    hasCurrentUserSentMessage(channelId: string): boolean;
+    hasPresent(channelId: string): boolean;
+    isLoadingMessages(channelId: string): boolean;
+    jumpedMessageId(channelId: string): string | undefined;
+    whenReady(channelId: string, callback: () => void): void;
+}

packages/discord-types/src/stores/RelationshipStore.d.ts

@@ -0,0 +1,21 @@
+import { FluxStore } from "..";
+
+export class RelationshipStore extends FluxStore {
+    getFriendIDs(): string[];
+    getIgnoredIDs(): string[];
+    getBlockedIDs(): string[];
+
+    getPendingCount(): number;
+    getRelationshipCount(): number;
+
+    /** Related to friend nicknames. */
+    getNickname(userId: string): string;
+    /** @returns Enum value from constants.RelationshipTypes */
+    getRelationshipType(userId: string): number;
+    isFriend(userId: string): boolean;
+    isBlocked(userId: string): boolean;
+    isIgnored(userId: string): boolean;
+    getSince(userId: string): string;
+
+    getMutableRelationships(): Map<string, number>;
+}

packages/discord-types/src/stores/SelectedChannelStore.d.ts

@@ -0,0 +1,14 @@
+import { FluxStore } from "..";
+
+export class SelectedChannelStore extends FluxStore {
+    getChannelId(guildId?: string | null): string;
+    getVoiceChannelId(): string | undefined;
+    getCurrentlySelectedChannelId(guildId?: string): string | undefined;
+    getMostRecentSelectedTextChannelId(guildId: string): string | undefined;
+    getLastSelectedChannelId(guildId?: string): string;
+    // yes this returns a string
+    getLastSelectedChannels(guildId?: string): string;
+
+    /** If you follow an announcement channel, this will return whichever channel you chose as destination */
+    getLastChannelFollowingDestination(): { guildId?: string; channelId?: string; } | undefined;
+}

packages/discord-types/src/stores/SelectedGuildStore.d.ts

@@ -0,0 +1,14 @@
+import { FluxStore } from "..";
+
+export interface SelectedGuildState {
+    selectedGuildTimestampMillis: Record<string | number, number>;
+    selectedGuildId: string | null;
+    lastSelectedGuildId: string | null;
+}
+
+export class SelectedGuildStore extends FluxStore {
+    getGuildId(): string | null;
+    getLastSelectedGuildId(): string | null;
+    getLastSelectedTimestamp(guildId: string): number | null;
+    getState(): SelectedGuildState | undefined;
+}

packages/discord-types/src/stores/ThemeStore.d.ts

@@ -0,0 +1,18 @@
+import { FluxStore } from "..";
+
+export type ThemePreference = "dark" | "light" | "unknown";
+export type SystemTheme = "dark" | "light";
+export type Theme = "light" | "dark" | "darker" | "midnight";
+
+export interface ThemeState {
+    theme: Theme;
+    status: 0 | 1;
+    preferences: Record<ThemePreference, Theme>;
+}
+export class ThemeStore extends FluxStore {
+    get theme(): Theme;
+    get darkSidebar(): boolean;
+    get systemTheme(): SystemTheme;
+    themePreferenceForSystemTheme(preference: ThemePreference): Theme;
+    getState(): ThemeState;
+}

packages/discord-types/src/stores/UserStore.d.ts

@@ -0,0 +1,10 @@
+import { FluxStore, User } from "..";
+
+export class UserStore extends FluxStore {
+    filter(filter: (user: User) => boolean, sort?: boolean): Record<string, User>;
+    findByTag(username: string, discriminator: string): User;
+    forEach(action: (user: User) => void): void;
+    getCurrentUser(): User;
+    getUser(userId: string): User;
+    getUsers(): Record<string, User>;
+}

packages/discord-types/src/stores/WindowStore.d.ts

@@ -0,0 +1,7 @@
+import { FluxStore } from "..";
+
+export class WindowStore extends FluxStore {
+    isElementFullScreen(): boolean;
+    isFocused(): boolean;
+    windowSize(): Record<"width" | "height", number>;
+}

packages/discord-types/src/stores/index.d.ts

@@ -0,0 +1,32 @@
+// please keep in alphabetical order
+export * from "./ChannelStore";
+export * from "./DraftStore";
+export * from "./EmojiStore";
+export * from "./FluxStore";
+export * from "./GuildMemberStore";
+export * from "./GuildRoleStore";
+export * from "./GuildStore";
+export * from "./MessageStore";
+export * from "./RelationshipStore";
+export * from "./SelectedChannelStore";
+export * from "./SelectedGuildStore";
+export * from "./ThemeStore";
+export * from "./UserStore";
+export * from "./WindowStore";
+
+/**
+ * React hook that returns stateful data for one or more stores
+ * You might need a custom comparator (4th argument) if your store data is an object
+ * @param stores The stores to listen to
+ * @param mapper A function that returns the data you need
+ * @param dependencies An array of reactive values which the hook depends on. Use this if your mapper or equality function depends on the value of another hook
+ * @param isEqual A custom comparator for the data returned by mapper
+ *
+ * @example const user = useStateFromStores([UserStore], () => UserStore.getCurrentUser(), null, (old, current) => old.id === current.id);
+ */
+export type useStateFromStores = <T>(
+    stores: any[],
+    mapper: () => T,
+    dependencies?: any,
+    isEqual?: (old: T, newer: T) => boolean
+) => T;

packages/discord-types/src/utils.d.ts

@@ -1,22 +1,4 @@
-/*
- * Vencord, a modification for Discord's desktop app
- * Copyright (c) 2023 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 { Channel, Guild, GuildMember, Message, User } from "discord-types/general";
+import { Channel, Guild, GuildMember, Message, User } from ".";
 import type { ReactNode } from "react";
 import { LiteralUnion } from "type-fest";
 
@@ -335,3 +317,19 @@ export interface DateUtils {
     dateFormat(date: Date, format: string): string;
     diffAsUnits(start: Date, end: Date, stopAtOneSecond?: boolean): Record<"days" | "hours" | "minutes" | "seconds", number>;
 }
+
+export interface CommandOptions {
+    type: number;
+    name: string;
+    description: string;
+    required?: boolean;
+    choices?: {
+        name: string;
+        values: string | number;
+    }[];
+    options?: CommandOptions[];
+    channel_types?: number[];
+    min_value?: number;
+    max_value?: number;
+    autocomplete?: boolean;
+}

packages/discord-types/webpack/index.d.ts

@@ -1,11 +1,9 @@
 /*
- * Vencord, a Discord client mod
+ * @vencord/discord-types
  * Copyright (c) 2024 Vendicated, Nuckyz and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
+ * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-import { SYM_ORIGINAL_FACTORY, SYM_PATCHED_BY, SYM_PATCHED_SOURCE } from "./patchWebpack";
-
 export type ModuleExports = any;
 
 export type Module = {
@@ -215,24 +213,3 @@ export type WebpackRequire = ((moduleId: PropertyKey) => ModuleExports) & {
     /** rspack unique id */
     ruid: string;
 };
-
-// Utility section for Vencord
-
-export type AnyWebpackRequire = ((moduleId: PropertyKey) => ModuleExports) & Partial<Omit<WebpackRequire, "m">> & {
-    /** The module factories, where all modules that have been loaded are stored (pre-loaded or loaded by lazy chunks) */
-    m: Record<PropertyKey, AnyModuleFactory>;
-};
-
-/** exports can be anything, however initially it is always an empty object */
-export type AnyModuleFactory = ((this: ModuleExports, module: Module, exports: ModuleExports, require: AnyWebpackRequire) => void) & {
-    [SYM_PATCHED_SOURCE]?: string;
-    [SYM_PATCHED_BY]?: Set<string>;
-};
-
-export type PatchedModuleFactory = AnyModuleFactory & {
-    [SYM_ORIGINAL_FACTORY]: AnyModuleFactory;
-    [SYM_PATCHED_SOURCE]?: string;
-    [SYM_PATCHED_BY]?: Set<string>;
-};
-
-export type MaybePatchedModuleFactory = PatchedModuleFactory | AnyModuleFactory;

packages/vencord-types/package.json

@@ -21,7 +21,6 @@
         "@types/node": "^22.13.4",
         "@types/react": "18.3.1",
         "@types/react-dom": "18.3.1",
-        "discord-types": "^1.3.26",
         "standalone-electron-types": "^34.2.0",
         "type-fest": "^4.35.0"
     }

pnpm-lock.yaml

@@ -65,12 +65,12 @@ importers:
       '@types/yazl':
         specifier: ^2.4.5
         version: 2.4.6
+      '@vencord/discord-types':
+        specifier: link:packages/discord-types
+        version: link:packages/discord-types
       diff:
         specifier: ^7.0.0
         version: 7.0.0
-      discord-types:
-        specifier: ^1.3.26
-        version: 1.3.26
       esbuild:
         specifier: ^0.25.1
         version: 0.25.1
@@ -141,6 +141,18 @@ importers:
         specifier: ^0.3.5
         version: 0.3.5
 
+  packages/discord-types:
+    dependencies:
+      '@types/react':
+        specifier: ^19.0.10
+        version: 19.0.12
+      moment:
+        specifier: ^2.22.2
+        version: 2.30.1
+      type-fest:
+        specifier: ^4.41.0
+        version: 4.41.0
+
   packages/vencord-types:
     dependencies:
       '@types/lodash':
@@ -155,9 +167,6 @@ importers:
       '@types/react-dom':
         specifier: 18.3.1
         version: 18.3.1
-      discord-types:
-        specifier: ^1.3.26
-        version: 1.3.26
       standalone-electron-types:
         specifier: ^34.2.0
         version: 34.2.0
@@ -522,9 +531,6 @@ packages:
     peerDependencies:
       '@types/react': ^19.0.0
 
-  '@types/react@17.0.2':
-    resolution: {integrity: sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==}
-
   '@types/react@18.3.1':
     resolution: {integrity: sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==}
 
@@ -956,9 +962,6 @@ packages:
     resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
     engines: {node: '>=8'}
 
-  discord-types@1.3.26:
-    resolution: {integrity: sha512-ToG51AOCH+JTQf7b+8vuYQe5Iqwz7nZ7StpECAZ/VZcI1ZhQk13pvt9KkRTfRv1xNvwJ2qib4e3+RifQlo8VPQ==}
-
   doctrine@2.1.0:
     resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
     engines: {node: '>=0.10.0'}
@@ -2328,6 +2331,10 @@ packages:
     resolution: {integrity: sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==}
     engines: {node: '>=16'}
 
+  type-fest@4.41.0:
+    resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
+    engines: {node: '>=16'}
+
   typed-array-buffer@1.0.3:
     resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
     engines: {node: '>= 0.4'}
@@ -2764,11 +2771,6 @@ snapshots:
     dependencies:
       '@types/react': 19.0.12
 
-  '@types/react@17.0.2':
-    dependencies:
-      '@types/prop-types': 15.7.14
-      csstype: 3.1.3
-
   '@types/react@18.3.1':
     dependencies:
       '@types/prop-types': 15.7.14
@@ -3255,11 +3257,6 @@ snapshots:
     dependencies:
       path-type: 4.0.0
 
-  discord-types@1.3.26:
-    dependencies:
-      '@types/react': 17.0.2
-      moment: 2.30.1
-
   doctrine@2.1.0:
     dependencies:
       esutils: 2.0.3
@@ -4923,6 +4920,8 @@ snapshots:
 
   type-fest@4.38.0: {}
 
+  type-fest@4.41.0: {}
+
   typed-array-buffer@1.0.3:
     dependencies:
       call-bound: 1.0.4

scripts/build/build.mjs

@@ -51,7 +51,7 @@ const nodeCommonOpts = {
     format: "cjs",
     platform: "node",
     target: ["esnext"],
-    // @ts-ignore this is never undefined
+    // @ts-expect-error this is never undefined
     external: ["electron", "original-fs", "~pluginNatives", ...commonOpts.external]
 };
 

scripts/build/common.mjs

@@ -363,6 +363,6 @@ export const commonRendererPlugins = [
     banImportPlugin(/^react$/, "Cannot import from react. React and hooks should be imported from @webpack/common"),
     banImportPlugin(/^electron(\/.*)?$/, "Cannot import electron in browser code. You need to use a native.ts file"),
     banImportPlugin(/^ts-pattern$/, "Cannot import from ts-pattern. match and P should be imported from @webpack/common"),
-    // @ts-ignore this is never undefined
+    // @ts-expect-error this is never undefined
     ...commonOpts.plugins
 ];

src/api/ChatButtons.tsx

@@ -8,9 +8,9 @@ import "./ChatButton.css";
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Logger } from "@utils/Logger";
+import { Channel } from "@vencord/discord-types";
 import { waitFor } from "@webpack";
 import { Button, ButtonWrapperClasses, Tooltip } from "@webpack/common";
-import { Channel } from "discord-types/general";
 import { HTMLProps, JSX, MouseEventHandler, ReactNode } from "react";
 
 let ChannelTextAreaClasses: Record<"button" | "buttonContainer", string>;

src/api/Commands/commandHelpers.ts

@@ -17,13 +17,11 @@
 */
 
 import { mergeDefaults } from "@utils/mergeDefaults";
+import { CommandArgument, Message } from "@vencord/discord-types";
 import { findByCodeLazy } from "@webpack";
 import { MessageActions, SnowflakeUtils } from "@webpack/common";
-import { Message } from "discord-types/general";
 import type { PartialDeep } from "type-fest";
 
-import { Argument } from "./types";
-
 const createBotMessage = findByCodeLazy('username:"Clyde"');
 
 export function generateId() {
@@ -51,8 +49,8 @@ export function sendBotMessage(channelId: string, message: PartialDeep<Message>)
  * @param fallbackValue Fallback value in case this option wasn't passed
  * @returns Value
  */
-export function findOption<T>(args: Argument[], name: string): T & {} | undefined;
-export function findOption<T>(args: Argument[], name: string, fallbackValue: T): T & {};
-export function findOption(args: Argument[], name: string, fallbackValue?: any) {
+export function findOption<T>(args: CommandArgument[], name: string): T & {} | undefined;
+export function findOption<T>(args: CommandArgument[], name: string, fallbackValue: T): T & {};
+export function findOption(args: CommandArgument[], name: string, fallbackValue?: any) {
     return (args.find(a => a.name === name)?.value ?? fallbackValue) as any;
 }

src/api/Commands/index.ts

@@ -18,38 +18,39 @@
 
 import { Logger } from "@utils/Logger";
 import { makeCodeblock } from "@utils/text";
+import { CommandArgument, CommandContext, CommandOption } from "@vencord/discord-types";
 
 import { sendBotMessage } from "./commandHelpers";
-import { ApplicationCommandInputType, ApplicationCommandOptionType, ApplicationCommandType, Argument, Command, CommandContext, Option } from "./types";
+import { ApplicationCommandInputType, ApplicationCommandOptionType, ApplicationCommandType, VencordCommand } from "./types";
 
 export * from "./commandHelpers";
 export * from "./types";
 
-export let BUILT_IN: Command[];
-export const commands = {} as Record<string, Command>;
+export let BUILT_IN: VencordCommand[];
+export const commands = {} as Record<string, VencordCommand>;
 
 // hack for plugins being evaluated before we can grab these from webpack
-const OptPlaceholder = Symbol("OptionalMessageOption") as any as Option;
-const ReqPlaceholder = Symbol("RequiredMessageOption") as any as Option;
+const OptPlaceholder = Symbol("OptionalMessageOption") as any as CommandOption;
+const ReqPlaceholder = Symbol("RequiredMessageOption") as any as CommandOption;
 
 /**
  * Optional message option named "message" you can use in commands.
  * Used in "tableflip" or "shrug"
  * @see {@link RequiredMessageOption}
  */
-export let OptionalMessageOption: Option = OptPlaceholder;
+export let OptionalMessageOption: CommandOption = OptPlaceholder;
 /**
  * Required message option named "message" you can use in commands.
  * Used in "me"
  * @see {@link OptionalMessageOption}
  */
-export let RequiredMessageOption: Option = ReqPlaceholder;
+export let RequiredMessageOption: CommandOption = ReqPlaceholder;
 
 // Discord's command list has random gaps for some reason, which can cause issues while rendering the commands
 // Add this offset to every added command to keep them unique
 let commandIdOffset: number;
 
-export const _init = function (cmds: Command[]) {
+export const _init = function (cmds: VencordCommand[]) {
     try {
         BUILT_IN = cmds;
         OptionalMessageOption = cmds.find(c => (c.untranslatedName || c.displayName) === "shrug")!.options![0];
@@ -61,7 +62,7 @@ export const _init = function (cmds: Command[]) {
     return cmds;
 } as never;
 
-export const _handleCommand = function (cmd: Command, args: Argument[], ctx: CommandContext) {
+export const _handleCommand = function (cmd: VencordCommand, args: CommandArgument[], ctx: CommandContext) {
     if (!cmd.isVencordCommand)
         return cmd.execute(args, ctx);
 
@@ -92,7 +93,7 @@ export const _handleCommand = function (cmd: Command, args: Argument[], ctx: Com
  * Prepare a Command Option for Discord by filling missing fields
  * @param opt
  */
-export function prepareOption<O extends Option | Command>(opt: O): O {
+export function prepareOption<O extends CommandOption | VencordCommand>(opt: O): O {
     opt.displayName ||= opt.name;
     opt.displayDescription ||= opt.description;
     opt.options?.forEach((opt, i, opts) => {
@@ -109,7 +110,7 @@ export function prepareOption<O extends Option | Command>(opt: O): O {
 // Yes, Discord registers individual commands for each subcommand
 // TODO: This probably doesn't support nested subcommands. If that is ever needed,
 // investigate
-function registerSubCommands(cmd: Command, plugin: string) {
+function registerSubCommands(cmd: VencordCommand, plugin: string) {
     cmd.options?.forEach(o => {
         if (o.type !== ApplicationCommandOptionType.SUB_COMMAND)
             throw new Error("When specifying sub-command options, all options must be sub-commands.");
@@ -132,7 +133,7 @@ function registerSubCommands(cmd: Command, plugin: string) {
     });
 }
 
-export function registerCommand<C extends Command>(command: C, plugin: string) {
+export function registerCommand<C extends VencordCommand>(command: C, plugin: string) {
     if (!BUILT_IN) {
         console.warn(
             "[CommandsAPI]",

src/api/Commands/types.ts

@@ -1,106 +1,12 @@
 /*
- * 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/>.
-*/
+ * Vencord, a Discord client mod
+ * Copyright (c) 2025 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
-import { Channel, Guild } from "discord-types/general";
-import { Promisable } from "type-fest";
+import { Command } from "@vencord/discord-types";
+export { ApplicationCommandInputType, ApplicationCommandOptionType, ApplicationCommandType } from "@vencord/discord-types/enums";
 
-export interface CommandContext {
-    channel: Channel;
-    guild?: Guild;
-}
-
-export const enum ApplicationCommandOptionType {
-    SUB_COMMAND = 1,
-    SUB_COMMAND_GROUP = 2,
-    STRING = 3,
-    INTEGER = 4,
-    BOOLEAN = 5,
-    USER = 6,
-    CHANNEL = 7,
-    ROLE = 8,
-    MENTIONABLE = 9,
-    NUMBER = 10,
-    ATTACHMENT = 11,
-}
-
-export const enum ApplicationCommandInputType {
-    BUILT_IN = 0,
-    BUILT_IN_TEXT = 1,
-    BUILT_IN_INTEGRATION = 2,
-    BOT = 3,
-    PLACEHOLDER = 4,
-}
-
-export interface Option {
-    name: string;
-    displayName?: string;
-    type: ApplicationCommandOptionType;
-    description: string;
-    displayDescription?: string;
-    required?: boolean;
-    options?: Option[];
-    choices?: Array<ChoicesOption>;
-}
-
-export interface ChoicesOption {
-    label: string;
-    value: string;
-    name: string;
-    displayName?: string;
-}
-
-export const enum ApplicationCommandType {
-    CHAT_INPUT = 1,
-    USER = 2,
-    MESSAGE = 3,
-}
-
-export interface CommandReturnValue {
-    content: string;
-    /** TODO: implement */
-    cancel?: boolean;
-}
-
-export interface Argument {
-    type: ApplicationCommandOptionType;
-    name: string;
-    value: string;
-    focused: undefined;
-    options: Argument[];
-}
-
-export interface Command {
-    id?: string;
-    applicationId?: string;
-    type?: ApplicationCommandType;
-    inputType?: ApplicationCommandInputType;
-    plugin?: string;
+export interface VencordCommand extends Command {
     isVencordCommand?: boolean;
-
-    name: string;
-    untranslatedName?: string;
-    displayName?: string;
-    description: string;
-    untranslatedDescription?: string;
-    displayDescription?: string;
-
-    options?: Option[];
-    predicate?(ctx: CommandContext): boolean;
-
-    execute(args: Argument[], ctx: CommandContext): Promisable<void | CommandReturnValue>;
 }

src/api/DataStore/index.ts

@@ -22,9 +22,9 @@ export function promisifyRequest<T = undefined>(
     request: IDBRequest<T> | IDBTransaction,
 ): Promise<T> {
     return new Promise<T>((resolve, reject) => {
-        // @ts-ignore - file size hacks
+        // @ts-expect-error - file size hacks
         request.oncomplete = request.onsuccess = () => resolve(request.result);
-        // @ts-ignore - file size hacks
+        // @ts-expect-error - file size hacks
         request.onabort = request.onerror = () => reject(request.error);
     });
 }

src/api/MemberListDecorators.tsx

@@ -17,7 +17,7 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Channel, User } from "discord-types/general/index.js";
+import { Channel, User } from "@vencord/discord-types";
 import { JSX } from "react";
 
 interface DecoratorProps {

src/api/MessageDecorations.tsx

@@ -17,7 +17,7 @@
 */
 
 import ErrorBoundary from "@components/ErrorBoundary";
-import { Channel, Message } from "discord-types/general/index.js";
+import { Channel, Message } from "@vencord/discord-types";
 import { JSX } from "react";
 
 export interface MessageDecorationProps {

src/api/MessageEvents.ts

@@ -17,9 +17,8 @@
 */
 
 import { Logger } from "@utils/Logger";
+import type { Channel, CustomEmoji, Message } from "@vencord/discord-types";
 import { MessageStore } from "@webpack/common";
-import { CustomEmoji } from "@webpack/types";
-import type { Channel, Message } from "discord-types/general";
 import type { Promisable } from "type-fest";
 
 const MessageEventsLogger = new Logger("MessageEvents", "#e5c890");

src/api/MessagePopover.tsx

@@ -18,7 +18,7 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Logger } from "@utils/Logger";
-import { Channel, Message } from "discord-types/general";
+import { Channel, Message } from "@vencord/discord-types";
 import type { ComponentType, MouseEventHandler } from "react";
 
 const logger = new Logger("MessagePopover");

src/api/MessageUpdater.ts

@@ -4,9 +4,8 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+import { FluxStore, Message } from "@vencord/discord-types";
 import { MessageCache, MessageStore } from "@webpack/common";
-import { FluxStore } from "@webpack/types";
-import { Message } from "discord-types/general";
 
 /**
  * Update and re-render a message

src/api/Settings.ts

@@ -268,7 +268,7 @@ type ResolveUseSettings<T extends object> = {
     [Key in keyof T]:
     Key extends string
     ? T[Key] extends Record<string, unknown>
-    // @ts-ignore "Type instantiation is excessively deep and possibly infinite"
+    // @ts-expect-error "Type instantiation is excessively deep and possibly infinite"
     ? UseSettings<T[Key]> extends string ? `${Key}.${UseSettings<T[Key]>}` : never
     : Key
     : never;

src/components/DonateButton.tsx

@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { ButtonProps } from "@vencord/discord-types";
 import { Button } from "@webpack/common";
-import { ButtonProps } from "@webpack/types";
 
 import { Heart } from "./Heart";
 

src/components/PluginSettings/ContributorModal.tsx

@@ -14,8 +14,8 @@ import { DevsById } from "@utils/constants";
 import { fetchUserProfile } from "@utils/discord";
 import { classes, pluralise } from "@utils/misc";
 import { ModalContent, ModalRoot, openModal } from "@utils/modal";
+import { User } from "@vencord/discord-types";
 import { Forms, showToast, useEffect, useMemo, UserProfileStore, useStateFromStores } from "@webpack/common";
-import { User } from "discord-types/general";
 
 import Plugins from "~plugins";
 

src/components/PluginSettings/PluginModal.tsx

@@ -29,9 +29,9 @@ import { Margins } from "@utils/margins";
 import { classes, isObjectEmpty } from "@utils/misc";
 import { ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { OptionType, Plugin } from "@utils/types";
+import { User } from "@vencord/discord-types";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Button, Clickable, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "@webpack/common";
-import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
 
 import { PluginMeta } from "~plugins";

src/debug/loadLazyChunks.ts

@@ -6,9 +6,10 @@
 
 import { Logger } from "@utils/Logger";
 import { canonicalizeMatch } from "@utils/patches";
+import { ModuleFactory } from "@vencord/discord-types/webpack";
 import * as Webpack from "@webpack";
 import { wreq } from "@webpack";
-import { AnyModuleFactory, ModuleFactory } from "@webpack/wreq.d";
+import { AnyModuleFactory } from "webpack";
 
 export async function loadLazyChunks() {
     const LazyChunkLoaderLogger = new Logger("LazyChunkLoader");

src/debug/runReporter.ts

@@ -28,7 +28,7 @@ async function runReporter() {
             }
         }, "Vencord Reporter");
 
-        // @ts-ignore
+        // @ts-expect-error
         Vencord.Webpack._initReporter = function () {
             // initReporter is called in the patched entry point of Discord
             // setImmediate to only start searching for lazy chunks after Discord initialized the app
@@ -83,7 +83,6 @@ async function runReporter() {
                     result = Webpack.mapMangledModule(code, mapper, includeBlacklistedExports);
                     if (Object.keys(result).length !== Object.keys(mapper).length) throw new Error("Webpack Find Fail");
                 } else {
-                    // @ts-ignore
                     result = Webpack[method](...args);
                 }
 

src/main/patcher.ts

@@ -38,7 +38,7 @@ const asarPath = join(dirname(injectorPath), "..", asarName);
 const discordPkg = require(join(asarPath, "package.json"));
 require.main!.filename = join(asarPath, discordPkg.main);
 
-// @ts-ignore Untyped method? Dies from cringe
+// @ts-expect-error Untyped method? Dies from cringe
 app.setAppPath(asarPath);
 
 if (!IS_VANILLA) {

src/plugins/_api/badges/index.tsx

@@ -30,8 +30,8 @@ import { Margins } from "@utils/margins";
 import { shouldShowContributorBadge } from "@utils/misc";
 import { closeModal, ModalContent, ModalFooter, ModalHeader, ModalRoot, openModal } from "@utils/modal";
 import definePlugin from "@utils/types";
+import { User } from "@vencord/discord-types";
 import { Forms, Toasts, UserStore } from "@webpack/common";
-import { User } from "discord-types/general";
 
 const CONTRIBUTOR_BADGE = "https://cdn.discordapp.com/emojis/1092089799109775453.png?size=64";
 

src/plugins/_core/noTrack.ts

@@ -20,7 +20,7 @@ import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
-import { WebpackRequire } from "@webpack/wreq.d";
+import { WebpackRequire } from "@vencord/discord-types/webpack";
 
 const settings = definePluginSettings({
     disableAnalytics: {

src/plugins/_core/settings.tsx

@@ -213,7 +213,7 @@ export default definePlugin({
     get chromiumVersion() {
         try {
             return VencordNative.native.getVersions().chrome
-                // @ts-ignore Typescript will add userAgentData IMMEDIATELY
+                // @ts-expect-error Typescript will add userAgentData IMMEDIATELY
                 || navigator.userAgentData?.brands?.find(b => b.brand === "Chromium" || b.brand === "Google Chrome")?.version
                 || null;
         } catch { // inb4 some stupid browser throws unsupported error for navigator.userAgentData, it's only in chromium

src/plugins/_core/supportHelper.tsx

@@ -32,8 +32,8 @@ import { onlyOnce } from "@utils/onlyOnce";
 import { makeCodeblock } from "@utils/text";
 import definePlugin from "@utils/types";
 import { checkForUpdates, isOutdated, update } from "@utils/updater";
+import { Channel } from "@vencord/discord-types";
 import { Alerts, Button, Card, ChannelStore, Forms, GuildMemberStore, Parser, PermissionsBits, PermissionStore, RelationshipStore, showToast, Text, Toasts, UserStore } from "@webpack/common";
-import { Channel } from "discord-types/general";
 import { JSX } from "react";
 
 import gitHash from "~git-hash";
@@ -196,7 +196,6 @@ export default definePlugin({
                 }
             }
 
-            // @ts-ignore outdated type
             const roles = GuildMemberStore.getSelfMember(VENCORD_GUILD_ID)?.roles;
             if (!roles || TrustedRolesIds.some(id => roles.includes(id))) return;
 

src/plugins/accountPanelServerProfile/index.tsx

@@ -9,9 +9,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getCurrentChannel } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
+import { User } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
 import { ContextMenuApi, Menu, useEffect, useRef } from "@webpack/common";
-import { User } from "discord-types/general";
 
 interface UserProfileProps {
     popoutProps: Record<string, any>;

src/plugins/biggerStreamPreview/index.tsx

@@ -21,8 +21,8 @@ import { ScreenshareIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { openImageModal } from "@utils/discord";
 import definePlugin from "@utils/types";
+import { Channel, User } from "@vencord/discord-types";
 import { Menu } from "@webpack/common";
-import { Channel, User } from "discord-types/general";
 
 import { ApplicationStreamingStore, ApplicationStreamPreviewStore } from "./webpack/stores";
 import { ApplicationStream, Stream } from "./webpack/types/stores";

src/plugins/biggerStreamPreview/webpack/types/stores.ts

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { FluxStore } from "@webpack/types";
+import { FluxStore } from "@vencord/discord-types";
 
 export interface ApplicationStreamPreviewStore extends FluxStore {
     getIsPreviewLoading: (guildId: string | bigint | null, channelId: string | bigint, ownerId: string | bigint) => boolean;

src/plugins/copyUserURLs/index.tsx

@@ -21,8 +21,8 @@ import { LinkIcon } from "@components/Icons";
 import { copyToClipboard } from "@utils/clipboard";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import type { Channel, User } from "@vencord/discord-types";
 import { Menu } from "@webpack/common";
-import type { Channel, User } from "discord-types/general";
 
 interface UserContextProps {
     channel: Channel;

src/plugins/decor/lib/stores/UsersDecorationsStore.ts

@@ -6,8 +6,8 @@
 
 import { debounce } from "@shared/debounce";
 import { proxyLazy } from "@utils/lazy";
+import { User } from "@vencord/discord-types";
 import { useEffect, useState, zustandCreate } from "@webpack/common";
-import { User } from "discord-types/general";
 
 import { AvatarDecoration } from "../../";
 import { getUsersDecorations } from "../api";

src/plugins/decor/ui/modals/ChangeDecorationModal.tsx

@@ -11,9 +11,9 @@ import { Margins } from "@utils/margins";
 import { classes, copyWithToast } from "@utils/misc";
 import { closeAllModals, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { Queue } from "@utils/Queue";
+import { User } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
 import { Alerts, Button, FluxDispatcher, Forms, GuildStore, NavigationRouter, Parser, Text, Tooltip, useEffect, UserStore, UserUtils, useState } from "@webpack/common";
-import { User } from "discord-types/general";
 
 import { Decoration, getPresets, Preset } from "../../lib/api";
 import { GUILD_ID, INVITE_KEY } from "../../lib/constants";

src/plugins/expressionCloner/index.tsx

@@ -25,9 +25,9 @@ import { Logger } from "@utils/Logger";
 import { Margins } from "@utils/margins";
 import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
 import definePlugin from "@utils/types";
+import { Guild } from "@vencord/discord-types";
 import { findByCodeLazy, findStoreLazy } from "@webpack";
 import { Constants, EmojiStore, FluxDispatcher, Forms, GuildStore, IconUtils, Menu, PermissionsBits, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
-import { Guild } from "discord-types/general";
 import { Promisable } from "type-fest";
 
 const StickersStore = findStoreLazy("StickersStore");

src/plugins/fakeNitro/index.tsx

@@ -23,10 +23,9 @@ import { ApngBlendOp, ApngDisposeOp, importApngJs } from "@utils/dependencies";
 import { getCurrentGuild, getEmojiURL } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType, Patch } from "@utils/types";
+import type { Emoji, Message } from "@vencord/discord-types";
 import { findByCodeLazy, findByPropsLazy, findStoreLazy, proxyLazyWebpack } from "@webpack";
 import { Alerts, ChannelStore, DraftType, EmojiStore, FluxDispatcher, Forms, GuildMemberStore, lodash, Parser, PermissionsBits, PermissionStore, UploadHandler, UserSettingsActionCreators, UserStore } from "@webpack/common";
-import type { Emoji } from "@webpack/types";
-import type { Message } from "discord-types/general";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
 import type { ReactElement, ReactNode } from "react";
 
@@ -813,7 +812,6 @@ export default definePlugin({
 
         let isUsableTwitchSubEmote = false;
         if (e.managed && e.guildId) {
-            // @ts-ignore outdated type
             const myRoles = GuildMemberStore.getSelfMember(e.guildId)?.roles ?? [];
             isUsableTwitchSubEmote = e.roles.some(r => myRoles.includes(r));
         }

src/plugins/fakeProfileThemes/index.tsx

@@ -25,16 +25,12 @@ import { Devs } from "@utils/constants";
 import { Margins } from "@utils/margins";
 import { classes, copyWithToast } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
+import { User } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
 import { Button, ColorPicker, Flex, Forms, React, Text, UserProfileStore, UserStore, useState } from "@webpack/common";
-import { User } from "discord-types/general";
 import { ReactElement } from "react";
 import virtualMerge from "virtual-merge";
 
-interface UserProfile extends User {
-    themeColors?: Array<number>;
-}
-
 interface Colors {
     primary: number;
     accent: number;
@@ -220,7 +216,7 @@ export default definePlugin({
             </Forms.FormSection>);
     },
     settings,
-    colorDecodeHook(user: UserProfile) {
+    colorDecodeHook(user: User) {
         if (user) {
             // don't replace colors if already set with nitro
             if (settings.store.nitroFirst && user.themeColors) return user;

src/plugins/favEmojiFirst/index.ts

@@ -18,8 +18,8 @@
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import { Emoji } from "@vencord/discord-types";
 import { EmojiStore } from "@webpack/common";
-import { Emoji } from "@webpack/types";
 
 interface EmojiAutocompleteState {
     query?: {

src/plugins/forceOwnerCrown/index.ts

@@ -18,8 +18,8 @@
 
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
+import { Channel, User } from "@vencord/discord-types";
 import { GuildStore } from "@webpack/common";
-import { Channel, User } from "discord-types/general";
 
 export default definePlugin({
     name: "ForceOwnerCrown",

src/plugins/fullSearchContext/index.tsx

@@ -22,9 +22,9 @@ import { Devs } from "@utils/constants";
 import { getIntlMessage } from "@utils/discord";
 import { NoopComponent } from "@utils/react";
 import definePlugin from "@utils/types";
+import { Message } from "@vencord/discord-types";
 import { filters, findByCodeLazy, waitFor } from "@webpack";
 import { ChannelStore, ContextMenuApi, UserStore } from "@webpack/common";
-import { Message } from "discord-types/general";
 
 const useMessageMenu = findByCodeLazy(".MESSAGE,commandTargetId:");
 

src/plugins/greetStickerPicker/index.tsx

@@ -19,9 +19,9 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { Channel, Message } from "@vencord/discord-types";
 import { findLazy } from "@webpack";
 import { ContextMenuApi, FluxDispatcher, Menu, MessageActions } from "@webpack/common";
-import { Channel, Message } from "discord-types/general";
 
 interface Sticker {
     id: string;

src/plugins/hideAttachments/index.tsx

@@ -25,8 +25,8 @@ import { ImageInvisible, ImageVisible } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { classes } from "@utils/misc";
 import definePlugin from "@utils/types";
+import { MessageSnapshot } from "@vencord/discord-types";
 import { ChannelStore } from "@webpack/common";
-import { MessageSnapshot } from "@webpack/types";
 
 const KEY = "HideAttachments_HiddenIds";
 
@@ -56,7 +56,7 @@ export default definePlugin({
     }],
 
     renderMessagePopoverButton(msg) {
-        // @ts-ignore - discord-types lags behind discord.
+        // @ts-expect-error - discord-types lags behind discord.
         const hasAttachmentsInShapshots = msg.messageSnapshots.some(
             (snapshot: MessageSnapshot) => snapshot?.message.attachments.length
         );

src/plugins/index.ts

@@ -30,9 +30,9 @@ import { disableStyle, enableStyle } from "@api/Styles";
 import { Logger } from "@utils/Logger";
 import { canonicalizeFind, canonicalizeReplacement } from "@utils/patches";
 import { Patch, Plugin, PluginDef, ReporterTestable, StartAt } from "@utils/types";
+import { FluxEvents } from "@vencord/discord-types";
 import { FluxDispatcher } from "@webpack/common";
 import { patches } from "@webpack/patcher";
-import { FluxEvents } from "@webpack/types";
 
 import Plugins from "~plugins";
 

src/plugins/invisibleChat.desktop/index.tsx

@@ -23,8 +23,8 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getStegCloak } from "@utils/dependencies";
 import definePlugin, { OptionType, ReporterTestable } from "@utils/types";
+import { Message } from "@vencord/discord-types";
 import { ChannelStore, Constants, RestAPI, Tooltip } from "@webpack/common";
-import { Message } from "discord-types/general";
 
 import { buildDecModal } from "./components/DecryptionModal";
 import { buildEncModal } from "./components/EncryptionModal";

src/plugins/memberCount/index.tsx

@@ -23,8 +23,8 @@ import { classNameFactory } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { FluxStore } from "@vencord/discord-types";
 import { findStoreLazy } from "@webpack";
-import { FluxStore } from "@webpack/types";
 
 import { MemberCount } from "./MemberCount";
 

src/plugins/mentionAvatars/index.tsx

@@ -10,8 +10,8 @@ import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { User } from "@vencord/discord-types";
 import { GuildRoleStore, SelectedGuildStore, useState } from "@webpack/common";
-import { User } from "discord-types/general";
 
 const settings = definePluginSettings({
     showAtSymbol: {

src/plugins/messageLatency/index.tsx

@@ -9,9 +9,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import definePlugin, { OptionType } from "@utils/types";
+import { Message } from "@vencord/discord-types";
 import { findComponentByCodeLazy } from "@webpack";
 import { SnowflakeUtils, Tooltip } from "@webpack/common";
-import { Message } from "discord-types/general";
 
 type FillValue = ("status-danger" | "status-warning" | "status-positive" | "text-muted");
 type Fill = [FillValue, FillValue, FillValue];

src/plugins/messageLinkEmbeds/index.tsx

@@ -24,6 +24,7 @@ import { Devs } from "@utils/constants.js";
 import { classes } from "@utils/misc";
 import { Queue } from "@utils/Queue";
 import definePlugin, { OptionType } from "@utils/types";
+import { Channel, Message } from "@vencord/discord-types";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import {
     Button,
@@ -39,7 +40,6 @@ import {
     Text,
     UserStore
 } from "@webpack/common";
-import { Channel, Message } from "discord-types/general";
 import { JSX } from "react";
 
 const messageCache = new Map<string, {
@@ -217,7 +217,7 @@ function withEmbeddedBy(message: Message, embeddedBy: string[]) {
     return new Proxy(message, {
         get(_, prop) {
             if (prop === "vencordEmbeddedBy") return embeddedBy;
-            // @ts-ignore ts so bad
+            // @ts-expect-error ts so bad
             return Reflect.get(...arguments);
         }
     });
@@ -225,7 +225,7 @@ function withEmbeddedBy(message: Message, embeddedBy: string[]) {
 
 
 function MessageEmbedAccessory({ message }: { message: Message; }) {
-    // @ts-ignore
+    // @ts-expect-error
     const embeddedBy: string[] = message.vencordEmbeddedBy ?? [];
 
     const accessories = [] as (JSX.Element | null)[];

src/plugins/messageLogger/index.tsx

@@ -28,9 +28,9 @@ import { getIntlMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
+import { Message } from "@vencord/discord-types";
 import { findByPropsLazy } from "@webpack";
 import { ChannelStore, FluxDispatcher, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
-import { Message } from "discord-types/general";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
 import textStyle from "./deleteStyleText.css?managed";

src/plugins/messageTags/index.ts

@@ -92,7 +92,7 @@ export default definePlugin({
         // TODO(OptionType.CUSTOM Related): Remove DataStore tags migration once enough time has passed
         const oldTags = await DataStore.get<Tag[]>(DATA_KEY);
         if (oldTags != null) {
-            // @ts-ignore
+            // @ts-expect-error
             settings.store.tagsList = Object.fromEntries(oldTags.map(oldTag => (delete oldTag.enabled, [oldTag.name, oldTag])));
             await DataStore.del(DATA_KEY);
         }
@@ -211,7 +211,7 @@ export default definePlugin({
                                     description: Object.values(getTags())
                                         .map(tag => `\`${tag.name}\`: ${tag.message.slice(0, 72).replaceAll("\\n", " ")}${tag.message.length > 72 ? "..." : ""}`)
                                         .join("\n") || `${EMOTE} Woops! There are no tags yet, use \`/tags create\` to create one!`,
-                                    // @ts-ignore
+                                    // @ts-expect-error
                                     color: 0xd77f7f,
                                     type: "rich",
                                 }

src/plugins/mutualGroupDMs/index.tsx

@@ -23,9 +23,9 @@ import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
 import { Logger } from "@utils/Logger";
 import definePlugin from "@utils/types";
+import { Channel, User } from "@vencord/discord-types";
 import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, Text, useMemo, UserStore } from "@webpack/common";
-import { Channel, User } from "discord-types/general";
 import { JSX } from "react";
 
 const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");

src/plugins/newGuildSettings/index.tsx

@@ -24,9 +24,9 @@ import { definePluginSettings } from "@api/Settings";
 import { CogWheel } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { Guild } from "@vencord/discord-types";
 import { findByCodeLazy, findByPropsLazy, mapMangledModuleLazy } from "@webpack";
 import { Menu } from "@webpack/common";
-import { Guild } from "discord-types/general";
 
 const { updateGuildNotificationSettings } = findByPropsLazy("updateGuildNotificationSettings");
 const { toggleShowAllChannels } = mapMangledModuleLazy(".onboardExistingMember(", {

src/plugins/noBlockedMessages/index.ts

@@ -21,8 +21,8 @@ import { Devs } from "@utils/constants";
 import { runtimeHashMessageKey } from "@utils/intlHash";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
+import { Message } from "@vencord/discord-types";
 import { i18n, RelationshipStore } from "@webpack/common";
-import { Message } from "discord-types/general";
 
 interface MessageDeleteProps {
     // Internal intl message for BLOCKED_MESSAGE_COUNT

src/plugins/noReplyMention/index.tsx

@@ -19,7 +19,7 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
-import type { Message } from "discord-types/general";
+import type { Message } from "@vencord/discord-types";
 
 const settings = definePluginSettings({
     userList: {

src/plugins/onePingPerDM/index.ts

@@ -7,8 +7,8 @@
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
 import definePlugin, { OptionType } from "@utils/types";
+import { MessageJSON } from "@vencord/discord-types";
 import { ChannelStore, ReadStateStore, UserStore } from "@webpack/common";
-import { MessageJSON } from "discord-types/general";
 
 const enum ChannelType {
     DM = 1,

src/plugins/pauseInvitesForever/index.tsx

@@ -27,7 +27,6 @@ function showDisableInvites(guildId: string) {
     if (!guild) return false;
 
     return (
-        // @ts-expect-error
         !hasGuildFeature(guild, "INVITES_DISABLED") &&
         PermissionStore.getGuildPermissionProps(guild).canManageRoles
     );

src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx

@@ -22,10 +22,9 @@ import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
 import { copyToClipboard } from "@utils/clipboard";
 import { getIntlMessage, getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
+import { Guild, Role, UnicodeEmoji, User } from "@vencord/discord-types";
 import { findByCodeLazy } from "@webpack";
 import { ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildRoleStore, i18n, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, useMemo, UserStore, useState, useStateFromStores } from "@webpack/common";
-import { UnicodeEmoji } from "@webpack/types";
-import type { Guild, Role, User } from "discord-types/general";
 
 import { settings } from "..";
 import { cl, getGuildPermissionSpecMap } from "../utils";

src/plugins/permissionsViewer/components/UserPermissions.tsx

@@ -19,9 +19,9 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { getIntlMessage } from "@utils/discord";
 import { classes } from "@utils/misc";
+import type { Guild, GuildMember } from "@vencord/discord-types";
 import { filters, findBulk, proxyLazyWebpack } from "@webpack";
 import { PermissionsBits, Text, Tooltip, useMemo, UserStore } from "@webpack/common";
-import type { Guild, GuildMember } from "discord-types/general";
 
 import { PermissionsSortOrder, settings } from "..";
 import { cl, getGuildPermissionSpecMap, getSortedRoles, sortUserRoles } from "../utils";

src/plugins/permissionsViewer/index.tsx

@@ -25,9 +25,9 @@ import { SafetyIcon } from "@components/Icons";
 import { Devs } from "@utils/constants";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
+import type { Guild, GuildMember } from "@vencord/discord-types";
 import { findByPropsLazy } from "@webpack";
 import { Button, ChannelStore, Dialog, GuildMemberStore, GuildRoleStore, GuildStore, match, Menu, PermissionsBits, Popout, TooltipContainer, useRef, UserStore } from "@webpack/common";
-import type { Guild, GuildMember } from "discord-types/general";
 
 import openRolesAndUsersPermissionsModal, { PermissionType, RoleOrUserPermission } from "./components/RolesAndUsersPermissions";
 import UserPermissions from "./components/UserPermissions";
@@ -71,7 +71,7 @@ function MenuItem(guildId: string, id?: string, type?: MenuItemParentType) {
                 const { permissions, header } = match(type)
                     .returnType<{ permissions: RoleOrUserPermission[], header: string; }>()
                     .with(MenuItemParentType.User, () => {
-                        const member = GuildMemberStore.getMember(guildId, id!);
+                        const member = GuildMemberStore.getMember(guildId, id!)!;
 
                         const permissions: RoleOrUserPermission[] = getSortedRoles(guild, member)
                             .map(role => ({

src/plugins/permissionsViewer/utils.ts

@@ -17,9 +17,9 @@
 */
 
 import { classNameFactory } from "@api/Styles";
+import { Guild, GuildMember, Role } from "@vencord/discord-types";
 import { findByPropsLazy } from "@webpack";
 import { GuildRoleStore } from "@webpack/common";
-import { Guild, GuildMember, Role } from "discord-types/general";
 
 import { PermissionsSortOrder, settings } from ".";
 import { PermissionType } from "./components/RolesAndUsersPermissions";

src/plugins/petpet/index.ts

@@ -16,10 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ApplicationCommandInputType, ApplicationCommandOptionType, Argument, CommandContext, findOption, sendBotMessage } from "@api/Commands";
+import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
 import { Devs } from "@utils/constants";
 import { makeLazy } from "@utils/lazy";
 import definePlugin from "@utils/types";
+import { CommandArgument, CommandContext } from "@vencord/discord-types";
 import { findByPropsLazy } from "@webpack";
 import { DraftType, UploadHandler, UploadManager, UserUtils } from "@webpack/common";
 import { applyPalette, GIFEncoder, quantize } from "gifenc";
@@ -54,7 +55,7 @@ function loadImage(source: File | string) {
     });
 }
 
-async function resolveImage(options: Argument[], ctx: CommandContext, noServerPfp: boolean): Promise<File | string | null> {
+async function resolveImage(options: CommandArgument[], ctx: CommandContext, noServerPfp: boolean): Promise<File | string | null> {
     for (const opt of options) {
         switch (opt.name) {
             case "image":
@@ -177,6 +178,8 @@ export default definePlugin({
                 }
 
                 gif.finish();
+                // @ts-ignore This causes a type error on *only some* typescript versions.
+                // usage adheres to mdn https://developer.mozilla.org/en-US/docs/Web/API/File/File#parameters
                 const file = new File([gif.bytesView()], "petpet.gif", { type: "image/gif" });
                 // Immediately after the command finishes, Discord clears all input, including pending attachments.
                 // Thus, setTimeout is needed to make this execute after Discord cleared the input

src/plugins/pinDms/index.tsx

@@ -11,9 +11,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType, StartAt } from "@utils/types";
+import { Channel } from "@vencord/discord-types";
 import { findByPropsLazy, findStoreLazy } from "@webpack";
 import { Clickable, ContextMenuApi, FluxDispatcher, Menu, React } from "@webpack/common";
-import { Channel } from "discord-types/general";
 
 import { contextMenus } from "./components/contextMenu";
 import { openCategoryModal, requireSettingsMenu } from "./components/CreateCategoryModal";