3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-13 21:35:02 +00:00

Update djs & knub ()

* update pkgs

Signed-off-by: GitHub <noreply@github.com>

* new knub typings

Signed-off-by: GitHub <noreply@github.com>

* more pkg updates

Signed-off-by: GitHub <noreply@github.com>

* more fixes

Signed-off-by: GitHub <noreply@github.com>

* channel typings

Signed-off-by: GitHub <noreply@github.com>

* more message utils typings fixes

Signed-off-by: GitHub <noreply@github.com>

* migrate permissions

Signed-off-by: GitHub <noreply@github.com>

* fix: InternalPoster webhookables

Signed-off-by: GitHub <noreply@github.com>

* djs typings: Attachment & Util

Signed-off-by: GitHub <noreply@github.com>

* more typings

Signed-off-by: GitHub <noreply@github.com>

* fix: rename permissionNames

Signed-off-by: GitHub <noreply@github.com>

* more fixes

Signed-off-by: GitHub <noreply@github.com>

* half the number of errors

* knub commands => messageCommands

Signed-off-by: GitHub <noreply@github.com>

* configPreprocessor => configParser

Signed-off-by: GitHub <noreply@github.com>

* fix channel.messages

Signed-off-by: GitHub <noreply@github.com>

* revert automod any typing

Signed-off-by: GitHub <noreply@github.com>

* more configParser typings

Signed-off-by: GitHub <noreply@github.com>

* revert

Signed-off-by: GitHub <noreply@github.com>

* remove knub type params

Signed-off-by: GitHub <noreply@github.com>

* fix more MessageEmbed / MessageOptions

Signed-off-by: GitHub <noreply@github.com>

* dumb commit for @almeidx to see why this is stupid

Signed-off-by: GitHub <noreply@github.com>

* temp disable custom_events

Signed-off-by: GitHub <noreply@github.com>

* more minor typings fixes - 23 err left

Signed-off-by: GitHub <noreply@github.com>

* update djs dep

* +debug build method (revert this)

Signed-off-by: GitHub <noreply@github.com>

* Revert "+debug build method (revert this)"

This reverts commit a80af1e729.

* Redo +debug build (Revert this)

Signed-off-by: GitHub <noreply@github.com>

* uniform before/after Load shorthands

Signed-off-by: GitHub <noreply@github.com>

* remove unused imports & add prettier plugin

Signed-off-by: GitHub <noreply@github.com>

* env fixes for web platform hosting

Signed-off-by: GitHub <noreply@github.com>

* feat: knub v32-next; related fixes

* fix: allow legacy keys in change_perms action

* fix: request Message Content intent

* fix: use Knub's config validation logic in API

* fix(dashboard): fix error when there are no message and/or slash commands in a plugin

* fix(automod): start_thread action thread options

* fix(CustomEvents): message command types

* chore: remove unneeded type annotation

* feat: add forum channel icon; use thread icon for news threads

* chore: make tslint happy

* chore: fix formatting

---------

Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: almeidx <almeidx@pm.me>
Co-authored-by: Dragory <2606411+Dragory@users.noreply.github.com>
This commit is contained in:
Tiago R 2023-04-01 12:58:17 +01:00 committed by GitHub
parent 293115af22
commit 06877e90cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
476 changed files with 2965 additions and 3251 deletions

View file

@ -1,8 +1,7 @@
import { MessageEmbedOptions, Snowflake, StageChannel, ThreadChannel, VoiceChannel } from "discord.js";
import { APIEmbed, ChannelType, Snowflake, StageChannel, VoiceChannel } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
import { ChannelTypeStrings } from "src/types";
import { EmbedWith, formatNumber, MINUTES, preEmbedPadding, trimLines, verboseUserMention } from "../../../utils";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
import { UtilityPluginType } from "../types";
@ -17,14 +16,16 @@ const STAGE_CHANNEL_ICON =
"https://cdn.discordapp.com/attachments/740650744830623756/839930647711186995/stage-channel.png";
const PUBLIC_THREAD_ICON =
"https://cdn.discordapp.com/attachments/740650744830623756/870343055855738921/public-thread.png";
const PRIVATE_THREAD_UCON =
const PRIVATE_THREAD_ICON =
"https://cdn.discordapp.com/attachments/740650744830623756/870343402447839242/private-thread.png";
const FORUM_CHANNEL_ICON =
"https://cdn.discordapp.com/attachments/740650744830623756/1091681253364875294/forum-channel-icon.png";
export async function getChannelInfoEmbed(
pluginData: GuildPluginData<UtilityPluginType>,
channelId: string,
requestMemberId?: string,
): Promise<MessageEmbedOptions | null> {
): Promise<APIEmbed | null> {
const channel = pluginData.guild.channels.cache.get(channelId as Snowflake);
if (!channel) {
return null;
@ -36,25 +37,28 @@ export async function getChannelInfoEmbed(
const icon =
{
[ChannelTypeStrings.VOICE]: VOICE_CHANNEL_ICON,
[ChannelTypeStrings.NEWS]: ANNOUNCEMENT_CHANNEL_ICON,
[ChannelTypeStrings.STAGE]: STAGE_CHANNEL_ICON,
[ChannelTypeStrings.PUBLIC_THREAD]: PUBLIC_THREAD_ICON,
[ChannelTypeStrings.PRIVATE_THREAD]: PRIVATE_THREAD_UCON,
}[channel.type] || TEXT_CHANNEL_ICON;
[ChannelType.GuildVoice]: VOICE_CHANNEL_ICON,
[ChannelType.GuildAnnouncement]: ANNOUNCEMENT_CHANNEL_ICON,
[ChannelType.GuildStageVoice]: STAGE_CHANNEL_ICON,
[ChannelType.PublicThread]: PUBLIC_THREAD_ICON,
[ChannelType.PrivateThread]: PRIVATE_THREAD_ICON,
[ChannelType.AnnouncementThread]: PUBLIC_THREAD_ICON,
[ChannelType.GuildForum]: FORUM_CHANNEL_ICON,
}[channel.type] ?? TEXT_CHANNEL_ICON;
const channelType =
{
[ChannelTypeStrings.TEXT]: "Text channel",
[ChannelTypeStrings.VOICE]: "Voice channel",
[ChannelTypeStrings.CATEGORY]: "Category",
[ChannelTypeStrings.NEWS]: "Announcement channel",
[ChannelTypeStrings.STORE]: "Store channel",
[ChannelTypeStrings.STAGE]: "Stage channel",
[ChannelTypeStrings.PUBLIC_THREAD]: "Public Thread channel",
[ChannelTypeStrings.PRIVATE_THREAD]: "Private Thread channel",
[ChannelTypeStrings.NEWS_THREAD]: "News Thread channel",
}[channel.type] || "Channel";
[ChannelType.GuildText]: "Text channel",
[ChannelType.GuildVoice]: "Voice channel",
[ChannelType.GuildCategory]: "Category channel",
[ChannelType.GuildAnnouncement]: "Announcement channel",
[ChannelType.GuildStageVoice]: "Stage channel",
[ChannelType.PublicThread]: "Public Thread channel",
[ChannelType.PrivateThread]: "Private Thread channel",
[ChannelType.AnnouncementThread]: "News Thread channel",
[ChannelType.GuildDirectory]: "Hub channel",
[ChannelType.GuildForum]: "Forum channel",
}[channel.type] ?? "Channel";
embed.author = {
name: `${channelType}: ${channel.name}`,
@ -63,9 +67,9 @@ export async function getChannelInfoEmbed(
let channelName = `#${channel.name}`;
if (
channel.type === ChannelTypeStrings.VOICE ||
channel.type === ChannelTypeStrings.CATEGORY ||
channel.type === ChannelTypeStrings.STAGE
channel.type === ChannelType.GuildVoice ||
channel.type === ChannelType.GuildCategory ||
channel.type === ChannelType.GuildStageVoice
) {
channelName = channel.name;
}
@ -81,7 +85,7 @@ export async function getChannelInfoEmbed(
round: true,
});
const showMention = channel.type !== ChannelTypeStrings.CATEGORY;
const showMention = channel.type !== ChannelType.GuildCategory;
embed.fields.push({
name: preEmbedPadding + "Channel information",
@ -94,11 +98,11 @@ export async function getChannelInfoEmbed(
`),
});
if (channel.type === ChannelTypeStrings.VOICE || channel.type === ChannelTypeStrings.STAGE) {
if (channel.type === ChannelType.GuildVoice || channel.type === ChannelType.GuildStageVoice) {
const voiceMembers = Array.from((channel as VoiceChannel | StageChannel).members.values());
const muted = voiceMembers.filter((vm) => vm.voice.mute || vm.voice.selfMute);
const deafened = voiceMembers.filter((vm) => vm.voice.deaf || vm.voice.selfDeaf);
const voiceOrStage = channel.type === ChannelTypeStrings.VOICE ? "Voice" : "Stage";
const voiceOrStage = channel.type === ChannelType.GuildVoice ? "Voice" : "Stage";
embed.fields.push({
name: preEmbedPadding + `${voiceOrStage} information`,
@ -110,13 +114,13 @@ export async function getChannelInfoEmbed(
});
}
if (channel.type === ChannelTypeStrings.CATEGORY) {
if (channel.type === ChannelType.GuildCategory) {
const textChannels = pluginData.guild.channels.cache.filter(
(ch) => ch.parentId === channel.id && ch.type !== ChannelTypeStrings.VOICE,
(ch) => ch.parentId === channel.id && ch.type !== ChannelType.GuildVoice,
);
const voiceChannels = pluginData.guild.channels.cache.filter(
(ch) =>
ch.parentId === channel.id && (ch.type === ChannelTypeStrings.VOICE || ch.type === ChannelTypeStrings.STAGE),
ch.parentId === channel.id && (ch.type === ChannelType.GuildVoice || ch.type === ChannelType.GuildStageVoice),
);
embed.fields.push({
@ -128,14 +132,13 @@ export async function getChannelInfoEmbed(
});
}
if (channel.type === ChannelTypeStrings.PRIVATE_THREAD || channel.type === ChannelTypeStrings.PUBLIC_THREAD) {
const thread = channel as ThreadChannel;
const parentChannelName = thread.parent?.name ?? `<#${thread.parentId}>`;
const memberCount = thread.memberCount ?? thread.members.cache.size;
const owner = await thread.fetchOwner().catch(() => null);
if (channel.isThread()) {
const parentChannelName = channel.parent?.name ?? `<#${channel.parentId}>`;
const memberCount = channel.memberCount ?? channel.members.cache.size;
const owner = await channel.fetchOwner().catch(() => null);
const ownerMention = owner?.user ? verboseUserMention(owner.user) : "Unknown#0000";
const humanizedArchiveTime = `Archive duration: **${humanizeDuration(
(thread.autoArchiveDuration ?? 0) * MINUTES,
(channel.autoArchiveDuration ?? 0) * MINUTES,
)}**`;
embed.fields.push({
@ -144,7 +147,7 @@ export async function getChannelInfoEmbed(
Parent channel: **#${parentChannelName}**
Member count: **${memberCount}**
Thread creator: ${ownerMention}
${thread.archived ? "Archived: **True**" : humanizedArchiveTime}`),
${channel.archived ? "Archived: **True**" : humanizedArchiveTime}`),
});
}

View file

@ -1,4 +1,4 @@
import { MessageEmbedOptions } from "discord.js";
import { APIEmbed } from "discord.js";
import { GuildPluginData } from "knub";
import { EmbedWith, preEmbedPadding, trimLines } from "../../../utils";
import { UtilityPluginType } from "../types";
@ -6,22 +6,21 @@ import { UtilityPluginType } from "../types";
export async function getEmojiInfoEmbed(
pluginData: GuildPluginData<UtilityPluginType>,
emojiId: string,
): Promise<MessageEmbedOptions | null> {
): Promise<APIEmbed | null> {
const emoji = pluginData.guild.emojis.cache.find((e) => e.id === emojiId);
if (!emoji) {
return null;
}
const embed: EmbedWith<"fields"> = {
const embed: EmbedWith<"fields" | "author"> = {
fields: [],
author: {
name: `Emoji: ${emoji.name}`,
icon_url: emoji.url,
},
};
embed.author = {
name: `Emoji: ${emoji.name}`,
icon_url: `https://cdn.discordapp.com/emojis/${emoji.id}.${emoji.animated ? "gif" : "png"}?v=1`,
};
embed.fields.push({
embed.fields!.push({
name: preEmbedPadding + "Emoji information",
value: trimLines(`
Name: **${emoji.name}**

View file

@ -1,8 +1,6 @@
import { MessageEmbedOptions } from "discord.js";
import { APIEmbed, ChannelType } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
import { ChannelTypeStrings } from "src/types";
import {
EmbedWith,
formatNumber,
@ -20,7 +18,7 @@ import { UtilityPluginType } from "../types";
export async function getInviteInfoEmbed(
pluginData: GuildPluginData<UtilityPluginType>,
inviteCode: string,
): Promise<MessageEmbedOptions | null> {
): Promise<APIEmbed | null> {
let invite = await resolveInvite(pluginData.client, inviteCode, true);
if (!invite) {
return null;
@ -45,7 +43,6 @@ export async function getInviteInfoEmbed(
}
const serverCreatedAtTimestamp = snowflakeToTimestamp(invite.guild.id);
const serverCreatedAt = moment.utc(serverCreatedAtTimestamp, "x");
const serverAge = humanizeDuration(Date.now() - serverCreatedAtTimestamp, {
largest: 2,
round: true,
@ -67,10 +64,9 @@ export async function getInviteInfoEmbed(
});
if (invite.channel) {
const channelName =
invite.channel.type === ChannelTypeStrings.VOICE ? `🔉 ${invite.channel.name}` : `#${invite.channel.name}`;
invite.channel.type === ChannelType.GuildVoice ? `🔉 ${invite.channel.name}` : `#${invite.channel.name}`;
const channelCreatedAtTimestamp = snowflakeToTimestamp(invite.channel.id);
const channelCreatedAt = moment.utc(channelCreatedAtTimestamp, "x");
const channelAge = humanizeDuration(Date.now() - channelCreatedAtTimestamp, {
largest: 2,
round: true,
@ -82,7 +78,7 @@ export async function getInviteInfoEmbed(
Created: **${channelAge} ago**
`);
if (invite.channel.type !== ChannelTypeStrings.VOICE) {
if (invite.channel.type !== ChannelType.GuildVoice) {
channelInfo += `\nMention: <#${invite.channel.id}>`;
}
@ -114,14 +110,15 @@ export async function getInviteInfoEmbed(
invite = invite as GroupDMInvite;
embed.author = {
name: invite.channel.name ? `Group DM invite: ${invite.channel.name}` : `Group DM invite`,
name: invite.channel!.name ? `Group DM invite: ${invite.channel!.name}` : `Group DM invite`,
url: `https://discord.gg/${invite.code}`,
}; // FIXME pending invite re-think
/*if (invite.channel.icon) {
embed.author.icon_url = `https://cdn.discordapp.com/channel-icons/${invite.channel.id}/${invite.channel.icon}.png?size=256`;
}*/ const channelCreatedAtTimestamp = snowflakeToTimestamp(invite.channel.id);
const channelCreatedAt = moment.utc(channelCreatedAtTimestamp, "x");
}*/
const channelCreatedAtTimestamp = snowflakeToTimestamp(invite.channel!.id);
const channelAge = humanizeDuration(Date.now() - channelCreatedAtTimestamp, {
largest: 2,
round: true,
@ -130,8 +127,8 @@ export async function getInviteInfoEmbed(
embed.fields.push({
name: preEmbedPadding + "Group DM information",
value: trimLines(`
Name: ${invite.channel.name ? `**${invite.channel.name}**` : `_Unknown_`}
ID: \`${invite.channel.id}\`
Name: ${invite.channel!.name ? `**${invite.channel!.name}**` : `_Unknown_`}
ID: \`${invite.channel!.id}\`
Created: **${channelAge} ago**
Members: **${formatNumber((invite as any).memberCount)}**
`),

View file

@ -1,9 +1,7 @@
import { MessageEmbedOptions, Snowflake, TextChannel } from "discord.js";
import { APIEmbed, MessageType, Snowflake, TextChannel } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import { getDefaultPrefix } from "knub/dist/commands/commandUtils";
import { getDefaultMessageCommandPrefix, GuildPluginData } from "knub";
import moment from "moment-timezone";
import { MessageTypeStrings } from "src/types";
import { chunkMessageLines, EmbedWith, messageLink, preEmbedPadding, trimEmptyLines, trimLines } from "../../../utils";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
import { UtilityPluginType } from "../types";
@ -15,7 +13,7 @@ export async function getMessageInfoEmbed(
channelId: string,
messageId: string,
requestMemberId?: string,
): Promise<MessageEmbedOptions | null> {
): Promise<APIEmbed | null> {
const message = await (pluginData.guild.channels.resolve(channelId as Snowflake) as TextChannel).messages
.fetch(messageId as Snowflake)
.catch(() => null);
@ -25,13 +23,12 @@ export async function getMessageInfoEmbed(
const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
const embed: EmbedWith<"fields"> = {
const embed: EmbedWith<"fields" | "author"> = {
fields: [],
};
embed.author = {
name: `Message: ${message.id}`,
icon_url: MESSAGE_ICON,
author: {
name: `Message: ${message.id}`,
icon_url: MESSAGE_ICON,
},
};
const createdAt = moment.utc(message.createdAt, "x");
@ -58,17 +55,17 @@ export async function getMessageInfoEmbed(
const type =
{
[MessageTypeStrings.DEFAULT]: "Regular message",
[MessageTypeStrings.PINS_ADD]: "System message",
[MessageTypeStrings.GUILD_MEMBER_JOIN]: "System message",
[MessageTypeStrings.USER_PREMIUM_GUILD_SUBSCRIPTION]: "System message",
[MessageTypeStrings.USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1]: "System message",
[MessageTypeStrings.USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2]: "System message",
[MessageTypeStrings.USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3]: "System message",
[MessageTypeStrings.CHANNEL_FOLLOW_ADD]: "System message",
[MessageTypeStrings.GUILD_DISCOVERY_DISQUALIFIED]: "System message",
[MessageTypeStrings.GUILD_DISCOVERY_REQUALIFIED]: "System message",
}[message.type] || "Unknown";
[MessageType.Default]: "Regular message",
[MessageType.ChannelPinnedMessage]: "System message",
[MessageType.UserJoin]: "System message",
[MessageType.GuildBoost]: "System message",
[MessageType.GuildBoostTier1]: "System message",
[MessageType.GuildBoostTier2]: "System message",
[MessageType.GuildBoostTier3]: "System message",
[MessageType.ChannelFollowAdd]: "System message",
[MessageType.GuildDiscoveryDisqualified]: "System message",
[MessageType.GuildDiscoveryRequalified]: "System message",
}[message.type] ?? "Unknown";
embed.fields.push({
name: preEmbedPadding + "Message information",
@ -138,7 +135,7 @@ export async function getMessageInfoEmbed(
}
if (message.embeds.length) {
const prefix = pluginData.fullConfig.prefix || getDefaultPrefix(pluginData.client);
const prefix = pluginData.fullConfig.prefix || getDefaultMessageCommandPrefix(pluginData.client);
embed.fields.push({
name: preEmbedPadding + "Embeds",
value: `Message contains an embed, use \`${prefix}source\` to see the embed source`,

View file

@ -1,4 +1,4 @@
import { MessageEmbedOptions, Permissions, Role } from "discord.js";
import { APIEmbed, PermissionFlagsBits, Role } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
@ -13,18 +13,16 @@ export async function getRoleInfoEmbed(
pluginData: GuildPluginData<UtilityPluginType>,
role: Role,
requestMemberId?: string,
): Promise<MessageEmbedOptions> {
const embed: EmbedWith<"fields"> = {
): Promise<APIEmbed> {
const embed: EmbedWith<"fields" | "author" | "color"> = {
fields: [],
author: {
name: `Role: ${role.name}`,
icon_url: MENTION_ICON,
},
color: role.color,
};
embed.author = {
name: `Role: ${role.name}`,
icon_url: MENTION_ICON,
};
embed.color = role.color;
const createdAt = moment.utc(role.createdAt, "x");
const timeAndDate = pluginData.getPlugin(TimeAndDatePlugin);
const tzCreatedAt = requestMemberId
@ -36,8 +34,8 @@ export async function getRoleInfoEmbed(
round: true,
});
const rolePerms = role.permissions.has(Permissions.FLAGS.ADMINISTRATOR)
? [PERMISSION_NAMES.ADMINISTRATOR]
const rolePerms = role.permissions.has(PermissionFlagsBits.Administrator)
? [PERMISSION_NAMES.Administrator]
: role.permissions.toArray().map((p) => PERMISSION_NAMES[p]);
// -1 because of the @everyone role

View file

@ -1,8 +1,7 @@
import { MessageEmbedOptions, PremiumTier, Snowflake } from "discord.js";
import { APIEmbed, ChannelType, GuildPremiumTier, Snowflake } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
import { ChannelTypeStrings } from "../../../types";
import {
EmbedWith,
formatNumber,
@ -19,18 +18,11 @@ import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
import { UtilityPluginType } from "../types";
import { getGuildPreview } from "./getGuildPreview";
const PremiumTiers: Record<PremiumTier, number> = {
NONE: 0,
TIER_1: 1,
TIER_2: 2,
TIER_3: 3,
};
export async function getServerInfoEmbed(
pluginData: GuildPluginData<UtilityPluginType>,
serverId: string,
requestMemberId?: string,
): Promise<MessageEmbedOptions | null> {
): Promise<APIEmbed | null> {
const thisServer = serverId === pluginData.guild.id ? pluginData.guild : null;
const [restGuild, guildPreview] = await Promise.all([
thisServer
@ -54,7 +46,7 @@ export async function getServerInfoEmbed(
embed.author = {
name: `Server: ${(guildPreview || restGuild)!.name}`,
iconURL: (guildPreview || restGuild)!.iconURL() ?? undefined,
icon_url: (guildPreview || restGuild)!.iconURL() ?? undefined,
};
// BASIC INFORMATION
@ -90,10 +82,10 @@ export async function getServerInfoEmbed(
});
// IMAGE LINKS
const iconUrl = `[Link](${(restGuild || guildPreview)!.iconURL({ dynamic: true, format: "png", size: 2048 })})`;
const bannerUrl = restGuild?.banner ? `[Link](${restGuild.bannerURL({ format: "png", size: 2048 })})` : "None";
const iconUrl = `[Link](${(restGuild || guildPreview)!.iconURL({ size: 2048 })})`;
const bannerUrl = restGuild?.banner ? `[Link](${restGuild.bannerURL({ size: 2048 })})` : "None";
const splashUrl = (restGuild || guildPreview)!.splash
? `[Link](${(restGuild || guildPreview)!.splashURL({ format: "png", size: 2048 })})`
? `[Link](${(restGuild || guildPreview)!.splashURL({ size: 2048 })})`
: "None";
embed.fields.push(
@ -162,9 +154,14 @@ export async function getServerInfoEmbed(
// CHANNEL COUNTS
if (thisServer) {
const totalChannels = thisServer.channels.cache.size;
const categories = thisServer.channels.cache.filter((channel) => channel.type === ChannelTypeStrings.CATEGORY);
const textChannels = thisServer.channels.cache.filter((channel) => channel.type === ChannelTypeStrings.TEXT);
const voiceChannels = thisServer.channels.cache.filter((channel) => channel.type === ChannelTypeStrings.VOICE);
const categories = thisServer.channels.cache.filter((channel) => channel.type === ChannelType.GuildCategory);
const textChannels = thisServer.channels.cache.filter((channel) => channel.type === ChannelType.GuildText);
const voiceChannels = thisServer.channels.cache.filter((channel) => channel.type === ChannelType.GuildVoice);
const threadChannels = thisServer.channels.cache.filter((channel) => channel.isThread());
const announcementChannels = thisServer.channels.cache.filter(
(channel) => channel.type === ChannelType.GuildAnnouncement,
);
const stageChannels = thisServer.channels.cache.filter((channel) => channel.type === ChannelType.GuildStageVoice);
embed.fields.push({
name: preEmbedPadding + "Channels",
@ -172,8 +169,10 @@ export async function getServerInfoEmbed(
value: trimLines(`
Total: **${totalChannels}** / 500
Categories: **${categories.size}**
Text: **${textChannels.size}**
Text: **${textChannels.size}** (**${threadChannels.size} threads**)
Announcement: **${announcementChannels.size}**
Voice: **${voiceChannels.size}**
Stage: **${stageChannels.size}**
`),
});
}
@ -186,22 +185,20 @@ export async function getServerInfoEmbed(
}
if (restGuild) {
const premiumTierValue = PremiumTiers[restGuild.premiumTier];
const maxEmojis =
{
0: 50,
1: 100,
2: 150,
3: 250,
}[premiumTierValue] ?? 50;
[GuildPremiumTier.None]: 50,
[GuildPremiumTier.Tier1]: 100,
[GuildPremiumTier.Tier2]: 150,
[GuildPremiumTier.Tier3]: 250,
}[restGuild.premiumTier] ?? 50;
const maxStickers =
{
0: 0,
1: 15,
2: 30,
3: 60,
}[premiumTierValue] ?? 0;
[GuildPremiumTier.None]: 0,
[GuildPremiumTier.Tier1]: 15,
[GuildPremiumTier.Tier2]: 30,
[GuildPremiumTier.Tier3]: 60,
}[restGuild.premiumTier] ?? 0;
otherStats.push(`Emojis: **${restGuild.emojis.cache.size}** / ${maxEmojis * 2}`);
otherStats.push(`Stickers: **${restGuild.stickers.cache.size}** / ${maxStickers}`);
@ -211,9 +208,7 @@ export async function getServerInfoEmbed(
}
if (thisServer) {
otherStats.push(
`Boosts: **${thisServer.premiumSubscriptionCount ?? 0}** (level ${PremiumTiers[thisServer.premiumTier]})`,
);
otherStats.push(`Boosts: **${thisServer.premiumSubscriptionCount ?? 0}** (level ${thisServer.premiumTier})`);
}
embed.fields.push({

View file

@ -1,4 +1,4 @@
import { MessageEmbedOptions } from "discord.js";
import { APIEmbed } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
@ -14,14 +14,13 @@ export async function getSnowflakeInfoEmbed(
snowflake: string,
showUnknownWarning = false,
requestMemberId?: string,
): Promise<MessageEmbedOptions> {
const embed: EmbedWith<"fields"> = {
): Promise<APIEmbed> {
const embed: EmbedWith<"fields" | "author"> = {
fields: [],
};
embed.author = {
name: `Snowflake: ${snowflake}`,
icon_url: SNOWFLAKE_ICON,
author: {
name: `Snowflake: ${snowflake}`,
icon_url: SNOWFLAKE_ICON,
},
};
if (showUnknownWarning) {

View file

@ -1,4 +1,4 @@
import { MessageEmbedOptions, Role } from "discord.js";
import { APIEmbed } from "discord.js";
import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub";
import moment from "moment-timezone";
@ -28,7 +28,7 @@ export async function getUserInfoEmbed(
userId: string,
compact = false,
requestMemberId?: string,
): Promise<MessageEmbedOptions | null> {
): Promise<APIEmbed | null> {
const user = await resolveUser(pluginData.client, userId);
if (!user || user instanceof UnknownUser) {
return null;