SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen1234 2025-10-27 19:51:22 -04:00
commit 1e869e256a
No known key found for this signature in database
2 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/discord-types/src/common/Guild.d.ts vendored
View file

@ -47,7 +47,7 @@ export class Guild extends DiscordRecord {
};
premiumProgressBarEnabled: boolean;
premiumSubscriberCount: number;
premiumTier: number;
premiumTier: 0 | 1 | 2 | 3;
profile: {
badge: string | undefined;
tag: string | undefined;

40
src/plugins/expressionCloner/index.tsx
View file

@ -28,6 +28,7 @@ import { Margins } from "@utils/margins";
import { ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
import definePlugin from "@utils/types";
import { Guild, GuildSticker } from "@vencord/discord-types";
import { StickerFormatType } from "@vencord/discord-types/enums";
import { findByCodeLazy } from "@webpack";
import { Constants, EmojiStore, FluxDispatcher, GuildStore, IconUtils, Menu, PermissionsBits, PermissionStore, React, RestAPI, StickersStore, Toasts, Tooltip, UserStore } from "@webpack/common";
import { Promisable } from "type-fest";
@ -49,13 +50,32 @@ interface Emoji {
type Data = Emoji | Sticker;
const StickerExt = [, "png", "png", "json", "gif"] as const;
const StickerExtMap = {
[StickerFormatType.PNG]: "png",
[StickerFormatType.APNG]: "png",
[StickerFormatType.LOTTIE]: "json",
[StickerFormatType.GIF]: "gif"
} as const;
const PremiumTierStickerLimitMap = {
0: 5,
1: 15,
2: 30,
3: 60
} as const;
function getGuildMaxStickerSlots(guild: Guild) {
if (guild.features.has("MORE_STICKERS") && guild.premiumTier === 3)
return 120;
return PremiumTierStickerLimitMap[guild.premiumTier] ?? PremiumTierStickerLimitMap[0];
}
function getUrl(data: Data) {
if (data.t === "Emoji")
return `${location.protocol}//${window.GLOBAL_ENV.CDN_HOST}/emojis/${data.id}.${data.isAnimated ? "gif" : "png"}?size=4096&lossless=true`;
return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExt[data.format_type]}?size=4096&lossless=true`;
return `${window.GLOBAL_ENV.MEDIA_PROXY_ENDPOINT}/stickers/${data.id}.${StickerExtMap[data.format_type]}?size=4096&lossless=true`;
}
async function fetchSticker(id: string) {
@ -120,17 +140,25 @@ function getGuildCandidates(data: Data) {
(PermissionStore.getGuildPermissions({ id: g.id }) & PermissionsBits.CREATE_GUILD_EXPRESSIONS) === PermissionsBits.CREATE_GUILD_EXPRESSIONS;
if (!canCreate) return false;
if (data.t === "Sticker") return true;
if (data.t === "Sticker") {
const stickerSlots = getGuildMaxStickerSlots(g);
const stickers = StickersStore.getStickersByGuildId(g.id);
return !stickers || stickers.length < stickerSlots;
}
const { isAnimated } = data as Emoji;
const emojiSlots = getGuildMaxEmojiSlots(g);
const { emojis } = EmojiStore.getGuilds()[g.id];
const emojis = EmojiStore.getGuildEmoji(g.id);
let count = 0;
for (const emoji of emojis)
if (emoji.animated === isAnimated && !emoji.managed)
for (const emoji of emojis) {
if (emoji.animated === isAnimated && !emoji.managed) {
count++;
}
}
return count < emojiSlots;
}).sort((a, b) => a.name.localeCompare(b.name));
}