Update djs & knub (#395)
* 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 a80af1e729b742d1aad1097df538d224fbd32ce7. * 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
GitHub
parent
293115af22
commit
06877e90cc
476 changed files with 2965 additions and 3251 deletions
|
|
@ -1,12 +1,13 @@
|
|||
import { GuildMember, MessageEmbedOptions, Snowflake } from "discord.js";
|
||||
import { GuildMember, Snowflake } from "discord.js";
|
||||
import { PluginOptions } from "knub";
|
||||
import { GuildArchives } from "../../data/GuildArchives";
|
||||
import { GuildCases } from "../../data/GuildCases";
|
||||
import { GuildLogs } from "../../data/GuildLogs";
|
||||
import { GuildSavedMessages } from "../../data/GuildSavedMessages";
|
||||
import { Supporters } from "../../data/Supporters";
|
||||
import { sendSuccessMessage } from "../../pluginUtils";
|
||||
import { makeIoTsConfigParser, sendSuccessMessage } from "../../pluginUtils";
|
||||
import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners";
|
||||
import { LogsPlugin } from "../Logs/LogsPlugin";
|
||||
import { ModActionsPlugin } from "../ModActions/ModActionsPlugin";
|
||||
import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin";
|
||||
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
|
||||
|
|
@ -42,7 +43,6 @@ import { hasPermission } from "./functions/hasPermission";
|
|||
import { activeReloads } from "./guildReloads";
|
||||
import { refreshMembersIfNeeded } from "./refreshMembers";
|
||||
import { ConfigSchema, UtilityPluginType } from "./types";
|
||||
import { LogsPlugin } from "../Logs/LogsPlugin";
|
||||
|
||||
const defaultOptions: PluginOptions<UtilityPluginType> = {
|
||||
config: {
|
||||
|
|
@ -117,14 +117,15 @@ export const UtilityPlugin = zeppelinGuildPlugin<UtilityPluginType>()({
|
|||
showInDocs: true,
|
||||
info: {
|
||||
prettyName: "Utility",
|
||||
configSchema: ConfigSchema,
|
||||
},
|
||||
|
||||
dependencies: () => [TimeAndDatePlugin, ModActionsPlugin, LogsPlugin],
|
||||
configSchema: ConfigSchema,
|
||||
configParser: makeIoTsConfigParser(ConfigSchema),
|
||||
defaultOptions,
|
||||
|
||||
// prettier-ignore
|
||||
commands: [
|
||||
messageCommands: [
|
||||
SearchCmd,
|
||||
BanSearchCmd,
|
||||
UserInfoCmd,
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
import { GuildChannel, MessageOptions } from "discord.js";
|
||||
import { APIEmbed, GuildChannel } from "discord.js";
|
||||
import humanizeDuration from "humanize-duration";
|
||||
import LCL from "last-commit-log";
|
||||
import { shuffle } from "lodash";
|
||||
import moment from "moment-timezone";
|
||||
import { rootDir } from "../../../paths";
|
||||
import { getCurrentUptime } from "../../../uptime";
|
||||
import { multiSorter, resolveMember, sorter } from "../../../utils";
|
||||
import { resolveMember, sorter } from "../../../utils";
|
||||
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
|
||||
import { utilityCmd } from "../types";
|
||||
import { shuffle } from "lodash";
|
||||
|
||||
export const AboutCmd = utilityCmd({
|
||||
trigger: "about",
|
||||
|
|
@ -59,20 +59,16 @@ export const AboutCmd = utilityCmd({
|
|||
);
|
||||
loadedPlugins.sort();
|
||||
|
||||
const aboutContent: MessageOptions = {
|
||||
embeds: [
|
||||
const aboutEmbed: APIEmbed = {
|
||||
title: `About ${pluginData.client.user!.username}`,
|
||||
fields: [
|
||||
{
|
||||
title: `About ${pluginData.client.user!.username}`,
|
||||
fields: [
|
||||
{
|
||||
name: "Status",
|
||||
value: basicInfoRows.map(([label, value]) => `${label}: **${value}**`).join("\n"),
|
||||
},
|
||||
{
|
||||
name: `Loaded plugins on this server (${loadedPlugins.length})`,
|
||||
value: loadedPlugins.join(", "),
|
||||
},
|
||||
],
|
||||
name: "Status",
|
||||
value: basicInfoRows.map(([label, value]) => `${label}: **${value}**`).join("\n"),
|
||||
},
|
||||
{
|
||||
name: `Loaded plugins on this server (${loadedPlugins.length})`,
|
||||
value: loadedPlugins.join(", "),
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
@ -86,7 +82,7 @@ export const AboutCmd = utilityCmd({
|
|||
.map((s, i) => (i % 2 === 0 ? `**${s.name}**` : `__${s.name}__`))
|
||||
.join(" ");
|
||||
|
||||
aboutContent.embeds![0].fields!.push({
|
||||
aboutEmbed.fields!.push({
|
||||
name: "Zeppelin supporters 🎉",
|
||||
value:
|
||||
"These amazing people have supported Zeppelin development by pledging on [Patreon](https://www.patreon.com/zeppelinbot):\n\n" +
|
||||
|
|
@ -102,14 +98,14 @@ export const AboutCmd = utilityCmd({
|
|||
botRoles = botRoles.filter((r) => r.color); // Filter to those with a color
|
||||
botRoles.sort(sorter("position", "DESC")); // Sort by position (highest first)
|
||||
if (botRoles.length) {
|
||||
aboutContent.embeds![0].color = botRoles[0].color;
|
||||
aboutEmbed.color = botRoles[0].color;
|
||||
}
|
||||
|
||||
// Use the bot avatar as the embed image
|
||||
if (pluginData.client.user!.avatarURL()) {
|
||||
aboutContent.embeds![0].thumbnail = { url: pluginData.client.user!.avatarURL()! };
|
||||
aboutEmbed.thumbnail = { url: pluginData.client.user!.avatarURL()! };
|
||||
}
|
||||
|
||||
msg.channel.send(aboutContent);
|
||||
msg.channel.send({ embeds: [aboutEmbed] });
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { MessageEmbedOptions } from "discord.js";
|
||||
import { APIEmbed, ImageFormat } from "discord.js";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { sendErrorMessage } from "../../../pluginUtils";
|
||||
import { UnknownUser } from "../../../utils";
|
||||
|
|
@ -16,9 +16,9 @@ export const AvatarCmd = utilityCmd({
|
|||
async run({ message: msg, args, pluginData }) {
|
||||
const user = args.user || msg.author;
|
||||
if (!(user instanceof UnknownUser)) {
|
||||
const embed: MessageEmbedOptions = {
|
||||
const embed: APIEmbed = {
|
||||
image: {
|
||||
url: user.displayAvatarURL({ dynamic: true, format: "png", size: 2048 }),
|
||||
url: user.displayAvatarURL({ extension: ImageFormat.PNG, size: 2048 }),
|
||||
},
|
||||
title: `Avatar of ${user.tag}:`,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@ import { GuildPluginData } from "knub";
|
|||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { SavedMessage } from "../../../data/entities/SavedMessage";
|
||||
import { LogType } from "../../../data/LogType";
|
||||
import { humanizeDurationShort } from "../../../humanizeDurationShort";
|
||||
import { ModActionsPlugin } from "../../../plugins/ModActions/ModActionsPlugin";
|
||||
import { getBaseUrl, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
|
||||
import { allowTimeout } from "../../../RegExpRunner";
|
||||
import { DAYS, getInviteCodesInString, noop, SECONDS } from "../../../utils";
|
||||
import { utilityCmd, UtilityPluginType } from "../types";
|
||||
import { LogsPlugin } from "../../Logs/LogsPlugin";
|
||||
import { humanizeDurationShort } from "../../../humanizeDurationShort";
|
||||
import { utilityCmd, UtilityPluginType } from "../types";
|
||||
|
||||
const MAX_CLEAN_COUNT = 150;
|
||||
const MAX_CLEAN_TIME = 1 * DAYS;
|
||||
|
|
@ -81,7 +81,7 @@ export async function cleanCmd(pluginData: GuildPluginData<UtilityPluginType>, a
|
|||
}
|
||||
|
||||
const targetChannel = args.channel ? pluginData.guild.channels.cache.get(args.channel as Snowflake) : msg.channel;
|
||||
if (!targetChannel?.isText()) {
|
||||
if (!targetChannel?.isTextBased()) {
|
||||
sendErrorMessage(pluginData, msg.channel, `Invalid channel specified`);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { sendErrorMessage } from "../../../pluginUtils";
|
||||
import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed";
|
||||
import { getCustomEmojiId } from "../functions/getCustomEmojiId";
|
||||
import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed";
|
||||
import { utilityCmd } from "../types";
|
||||
|
||||
export const EmojiInfoCmd = utilityCmd({
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import { LoadedGuildPlugin } from "knub";
|
||||
import { PluginCommandDefinition } from "knub/dist/commands/commandUtils";
|
||||
import { LoadedGuildPlugin, PluginCommandDefinition } from "knub";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { createChunkedMessage } from "../../../utils";
|
||||
import { utilityCmd } from "../types";
|
||||
|
|
@ -24,7 +23,7 @@ export const HelpCmd = utilityCmd({
|
|||
|
||||
const guildData = pluginData.getKnubInstance().getLoadedGuild(pluginData.guild.id)!;
|
||||
for (const plugin of guildData.loadedPlugins.values()) {
|
||||
const registeredCommands = plugin.pluginData.commands.getAll();
|
||||
const registeredCommands = plugin.pluginData.messageCommands.getAll();
|
||||
for (const registeredCommand of registeredCommands) {
|
||||
for (const trigger of registeredCommand.originalTriggers) {
|
||||
const strTrigger = typeof trigger === "string" ? trigger : trigger.source;
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
import { Snowflake } from "discord.js";
|
||||
import { getChannelId, getRoleId } from "knub/dist/utils";
|
||||
import { getChannelId, getRoleId } from "knub/helpers";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { sendErrorMessage } from "../../../pluginUtils";
|
||||
import { isValidSnowflake, noop, parseInviteCodeInput, resolveInvite, resolveUser } from "../../../utils";
|
||||
import { getUserInfoEmbed } from "../functions/getUserInfoEmbed";
|
||||
import { canReadChannel } from "../../../utils/canReadChannel";
|
||||
import { resolveMessageTarget } from "../../../utils/resolveMessageTarget";
|
||||
import { getChannelInfoEmbed } from "../functions/getChannelInfoEmbed";
|
||||
import { getCustomEmojiId } from "../functions/getCustomEmojiId";
|
||||
import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed";
|
||||
import { getGuildPreview } from "../functions/getGuildPreview";
|
||||
import { getInviteInfoEmbed } from "../functions/getInviteInfoEmbed";
|
||||
import { getMessageInfoEmbed } from "../functions/getMessageInfoEmbed";
|
||||
import { getRoleInfoEmbed } from "../functions/getRoleInfoEmbed";
|
||||
import { getEmojiInfoEmbed } from "../functions/getEmojiInfoEmbed";
|
||||
import { getCustomEmojiId } from "../functions/getCustomEmojiId";
|
||||
import { utilityCmd } from "../types";
|
||||
import { getServerInfoEmbed } from "../functions/getServerInfoEmbed";
|
||||
import { getSnowflakeInfoEmbed } from "../functions/getSnowflakeInfoEmbed";
|
||||
import { getUserInfoEmbed } from "../functions/getUserInfoEmbed";
|
||||
import { utilityCmd } from "../types";
|
||||
|
||||
export const InfoCmd = utilityCmd({
|
||||
trigger: "info",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import { MessageAttachment } from "discord.js";
|
||||
import fs from "fs";
|
||||
import photon from "@silvia-odwyer/photon-node";
|
||||
import { AttachmentBuilder } from "discord.js";
|
||||
import fs from "fs";
|
||||
import twemoji from "twemoji";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { sendErrorMessage } from "../../../pluginUtils";
|
||||
|
|
@ -50,7 +50,7 @@ export const JumboCmd = utilityCmd({
|
|||
const emojiRegex = new RegExp(`(<.*:).*:(\\d+)`);
|
||||
const results = emojiRegex.exec(args.emoji);
|
||||
let extension = ".png";
|
||||
let file: MessageAttachment | undefined;
|
||||
let file: AttachmentBuilder | undefined;
|
||||
|
||||
if (!isEmoji(args.emoji)) {
|
||||
sendErrorMessage(pluginData, msg.channel, "Invalid emoji");
|
||||
|
|
@ -65,10 +65,10 @@ export const JumboCmd = utilityCmd({
|
|||
url += `${results[2]}${extension}`;
|
||||
if (extension === ".png") {
|
||||
const image = resizeBuffer(await getBufferFromUrl(url), size, size);
|
||||
file = new MessageAttachment(image, `emoji${extension}`);
|
||||
file = new AttachmentBuilder(image, { name: `emoji${extension}` });
|
||||
} else {
|
||||
const image = await getBufferFromUrl(url);
|
||||
file = new MessageAttachment(image, `emoji${extension}`);
|
||||
file = new AttachmentBuilder(image, { name: `emoji${extension}` });
|
||||
}
|
||||
} else {
|
||||
let url = `${twemoji.base}${twemoji.size}/${twemoji.convert.toCodePoint(args.emoji)}${twemoji.ext}`;
|
||||
|
|
@ -87,7 +87,7 @@ export const JumboCmd = utilityCmd({
|
|||
return;
|
||||
}
|
||||
|
||||
file = new MessageAttachment(image, "emoji.png");
|
||||
file = new AttachmentBuilder(image, { name: "emoji.png" });
|
||||
}
|
||||
|
||||
msg.channel.send({ files: [file] });
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { Util } from "discord.js";
|
||||
import { escapeBold } from "discord.js";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { errorMessage } from "../../../utils";
|
||||
import { canActOn, sendSuccessMessage } from "../../../pluginUtils";
|
||||
import { errorMessage } from "../../../utils";
|
||||
import { utilityCmd } from "../types";
|
||||
|
||||
export const NicknameCmd = utilityCmd({
|
||||
|
|
@ -20,7 +20,7 @@ export const NicknameCmd = utilityCmd({
|
|||
if (!args.member.nickname) {
|
||||
msg.channel.send(`<@!${args.member.id}> does not have a nickname`);
|
||||
} else {
|
||||
msg.channel.send(`The nickname of <@!${args.member.id}> is **${Util.escapeBold(args.member.nickname)}**`);
|
||||
msg.channel.send(`The nickname of <@!${args.member.id}> is **${escapeBold(args.member.nickname)}**`);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
import { Snowflake } from "discord.js";
|
||||
import moment from "moment-timezone";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { getBaseUrl, sendErrorMessage } from "../../../pluginUtils";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,8 @@
|
|||
import { VoiceChannel } from "discord.js";
|
||||
import {
|
||||
channelToTemplateSafeChannel,
|
||||
memberToTemplateSafeMember,
|
||||
userToTemplateSafeUser,
|
||||
} from "../../../utils/templateSafeObjects";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { LogType } from "../../../data/LogType";
|
||||
import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
|
||||
import { utilityCmd } from "../types";
|
||||
import { LogsPlugin } from "../../Logs/LogsPlugin";
|
||||
import { utilityCmd } from "../types";
|
||||
|
||||
export const VcdisconnectCmd = utilityCmd({
|
||||
trigger: ["vcdisconnect", "vcdisc", "vcdc", "vckick", "vck"],
|
||||
|
|
|
|||
|
|
@ -1,16 +1,9 @@
|
|||
import { Snowflake, VoiceChannel } from "discord.js";
|
||||
import {
|
||||
channelToTemplateSafeChannel,
|
||||
memberToTemplateSafeMember,
|
||||
userToTemplateSafeUser,
|
||||
} from "../../../utils/templateSafeObjects";
|
||||
import { ChannelType, Snowflake, VoiceChannel } from "discord.js";
|
||||
import { commandTypeHelpers as ct } from "../../../commandTypes";
|
||||
import { LogType } from "../../../data/LogType";
|
||||
import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
|
||||
import { channelMentionRegex, isSnowflake, simpleClosestStringMatch } from "../../../utils";
|
||||
import { utilityCmd } from "../types";
|
||||
import { ChannelTypeStrings } from "../../../types";
|
||||
import { LogsPlugin } from "../../Logs/LogsPlugin";
|
||||
import { utilityCmd } from "../types";
|
||||
|
||||
export const VcmoveCmd = utilityCmd({
|
||||
trigger: "vcmove",
|
||||
|
|
@ -48,7 +41,7 @@ export const VcmoveCmd = utilityCmd({
|
|||
} else {
|
||||
// Search string -> find closest matching voice channel name
|
||||
const voiceChannels = [...pluginData.guild.channels.cache.values()].filter(
|
||||
(c): c is VoiceChannel => c.type === ChannelTypeStrings.VOICE,
|
||||
(c): c is VoiceChannel => c.type === ChannelType.GuildVoice,
|
||||
);
|
||||
const closestMatch = simpleClosestStringMatch(args.channel, voiceChannels, (ch) => ch.name);
|
||||
if (!closestMatch) {
|
||||
|
|
@ -127,7 +120,7 @@ export const VcmoveAllCmd = utilityCmd({
|
|||
} else {
|
||||
// Search string -> find closest matching voice channel name
|
||||
const voiceChannels = [...pluginData.guild.channels.cache.values()].filter(
|
||||
(c): c is VoiceChannel => c.type === ChannelTypeStrings.VOICE,
|
||||
(c): c is VoiceChannel => c.type === ChannelType.GuildVoice,
|
||||
);
|
||||
const closestMatch = simpleClosestStringMatch(args.channel, voiceChannels, (ch) => ch.name);
|
||||
if (!closestMatch) {
|
||||
|
|
|
|||
|
|
@ -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}`),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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}**
|
||||
|
|
|
|||
|
|
@ -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)}**
|
||||
`),
|
||||
|
|
|
|||
|
|
@ -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`,
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,16 @@
|
|||
import {
|
||||
ActionRowBuilder,
|
||||
ButtonBuilder,
|
||||
ButtonStyle,
|
||||
GuildMember,
|
||||
Message,
|
||||
MessageActionRow,
|
||||
MessageButton,
|
||||
MessageComponentInteraction,
|
||||
Permissions,
|
||||
PermissionsBitField,
|
||||
Snowflake,
|
||||
TextChannel,
|
||||
User,
|
||||
} from "discord.js";
|
||||
import escapeStringRegexp from "escape-string-regexp";
|
||||
import { GuildPluginData } from "knub";
|
||||
import { ArgsFromSignatureOrArray } from "knub/dist/commands/commandUtils";
|
||||
import { ArgsFromSignatureOrArray, GuildPluginData } from "knub";
|
||||
import moment from "moment-timezone";
|
||||
import { getBaseUrl, sendErrorMessage } from "../../pluginUtils";
|
||||
import { allowTimeout, RegExpRunner } from "../../RegExpRunner";
|
||||
|
|
@ -116,12 +115,12 @@ export async function displaySearch(
|
|||
}
|
||||
} catch (e) {
|
||||
if (e instanceof SearchError) {
|
||||
sendErrorMessage(pluginData, msg.channel as TextChannel, e.message);
|
||||
sendErrorMessage(pluginData, msg.channel, e.message);
|
||||
return;
|
||||
}
|
||||
|
||||
if (e instanceof InvalidRegexError) {
|
||||
sendErrorMessage(pluginData, msg.channel as TextChannel, e.message);
|
||||
sendErrorMessage(pluginData, msg.channel, e.message);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -129,7 +128,7 @@ export async function displaySearch(
|
|||
}
|
||||
|
||||
if (searchResult.totalResults === 0) {
|
||||
sendErrorMessage(pluginData, msg.channel as TextChannel, "No results found");
|
||||
sendErrorMessage(pluginData, msg.channel, "No results found");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -169,23 +168,21 @@ export async function displaySearch(
|
|||
// Set up pagination reactions if needed. The reactions are cleared after a timeout.
|
||||
if (searchResult.totalResults > perPage) {
|
||||
const idMod = `${searchMsg.id}:${moment.utc().valueOf()}`;
|
||||
const buttons: MessageButton[] = [];
|
||||
|
||||
buttons.push(
|
||||
new MessageButton()
|
||||
.setStyle("SECONDARY")
|
||||
const buttons: ButtonBuilder[] = [
|
||||
new ButtonBuilder()
|
||||
.setStyle(ButtonStyle.Secondary)
|
||||
.setEmoji("⬅")
|
||||
.setCustomId(`previousButton:${idMod}`)
|
||||
.setDisabled(currentPage === 1),
|
||||
new MessageButton()
|
||||
.setStyle("SECONDARY")
|
||||
new ButtonBuilder()
|
||||
.setStyle(ButtonStyle.Secondary)
|
||||
.setEmoji("➡")
|
||||
.setCustomId(`nextButton:${idMod}`)
|
||||
.setDisabled(currentPage === searchResult.lastPage),
|
||||
new MessageButton().setStyle("SECONDARY").setEmoji("🔄").setCustomId(`reloadButton:${idMod}`),
|
||||
);
|
||||
new ButtonBuilder().setStyle(ButtonStyle.Secondary).setEmoji("🔄").setCustomId(`reloadButton:${idMod}`),
|
||||
];
|
||||
|
||||
const row = new MessageActionRow().addComponents(buttons);
|
||||
const row = new ActionRowBuilder<ButtonBuilder>().addComponents(buttons);
|
||||
await searchMsg.edit({ content: result, components: [row] });
|
||||
|
||||
const collector = searchMsg.createMessageComponentCollector({ time: 2 * MINUTES });
|
||||
|
|
@ -194,6 +191,7 @@ export async function displaySearch(
|
|||
if (msg.author.id !== interaction.user.id) {
|
||||
interaction
|
||||
.reply({ content: `You are not permitted to use these buttons.`, ephemeral: true })
|
||||
// tslint:disable-next-line no-console
|
||||
.catch((err) => console.trace(err.message));
|
||||
} else {
|
||||
if (interaction.customId === `previousButton:${idMod}` && currentPage > 1) {
|
||||
|
|
@ -261,12 +259,12 @@ export async function archiveSearch(
|
|||
}
|
||||
} catch (e) {
|
||||
if (e instanceof SearchError) {
|
||||
sendErrorMessage(pluginData, msg.channel as TextChannel, e.message);
|
||||
sendErrorMessage(pluginData, msg.channel, e.message);
|
||||
return;
|
||||
}
|
||||
|
||||
if (e instanceof InvalidRegexError) {
|
||||
sendErrorMessage(pluginData, msg.channel as TextChannel, e.message);
|
||||
sendErrorMessage(pluginData, msg.channel, e.message);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -274,7 +272,7 @@ export async function archiveSearch(
|
|||
}
|
||||
|
||||
if (results.totalResults === 0) {
|
||||
sendErrorMessage(pluginData, msg.channel as TextChannel, "No results found");
|
||||
sendErrorMessage(pluginData, msg.channel, "No results found");
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -430,7 +428,7 @@ async function performBanSearch(
|
|||
perPage = SEARCH_RESULTS_PER_PAGE,
|
||||
): Promise<{ results: User[]; totalResults: number; page: number; lastPage: number; from: number; to: number }> {
|
||||
const member = pluginData.guild.members.cache.get(pluginData.client.user!.id);
|
||||
if (member && !hasDiscordPermissions(member.permissions, Permissions.FLAGS.BAN_MEMBERS)) {
|
||||
if (member && !hasDiscordPermissions(member.permissions, PermissionsBitField.Flags.BanMembers)) {
|
||||
throw new SearchError(`Unable to search bans: missing "Ban Members" permission`);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import * as t from "io-ts";
|
||||
import { BasePluginType, typedGuildCommand, typedGuildEventListener } from "knub";
|
||||
import { BasePluginType, guildPluginEventListener, guildPluginMessageCommand } from "knub";
|
||||
import { GuildArchives } from "../../data/GuildArchives";
|
||||
import { GuildCases } from "../../data/GuildCases";
|
||||
import { GuildLogs } from "../../data/GuildLogs";
|
||||
|
|
@ -52,5 +52,5 @@ export interface UtilityPluginType extends BasePluginType {
|
|||
};
|
||||
}
|
||||
|
||||
export const utilityCmd = typedGuildCommand<UtilityPluginType>();
|
||||
export const utilityEvt = typedGuildEventListener<UtilityPluginType>();
|
||||
export const utilityCmd = guildPluginMessageCommand<UtilityPluginType>();
|
||||
export const utilityEvt = guildPluginEventListener<UtilityPluginType>();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue