{requiredPlugins}
-
@@ -124,6 +125,8 @@ export default ErrorBoundary.wrap(function () {
onBlur={onBlur}
/>
>, action: () => any) {
return async () => {
dispatcher(true);
@@ -125,7 +126,6 @@ function Updatable(props: CommonProps) {
onClick={withDispatcher(setIsUpdating, async () => {
if (await update()) {
setUpdates([]);
- await rebuild();
await new Promise(r => {
Alerts.show({
title: "Update Success!",
@@ -198,7 +198,7 @@ function Updater() {
};
return (
-
+
Updater Settings
Updates
{isNewer ?
+
);
}
-export default IS_WEB ? null : ErrorBoundary.wrap(Updater, {
- message: "Failed to render the Updater. If this persists, try using the installer to reinstall!",
- onError: handleComponentFailed,
-});
+export default IS_WEB ? null : wrapTab(Updater, "Updater");
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
index 751220856..1502bfabd 100644
--- a/src/components/VencordSettings/VencordTab.tsx
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -18,17 +18,18 @@
import { openNotificationLogModal } from "@api/Notifications/notificationLog";
-import { Settings, useSettings } from "@api/settings";
+import { Settings, useSettings } from "@api/Settings";
import { classNameFactory } from "@api/Styles";
import DonateButton from "@components/DonateButton";
-import ErrorBoundary from "@components/ErrorBoundary";
import { ErrorCard } from "@components/ErrorCard";
-import IpcEvents from "@utils/IpcEvents";
import { Margins } from "@utils/margins";
-import { identity, useAwaiter } from "@utils/misc";
+import { identity } from "@utils/misc";
import { relaunch, showItemInFolder } from "@utils/native";
+import { useAwaiter } from "@utils/react";
import { Button, Card, Forms, React, Select, Slider, Switch } from "@webpack/common";
+import { SettingsTab, wrapTab } from "./shared";
+
const cl = classNameFactory("vc-settings-");
const DEFAULT_DONATE_IMAGE = "https://cdn.discordapp.com/emojis/1026533090627174460.png";
@@ -39,7 +40,7 @@ type KeysOfType = {
}[keyof Object];
function VencordSettings() {
- const [settingsDir, , settingsDirPending] = useAwaiter(() => VencordNative.ipc.invoke(IpcEvents.GET_SETTINGS_DIR), {
+ const [settingsDir, , settingsDirPending] = useAwaiter(VencordNative.settings.getSettingsDir, {
fallbackValue: "Loading..."
});
const settings = useSettings();
@@ -97,44 +98,39 @@ function VencordSettings() {
];
return (
-
+
- {IS_WEB ? (
-
- ) : (
-
+
+ {!IS_WEB && (
-
+ )}
+
+ {!IS_WEB && (
-
-
- )}
+ )}
+
+
@@ -158,7 +154,7 @@ function VencordSettings() {
{typeof Notification !== "undefined" &&
+
);
}
@@ -268,4 +264,4 @@ function DonateCard({ image }: DonateCardProps) {
);
}
-export default ErrorBoundary.wrap(VencordSettings);
+export default wrapTab(VencordSettings, "Vencord Settings");
diff --git a/src/components/VencordSettings/index.tsx b/src/components/VencordSettings/index.tsx
deleted file mode 100644
index b2916c4a9..000000000
--- a/src/components/VencordSettings/index.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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 = {
- VencordSettings: { name: "Vencord", component: () =>
- Vencord Settings
-
-
- {Object.entries(SettingsTabs).map(([key, { name, component }]) => {
- if (!component) return null;
- return
- {name}
- ;
- })}
-
- ;
-}
-
-export default function (props: SettingsProps) {
- return
- ;
-}
diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css
index 971e9a877..26988fdb6 100644
--- a/src/components/VencordSettings/settingsStyles.css
+++ b/src/components/VencordSettings/settingsStyles.css
@@ -15,7 +15,7 @@
display: flex;
gap: 1em;
align-items: center;
- justify-content: space-between;
+ justify-content: space-evenly;
flex-grow: 1;
flex-flow: row wrap;
margin-bottom: 1em;
@@ -29,14 +29,12 @@
.vc-settings-card {
padding: 1em;
margin-bottom: 1em;
- margin-top: 1em;
}
.vc-backup-restore-card {
background-color: var(--info-warning-background);
border-color: var(--info-warning-foreground);
color: var(--info-warning-text);
- margin-top: 0;
}
.vc-settings-theme-links {
@@ -59,7 +57,7 @@
}
.vc-text-selectable,
-.vc-text-selectable :not(a, button) {
+.vc-text-selectable :not(a, button, a *, button *, input, input *) {
/* make text selectable, silly discord makes the entirety of settings not selectable */
user-select: text;
diff --git a/src/components/VencordSettings/shared.tsx b/src/components/VencordSettings/shared.tsx
new file mode 100644
index 000000000..0d3910dfb
--- /dev/null
+++ b/src/components/VencordSettings/shared.tsx
@@ -0,0 +1,51 @@
+/*
+ * 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
+
+ {title}
+
+
+ {children}
+
+ );
+}
+
+const onError = onlyOnce(handleComponentFailed);
+
+export function wrapTab(component: ComponentType, tab: string) {
+ return ErrorBoundary.wrap(component, {
+ message: `Failed to render the ${tab} tab. If this issue persists, try using the installer to reinstall!`,
+ onError,
+ });
+}
diff --git a/src/components/iconStyles.css b/src/components/iconStyles.css
new file mode 100644
index 000000000..ca4075da0
--- /dev/null
+++ b/src/components/iconStyles.css
@@ -0,0 +1,7 @@
+.vc-open-external-icon {
+ transform: rotate(45deg);
+}
+
+.vc-owner-crown-icon {
+ color: var(--text-warning);
+}
diff --git a/src/components/monacoWin.html b/src/components/monacoWin.html
index d9d24121f..57d321410 100644
--- a/src/components/monacoWin.html
+++ b/src/components/monacoWin.html
@@ -1,52 +1,66 @@
-
+
+
+
+ Vencord QuickCSS Editor
+
+
+
-
-
- Vencord QuickCSS Editor
-
-
-
+
+
+
-
-
-
+
-
-
+
+
diff --git a/src/debug/Tracer.ts b/src/debug/Tracer.ts
index 185915a97..4337e0019 100644
--- a/src/debug/Tracer.ts
+++ b/src/debug/Tracer.ts
@@ -16,7 +16,7 @@
* along with this program. If not, see ;
diff --git a/src/main/ipcMain.ts b/src/main/ipcMain.ts
index d60200f7a..5fcf8b7df 100644
--- a/src/main/ipcMain.ts
+++ b/src/main/ipcMain.ts
@@ -19,7 +19,7 @@
import "./updater";
import { debounce } from "@utils/debounce";
-import IpcEvents from "@utils/IpcEvents";
+import { IpcEvents } from "@utils/IpcEvents";
import { Queue } from "@utils/Queue";
import { BrowserWindow, ipcMain, shell } from "electron";
import { mkdirSync, readFileSync, watch } from "fs";
@@ -44,7 +44,7 @@ export function readSettings() {
}
}
-export function getSettings(): typeof import("@api/settings").Settings {
+export function getSettings(): typeof import("@api/Settings").Settings {
try {
return JSON.parse(readSettings());
} catch {
diff --git a/src/main/updater/git.ts b/src/main/updater/git.ts
index d6a29a852..c6e5cc90a 100644
--- a/src/main/updater/git.ts
+++ b/src/main/updater/git.ts
@@ -16,7 +16,7 @@
* along with this program. If not, see >;
+let DonorBadges = {} as Record[]>;
+
+async function loadBadges(noCache = false) {
+ DonorBadges = {};
+
+ const init = {} as RequestInit;
+ if (noCache)
+ init.cache = "no-cache";
+
+ const badges = await fetch("https://gist.githubusercontent.com/Vendicated/51a3dd775f6920429ec6e9b735ca7f01/raw/badges.csv", init)
+ .then(r => r.text());
+
+ const lines = badges.trim().split("\n");
+ if (lines.shift() !== "id,tooltip,image") {
+ new Logger("BadgeAPI").error("Invalid badges.csv file!");
+ return;
+ }
+
+ for (const line of lines) {
+ const [id, description, image] = line.split(",");
+ (DonorBadges[id] ??= []).push({ image, description });
+ }
+}
export default definePlugin({
name: "BadgeAPI",
@@ -61,8 +82,8 @@ export default definePlugin({
find: "Messages.PROFILE_USER_BADGES,role:",
replacement: [
{
- match: /null==\i\?void 0:(\i)\.getBadges\(\)/,
- replace: (_, badgesMod) => `Vencord.Api.Badges._getBadges(arguments[0]).concat(${badgesMod}?.getBadges()??[])`,
+ match: /(?<=(\i)\.isTryItOutFlow,)(.{0,300})null==\i\?void 0:(\i)\.getBadges\(\)/,
+ replace: (_, props, restCode, badgesMod) => `vencordProps=${props},${restCode}Vencord.Api.Badges._getBadges(vencordProps).concat(${badgesMod}?.getBadges()??[])`,
},
{
// alt: "", aria-hidden: false, src: originalSrc
@@ -82,93 +103,93 @@ export default definePlugin({
}
],
+ toolboxActions: {
+ async "Refetch Badges"() {
+ await loadBadges(true);
+ Toasts.show({
+ id: Toasts.genId(),
+ message: "Successfully refetched badges!",
+ type: Toasts.Type.SUCCESS
+ });
+ }
+ },
+
+ async start() {
+ Vencord.Api.Badges.addBadge(ContributorBadge);
+ await loadBadges();
+ },
+
renderBadgeComponent: ErrorBoundary.wrap((badge: ProfileBadge & BadgeUserArgs) => {
const Component = badge.component!;
return {
- closeModal(modalKey);
- VencordNative.ipc.invoke(IpcEvents.OPEN_EXTERNAL, "https://github.com/sponsors/Vendicated");
- }}>
-
-
-
-
-
-
-
-
-
- 
- 
-
-
-
-
-
-
-
-
- ));
- },
- };
- }
+ getDonorBadges(userId: string) {
+ return DonorBadges[userId]?.map(badge => ({
+ ...badge,
+ position: BadgePosition.START,
+ props: {
+ style: {
+ borderRadius: "50%",
+ transform: "scale(0.9)" // The image is a bit too big compared to default badges
+ }
+ },
+ onClick() {
+ const modalKey = openModal(props => (
+ {
+ closeModal(modalKey);
+ VencordNative.native.openExternal("https://github.com/sponsors/Vendicated");
+ }}>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ));
+ },
+ }));
}
});
diff --git a/src/plugins/apiMessageEvents.ts b/src/plugins/apiMessageEvents.ts
index 6843200d4..fa467522c 100644
--- a/src/plugins/apiMessageEvents.ts
+++ b/src/plugins/apiMessageEvents.ts
@@ -22,17 +22,29 @@ import definePlugin from "@utils/types";
export default definePlugin({
name: "MessageEventsAPI",
description: "Api required by anything using message events.",
- authors: [Devs.Arjix, Devs.hunt],
+ authors: [Devs.Arjix, Devs.hunt, Devs.Ven],
patches: [
{
find: '"MessageActionCreators"',
- replacement: [{
- match: /_sendMessage:(function\([^)]+\)){/,
- replace: "_sendMessage:async $1{if(await Vencord.Api.MessageEvents._handlePreSend(...arguments))return;"
- }, {
- match: /\beditMessage:(function\([^)]+\)){/,
+ replacement: {
+ // editMessage: function (...) {
+ match: /\beditMessage:(function\(.+?\))\{/,
+ // editMessage: async function (...) { await handlePreEdit(...); ...
replace: "editMessage:async $1{await Vencord.Api.MessageEvents._handlePreEdit(...arguments);"
- }]
+ }
+ },
+ {
+ find: ".handleSendMessage=",
+ replacement: {
+ // props.chatInputType...then((function(isMessageValid)... var parsedMessage = b.c.parse(channel,... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply);
+ // Lookbehind: validateMessage)({openWarningPopout:..., type: i.props.chatInputType, content: t, stickers: r, ...}).then((function(isMessageValid)
+ match: /(props\.chatInputType.+?\.then\(\()(function.+?var (\i)=\i\.\i\.parse\((\i),.+?var (\i)=\i\.\i\.getSendMessageOptionsForReply\(\i\);)(?<=\)\(({.+?})\)\.then.+?)/,
+ // props.chatInputType...then((async function(isMessageValid)... var replyOptions = f.g.getSendMessageOptionsForReply(pendingReply); if(await Vencord.api...) return { shoudClear:true, shouldRefocus:true };
+ replace: (_, rest1, rest2, parsedMessage, channel, replyOptions, extra) => "" +
+ `${rest1}async ${rest2}` +
+ `if(await Vencord.Api.MessageEvents._handlePreSend(${channel}.id,${parsedMessage},${extra},${replyOptions}))` +
+ "return{shoudClear:true,shouldRefocus:true};"
+ }
},
{
find: '("interactionUsernameProfile',
diff --git a/src/plugins/apiServerList.ts b/src/plugins/apiServerList.ts
index 77498ac81..6585d3819 100644
--- a/src/plugins/apiServerList.ts
+++ b/src/plugins/apiServerList.ts
@@ -32,7 +32,7 @@ export default definePlugin({
}
},
{
- find: "Messages.SERVERS",
+ find: "Messages.SERVERS,children",
replacement: {
match: /(Messages\.SERVERS,children:)(.+?default:return null\}\}\)\))/,
replace: "$1Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($2)"
diff --git a/src/plugins/betterFolders/FolderSideBar.tsx b/src/plugins/betterFolders/FolderSideBar.tsx
index 3e44a5806..7159f7eea 100644
--- a/src/plugins/betterFolders/FolderSideBar.tsx
+++ b/src/plugins/betterFolders/FolderSideBar.tsx
@@ -16,7 +16,7 @@
* along with this program. If not, see {
- socket?.close(1000, "Reconnecting");
- initWs(true);
- }}
- />
- );
-};
-
export default definePlugin({
name: "DevCompanion",
description: "Dev Companion Plugin",
authors: [Devs.Ven],
settings,
+ toolboxActions: {
+ "Reconnect"() {
+ socket?.close(1000, "Reconnecting");
+ initWs(true);
+ }
+ },
+
start() {
initWs();
- addContextMenuPatch("user-settings-cog", contextMenuPatch);
},
stop() {
socket?.close(1000, "Plugin Stopped");
socket = void 0;
- removeContextMenuPatch("user-settings-cog", contextMenuPatch);
}
});
diff --git a/src/plugins/emoteCloner.tsx b/src/plugins/emoteCloner.tsx
index 61eec8865..0900422a8 100644
--- a/src/plugins/emoteCloner.tsx
+++ b/src/plugins/emoteCloner.tsx
@@ -19,19 +19,103 @@
import { addContextMenuPatch, findGroupChildrenByChildId, NavContextMenuPatchCallback, removeContextMenuPatch } from "@api/ContextMenu";
import { CheckedTextInput } from "@components/CheckedTextInput";
import { Devs } from "@utils/constants";
-import Logger from "@utils/Logger";
+import { Logger } from "@utils/Logger";
import { Margins } from "@utils/margins";
-import { ModalContent, ModalHeader, ModalRoot, openModal } from "@utils/modal";
+import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
import definePlugin from "@utils/types";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { Forms, GuildStore, Menu, PermissionStore, React, Toasts, Tooltip, UserStore } from "@webpack/common";
+import { findByCodeLazy, findStoreLazy } from "@webpack";
+import { EmojiStore, FluxDispatcher, Forms, GuildStore, Menu, PermissionStore, React, RestAPI, Toasts, Tooltip, UserStore } from "@webpack/common";
+import { Promisable } from "type-fest";
const MANAGE_EMOJIS_AND_STICKERS = 1n << 30n;
-const GuildEmojiStore = findByPropsLazy("getGuilds", "getGuildEmoji");
+const StickersStore = findStoreLazy("StickersStore");
const uploadEmoji = findByCodeLazy('"EMOJI_UPLOAD_START"', "GUILD_EMOJIS(");
-function getGuildCandidates(isAnimated: boolean) {
+interface Sticker {
+ t: "Sticker";
+ description: string;
+ format_type: number;
+ guild_id: string;
+ id: string;
+ name: string;
+ tags: string;
+ type: number;
+}
+
+interface Emoji {
+ t: "Emoji";
+ id: string;
+ name: string;
+ isAnimated: boolean;
+}
+
+type Data = Emoji | Sticker;
+
+const StickerExt = [, "png", "png", "json", "gif"] as const;
+
+function getUrl(data: Data) {
+ if (data.t === "Emoji")
+ return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.${data.isAnimated ? "gif" : "png"}`;
+
+ return `${location.origin}/stickers/${data.id}.${StickerExt[data.format_type]}`;
+}
+
+async function fetchSticker(id: string) {
+ const cached = StickersStore.getStickerById(id);
+ if (cached) return cached;
+
+ const { body } = await RestAPI.get({
+ url: `/stickers/${id}`
+ });
+
+ FluxDispatcher.dispatch({
+ type: "STICKER_FETCH_SUCCESS",
+ sticker: body
+ });
+
+ return body as Sticker;
+}
+
+async function cloneSticker(guildId: string, sticker: Sticker) {
+ const data = new FormData();
+ data.append("name", sticker.name);
+ data.append("tags", sticker.tags);
+ data.append("description", sticker.description);
+ data.append("file", await fetchBlob(getUrl(sticker)));
+
+ const { body } = await RestAPI.post({
+ url: `/guilds/${guildId}/stickers`,
+ body: data,
+ });
+
+ FluxDispatcher.dispatch({
+ type: "GUILD_STICKERS_CREATE_SUCCESS",
+ guildId,
+ sticker: {
+ ...body,
+ user: UserStore.getCurrentUser()
+ }
+ });
+}
+
+async function cloneEmoji(guildId: string, emoji: Emoji) {
+ const data = await fetchBlob(getUrl(emoji));
+
+ const dataUrl = await new Promise(resolve => {
+ const reader = new FileReader();
+ reader.onload = () => resolve(reader.result as string);
+ reader.readAsDataURL(data);
+ });
+
+ return uploadEmoji({
+ guildId,
+ name: emoji.name.split("~")[0],
+ image: dataUrl
+ });
+}
+
+function getGuildCandidates(data: Data) {
const meId = UserStore.getCurrentUser().id;
return Object.values(GuildStore.getGuilds()).filter(g => {
@@ -39,8 +123,12 @@ function getGuildCandidates(isAnimated: boolean) {
BigInt(PermissionStore.getGuildPermissions({ id: g.id }) & MANAGE_EMOJIS_AND_STICKERS) === MANAGE_EMOJIS_AND_STICKERS;
if (!canCreate) return false;
+ if (data.t === "Sticker") return true;
+
+ const { isAnimated } = data as Emoji;
+
const emojiSlots = g.getMaxEmojiSlots();
- const { emojis } = GuildEmojiStore.getGuilds()[g.id];
+ const { emojis } = EmojiStore.getGuilds()[g.id];
let count = 0;
for (const emoji of emojis)
@@ -49,33 +137,34 @@ function getGuildCandidates(isAnimated: boolean) {
}).sort((a, b) => a.name.localeCompare(b.name));
}
-async function doClone(guildId: string, id: string, name: string, isAnimated: boolean) {
- const data = await fetch(`${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${id}.${isAnimated ? "gif" : "png"}`)
- .then(r => r.blob());
- const reader = new FileReader();
+async function fetchBlob(url: string) {
+ const res = await fetch(url);
+ if (!res.ok)
+ throw new Error(`Failed to fetch ${url} - ${res.status}`);
- reader.onload = () => {
- uploadEmoji({
- guildId,
- name: name.split("~")[0],
- image: reader.result
- }).then(() => {
- Toasts.show({
- message: `Successfully cloned ${name}!`,
- type: Toasts.Type.SUCCESS,
- id: Toasts.genId()
- });
- }).catch((e: any) => {
- new Logger("EmoteCloner").error("Failed to upload emoji", e);
- Toasts.show({
- message: "Oopsie something went wrong :( Check console!!!",
- type: Toasts.Type.FAILURE,
- id: Toasts.genId()
- });
+ return res.blob();
+}
+
+async function doClone(guildId: string, data: Sticker | Emoji) {
+ try {
+ if (data.t === "Sticker")
+ await cloneSticker(guildId, data);
+ else
+ await cloneEmoji(guildId, data);
+
+ Toasts.show({
+ message: `Successfully cloned ${data.name} to ${GuildStore.getGuild(guildId)?.name ?? "your server"}!`,
+ type: Toasts.Type.SUCCESS,
+ id: Toasts.genId()
});
- };
-
- reader.readAsDataURL(data);
+ } catch (e) {
+ new Logger("EmoteCloner").error("Failed to clone", data.name, "to", guildId, e);
+ Toasts.show({
+ message: "Oopsie something went wrong :( Check console!!!",
+ type: Toasts.Type.FAILURE,
+ id: Toasts.genId()
+ });
+ }
}
const getFontSize = (s: string) => {
@@ -86,22 +175,26 @@ const getFontSize = (s: string) => {
const nameValidator = /^\w+$/i;
-function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: string; isAnimated: boolean; }) {
+function CloneModal({ data }: { data: Sticker | Emoji; }) {
const [isCloning, setIsCloning] = React.useState(false);
- const [name, setName] = React.useState(emojiName);
+ const [name, setName] = React.useState(data.name);
const [x, invalidateMemo] = React.useReducer(x => x + 1, 0);
- const guilds = React.useMemo(() => getGuildCandidates(isAnimated), [isAnimated, x]);
+ const guilds = React.useMemo(() => getGuildCandidates(data), [data.id, x]);
return (
<>
Custom Name
{
+ data.name = v;
+ setName(v);
+ }}
validate={v =>
- (v.length > 1 && v.length < 32 && nameValidator.test(v))
+ (data.t === "Emoji" && v.length > 2 && v.length < 32 && nameValidator.test(v))
+ || (data.t === "Sticker" && v.length > 2 && v.length < 30)
|| "Name must be between 2 and 32 characters and only contain alphanumeric characters"
}
/>
@@ -135,7 +228,7 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
}}
onClick={isCloning ? void 0 : async () => {
setIsCloning(true);
- doClone(g.id, id, name, isAnimated).finally(() => {
+ doClone(g.id, data).finally(() => {
invalidateMemo();
setIsCloning(false);
});
@@ -175,32 +268,38 @@ function CloneModal({ id, name: emojiName, isAnimated }: { id: string; name: str
);
}
-function buildMenuItem(id: string, name: string, isAnimated: boolean) {
+function buildMenuItem(type: "Emoji" | "Sticker", fetchData: () => Promisable>) {
return (
- openModal(modalProps => (
-
-
- 
- Clone {name}
-
-
-
-
- ))
+ openModalLazy(async () => {
+ const res = await fetchData();
+ const data = { t: type, ...res } as Sticker | Emoji;
+ const url = getUrl(data);
+
+ return modalProps => (
+
+
+ 
+ Clone {data.name}
+
+
+
+
+ );
+ })
}
/>
);
@@ -213,28 +312,53 @@ function isGifUrl(url: string) {
const messageContextMenuPatch: NavContextMenuPatchCallback = (children, props) => () => {
const { favoriteableId, itemHref, itemSrc, favoriteableType } = props ?? {};
- if (!favoriteableId || favoriteableType !== "emoji") return;
+ if (!favoriteableId) return;
- const match = props.message.content.match(RegExp(`|https://cdn\\.discordapp\\.com/emojis/${favoriteableId}\\.`));
- if (!match) return;
- const name = match[1] ?? "FakeNitroEmoji";
+ const menuItem = (() => {
+ switch (favoriteableType) {
+ case "emoji":
+ const match = props.message.content.match(RegExp(`|https://cdn\\.discordapp\\.com/emojis/${favoriteableId}\\.`));
+ if (!match) return;
+ const name = match[1] ?? "FakeNitroEmoji";
- const group = findGroupChildrenByChildId("copy-link", children);
- if (group) group.push(buildMenuItem(favoriteableId, name, isGifUrl(itemHref ?? itemSrc)));
+ return buildMenuItem("Emoji", () => ({
+ id: favoriteableId,
+ name,
+ isAnimated: isGifUrl(itemHref ?? itemSrc)
+ }));
+ case "sticker":
+ const sticker = props.message.stickerItems.find(s => s.id === favoriteableId);
+ if (sticker?.format_type === 3 /* LOTTIE */) return;
+
+ return buildMenuItem("Sticker", () => fetchSticker(favoriteableId));
+ }
+ })();
+
+ if (menuItem)
+ findGroupChildrenByChildId("copy-link", children)?.push(menuItem);
};
const expressionPickerPatch: NavContextMenuPatchCallback = (children, props: { target: HTMLElement; }) => () => {
const { id, name, type } = props?.target?.dataset ?? {};
- if (!id || !name || type !== "emoji") return;
+ if (!id) return;
- const firstChild = props.target.firstChild as HTMLImageElement;
+ if (type === "emoji" && name) {
+ const firstChild = props.target.firstChild as HTMLImageElement;
- children.push(buildMenuItem(id, name, firstChild && isGifUrl(firstChild.src)));
+ children.push(buildMenuItem("Emoji", () => ({
+ id,
+ name,
+ isAnimated: firstChild && isGifUrl(firstChild.src)
+ })));
+ } else if (type === "sticker" && !props.target.className?.includes("lottieCanvas")) {
+ children.push(buildMenuItem("Sticker", () => fetchSticker(id)));
+ }
};
export default definePlugin({
name: "EmoteCloner",
- description: "Adds a Clone context menu item to emotes to clone them your own server",
+ description: "Allows you to clone Emotes & Stickers to your own server (right click them)",
+ tags: ["StickerCloner"],
authors: [Devs.Ven, Devs.Nuckyz],
start() {
diff --git a/src/plugins/experiments.tsx b/src/plugins/experiments.tsx
index 686b822d7..cc8309df7 100644
--- a/src/plugins/experiments.tsx
+++ b/src/plugins/experiments.tsx
@@ -16,8 +16,11 @@
* along with this program. If not, see
+ Hold on!!
+
+
+ Experiments are unreleased Discord features. They might not work, or even break your client or get your account disabled.
+
+
+
+ Only use experiments if you know what you're doing. Vencord is not responsible for any damage caused by enabling experiments.
+
+
+ ), { noop: true })
});
diff --git a/src/plugins/fakeNitro.tsx b/src/plugins/fakeNitro.tsx
index fda9b6b7c..88b2ae20f 100644
--- a/src/plugins/fakeNitro.tsx
+++ b/src/plugins/fakeNitro.tsx
@@ -17,14 +17,14 @@
*/
import { addPreEditListener, addPreSendListener, removePreEditListener, removePreSendListener } from "@api/MessageEvents";
-import { definePluginSettings, migratePluginSettings, Settings } from "@api/settings";
+import { definePluginSettings, Settings } from "@api/Settings";
import { Devs } from "@utils/constants";
import { ApngBlendOp, ApngDisposeOp, getGifEncoder, importApngJs } from "@utils/dependencies";
import { getCurrentGuild } from "@utils/discord";
-import { proxyLazy } from "@utils/proxyLazy";
+import { proxyLazy } from "@utils/lazy";
import definePlugin, { OptionType } from "@utils/types";
import { findByCodeLazy, findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
+import { ChannelStore, EmojiStore, FluxDispatcher, Parser, PermissionStore, UserStore } from "@webpack/common";
import type { Message } from "discord-types/general";
import type { ReactNode } from "react";
@@ -38,8 +38,6 @@ const StickerStore = findStoreLazy("StickersStore") as {
getAllGuildStickers(): Map;
getStickerById(id: string): Sticker | undefined;
};
-const EmojiStore = findStoreLazy("EmojiStore");
-
function searchProtoClass(localName: string, parentProtoClass: any) {
if (!parentProtoClass) return;
@@ -149,8 +147,6 @@ const settings = definePluginSettings({
}
});
-migratePluginSettings("FakeNitro", "NitroBypass");
-
export default definePlugin({
name: "FakeNitro",
authors: [Devs.Arjix, Devs.D3SOX, Devs.Ven, Devs.obscurity, Devs.captain, Devs.Nuckyz, Devs.AutumnVN],
@@ -323,7 +319,7 @@ export default definePlugin({
},
handleProtoChange(proto: any, user: any) {
- if ((!proto.appearance && !AppearanceSettingsProto) || !UserSettingsProtoStore) return;
+ if (proto == null || typeof proto === "string" || !UserSettingsProtoStore || (!proto.appearance && !AppearanceSettingsProto)) return;
const premiumType: number = user?.premium_type ?? UserStore?.getCurrentUser()?.premiumType ?? 0;
@@ -643,7 +639,7 @@ export default definePlugin({
if (!settings.enableStickerBypass)
break stickerBypass;
- const sticker = StickerStore.getStickerById(extra?.stickerIds?.[0]!);
+ const sticker = StickerStore.getStickerById(extra.stickers?.[0]!);
if (!sticker)
break stickerBypass;
@@ -665,7 +661,7 @@ export default definePlugin({
link = `https://distok.top/stickers/${packId}/${sticker.id}.gif`;
}
- delete extra.stickerIds;
+ extra.stickers!.length = 0;
messageObj.content += " " + link + `&name=${encodeURIComponent(sticker.name)}`;
}
}
diff --git a/src/plugins/fakeProfileThemes.tsx b/src/plugins/fakeProfileThemes.tsx
index 8a0db1d27..70003e5ab 100644
--- a/src/plugins/fakeProfileThemes.tsx
+++ b/src/plugins/fakeProfileThemes.tsx
@@ -17,7 +17,7 @@
*/
// This plugin is a port from Alyxia's Vendetta plugin
-import { definePluginSettings } from "@api/settings";
+import { definePluginSettings } from "@api/Settings";
import ErrorBoundary from "@components/ErrorBoundary";
import { Devs } from "@utils/constants";
import { Margins } from "@utils/margins";
diff --git a/src/plugins/fart.ts b/src/plugins/fart.ts
index 9404b39b0..b92a41df0 100644
--- a/src/plugins/fart.ts
+++ b/src/plugins/fart.ts
@@ -17,7 +17,7 @@
*/
import { ApplicationCommandOptionType } from "@api/Commands";
-import { Settings } from "@api/settings";
+import { Settings } from "@api/Settings";
import { makeRange } from "@components/PluginSettings/components";
import { Devs } from "@utils/constants";
import definePlugin, { OptionType } from "@utils/types";
diff --git a/src/plugins/favEmojiFirst.ts b/src/plugins/favEmojiFirst.ts
new file mode 100644
index 000000000..fec0b045d
--- /dev/null
+++ b/src/plugins/favEmojiFirst.ts
@@ -0,0 +1,83 @@
+/*
+ * 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
{({ onMouseEnter, onMouseLeave }) => (
@@ -85,7 +91,7 @@ function ChatBarIcon() {
onMouseLeave={onMouseLeave}
innerClassName={ButtonWrapperClasses.button}
onClick={() => buildEncModal()}
- style={{ padding: "0 4px" }}
+ style={{ padding: "0 2px", scale: "0.9" }}
>
-
-
-
- This Badge is a special perk for Vencord Donors
-
-
- Please consider supporting the development of Vencord by becoming a donor. It would mean a lot!!
-
-
-
+
+
+
+ This Badge is a special perk for Vencord Donors
+
+
+ Please consider supporting the development of Vencord by becoming a donor. It would mean a lot!!
+
+
+