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,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) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue