StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update djs & knub (#395)

Browse source 
* 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 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
Download patch file Download diff file Expand all files Collapse all files

43
backend/src/plugins/Utility/functions/getMessageInfoEmbed.ts
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`,