From 91d3a676579a3f678f86dff3211bb2387abb63c0 Mon Sep 17 00:00:00 2001 From: thororen1234 <78185467+thororen1234@users.noreply.github.com> Date: Thu, 10 Jul 2025 19:40:07 -0400 Subject: [PATCH] Fixes --- package.json | 2 +- packages/discord-types/src/components.d.ts | 1 + packages/discord-types/src/index.d.ts | 2 + .../src/stores/RelationshipStore.d.ts | 19 +++++- .../src/stores/StickerStore.d.ts | 60 +++++++++++++++++++ packages/discord-types/src/stores/index.d.ts | 1 + pnpm-lock.yaml | 10 ++-- .../components/SettingSelectComponent.tsx | 5 +- src/equicordplugins/allCallTimers/index.tsx | 2 +- .../alwaysExpandProfile/index.ts | 2 +- .../bannersEverywhere/index.tsx | 2 +- src/equicordplugins/betterActivities/types.ts | 2 +- src/equicordplugins/blockKeywords/index.ts | 2 +- src/equicordplugins/bypassStatus/index.tsx | 2 +- src/equicordplugins/channelBadges/index.ts | 2 +- .../channelTabs/components/ChannelTab.tsx | 2 +- src/equicordplugins/channelTabs/index.tsx | 2 +- src/equicordplugins/cleanChannelName/index.ts | 2 +- src/equicordplugins/clientSideBlock/index.tsx | 2 +- .../index.tsx | 2 +- src/equicordplugins/copyUserMention/index.tsx | 2 +- .../customUserColors/index.tsx | 2 +- src/equicordplugins/encryptcord/index.tsx | 2 +- .../expandedUserTags/consts.ts | 3 +- .../expandedUserTags/index.tsx | 2 +- src/equicordplugins/expandedUserTags/types.ts | 3 +- src/equicordplugins/exportMessages/index.tsx | 2 +- .../components/Builder.tsx | 4 +- .../components/index.tsx | 3 +- .../lib/profileEffects.ts | 2 +- .../findReply/ReplyNavigator.tsx | 2 +- src/equicordplugins/findReply/index.tsx | 2 +- src/equicordplugins/followVoiceUser/index.tsx | 3 +- src/equicordplugins/forwardAnywhere/index.ts | 6 +- src/equicordplugins/friendCloud/index.ts | 2 +- src/equicordplugins/furudoSpeak.dev/native.ts | 2 +- .../furudoSpeak.dev/providers/Ollama.ts | 2 +- .../furudoSpeak.dev/providers/OpenAI.ts | 2 +- .../gifCollections/utils/getGif.ts | 2 +- src/equicordplugins/githubRepos/index.tsx | 2 +- src/equicordplugins/globalBadges/index.tsx | 2 +- .../guildPickerDumper/index.tsx | 2 +- .../hideServers/HiddenServersStore.ts | 2 +- .../components/HiddenServersMenu.tsx | 2 +- src/equicordplugins/hideServers/index.tsx | 2 +- src/equicordplugins/holyNotes/NoteHandler.ts | 2 +- src/equicordplugins/holyNotes/index.tsx | 2 +- src/equicordplugins/holyNotes/types.ts | 2 +- src/equicordplugins/hopOn/index.tsx | 2 +- src/equicordplugins/iRememberYou/index.tsx | 2 +- src/equicordplugins/iconViewer/IconModal.tsx | 2 +- src/equicordplugins/iconViewer/IconsTab.tsx | 2 +- src/equicordplugins/iconViewer/names.ts | 2 +- src/equicordplugins/iconViewer/rawModal.tsx | 2 +- src/equicordplugins/iconViewer/saveModal.tsx | 2 +- src/equicordplugins/iconViewer/utils.tsx | 4 +- src/equicordplugins/ignoreCalls/index.tsx | 2 +- src/equicordplugins/imgToGif/index.tsx | 5 +- .../inRole/RoleMembersModal.tsx | 2 +- src/equicordplugins/inRole/index.tsx | 2 +- .../instantScreenshare/index.tsx | 2 +- src/equicordplugins/keywordNotify/index.tsx | 2 +- .../mediaDownloader.desktop/index.tsx | 2 +- src/equicordplugins/messageBurst/index.ts | 2 +- .../components/LogsModal.tsx | 2 +- .../messageLoggerEnhanced/index.tsx | 4 +- .../messageLoggerEnhanced/types.ts | 18 +++++- .../messageLoggerEnhanced/utils/cleanUp.ts | 4 +- .../utils/saveImage/index.ts | 2 +- src/equicordplugins/moreStickers/index.tsx | 2 +- src/equicordplugins/moyai/index.ts | 2 +- src/equicordplugins/noNitroUpsell/index.ts | 2 +- src/equicordplugins/pinIcon/index.tsx | 2 +- src/equicordplugins/purgeMessages/index.tsx | 2 +- src/equicordplugins/quoter/index.tsx | 2 +- src/equicordplugins/repeatMessage/index.tsx | 2 +- src/equicordplugins/replyPingControl/index.ts | 2 +- src/equicordplugins/rpcStats/index.tsx | 2 +- .../shakeSpearean.dev/native.ts | 2 +- .../showBadgesInChat/index.tsx | 2 +- src/equicordplugins/sidebarChat/index.tsx | 4 +- src/equicordplugins/sidebarChat/store.ts | 2 +- .../components/SoundBoardLog.tsx | 2 +- src/equicordplugins/soundBoardLogger/utils.ts | 2 +- .../themeLibrary/components/ThemeCard.tsx | 2 +- src/equicordplugins/themeLibrary/types.ts | 2 +- src/equicordplugins/timezones/index.tsx | 2 +- .../toastNotifications/index.tsx | 2 +- .../translatePlus/utils/accessory.tsx | 2 +- .../unitConverter/ConverterAccessory.tsx | 2 +- .../unreadBadgeCount/index.tsx | 2 +- src/equicordplugins/userpfp/index.tsx | 2 +- .../vcNarratorCustom/index.tsx | 4 +- src/equicordplugins/vencordRPC/index.ts | 7 +-- src/equicordplugins/viewRawVariant/index.tsx | 2 +- .../VoiceChannelLogEntryComponent.tsx | 2 +- .../components/VoiceChannelLogEntryIcons.tsx | 2 +- .../components/VoiceChannelLogModal.tsx | 2 +- .../voiceChannelLog.dev/index.tsx | 2 +- src/equicordplugins/voiceChatUtils/index.tsx | 2 +- .../voiceJoinMessages/index.ts | 2 +- src/equicordplugins/wallpaperFree/index.tsx | 2 +- src/equicordplugins/wallpaperFree/store.ts | 3 +- src/equicordplugins/webpackTarball/index.tsx | 3 +- src/equicordplugins/webpackTarball/webpack.ts | 8 +-- .../whitelistedEmojis/index.tsx | 6 +- src/equicordplugins/whosWatching/index.tsx | 2 +- .../youtubeDescription/index.tsx | 2 +- src/plugins/showMeYourName/index.tsx | 2 +- 109 files changed, 225 insertions(+), 133 deletions(-) create mode 100644 packages/discord-types/src/stores/StickerStore.d.ts diff --git a/package.json b/package.json index dd9028814..3ce6fe8f4 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "fflate": "^0.8.2", "gifenc": "github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3", "jsqr": "1.4.0", - "idb": "8.0.0", + "idb": "8.0.3", "monaco-editor": "^0.52.2", "nanoid": "^5.1.5", "socket.io": "^4.8.1", diff --git a/packages/discord-types/src/components.d.ts b/packages/discord-types/src/components.d.ts index 6ea6f48a3..5d5e8e93c 100644 --- a/packages/discord-types/src/components.d.ts +++ b/packages/discord-types/src/components.d.ts @@ -1,3 +1,4 @@ +import { Moment } from "moment"; import type { ComponentClass, ComponentPropsWithRef, ComponentType, CSSProperties, FunctionComponent, HtmlHTMLAttributes, HTMLProps, JSX, KeyboardEvent, MouseEvent, PointerEvent, PropsWithChildren, ReactNode, Ref, RefObject } from "react"; // copy(find(m => Array.isArray(m) && m.includes("heading-sm/normal")).map(JSON.stringify).join("|")) diff --git a/packages/discord-types/src/index.d.ts b/packages/discord-types/src/index.d.ts index 6d9356b4b..78c980c9f 100644 --- a/packages/discord-types/src/index.d.ts +++ b/packages/discord-types/src/index.d.ts @@ -5,5 +5,7 @@ export * from "./flux"; export * from "./fluxEvents"; export * from "./menu"; export * from "./stores"; +export * from "./passiveupdatestate"; export * from "./utils"; +export * from "./voicestate"; export * as Webpack from "../webpack"; diff --git a/packages/discord-types/src/stores/RelationshipStore.d.ts b/packages/discord-types/src/stores/RelationshipStore.d.ts index 5d1a08af8..946596004 100644 --- a/packages/discord-types/src/stores/RelationshipStore.d.ts +++ b/packages/discord-types/src/stores/RelationshipStore.d.ts @@ -4,18 +4,35 @@ export class RelationshipStore extends FluxStore { getFriendIDs(): string[]; getIgnoredIDs(): string[]; getBlockedIDs(): string[]; + getBlockedOrIgnoredIDs(): 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; + isBlockedOrIgnored(userId: string): boolean; + isBlockedOrIgnoredForMessage(userId: string): boolean; isBlocked(userId: string): boolean; + isBlockedForMessage(userId: string): boolean; + isFriend(userId: string): boolean; isIgnored(userId: string): boolean; + isIgnoredForMessage(userId: string): boolean; + isUnfilteredPendingIncoming(userId: string): boolean; + isSpam(userId): boolean; getSince(userId: string): string; + getSinces(): Record; + + getFriendCount(): number; + getPendingCount(): number; + getPendingIgnoredCount(): number; + getSpamCount(): number; + getRelationshipCount(): number; + getOutgoingCount(): number; getMutableRelationships(): Map; + getVersion(): number; } diff --git a/packages/discord-types/src/stores/StickerStore.d.ts b/packages/discord-types/src/stores/StickerStore.d.ts new file mode 100644 index 000000000..6ffee2726 --- /dev/null +++ b/packages/discord-types/src/stores/StickerStore.d.ts @@ -0,0 +1,60 @@ +import { FluxStore } from ".."; + +export interface Sticker { + available: boolean; + description: string; + id: string; + name: string; + tags: string; + type: number; + t: "Sticker"; + format_type: number; + image: string; + title: string; + stickerPackId: StickerPackMeta["id"]; + guild_id: string; + filename?: string; + isAnimated?: boolean; +} + +export interface StickerPackMeta { + id: string; + title: string; + author?: { + name: string; + url?: string; + }; + logo: Sticker; + + dynamic?: DynamicStickerPackMeta["dynamic"]; +} + +export interface DynamicStickerPackMeta extends StickerPackMeta { + dynamic: { + version?: string; + refreshUrl: string; + authHeaders?: Record; + }; +} + +export interface StickerPack extends StickerPackMeta { + stickers: Sticker[]; +} + + +export interface StickerCategoryType { + id: string; + name: string; + iconUrl?: string; +} + +export class StickerStore extends FluxStore { + getStickerById(id: string): Sticker | undefined; + getStickerPack(id: string): StickerPack | undefined; + getPremiumPacks(): StickerPack[]; + isPremiumPack(id: string): boolean; + getRawStickersByGuild(): Map; + getAllStickersIterator(): IterableIterator; + getAllGuildStickers(): Map; + getStickersByGuildId(id: string): Sticker[] | undefined; +} diff --git a/packages/discord-types/src/stores/index.d.ts b/packages/discord-types/src/stores/index.d.ts index b62548440..aaa9aa8f1 100644 --- a/packages/discord-types/src/stores/index.d.ts +++ b/packages/discord-types/src/stores/index.d.ts @@ -13,6 +13,7 @@ export * from "./SelectedGuildStore"; export * from "./ThemeStore"; export * from "./UserStore"; export * from "./WindowStore"; +export * from "./StickerStore"; /** * React hook that returns stateful data for one or more stores diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f5ccd8a0b..c421af362 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -50,8 +50,8 @@ importers: specifier: github:mattdesl/gifenc#64842fca317b112a8590f8fef2bf3825da8f6fe3 version: https://codeload.github.com/mattdesl/gifenc/tar.gz/64842fca317b112a8590f8fef2bf3825da8f6fe3 idb: - specifier: 8.0.0 - version: 8.0.0 + specifier: 8.0.3 + version: 8.0.3 jsqr: specifier: 1.4.0 version: 1.4.0 @@ -1519,8 +1519,8 @@ packages: humanize-ms@1.2.1: resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==} - idb@8.0.0: - resolution: {integrity: sha512-l//qvlAKGmQO31Qn7xdzagVPPaHTxXx199MhrAFuVBTPqydcPYBWjkrbv4Y0ktB+GmWOiwHl237UUOrLmQxLvw==} + idb@8.0.3: + resolution: {integrity: sha512-LtwtVyVYO5BqRvcsKuB2iUMnHwPVByPCXFXOpuU96IZPPoPN6xjOGxZQ74pgSVVLQWtUOYgyeL4GE98BY5D3wg==} ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} @@ -4015,7 +4015,7 @@ snapshots: dependencies: ms: 2.1.2 - idb@8.0.0: {} + idb@8.0.3: {} ieee754@1.2.1: {} diff --git a/src/components/ThemeSettings/components/SettingSelectComponent.tsx b/src/components/ThemeSettings/components/SettingSelectComponent.tsx index 0ee278af9..2c6cf089d 100644 --- a/src/components/ThemeSettings/components/SettingSelectComponent.tsx +++ b/src/components/ThemeSettings/components/SettingSelectComponent.tsx @@ -5,7 +5,8 @@ */ import { identity } from "@utils/misc"; -import { ComponentTypes, Forms, Select, useMemo } from "@webpack/common"; +import { SelectOption } from "@vencord/discord-types"; +import { Forms, Select, useMemo } from "@webpack/common"; interface Props { label: string; @@ -31,7 +32,7 @@ export function SettingSelectComponent({ label, name, options, default: def, the value: option.value, default: def === option.name, label: option.label - } satisfies ComponentTypes.SelectOption)), [options, def]); + } satisfies SelectOption)), [options, def]); return ( diff --git a/src/equicordplugins/allCallTimers/index.tsx b/src/equicordplugins/allCallTimers/index.tsx index 0127a48b1..674ef2015 100644 --- a/src/equicordplugins/allCallTimers/index.tsx +++ b/src/equicordplugins/allCallTimers/index.tsx @@ -8,8 +8,8 @@ import { definePluginSettings } from "@api/Settings"; import ErrorBoundary from "@components/ErrorBoundary"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { PassiveUpdateState, VoiceState } from "@vencord/discord-types"; import { FluxDispatcher, GuildStore, UserStore } from "@webpack/common"; -import { PassiveUpdateState, VoiceState } from "@webpack/types"; import { Timer } from "./Timer"; diff --git a/src/equicordplugins/alwaysExpandProfile/index.ts b/src/equicordplugins/alwaysExpandProfile/index.ts index 16070343a..041284fdc 100644 --- a/src/equicordplugins/alwaysExpandProfile/index.ts +++ b/src/equicordplugins/alwaysExpandProfile/index.ts @@ -7,7 +7,7 @@ import { EquicordDevs } from "@utils/constants"; import { openUserProfile } from "@utils/discord"; import definePlugin from "@utils/types"; -import { User } from "discord-types/general"; +import { User } from "@vencord/discord-types"; export default definePlugin({ name: "AlwaysExpandProfile", diff --git a/src/equicordplugins/bannersEverywhere/index.tsx b/src/equicordplugins/bannersEverywhere/index.tsx index f402dd3f6..7b30c7e59 100644 --- a/src/equicordplugins/bannersEverywhere/index.tsx +++ b/src/equicordplugins/bannersEverywhere/index.tsx @@ -9,8 +9,8 @@ import { definePluginSettings } from "@api/Settings"; import { disableStyle, enableStyle } from "@api/Styles"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType, Plugin } from "@utils/types"; +import { User } from "@vencord/discord-types"; import { findStoreLazy } from "@webpack"; -import { User } from "discord-types/general"; import style from "./style.css?managed"; diff --git a/src/equicordplugins/betterActivities/types.ts b/src/equicordplugins/betterActivities/types.ts index 78d21bfd6..b0f6e5e21 100644 --- a/src/equicordplugins/betterActivities/types.ts +++ b/src/equicordplugins/betterActivities/types.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import { User } from "discord-types/general"; +import { User } from "@vencord/discord-types"; import { CSSProperties, ImgHTMLAttributes, JSX } from "react"; export interface Timestamp { diff --git a/src/equicordplugins/blockKeywords/index.ts b/src/equicordplugins/blockKeywords/index.ts index 294ce233c..206807924 100644 --- a/src/equicordplugins/blockKeywords/index.ts +++ b/src/equicordplugins/blockKeywords/index.ts @@ -7,7 +7,7 @@ import { definePluginSettings, Settings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; -import { MessageJSON } from "discord-types/general"; +import { MessageJSON } from "@vencord/discord-types"; let blockedKeywords: Array; diff --git a/src/equicordplugins/bypassStatus/index.tsx b/src/equicordplugins/bypassStatus/index.tsx index f9bec6e3d..bc91399b4 100644 --- a/src/equicordplugins/bypassStatus/index.tsx +++ b/src/equicordplugins/bypassStatus/index.tsx @@ -11,8 +11,8 @@ import { Devs } from "@utils/constants"; import { getCurrentChannel } from "@utils/discord"; import { Logger } from "@utils/Logger"; import definePlugin, { OptionType } from "@utils/types"; +import type { Message } from "@vencord/discord-types"; import { ChannelActionCreators, ChannelStore, Menu, MessageStore, NavigationRouter, PresenceStore, UserStore, WindowStore } from "@webpack/common"; -import type { Message } from "discord-types/general"; import { JSX } from "react"; interface IMessageCreate { diff --git a/src/equicordplugins/channelBadges/index.ts b/src/equicordplugins/channelBadges/index.ts index 99238438b..3c0f5838a 100644 --- a/src/equicordplugins/channelBadges/index.ts +++ b/src/equicordplugins/channelBadges/index.ts @@ -9,8 +9,8 @@ import "./style.css"; import { EquicordDevs } from "@utils/constants"; import { getCurrentGuild } from "@utils/discord"; import definePlugin from "@utils/types"; +import { Channel, Guild } from "@vencord/discord-types"; import { ChannelStore, SelectedGuildStore } from "@webpack/common"; -import { Channel, Guild } from "discord-types/general"; import { isEnabled, returnChannelBadge, settings } from "./settings"; diff --git a/src/equicordplugins/channelTabs/components/ChannelTab.tsx b/src/equicordplugins/channelTabs/components/ChannelTab.tsx index 2ce99b87e..c2dac00d6 100644 --- a/src/equicordplugins/channelTabs/components/ChannelTab.tsx +++ b/src/equicordplugins/channelTabs/components/ChannelTab.tsx @@ -7,9 +7,9 @@ import { classNameFactory } from "@api/Styles"; import { getGuildAcronym, getIntlMessage, getUniqueUsername } from "@utils/discord"; import { classes } from "@utils/misc"; +import { Channel, Guild, User } from "@vencord/discord-types"; import { findByPropsLazy, findComponentByCodeLazy } from "@webpack"; import { Avatar, ChannelStore, ContextMenuApi, GuildStore, PresenceStore, ReadStateStore, Text, TypingStore, useDrag, useDrop, useRef, UserStore, useStateFromStores } from "@webpack/common"; -import { Channel, Guild, User } from "discord-types/general"; import { ChannelTabsProps, CircleQuestionIcon, closeTab, isTabSelected, moveDraggedTabs, moveToTab, openedTabs, settings } from "../util"; import { TabContextMenu } from "./ContextMenus"; diff --git a/src/equicordplugins/channelTabs/index.tsx b/src/equicordplugins/channelTabs/index.tsx index 519bf52b6..0d42dedb4 100644 --- a/src/equicordplugins/channelTabs/index.tsx +++ b/src/equicordplugins/channelTabs/index.tsx @@ -10,8 +10,8 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co import ErrorBoundary from "@components/ErrorBoundary"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { Channel, Message } from "@vencord/discord-types"; import { ChannelStore, Menu } from "@webpack/common"; -import { Channel, Message } from "discord-types/general"; import { JSX } from "react"; import ChannelsTabsContainer from "./components/ChannelTabsContainer"; diff --git a/src/equicordplugins/cleanChannelName/index.ts b/src/equicordplugins/cleanChannelName/index.ts index ee4ea0bbe..822d5b5d2 100644 --- a/src/equicordplugins/cleanChannelName/index.ts +++ b/src/equicordplugins/cleanChannelName/index.ts @@ -6,7 +6,7 @@ import { Devs } from "@utils/constants"; import definePlugin from "@utils/types"; -import { Channel } from "discord-types/general"; +import { Channel } from "@vencord/discord-types"; export default definePlugin({ name: "CleanChannelName", diff --git a/src/equicordplugins/clientSideBlock/index.tsx b/src/equicordplugins/clientSideBlock/index.tsx index 5ef66c1c1..b25cf09c5 100644 --- a/src/equicordplugins/clientSideBlock/index.tsx +++ b/src/equicordplugins/clientSideBlock/index.tsx @@ -7,8 +7,8 @@ import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { GuildMember } from "@vencord/discord-types"; import { ChannelStore, GuildMemberStore, GuildRoleStore, RelationshipStore, Text, UserStore } from "@webpack/common"; -import { GuildMember } from "discord-types/general"; const settings = definePluginSettings( { diff --git a/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx b/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx index 624ed6ba5..31bdf68e7 100644 --- a/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx +++ b/src/equicordplugins/clipsEnhancements.discordDesktop/index.tsx @@ -9,9 +9,9 @@ import { Link } from "@components/Link"; import { Devs } from "@utils/constants"; import { ModalAPI } from "@utils/modal"; import definePlugin, { OptionType } from "@utils/types"; +import { SelectOption } from "@vencord/discord-types"; import { findStoreLazy } from "@webpack"; import { PresenceStore, UserStore } from "@webpack/common"; -import { SelectOption } from "@webpack/types"; interface Activity { name: string; diff --git a/src/equicordplugins/copyUserMention/index.tsx b/src/equicordplugins/copyUserMention/index.tsx index c8e03d8e8..e11eda7e0 100644 --- a/src/equicordplugins/copyUserMention/index.tsx +++ b/src/equicordplugins/copyUserMention/index.tsx @@ -8,8 +8,8 @@ import { NavContextMenuPatchCallback } from "@api/ContextMenu"; import { copyToClipboard } from "@utils/clipboard"; import { Devs, EquicordDevs } 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"; const MentionIcon = () => ( m.prototype?.trackUploadFinished); import { getCurrentChannel } from "@utils/discord"; diff --git a/src/equicordplugins/expandedUserTags/consts.ts b/src/equicordplugins/expandedUserTags/consts.ts index 8d820637a..a75765ad1 100644 --- a/src/equicordplugins/expandedUserTags/consts.ts +++ b/src/equicordplugins/expandedUserTags/consts.ts @@ -4,10 +4,9 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import { Channel, Guild, Message, RC, User } from "@vencord/discord-types"; import { findByCodeLazy, findLazy } from "@webpack"; import { GuildStore } from "@webpack/common"; -import { RC } from "@webpack/types"; -import { Channel, Guild, Message, User } from "discord-types/general"; import { settings } from "./settings"; import type { ITag } from "./types"; diff --git a/src/equicordplugins/expandedUserTags/index.tsx b/src/equicordplugins/expandedUserTags/index.tsx index 32ad46605..69f50bcd4 100644 --- a/src/equicordplugins/expandedUserTags/index.tsx +++ b/src/equicordplugins/expandedUserTags/index.tsx @@ -11,8 +11,8 @@ import { classNameFactory } from "@api/Styles"; import { Devs, EquicordDevs } from "@utils/constants"; import { getCurrentChannel, getIntlMessage } from "@utils/discord"; import definePlugin from "@utils/types"; +import { Channel, Message, User } from "@vencord/discord-types"; import { ChannelStore, GuildStore, PermissionsBits, SelectedChannelStore, UserStore } from "@webpack/common"; -import { Channel, Message, User } from "discord-types/general"; import { computePermissions, Tag, tags } from "./consts"; import { settings } from "./settings"; diff --git a/src/equicordplugins/expandedUserTags/types.ts b/src/equicordplugins/expandedUserTags/types.ts index 40d8ac7d3..f1061609d 100644 --- a/src/equicordplugins/expandedUserTags/types.ts +++ b/src/equicordplugins/expandedUserTags/types.ts @@ -4,8 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import type { Permissions } from "@webpack/types"; -import type { Channel, Message, User } from "discord-types/general"; +import type { Channel, Message, Permissions, User } from "@vencord/discord-types"; import { tags } from "./consts"; diff --git a/src/equicordplugins/exportMessages/index.tsx b/src/equicordplugins/exportMessages/index.tsx index c4cf96d04..79c978630 100644 --- a/src/equicordplugins/exportMessages/index.tsx +++ b/src/equicordplugins/exportMessages/index.tsx @@ -10,8 +10,8 @@ import { EquicordDevs } from "@utils/constants"; import { showItemInFolder } from "@utils/native"; import definePlugin, { OptionType } from "@utils/types"; import { saveFile } from "@utils/web"; +import { Message } from "@vencord/discord-types"; import { Menu } from "@webpack/common"; -import { Message } from "discord-types/general"; const settings = definePluginSettings({ openFileAfterExport: { diff --git a/src/equicordplugins/fakeProfileThemesAndEffects/components/Builder.tsx b/src/equicordplugins/fakeProfileThemesAndEffects/components/Builder.tsx index 99062df60..2a735c528 100644 --- a/src/equicordplugins/fakeProfileThemesAndEffects/components/Builder.tsx +++ b/src/equicordplugins/fakeProfileThemesAndEffects/components/Builder.tsx @@ -5,8 +5,8 @@ */ import { copyWithToast } from "@utils/misc"; +import type { Guild } from "@vencord/discord-types"; import { Button, showToast, Switch, UserStore, useState, useToken } from "@webpack/common"; -import type { Guild } from "discord-types/general"; import { buildFPTE } from "../lib/fpte"; import { useAccentColor, usePrimaryColor, useProfileEffect, useShowPreview } from "../lib/profilePreview"; @@ -25,7 +25,7 @@ export function Builder({ guild }: BuilderProps) { const avatarColors = useAvatarColors( UserStore.getCurrentUser()?.getAvatarURL(guild?.id, 80), - useToken(tokens.unsafe_rawColors.PRIMARY_530).hex(), + useToken(tokens.unsafe_rawColors.PRIMARY_530 as any).hex(), false ); diff --git a/src/equicordplugins/fakeProfileThemesAndEffects/components/index.tsx b/src/equicordplugins/fakeProfileThemesAndEffects/components/index.tsx index d8d074b86..bce727f22 100644 --- a/src/equicordplugins/fakeProfileThemesAndEffects/components/index.tsx +++ b/src/equicordplugins/fakeProfileThemesAndEffects/components/index.tsx @@ -5,9 +5,8 @@ */ import { type ModalProps, openModal } from "@utils/modal"; +import type { Guild, useToken } from "@vencord/discord-types"; import { extractAndLoadChunksLazy, findByCodeLazy, findByPropsLazy, findComponentByCodeLazy } from "@webpack"; -import type { useToken } from "@webpack/types"; -import type { Guild } from "discord-types/general"; import type { ComponentType, FunctionComponent, PropsWithChildren, ReactNode } from "react"; import type { ProfileEffectConfig } from "../lib/profileEffects"; diff --git a/src/equicordplugins/fakeProfileThemesAndEffects/lib/profileEffects.ts b/src/equicordplugins/fakeProfileThemesAndEffects/lib/profileEffects.ts index bb789f3e2..aef85ca97 100644 --- a/src/equicordplugins/fakeProfileThemesAndEffects/lib/profileEffects.ts +++ b/src/equicordplugins/fakeProfileThemesAndEffects/lib/profileEffects.ts @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import type { FluxStore } from "@vencord/discord-types"; import { findByCodeLazy, findStoreLazy } from "@webpack"; -import type { FluxStore } from "@webpack/types"; import type { SnakeCasedProperties } from "type-fest"; export const ProfileEffectStore: FluxStore & { diff --git a/src/equicordplugins/findReply/ReplyNavigator.tsx b/src/equicordplugins/findReply/ReplyNavigator.tsx index ecb8e91b8..1480a98ec 100644 --- a/src/equicordplugins/findReply/ReplyNavigator.tsx +++ b/src/equicordplugins/findReply/ReplyNavigator.tsx @@ -6,9 +6,9 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { ModalCloseButton } from "@utils/modal"; +import { Message } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { Paginator, React, useRef, useState } from "@webpack/common"; -import { Message } from "discord-types/general"; import { MutableRefObject } from "react"; import { jumper } from "./index"; diff --git a/src/equicordplugins/findReply/index.tsx b/src/equicordplugins/findReply/index.tsx index 9ce27e2c4..411630fb6 100644 --- a/src/equicordplugins/findReply/index.tsx +++ b/src/equicordplugins/findReply/index.tsx @@ -20,9 +20,9 @@ import { addMessagePopoverButton, removeMessagePopoverButton } from "@api/Messag import { disableStyle, enableStyle } from "@api/Styles"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { ChannelStore, createRoot, MessageStore, Toasts } from "@webpack/common"; -import Message from "discord-types/general/Message"; import { Root } from "react-dom/client"; import ReplyNavigator from "./ReplyNavigator"; diff --git a/src/equicordplugins/followVoiceUser/index.tsx b/src/equicordplugins/followVoiceUser/index.tsx index 0fc0c393e..03ceffe53 100644 --- a/src/equicordplugins/followVoiceUser/index.tsx +++ b/src/equicordplugins/followVoiceUser/index.tsx @@ -10,10 +10,9 @@ import { NavContextMenuPatchCallback } from "@api/ContextMenu"; import { definePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel, User, VoiceState } from "@vencord/discord-types"; import { findByPropsLazy, findStoreLazy } from "@webpack"; import { Forms, Menu, React, VoiceStateStore } from "@webpack/common"; -import { VoiceState } from "@webpack/types"; -import { Channel, User } from "discord-types/general"; type TFollowedUserInfo = { lastChannelId: string; diff --git a/src/equicordplugins/forwardAnywhere/index.ts b/src/equicordplugins/forwardAnywhere/index.ts index c2ca185ff..42d3e08a1 100644 --- a/src/equicordplugins/forwardAnywhere/index.ts +++ b/src/equicordplugins/forwardAnywhere/index.ts @@ -8,7 +8,7 @@ import { definePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import { sendMessage } from "@utils/discord"; import definePlugin, { OptionType } from "@utils/types"; -import { Message } from "discord-types/general"; +import { Message } from "@vencord/discord-types"; // Taken From Signature :) const settings = definePluginSettings({ @@ -31,8 +31,8 @@ export default definePlugin({ { find: "#{intl::MESSAGE_FORWARDING_NSFW_NOT_ALLOWED}", replacement: { - match: /if\((\i)\.isNSFW\(\)&&.{0,25}\)\)\)/, - replace: "if(false)", + match: /if\(.*?\)(return.{0,25}#{intl::MESSAGE_FORWARDING_NSFW_NOT_ALLOWED})/, + replace: "if(false)$1", } }, { diff --git a/src/equicordplugins/friendCloud/index.ts b/src/equicordplugins/friendCloud/index.ts index b40e87879..a85a3c512 100644 --- a/src/equicordplugins/friendCloud/index.ts +++ b/src/equicordplugins/friendCloud/index.ts @@ -20,9 +20,9 @@ import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, import { EquicordDevs } from "@utils/constants"; import { Logger } from "@utils/Logger"; import definePlugin from "@utils/types"; +import { User } from "@vencord/discord-types"; import { findStore } from "@webpack"; import { DraftType, UploadHandler, UserStore } from "@webpack/common"; -import { User } from "discord-types/general"; const logger = new Logger("FriendCloud"); diff --git a/src/equicordplugins/furudoSpeak.dev/native.ts b/src/equicordplugins/furudoSpeak.dev/native.ts index f1ba09360..771aff107 100644 --- a/src/equicordplugins/furudoSpeak.dev/native.ts +++ b/src/equicordplugins/furudoSpeak.dev/native.ts @@ -5,7 +5,7 @@ */ import { MessageObject } from "@api/MessageEvents"; -import { Message } from "discord-types/general"; +import { Message } from "@vencord/discord-types"; import Ollama from "./providers/Ollama"; import OpenAI from "./providers/OpenAI"; diff --git a/src/equicordplugins/furudoSpeak.dev/providers/Ollama.ts b/src/equicordplugins/furudoSpeak.dev/providers/Ollama.ts index e36d40de4..f0f787159 100644 --- a/src/equicordplugins/furudoSpeak.dev/providers/Ollama.ts +++ b/src/equicordplugins/furudoSpeak.dev/providers/Ollama.ts @@ -5,7 +5,7 @@ */ import { MessageObject } from "@api/MessageEvents"; -import { Message } from "discord-types/general"; +import { Message } from "@vencord/discord-types"; import { instructions } from "../instructions"; import { FurudoSettings } from "../types"; diff --git a/src/equicordplugins/furudoSpeak.dev/providers/OpenAI.ts b/src/equicordplugins/furudoSpeak.dev/providers/OpenAI.ts index d8b6eca1c..19d7784fe 100644 --- a/src/equicordplugins/furudoSpeak.dev/providers/OpenAI.ts +++ b/src/equicordplugins/furudoSpeak.dev/providers/OpenAI.ts @@ -5,7 +5,7 @@ */ import { MessageObject } from "@api/MessageEvents"; -import { Message } from "discord-types/general"; +import { Message } from "@vencord/discord-types"; import { instructions } from "../instructions"; import { FurudoSettings } from "../types"; diff --git a/src/equicordplugins/gifCollections/utils/getGif.ts b/src/equicordplugins/gifCollections/utils/getGif.ts index 1a6726a93..951791557 100644 --- a/src/equicordplugins/gifCollections/utils/getGif.ts +++ b/src/equicordplugins/gifCollections/utils/getGif.ts @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import { Message } from "@vencord/discord-types"; import { MessageStore, SnowflakeUtils } from "@webpack/common"; -import { Message } from "discord-types/general"; import { settings } from "../index"; import { Gif } from "../types"; diff --git a/src/equicordplugins/githubRepos/index.tsx b/src/equicordplugins/githubRepos/index.tsx index 9d8595c28..543b0d5e5 100644 --- a/src/equicordplugins/githubRepos/index.tsx +++ b/src/equicordplugins/githubRepos/index.tsx @@ -11,9 +11,9 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { EquicordDevs } from "@utils/constants"; import { Logger } from "@utils/Logger"; import definePlugin, { OptionType } from "@utils/types"; +import { User } from "@vencord/discord-types"; import { findByCodeLazy } from "@webpack"; import { React, Text } from "@webpack/common"; -import { User } from "discord-types/general"; import { GitHubReposComponent } from "./components/GitHubReposComponent"; diff --git a/src/equicordplugins/globalBadges/index.tsx b/src/equicordplugins/globalBadges/index.tsx index e80fb1f57..ff95e0aa3 100644 --- a/src/equicordplugins/globalBadges/index.tsx +++ b/src/equicordplugins/globalBadges/index.tsx @@ -22,8 +22,8 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { Devs, EquicordDevs } from "@utils/constants"; import { ModalContent, ModalRoot, openModal } from "@utils/modal"; import definePlugin, { OptionType } from "@utils/types"; +import { User } from "@vencord/discord-types"; import { Forms, React, Tooltip, UserStore } from "@webpack/common"; -import { User } from "discord-types/general"; import { JSX } from "react"; type CustomBadge = string | { diff --git a/src/equicordplugins/guildPickerDumper/index.tsx b/src/equicordplugins/guildPickerDumper/index.tsx index 1499201b7..de0fddcb6 100644 --- a/src/equicordplugins/guildPickerDumper/index.tsx +++ b/src/equicordplugins/guildPickerDumper/index.tsx @@ -8,8 +8,8 @@ import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/Co import { migratePluginSettings } from "@api/Settings"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import type { Guild } from "@vencord/discord-types"; import { EmojiStore, Menu, StickerStore } from "@webpack/common"; -import type { Guild } from "discord-types/general"; import { zipSync } from "fflate"; const Patch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild; }) => { diff --git a/src/equicordplugins/hideServers/HiddenServersStore.ts b/src/equicordplugins/hideServers/HiddenServersStore.ts index 2f7a4f93c..65e52abad 100644 --- a/src/equicordplugins/hideServers/HiddenServersStore.ts +++ b/src/equicordplugins/hideServers/HiddenServersStore.ts @@ -5,9 +5,9 @@ */ import * as DataStore from "@api/DataStore"; +import { Guild } from "@vencord/discord-types"; import { findStoreLazy, proxyLazyWebpack } from "@webpack"; import { Flux, FluxDispatcher, GuildStore } from "@webpack/common"; -import { Guild } from "discord-types/general"; export const HiddenServersStore = proxyLazyWebpack(() => { diff --git a/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx b/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx index cd67e6f3a..07be64d0f 100644 --- a/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx +++ b/src/equicordplugins/hideServers/components/HiddenServersMenu.tsx @@ -17,9 +17,9 @@ import { ModalSize, openModal, } from "@utils/modal"; +import { Guild } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { Button, Forms, IconUtils, Text, useStateFromStores } from "@webpack/common"; -import { Guild } from "discord-types/general"; import { HiddenServersStore } from "../HiddenServersStore"; diff --git a/src/equicordplugins/hideServers/index.tsx b/src/equicordplugins/hideServers/index.tsx index 8c44ee7e4..7ee891d38 100644 --- a/src/equicordplugins/hideServers/index.tsx +++ b/src/equicordplugins/hideServers/index.tsx @@ -17,8 +17,8 @@ import { } from "@api/ServerList"; import { EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { Guild } from "@vencord/discord-types"; import { Menu, React, useStateFromStores } from "@webpack/common"; -import { Guild } from "discord-types/general"; import hiddenServersButton from "./components/HiddenServersButton"; import { HiddenServersStore } from "./HiddenServersStore"; diff --git a/src/equicordplugins/holyNotes/NoteHandler.ts b/src/equicordplugins/holyNotes/NoteHandler.ts index 654186db2..e14431fe2 100644 --- a/src/equicordplugins/holyNotes/NoteHandler.ts +++ b/src/equicordplugins/holyNotes/NoteHandler.ts @@ -5,8 +5,8 @@ */ import { makeDummyUser } from "@components/PluginSettings/PluginModal"; +import { Channel, Message } from "@vencord/discord-types"; import { ChannelStore, lodash, Toasts, UserStore } from "@webpack/common"; -import { Channel, Message } from "discord-types/general"; import { Discord, HolyNotes } from "./types"; import { deleteCacheFromDataStore, DeleteEntireStore, saveCacheToDataStore } from "./utils"; diff --git a/src/equicordplugins/holyNotes/index.tsx b/src/equicordplugins/holyNotes/index.tsx index c2bd7568e..d00008363 100644 --- a/src/equicordplugins/holyNotes/index.tsx +++ b/src/equicordplugins/holyNotes/index.tsx @@ -26,9 +26,9 @@ import { EquicordDevs } from "@utils/constants"; import { classes } from "@utils/misc"; import { openModal } from "@utils/modal"; import definePlugin from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { findByCodeLazy, findByProps, findComponentByCodeLazy } from "@webpack"; import { ChannelStore, Menu } from "@webpack/common"; -import { Message } from "discord-types/general"; import { Popover as NoteButtonPopover, Popover } from "./components/icons/NoteButton"; import { NoteModal } from "./components/modals/Notebook"; diff --git a/src/equicordplugins/holyNotes/types.ts b/src/equicordplugins/holyNotes/types.ts index c6c67ee40..c951e2043 100644 --- a/src/equicordplugins/holyNotes/types.ts +++ b/src/equicordplugins/holyNotes/types.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import { Embed, MessageAttachment, MessageReaction } from "discord-types/general"; +import { Embed, MessageAttachment, MessageReaction } from "@vencord/discord-types"; export declare namespace Discord { export interface Sticker { diff --git a/src/equicordplugins/hopOn/index.tsx b/src/equicordplugins/hopOn/index.tsx index 3055d3d0f..46e5326c9 100644 --- a/src/equicordplugins/hopOn/index.tsx +++ b/src/equicordplugins/hopOn/index.tsx @@ -7,8 +7,8 @@ import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { RelationshipStore, SelectedChannelStore } from "@webpack/common"; -import { Message } from "discord-types/general"; interface IMessageCreate { type: "MESSAGE_CREATE"; diff --git a/src/equicordplugins/iRememberYou/index.tsx b/src/equicordplugins/iRememberYou/index.tsx index a3c78481f..fa73a50ff 100644 --- a/src/equicordplugins/iRememberYou/index.tsx +++ b/src/equicordplugins/iRememberYou/index.tsx @@ -13,8 +13,8 @@ import { EquicordDevs } from "@utils/constants"; import { openUserProfile } from "@utils/discord"; import * as Modal from "@utils/modal"; import definePlugin from "@utils/types"; +import { Guild, User } from "@vencord/discord-types"; import { Avatar, Button, ChannelStore, Clickable, Flex, GuildMemberStore, GuildStore, MessageStore, React, Text, TextArea, TextInput, Tooltip, UserStore, } from "@webpack/common"; -import { Guild, User } from "discord-types/general"; interface IUserExtra { isOwner?: boolean; diff --git a/src/equicordplugins/iconViewer/IconModal.tsx b/src/equicordplugins/iconViewer/IconModal.tsx index 48f1c153f..e435bd06d 100644 --- a/src/equicordplugins/iconViewer/IconModal.tsx +++ b/src/equicordplugins/iconViewer/IconModal.tsx @@ -17,8 +17,8 @@ import { ModalSize, openModal } from "@utils/modal"; +import * as t from "@vencord/discord-types"; import { Button, FluxDispatcher, TooltipContainer, useCallback, useEffect, useState } from "@webpack/common"; -import * as t from "@webpack/types"; import { IconsFinds } from "./names"; import { openRawModal } from "./rawModal"; diff --git a/src/equicordplugins/iconViewer/IconsTab.tsx b/src/equicordplugins/iconViewer/IconsTab.tsx index b6049c58f..7db97eec0 100644 --- a/src/equicordplugins/iconViewer/IconsTab.tsx +++ b/src/equicordplugins/iconViewer/IconsTab.tsx @@ -21,8 +21,8 @@ import "./IconsTab.css"; import { SettingsTab, wrapTab } from "@components/VencordSettings/shared"; import { Margins } from "@utils/margins"; import { classes } from "@utils/misc"; +import * as t from "@vencord/discord-types"; import { Button, Clickable, Forms, React, TextInput, TooltipContainer } from "@webpack/common"; -import * as t from "@webpack/types"; import { openIconModal } from "./IconModal"; import { getNameByIcon } from "./names"; diff --git a/src/equicordplugins/iconViewer/names.ts b/src/equicordplugins/iconViewer/names.ts index 4c110b3f3..70cddc34f 100644 --- a/src/equicordplugins/iconViewer/names.ts +++ b/src/equicordplugins/iconViewer/names.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import * as t from "@webpack/types"; +import * as t from "@vencord/discord-types"; // name: pattern export const IconsFinds = { diff --git a/src/equicordplugins/iconViewer/rawModal.tsx b/src/equicordplugins/iconViewer/rawModal.tsx index f6092a19f..a137050d3 100644 --- a/src/equicordplugins/iconViewer/rawModal.tsx +++ b/src/equicordplugins/iconViewer/rawModal.tsx @@ -18,8 +18,8 @@ import { ModalSize, openModal } from "@utils/modal"; +import * as t from "@vencord/discord-types"; import { Button, Toasts } from "@webpack/common"; -import * as t from "@webpack/types"; import { ModalHeaderTitle } from "./subComponents"; diff --git a/src/equicordplugins/iconViewer/saveModal.tsx b/src/equicordplugins/iconViewer/saveModal.tsx index 46270f6a0..f51e88a9c 100644 --- a/src/equicordplugins/iconViewer/saveModal.tsx +++ b/src/equicordplugins/iconViewer/saveModal.tsx @@ -14,8 +14,8 @@ import { ModalSize, openModal } from "@utils/modal"; +import * as t from "@vencord/discord-types"; import { Button, Forms, Select, TextInput, useCallback, useEffect, useState } from "@webpack/common"; -import * as t from "@webpack/types"; import { ModalHeaderTitle } from "./subComponents"; import { convertComponentToHtml, cssColors, iconSizesInPx, saveIcon } from "./utils"; diff --git a/src/equicordplugins/iconViewer/utils.tsx b/src/equicordplugins/iconViewer/utils.tsx index eb3f9cdda..a6ba6ebb6 100644 --- a/src/equicordplugins/iconViewer/utils.tsx +++ b/src/equicordplugins/iconViewer/utils.tsx @@ -5,9 +5,9 @@ */ import { saveFile } from "@utils/web"; +import * as t from "@vencord/discord-types"; import { filters, findAll, findByPropsLazy, waitFor } from "@webpack"; -import { createRoot, React, ReactDOM } from "@webpack/common"; -import * as t from "@webpack/types"; +import { createRoot, ReactDOM } from "@webpack/common"; export let _cssColors: string[] = []; export type IconsDef = { [k: string]: t.Icon; }; diff --git a/src/equicordplugins/ignoreCalls/index.tsx b/src/equicordplugins/ignoreCalls/index.tsx index cb85c29ec..2a3bb7d59 100644 --- a/src/equicordplugins/ignoreCalls/index.tsx +++ b/src/equicordplugins/ignoreCalls/index.tsx @@ -9,8 +9,8 @@ import { definePluginSettings } from "@api/Settings"; import { ErrorBoundary } from "@components/index"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel } from "@vencord/discord-types"; import { FluxDispatcher, Menu, React, UserStore } from "@webpack/common"; -import { Channel } from "discord-types/general"; const ignoredChannelIds = new Set(); diff --git a/src/equicordplugins/imgToGif/index.tsx b/src/equicordplugins/imgToGif/index.tsx index 4b8c88d0c..e6e849460 100644 --- a/src/equicordplugins/imgToGif/index.tsx +++ b/src/equicordplugins/imgToGif/index.tsx @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -import { ApplicationCommandInputType, ApplicationCommandOptionType, Argument, CommandContext, sendBotMessage } from "@api/Commands"; +import { ApplicationCommandInputType, ApplicationCommandOptionType, sendBotMessage } from "@api/Commands"; import { EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { CommandArgument, CommandContext } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { DraftType, UploadHandler, UploadManager } from "@webpack/common"; import { applyPalette, GIFEncoder, quantize } from "gifenc"; @@ -44,7 +45,7 @@ function loadImage(source: File | string) { }); } -async function resolveImage(options: Argument[], ctx: CommandContext): Promise<{ image: File | null; width: number | null; height: number | null; }> { +async function resolveImage(options: CommandArgument[], ctx: CommandContext): Promise<{ image: File | null; width: number | null; height: number | null; }> { let image: File | null = null; let width: number | null = null; let height: number | null = null; diff --git a/src/equicordplugins/inRole/RoleMembersModal.tsx b/src/equicordplugins/inRole/RoleMembersModal.tsx index 3ef6cb49c..2adf15e74 100644 --- a/src/equicordplugins/inRole/RoleMembersModal.tsx +++ b/src/equicordplugins/inRole/RoleMembersModal.tsx @@ -7,8 +7,8 @@ import { classNameFactory } from "@api/Styles"; import ErrorBoundary from "@components/ErrorBoundary"; import { ModalCloseButton, ModalContent, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal"; +import { GuildMember } from "@vencord/discord-types"; import { Forms, Parser } from "@webpack/common"; -import { GuildMember } from "discord-types/general"; const cl = classNameFactory("vc-inrole-"); diff --git a/src/equicordplugins/inRole/index.tsx b/src/equicordplugins/inRole/index.tsx index 079e18d39..29ddfb1ab 100644 --- a/src/equicordplugins/inRole/index.tsx +++ b/src/equicordplugins/inRole/index.tsx @@ -12,8 +12,8 @@ import { InfoIcon } from "@components/Icons"; import { Devs } from "@utils/constants"; import { getCurrentChannel, getCurrentGuild } from "@utils/discord"; import definePlugin from "@utils/types"; +import { GuildMember } from "@vencord/discord-types"; import { Forms, GuildMemberStore, GuildRoleStore, Menu, Parser } from "@webpack/common"; -import { GuildMember } from "discord-types/general"; import { showInRoleModal } from "./RoleMembersModal"; diff --git a/src/equicordplugins/instantScreenshare/index.tsx b/src/equicordplugins/instantScreenshare/index.tsx index 931d62ae6..21b5a833d 100644 --- a/src/equicordplugins/instantScreenshare/index.tsx +++ b/src/equicordplugins/instantScreenshare/index.tsx @@ -6,9 +6,9 @@ import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { VoiceState } from "@vencord/discord-types"; import { findByCodeLazy } from "@webpack"; import { ChannelStore, PermissionsBits, PermissionStore, SelectedChannelStore, UserStore } from "@webpack/common"; -import { VoiceState } from "@webpack/types"; import { getCurrentMedia, settings } from "./utils"; diff --git a/src/equicordplugins/keywordNotify/index.tsx b/src/equicordplugins/keywordNotify/index.tsx index dd01dcc14..33ba20a4a 100644 --- a/src/equicordplugins/keywordNotify/index.tsx +++ b/src/equicordplugins/keywordNotify/index.tsx @@ -16,9 +16,9 @@ import { Margins } from "@utils/margins"; import { classes } from "@utils/misc"; import { useForceUpdater } from "@utils/react"; import definePlugin, { OptionType } from "@utils/types"; +import { Message, User } from "@vencord/discord-types"; import { findByCodeLazy, findByPropsLazy } from "@webpack"; import { Button, ChannelStore, FluxDispatcher, Forms, Select, SelectedChannelStore, Switch, TabBar, TextInput, Tooltip, UserStore, useState } from "@webpack/common"; -import { Message, User } from "discord-types/general/index.js"; import type { JSX, PropsWithChildren } from "react"; type IconProps = JSX.IntrinsicElements["svg"]; diff --git a/src/equicordplugins/mediaDownloader.desktop/index.tsx b/src/equicordplugins/mediaDownloader.desktop/index.tsx index 7f74361b6..3d5c9b55b 100644 --- a/src/equicordplugins/mediaDownloader.desktop/index.tsx +++ b/src/equicordplugins/mediaDownloader.desktop/index.tsx @@ -15,8 +15,8 @@ import { EquicordDevs } from "@utils/constants"; import { Logger } from "@utils/Logger"; import { openModal } from "@utils/modal"; import definePlugin, { OptionType, PluginNative, ReporterTestable } from "@utils/types"; +import { Channel } from "@vencord/discord-types"; import { Button, DraftType, FluxDispatcher, Forms, UploadHandler, UploadManager, UserStore } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { DependencyModal } from "./DependencyModal"; diff --git a/src/equicordplugins/messageBurst/index.ts b/src/equicordplugins/messageBurst/index.ts index cefd7f641..699fc14a6 100644 --- a/src/equicordplugins/messageBurst/index.ts +++ b/src/equicordplugins/messageBurst/index.ts @@ -7,8 +7,8 @@ import { definePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel, Message } from "@vencord/discord-types"; import { ChannelStore, MessageActions, MessageStore, UserStore } from "@webpack/common"; -import { Channel, Message } from "discord-types/general"; function shouldEdit(channel: Channel, message: Message, timePeriod: number, shouldMergeWithAttachment: boolean) { let should = true; diff --git a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx index 6e8ce0148..1152b56af 100644 --- a/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/components/LogsModal.tsx @@ -11,9 +11,9 @@ import { openUserProfile } from "@utils/discord"; import { copyWithToast } from "@utils/misc"; import { closeAllModals, ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal"; import { LazyComponent } from "@utils/react"; +import { User } from "@vencord/discord-types"; import { find, findByCode, findByCodeLazy } from "@webpack"; import { Alerts, Button, ChannelStore, ContextMenuApi, FluxDispatcher, Menu, NavigationRouter, React, TabBar, Text, TextInput, Tooltip, useMemo, useRef, useState } from "@webpack/common"; -import { User } from "discord-types/general"; import { clearMessagesIDB, DBMessageRecord, deleteMessageIDB, deleteMessagesBulkIDB } from "../db"; import { settings } from "../index"; diff --git a/src/equicordplugins/messageLoggerEnhanced/index.tsx b/src/equicordplugins/messageLoggerEnhanced/index.tsx index 8352300e9..7c866483e 100644 --- a/src/equicordplugins/messageLoggerEnhanced/index.tsx +++ b/src/equicordplugins/messageLoggerEnhanced/index.tsx @@ -56,6 +56,7 @@ async function messageDeleteHandler(payload: MessageDeletePayload & { isBulk: bo try { handledMessageIds.add(payload.id); + // @ts-ignore let message: LoggedMessage | LoggedMessageJSON | null = oldGetMessage?.(payload.channelId, payload.id); if (message == null) { @@ -152,6 +153,7 @@ async function messageUpdateHandler(payload: MessageUpdatePayload) { ] }; + // @ts-ignore cacheSentMessages.set(`${payload.message.channel_id},${payload.message.id}`, message); } } @@ -215,7 +217,7 @@ async function processMessageFetch(response: FetchMessagesResponse) { for (let j = 0, len2 = message.mentions.length; j < len2; j++) { const user = message.mentions[j]; - const cachedUser = fetchUser((user as any).id || user); + const cachedUser = fetchUser(user); if (cachedUser) (message.mentions[j] as any) = cleanupUserObject(cachedUser); } diff --git a/src/equicordplugins/messageLoggerEnhanced/types.ts b/src/equicordplugins/messageLoggerEnhanced/types.ts index 371c48b21..7df6bf714 100644 --- a/src/equicordplugins/messageLoggerEnhanced/types.ts +++ b/src/equicordplugins/messageLoggerEnhanced/types.ts @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import { Message, MessageAttachment, MessageJSON } from "discord-types/general"; +import { Message, MessageAttachment, MessageJSON, User } from "@vencord/discord-types"; export interface LoggedAttachment extends MessageAttachment { fileExtension?: string | null; @@ -35,6 +35,14 @@ export interface LoggedMessageJSON extends Omit { ghostPinged?: boolean; timestamp: string; ourCache?: boolean; + channel_id: string; + id: string; + author: User; + flags: number; + bot: boolean; + mentions: string[]; + content: string; + webhookId: string | undefined; referenced_message: RefrencedMessage; message_reference: RefrencedMessage; } @@ -47,6 +55,14 @@ export interface LoggedMessage extends Message { timestamp: string; content: string; }[]; + channel_id: string; + id: string; + author: User; + flags: number; + bot: boolean; + mentions: string[]; + content: string; + webhookId: string | undefined; } export interface MessageDeletePayload { diff --git a/src/equicordplugins/messageLoggerEnhanced/utils/cleanUp.ts b/src/equicordplugins/messageLoggerEnhanced/utils/cleanUp.ts index 7f47ff36a..2f0558c79 100644 --- a/src/equicordplugins/messageLoggerEnhanced/utils/cleanUp.ts +++ b/src/equicordplugins/messageLoggerEnhanced/utils/cleanUp.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ +import { User } from "@vencord/discord-types"; import { MessageStore } from "@webpack/common"; -import { User } from "discord-types/general"; import { LoggedMessageJSON, RefrencedMessage } from "../types"; import { getGuildIdByChannel, isGhostPinged } from "./index"; @@ -111,6 +111,6 @@ export function cleanupUserObject(user: User) { avatar: user.avatar, id: user.id, bot: user.bot, - public_flags: typeof user.publicFlags !== "undefined" ? user.publicFlags : (user as any).public_flags + public_flags: typeof user.publicFlags !== "undefined" ? user.publicFlags : user.publicFlags }; } diff --git a/src/equicordplugins/messageLoggerEnhanced/utils/saveImage/index.ts b/src/equicordplugins/messageLoggerEnhanced/utils/saveImage/index.ts index 4a1f159b5..e0e39e2ca 100644 --- a/src/equicordplugins/messageLoggerEnhanced/utils/saveImage/index.ts +++ b/src/equicordplugins/messageLoggerEnhanced/utils/saveImage/index.ts @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import { MessageAttachment } from "discord-types/general"; +import { MessageAttachment } from "@vencord/discord-types"; import { Flogger, settings } from "../.."; import { LoggedAttachment, LoggedMessage, LoggedMessageJSON } from "../../types"; diff --git a/src/equicordplugins/moreStickers/index.tsx b/src/equicordplugins/moreStickers/index.tsx index 3194c19d6..7eb2c4c34 100644 --- a/src/equicordplugins/moreStickers/index.tsx +++ b/src/equicordplugins/moreStickers/index.tsx @@ -9,8 +9,8 @@ import "./style.css"; import { FFmpeg } from "@ffmpeg/ffmpeg"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel } from "@vencord/discord-types"; import { React } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { PickerContent, PickerHeader, PickerSidebar, Settings, Wrapper } from "./components"; import { getStickerPack, getStickerPackMetas } from "./stickers"; diff --git a/src/equicordplugins/moyai/index.ts b/src/equicordplugins/moyai/index.ts index a0f76b014..0e4ea789f 100644 --- a/src/equicordplugins/moyai/index.ts +++ b/src/equicordplugins/moyai/index.ts @@ -21,8 +21,8 @@ import { makeRange } from "@components/PluginSettings/components/SettingSliderCo import { Devs } from "@utils/constants"; import { sleep } from "@utils/misc"; import definePlugin, { OptionType } from "@utils/types"; +import { Message, ReactionEmoji } from "@vencord/discord-types"; import { RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common"; -import { Message, ReactionEmoji } from "discord-types/general"; interface IMessageCreate { type: "MESSAGE_CREATE"; diff --git a/src/equicordplugins/noNitroUpsell/index.ts b/src/equicordplugins/noNitroUpsell/index.ts index 284d3c8c0..a45d7a975 100644 --- a/src/equicordplugins/noNitroUpsell/index.ts +++ b/src/equicordplugins/noNitroUpsell/index.ts @@ -6,8 +6,8 @@ import { EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { User } from "@vencord/discord-types"; import { UserStore } from "@webpack/common"; -import { User } from "discord-types/general"; let user: ModifiedUser | undefined; let lastUserId: string | undefined; diff --git a/src/equicordplugins/pinIcon/index.tsx b/src/equicordplugins/pinIcon/index.tsx index f97869f45..2a0d9154c 100644 --- a/src/equicordplugins/pinIcon/index.tsx +++ b/src/equicordplugins/pinIcon/index.tsx @@ -18,8 +18,8 @@ import { EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { findComponentByCodeLazy } from "@webpack"; -import { Message } from "discord-types/general"; const PinIcon = findComponentByCodeLazy("1-.06-.63L6.16"); export default definePlugin({ diff --git a/src/equicordplugins/purgeMessages/index.tsx b/src/equicordplugins/purgeMessages/index.tsx index 03269bf8a..05812e87d 100644 --- a/src/equicordplugins/purgeMessages/index.tsx +++ b/src/equicordplugins/purgeMessages/index.tsx @@ -21,8 +21,8 @@ import "@equicordplugins/_misc/styles.css"; import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { Channel, Message } from "@vencord/discord-types"; import { Forms, MessageActions, MessageStore, UserStore } from "@webpack/common"; -import { Channel, Message } from "discord-types/general"; async function deleteMessages(amount: number, channel: Channel, delay: number = 1500): Promise { let deleted = 0; diff --git a/src/equicordplugins/quoter/index.tsx b/src/equicordplugins/quoter/index.tsx index 3c2770f67..9e2feeba3 100644 --- a/src/equicordplugins/quoter/index.tsx +++ b/src/equicordplugins/quoter/index.tsx @@ -10,8 +10,8 @@ import { Devs } from "@utils/constants"; import { getCurrentChannel } from "@utils/discord"; import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal"; import definePlugin, { OptionType } from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { Button, Menu, Select, Switch, Text, UploadHandler, useEffect, useState } from "@webpack/common"; -import { Message } from "discord-types/general"; import { QuoteIcon } from "./components"; import { canvasToBlob, fetchImageAsBlob, FixUpQuote, wrapText } from "./utils"; diff --git a/src/equicordplugins/repeatMessage/index.tsx b/src/equicordplugins/repeatMessage/index.tsx index 926d70424..d41e84934 100644 --- a/src/equicordplugins/repeatMessage/index.tsx +++ b/src/equicordplugins/repeatMessage/index.tsx @@ -23,8 +23,8 @@ import { EquicordDevs } from "@utils/constants"; import { sendMessage } from "@utils/discord"; import { classes } from "@utils/misc"; import definePlugin from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { ChannelStore, Menu } from "@webpack/common"; -import { Message } from "discord-types/general"; function RepeatMessageIcon({ className }: { className?: string; }) { return ( diff --git a/src/equicordplugins/replyPingControl/index.ts b/src/equicordplugins/replyPingControl/index.ts index 6fe014c84..aa877cfb6 100644 --- a/src/equicordplugins/replyPingControl/index.ts +++ b/src/equicordplugins/replyPingControl/index.ts @@ -7,8 +7,8 @@ import { definePluginSettings } from "@api/Settings"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { MessageJSON } from "@vencord/discord-types"; import { MessageStore, UserStore } from "@webpack/common"; -import { MessageJSON } from "discord-types/general"; export const settings = definePluginSettings({ alwaysPingOnReply: { diff --git a/src/equicordplugins/rpcStats/index.tsx b/src/equicordplugins/rpcStats/index.tsx index 33237be5e..c81b557b1 100644 --- a/src/equicordplugins/rpcStats/index.tsx +++ b/src/equicordplugins/rpcStats/index.tsx @@ -8,8 +8,8 @@ import { DataStore } from "@api/index"; import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType, PluginNative } from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { ApplicationAssetUtils, FluxDispatcher, UserStore } from "@webpack/common"; -import { Message } from "discord-types/general"; export async function getApplicationAsset(key: string): Promise { if (/https?:\/\/(cdn|media)\.discordapp\.(com|net)\/attachments\//.test(key)) return "mp:" + key.replace(/https?:\/\/(cdn|media)\.discordapp\.(com|net)\//, ""); diff --git a/src/equicordplugins/shakeSpearean.dev/native.ts b/src/equicordplugins/shakeSpearean.dev/native.ts index 3f104d2eb..8f8047514 100644 --- a/src/equicordplugins/shakeSpearean.dev/native.ts +++ b/src/equicordplugins/shakeSpearean.dev/native.ts @@ -5,7 +5,7 @@ */ import { MessageObject } from "@api/MessageEvents"; -import { Message } from "discord-types/general"; +import { Message } from "@vencord/discord-types"; export async function transferMessage(message: MessageObject, model: string, repliedMessage?: Message) { // you can use this on anything really diff --git a/src/equicordplugins/showBadgesInChat/index.tsx b/src/equicordplugins/showBadgesInChat/index.tsx index ba9d15829..1b8374833 100644 --- a/src/equicordplugins/showBadgesInChat/index.tsx +++ b/src/equicordplugins/showBadgesInChat/index.tsx @@ -14,7 +14,7 @@ const roleIconClassName = findByPropsLazy("roleIcon", "separator").roleIcon; const RoleIconComponent = findComponentByCodeLazy("#{intl::ROLE_ICON_ALT_TEXT}"); import "./styles.css"; -import { User } from "discord-types/general"; +import { User } from "@vencord/discord-types"; import { JSX } from "react"; import settings from "./settings"; diff --git a/src/equicordplugins/sidebarChat/index.tsx b/src/equicordplugins/sidebarChat/index.tsx index bc5f8aec1..82c6253f6 100644 --- a/src/equicordplugins/sidebarChat/index.tsx +++ b/src/equicordplugins/sidebarChat/index.tsx @@ -8,6 +8,7 @@ import { NavContextMenuPatchCallback } from "@api/ContextMenu"; import ErrorBoundary from "@components/ErrorBoundary"; import { Devs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { Channel, User } from "@vencord/discord-types"; import { findByPropsLazy, findComponentByCodeLazy } from "@webpack"; import { ChannelRouter, @@ -22,7 +23,6 @@ import { UserStore, useStateFromStores } from "@webpack/common"; -import { Channel, User } from "discord-types/general"; import { SidebarStore } from "./store"; @@ -149,7 +149,7 @@ export default definePlugin({ }} /> ()} + icon={() => ()} tooltip="Close Sidebar Chat" onClick={() => { FluxDispatcher.dispatch({ diff --git a/src/equicordplugins/sidebarChat/store.ts b/src/equicordplugins/sidebarChat/store.ts index c91482191..13914e12b 100644 --- a/src/equicordplugins/sidebarChat/store.ts +++ b/src/equicordplugins/sidebarChat/store.ts @@ -5,9 +5,9 @@ */ import { proxyLazy } from "@utils/lazy"; +import { Channel, Guild } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { ChannelStore, Flux, FluxDispatcher, GuildStore } from "@webpack/common"; -import { Channel, Guild } from "discord-types/general"; // cant destructure, otherwise context is lost const DMChannelHandler = findByPropsLazy("getOrEnsurePrivateChannel"); diff --git a/src/equicordplugins/soundBoardLogger/components/SoundBoardLog.tsx b/src/equicordplugins/soundBoardLogger/components/SoundBoardLog.tsx index e6c1d8cf6..352379bcd 100644 --- a/src/equicordplugins/soundBoardLogger/components/SoundBoardLog.tsx +++ b/src/equicordplugins/soundBoardLogger/components/SoundBoardLog.tsx @@ -9,9 +9,9 @@ import { Flex } from "@components/Flex"; import { Margins } from "@utils/margins"; import { classes, copyWithToast } from "@utils/misc"; import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal"; +import { User } from "@vencord/discord-types"; import { findComponentByCodeLazy } from "@webpack"; import { Button, Clickable, Forms, Text, Tooltip, useEffect, UserUtils, useState } from "@webpack/common"; -import { User } from "discord-types/general"; import settings from "../settings"; import { clearLoggedSounds, getLoggedSounds } from "../store"; diff --git a/src/equicordplugins/soundBoardLogger/utils.ts b/src/equicordplugins/soundBoardLogger/utils.ts index 12f547cf6..9bb91868d 100644 --- a/src/equicordplugins/soundBoardLogger/utils.ts +++ b/src/equicordplugins/soundBoardLogger/utils.ts @@ -8,8 +8,8 @@ import { classNameFactory } from "@api/Styles"; import { proxyLazy } from "@utils/lazy"; import { LazyComponent } from "@utils/react"; import { saveFile } from "@utils/web"; +import type { User } from "@vencord/discord-types"; import { findByCode, findByProps, findByPropsLazy } from "@webpack"; -import type { User } from "discord-types/general"; import settings from "./settings"; diff --git a/src/equicordplugins/themeLibrary/components/ThemeCard.tsx b/src/equicordplugins/themeLibrary/components/ThemeCard.tsx index e321871ed..9302cc244 100644 --- a/src/equicordplugins/themeLibrary/components/ThemeCard.tsx +++ b/src/equicordplugins/themeLibrary/components/ThemeCard.tsx @@ -10,8 +10,8 @@ import { OpenExternalIcon } from "@components/Icons"; import { proxyLazy } from "@utils/lazy"; import { Margins } from "@utils/margins"; import { ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal"; +import { User } from "@vencord/discord-types"; import { Button, Card, FluxDispatcher, Forms, Parser, React, UserStore, UserUtils } from "@webpack/common"; -import { User } from "discord-types/general"; import { Constructor } from "type-fest"; import type { Theme, ThemeLikeProps } from "../types"; diff --git a/src/equicordplugins/themeLibrary/types.ts b/src/equicordplugins/themeLibrary/types.ts index 199edfba9..85edf8fc1 100644 --- a/src/equicordplugins/themeLibrary/types.ts +++ b/src/equicordplugins/themeLibrary/types.ts @@ -5,7 +5,7 @@ */ import { ModalProps } from "@utils/modal"; -import { User } from "discord-types/general"; +import { User } from "@vencord/discord-types"; type Author = { github_name?: string; diff --git a/src/equicordplugins/timezones/index.tsx b/src/equicordplugins/timezones/index.tsx index 2871c342c..5a4dca6a7 100644 --- a/src/equicordplugins/timezones/index.tsx +++ b/src/equicordplugins/timezones/index.tsx @@ -13,9 +13,9 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { Devs, EquicordDevs } from "@utils/constants"; import { openModal } from "@utils/modal"; import definePlugin, { OptionType } from "@utils/types"; +import { Message, User } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { Button, Menu, showToast, Toasts, Tooltip, useEffect, UserStore, useState } from "@webpack/common"; -import { Message, User } from "discord-types/general"; import { deleteTimezone, getTimezone, loadDatabaseTimezones, setUserDatabaseTimezone } from "./database"; import { SetTimezoneModal } from "./TimezoneModal"; diff --git a/src/equicordplugins/toastNotifications/index.tsx b/src/equicordplugins/toastNotifications/index.tsx index d654dd778..8939023b2 100644 --- a/src/equicordplugins/toastNotifications/index.tsx +++ b/src/equicordplugins/toastNotifications/index.tsx @@ -20,9 +20,9 @@ import { definePluginSettings } from "@api/Settings"; import { makeRange } from "@components/PluginSettings/components"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel, Message, User } from "@vencord/discord-types"; import { findByPropsLazy, findStore } from "@webpack"; import { Button, ChannelStore, GuildRoleStore, NavigationRouter, RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common"; -import { Channel, Message, User } from "discord-types/general"; import { ReactNode } from "react"; import { NotificationData, showNotification } from "./components/Notifications"; diff --git a/src/equicordplugins/translatePlus/utils/accessory.tsx b/src/equicordplugins/translatePlus/utils/accessory.tsx index 7d473b196..7665724de 100644 --- a/src/equicordplugins/translatePlus/utils/accessory.tsx +++ b/src/equicordplugins/translatePlus/utils/accessory.tsx @@ -4,8 +4,8 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +import { Message } from "@vencord/discord-types"; import { Parser, useEffect, useState } from "@webpack/common"; -import { Message } from "discord-types/general"; import { languages } from "../misc/languages"; import { cl, Translation } from "../misc/types"; diff --git a/src/equicordplugins/unitConverter/ConverterAccessory.tsx b/src/equicordplugins/unitConverter/ConverterAccessory.tsx index 940c89d1a..ec897f37e 100644 --- a/src/equicordplugins/unitConverter/ConverterAccessory.tsx +++ b/src/equicordplugins/unitConverter/ConverterAccessory.tsx @@ -17,8 +17,8 @@ */ import { classNameFactory } from "@api/Styles"; +import { Message } from "@vencord/discord-types"; import { useState } from "@webpack/common"; -import { Message } from "discord-types/general"; export const conversions = new Map void>(); const cl = classNameFactory("vc-converter-"); diff --git a/src/equicordplugins/unreadBadgeCount/index.tsx b/src/equicordplugins/unreadBadgeCount/index.tsx index c8d014ba0..3855d976f 100644 --- a/src/equicordplugins/unreadBadgeCount/index.tsx +++ b/src/equicordplugins/unreadBadgeCount/index.tsx @@ -10,9 +10,9 @@ import { definePluginSettings } from "@api/Settings"; import ErrorBoundary from "@components/ErrorBoundary"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel } from "@vencord/discord-types"; import { findStoreLazy } from "@webpack"; import { ReadStateStore, useStateFromStores } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { JSX } from "react"; const UserGuildSettingsStore = findStoreLazy("UserGuildSettingsStore"); diff --git a/src/equicordplugins/userpfp/index.tsx b/src/equicordplugins/userpfp/index.tsx index 65c436ad5..fb8a4b198 100644 --- a/src/equicordplugins/userpfp/index.tsx +++ b/src/equicordplugins/userpfp/index.tsx @@ -8,7 +8,7 @@ import { definePluginSettings } from "@api/Settings"; import { Link } from "@components/Link"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; -import { User } from "discord-types/general"; +import { User } from "@vencord/discord-types"; let data = { avatars: {} as Record, diff --git a/src/equicordplugins/vcNarratorCustom/index.tsx b/src/equicordplugins/vcNarratorCustom/index.tsx index fa8d8b923..8986841fd 100644 --- a/src/equicordplugins/vcNarratorCustom/index.tsx +++ b/src/equicordplugins/vcNarratorCustom/index.tsx @@ -217,7 +217,7 @@ function getTypeAndChannelId( function playSample(tempSettings: any, type: string) { const s = Object.assign({}, settings.plain, tempSettings); const currentUser = UserStore.getCurrentUser(); - const myGuildId = SelectedGuildStore.getGuildId(); + const myGuildId = SelectedGuildStore.getGuildId()!; speak( formatText( @@ -312,7 +312,7 @@ export default definePlugin({ settings, flux: { VOICE_STATE_UPDATES({ voiceStates }: { voiceStates: VoiceState[]; }) { - const myGuildId = SelectedGuildStore.getGuildId(); + const myGuildId = SelectedGuildStore.getGuildId()!; const myChanId = SelectedChannelStore.getVoiceChannelId(); const myId = UserStore.getCurrentUser().id; diff --git a/src/equicordplugins/vencordRPC/index.ts b/src/equicordplugins/vencordRPC/index.ts index 4a4a5126e..ec8fb81c3 100644 --- a/src/equicordplugins/vencordRPC/index.ts +++ b/src/equicordplugins/vencordRPC/index.ts @@ -8,10 +8,9 @@ import { definePluginSettings } from "@api/Settings"; import { Devs } from "@utils/constants"; import { isTruthy } from "@utils/guards"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel, FluxStore } from "@vencord/discord-types"; import { findByPropsLazy, findStoreLazy } from "@webpack"; import { ApplicationAssetUtils, ChannelStore, FluxDispatcher, GuildStore, IconUtils, PresenceStore, RelationshipStore, SelectedChannelStore, SelectedGuildStore, UserStore } from "@webpack/common"; -import { FluxStore } from "@webpack/types"; -import { Channel } from "discord-types/general"; const presenceStore = findByPropsLazy("getLocalPresence"); const GuildMemberCountStore = findStoreLazy("GuildMemberCountStore") as FluxStore & { getMemberCount(guildId: string): number | null; }; @@ -213,7 +212,7 @@ function totalFriendCount(): number { function memberCount(): string { const channelId = SelectedChannelStore.getChannelId(); - const guildId = SelectedGuildStore.getGuildId(); + const guildId = SelectedGuildStore.getGuildId()!; const { groups } = ChannelMemberStore.getProps(guildId, channelId); const total = GuildMemberCountStore.getMemberCount(guildId); @@ -265,7 +264,7 @@ async function createActivity(): Promise { const channelId = SelectedChannelStore.getChannelId(); - const guildId = SelectedGuildStore.getGuildId(); + const guildId = SelectedGuildStore.getGuildId()!; const voiceId = SelectedChannelStore.getVoiceChannelId(); const currentUser = UserStore.getCurrentUser(); if (userAvatarAsSmallImage) imageSmall = currentUser.getAvatarURL(undefined, undefined, true) || chino; diff --git a/src/equicordplugins/viewRawVariant/index.tsx b/src/equicordplugins/viewRawVariant/index.tsx index a6a1f40f1..30d057f60 100644 --- a/src/equicordplugins/viewRawVariant/index.tsx +++ b/src/equicordplugins/viewRawVariant/index.tsx @@ -20,8 +20,8 @@ import { openModal, } from "@utils/modal"; import definePlugin from "@utils/types"; +import { Message } from "@vencord/discord-types"; import { Forms, Menu, Text } from "@webpack/common"; -import { Message } from "discord-types/general"; type CustomMessage = Message & { editHistory?: any; diff --git a/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryComponent.tsx b/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryComponent.tsx index 14758bce5..8788470f6 100644 --- a/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryComponent.tsx +++ b/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryComponent.tsx @@ -7,8 +7,8 @@ import "./VoiceChannelLogEntryComponent.css"; import { classes } from "@utils/misc"; +import { Channel } from "@vencord/discord-types"; import { React, Timestamp, Tooltip, UserStore } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { Util } from "Vencord"; import { cl } from ".."; diff --git a/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryIcons.tsx b/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryIcons.tsx index 304b65e05..243d554fe 100644 --- a/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryIcons.tsx +++ b/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogEntryIcons.tsx @@ -5,8 +5,8 @@ */ import { classes } from "@utils/misc"; +import { Channel } from "@vencord/discord-types"; import { React } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { cl } from ".."; import { VoiceChannelLogEntry } from "../logs"; diff --git a/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogModal.tsx b/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogModal.tsx index 3b523b555..160a90583 100644 --- a/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogModal.tsx +++ b/src/equicordplugins/voiceChannelLog.dev/components/VoiceChannelLogModal.tsx @@ -6,9 +6,9 @@ import { classes } from "@utils/misc"; import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal"; +import { Channel } from "@vencord/discord-types"; import { findStoreLazy } from "@webpack"; import { React, ScrollerThin, Text } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { cl } from ".."; import { getVcLogs, vcLogSubscribe } from "../logs"; diff --git a/src/equicordplugins/voiceChannelLog.dev/index.tsx b/src/equicordplugins/voiceChannelLog.dev/index.tsx index 77f072e0e..da4662d13 100644 --- a/src/equicordplugins/voiceChannelLog.dev/index.tsx +++ b/src/equicordplugins/voiceChannelLog.dev/index.tsx @@ -9,9 +9,9 @@ import { definePluginSettings } from "@api/Settings"; import { classNameFactory } from "@api/Styles"; import { Devs, EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Message, User } from "@vencord/discord-types"; import { findByCodeLazy } from "@webpack"; import { FluxDispatcher, Menu, MessageActions, MessageStore, RelationshipStore, SelectedChannelStore, UserStore } from "@webpack/common"; -import { Message, User } from "discord-types/general"; import { openVoiceChannelLog } from "./components/VoiceChannelLogModal"; import { addLogEntry } from "./logs"; diff --git a/src/equicordplugins/voiceChatUtils/index.tsx b/src/equicordplugins/voiceChatUtils/index.tsx index 3c3b39983..1acc93019 100644 --- a/src/equicordplugins/voiceChatUtils/index.tsx +++ b/src/equicordplugins/voiceChatUtils/index.tsx @@ -9,8 +9,8 @@ import { definePluginSettings } from "@api/Settings"; import { makeRange } from "@components/PluginSettings/components"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import type { Channel } from "@vencord/discord-types"; import { GuildChannelStore, Menu, React, RestAPI, UserStore, VoiceStateStore } from "@webpack/common"; -import type { Channel } from "discord-types/general"; async function runSequential(promises: Promise[]): Promise { const results: T[] = []; diff --git a/src/equicordplugins/voiceJoinMessages/index.ts b/src/equicordplugins/voiceJoinMessages/index.ts index f4adf6b9d..8f7d74e1b 100644 --- a/src/equicordplugins/voiceJoinMessages/index.ts +++ b/src/equicordplugins/voiceJoinMessages/index.ts @@ -8,9 +8,9 @@ import { definePluginSettings } from "@api/Settings"; import { Devs, EquicordDevs } from "@utils/constants"; import { humanFriendlyJoin } from "@utils/text"; import definePlugin, { OptionType } from "@utils/types"; +import { Message, User } from "@vencord/discord-types"; import { findByCodeLazy } from "@webpack"; import { ChannelStore, FluxDispatcher, MessageActions, MessageStore, RelationshipStore, SelectedChannelStore, UserStore, VoiceStateStore } from "@webpack/common"; -import { Message, User } from "discord-types/general"; const createBotMessage = findByCodeLazy('username:"Clyde"'); diff --git a/src/equicordplugins/wallpaperFree/index.tsx b/src/equicordplugins/wallpaperFree/index.tsx index 2a0d4ef38..90ba39eb9 100644 --- a/src/equicordplugins/wallpaperFree/index.tsx +++ b/src/equicordplugins/wallpaperFree/index.tsx @@ -10,8 +10,8 @@ import { definePluginSettings } from "@api/Settings"; import { ErrorBoundary } from "@components/index"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { Channel } from "@vencord/discord-types"; import { useStateFromStores } from "@webpack/common"; -import { Channel } from "discord-types/general"; import { ChannelContextPatch, GuildContextPatch, UserContextPatch } from "./components/ctxmenu"; import { GlobalDefaultComponent, TipsComponent } from "./components/util"; diff --git a/src/equicordplugins/wallpaperFree/store.ts b/src/equicordplugins/wallpaperFree/store.ts index c4c2c1a96..9ccbdc8eb 100644 --- a/src/equicordplugins/wallpaperFree/store.ts +++ b/src/equicordplugins/wallpaperFree/store.ts @@ -5,10 +5,9 @@ */ import { proxyLazy } from "@utils/lazy"; +import { Channel, FluxEmitter, FluxStore } from "@vencord/discord-types"; import { findByPropsLazy } from "@webpack"; import { FluxDispatcher } from "@webpack/common"; -import { FluxEmitter, FluxStore } from "@webpack/types"; -import { Channel } from "discord-types/general"; interface IFlux { PersistedStore: typeof FluxStore; diff --git a/src/equicordplugins/webpackTarball/index.tsx b/src/equicordplugins/webpackTarball/index.tsx index 852c2eff3..2d666f31b 100644 --- a/src/equicordplugins/webpackTarball/index.tsx +++ b/src/equicordplugins/webpackTarball/index.tsx @@ -11,7 +11,6 @@ import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, M import definePlugin, { OptionType } from "@utils/types"; import { findByProps, wreq } from "@webpack"; import { Button, Flex, Forms, Switch, Text, Timestamp, useState } from "@webpack/common"; -import __webpack_require__ from "discord-types/other/WebpackInstance"; import TarFile from "./tar"; import * as Webpack from "./webpack"; @@ -80,7 +79,7 @@ async function saveTar(patched: boolean) { } function TarModal({ modalProps, close }: { modalProps: ModalProps; close(): void; }) { - const webpackRequire = wreq as unknown as __webpack_require__; + const webpackRequire = wreq as any; const { buildNumber, builtAt } = getBuildNumber(); const [, rerender] = useState({}); const [isLoading, setLoading] = useState(false); diff --git a/src/equicordplugins/webpackTarball/webpack.ts b/src/equicordplugins/webpackTarball/webpack.ts index da0bf4b69..c5fd69def 100644 --- a/src/equicordplugins/webpackTarball/webpack.ts +++ b/src/equicordplugins/webpackTarball/webpack.ts @@ -4,8 +4,6 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ -import type { WebpackInstance } from "discord-types/other"; - export async function protectWebpack(webpack: any[], body: () => Promise): Promise { const prev_m = Object.getOwnPropertyDescriptor(Function.prototype, "m")!; Object.defineProperty(Function.prototype, "m", { @@ -22,7 +20,7 @@ export async function protectWebpack(webpack: any[], body: () => Promise): } } -export function getLoadedChunks(wreq: WebpackInstance): { [chunkId: string | symbol]: 0 | undefined; } { +export function getLoadedChunks(wreq): { [chunkId: string | symbol]: 0 | undefined; } { const { o } = wreq; try { wreq.o = (a: any) => { throw a; }; @@ -35,7 +33,7 @@ export function getLoadedChunks(wreq: WebpackInstance): { [chunkId: string | sym throw new Error("getLoadedChunks failed"); } -export function getChunkPaths(wreq: WebpackInstance): { [chunkId: string]: string; } { +export function getChunkPaths(wreq): { [chunkId: string]: string; } { const sym = Symbol("getChunkPaths"); try { Object.defineProperty(Object.prototype, sym, { @@ -53,7 +51,7 @@ export function getChunkPaths(wreq: WebpackInstance): { [chunkId: string]: strin throw new Error("getChunkPaths failed"); } -export async function forceLoadAll(wreq: WebpackInstance, on_chunk: (id: string) => void = () => { }) { +export async function forceLoadAll(wreq, on_chunk: (id: string) => void = () => { }) { const chunks = getChunkPaths(wreq); const loaded = getLoadedChunks(wreq); const ids = Object.keys(chunks).filter(id => loaded[id] !== 0); diff --git a/src/equicordplugins/whitelistedEmojis/index.tsx b/src/equicordplugins/whitelistedEmojis/index.tsx index 4c0677cf8..5c041d48c 100644 --- a/src/equicordplugins/whitelistedEmojis/index.tsx +++ b/src/equicordplugins/whitelistedEmojis/index.tsx @@ -11,8 +11,8 @@ import { DataStore } from "@api/index"; import { definePluginSettings, migratePluginSettings } from "@api/Settings"; import { EquicordDevs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; +import { CustomEmoji, UnicodeEmoji } from "@vencord/discord-types"; import { Alerts, Button, EmojiStore, GuildStore, Menu, Toasts, useEffect, useState } from "@webpack/common"; -import { CustomEmoji, UnicodeEmoji } from "@webpack/types"; import { JSX } from "react"; interface ContextMenuEmoji { @@ -57,7 +57,7 @@ function itemAlreadyInList(item: ContextMenuEmoji) { async function addBulkToAllowedList(items: ContextMenuEmoji[]) { const itemsToAdd = await Promise.all(items.map(async item => { if (!itemAlreadyInList(item)) { - let emojiData: CustomEmoji | null = null; + let emojiData: CustomEmoji | undefined = undefined; if (!item.surrogates) { emojiData = EmojiStore.getCustomEmojiById(item.id); @@ -122,7 +122,7 @@ async function removeBulkFromAllowedList(items: ContextMenuEmoji[]) { async function addToAllowedList(item: ContextMenuEmoji) { if (!itemAlreadyInList(item)) { - let emojiData: CustomEmoji | null = null; + let emojiData: CustomEmoji | undefined = undefined; if (!item.surrogates) { emojiData = EmojiStore.getCustomEmojiById(item.id); diff --git a/src/equicordplugins/whosWatching/index.tsx b/src/equicordplugins/whosWatching/index.tsx index a3291a99b..8bee85b52 100644 --- a/src/equicordplugins/whosWatching/index.tsx +++ b/src/equicordplugins/whosWatching/index.tsx @@ -13,9 +13,9 @@ import { getIntlMessage, openUserProfile } from "@utils/discord"; import { Margins } from "@utils/margins"; import { classes } from "@utils/misc"; import definePlugin, { OptionType } from "@utils/types"; +import { User } from "@vencord/discord-types"; import { findByPropsLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack"; import { Clickable, Forms, RelationshipStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common"; -import { User } from "discord-types/general"; import { JSX } from "react"; interface WatchingProps { diff --git a/src/equicordplugins/youtubeDescription/index.tsx b/src/equicordplugins/youtubeDescription/index.tsx index c475eefbe..4b2072893 100644 --- a/src/equicordplugins/youtubeDescription/index.tsx +++ b/src/equicordplugins/youtubeDescription/index.tsx @@ -7,8 +7,8 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { Devs } from "@utils/constants"; import definePlugin from "@utils/types"; +import { Embed } from "@vencord/discord-types"; import { useState } from "@webpack/common"; -import { Embed } from "discord-types/general"; interface ToggleableDescriptionProps { embed: Embed, original: () => any; } diff --git a/src/plugins/showMeYourName/index.tsx b/src/plugins/showMeYourName/index.tsx index a595d4e5d..3e8ec5098 100644 --- a/src/plugins/showMeYourName/index.tsx +++ b/src/plugins/showMeYourName/index.tsx @@ -11,7 +11,7 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { Devs } from "@utils/constants"; import definePlugin, { OptionType } from "@utils/types"; import { Message, User } from "@vencord/discord-types"; -import { GuildMemberStore } from "@webpack/common"; +import { GuildMemberStore, RelationshipStore } from "@webpack/common"; interface UsernameProps { author: { nick: string; };