3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 22:21:51 +00:00

More fixes, change rest of stripObjectToScalars to configAccessibleObj

This commit is contained in:
Dark 2021-07-21 22:14:09 +02:00
parent 4ad99975de
commit acb4913495
No known key found for this signature in database
GPG key ID: 384C4B4F5B1E25A8
66 changed files with 623 additions and 192 deletions

View file

@ -14,7 +14,7 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"deep-diff": "^1.0.2", "deep-diff": "^1.0.2",
"discord.js": "^13.0.0-dev.2e078e4.1625529824", "discord.js": "^13.0.0-dev.07017a9.1626869177",
"dotenv": "^4.0.0", "dotenv": "^4.0.0",
"emoji-regex": "^8.0.0", "emoji-regex": "^8.0.0",
"erlpack": "github:discord/erlpack", "erlpack": "github:discord/erlpack",
@ -81,8 +81,8 @@
"version": "30.0.0-beta.38", "version": "30.0.0-beta.38",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"discord-api-types": "^0.18.1", "discord-api-types": "^0.19.0-next.836e8fb.1625574825",
"discord.js": "^13.0.0-dev.2e078e4.1625529824", "discord.js": "^13.0.0-dev.07017a9.1626869177",
"knub-command-manager": "^9.1.0", "knub-command-manager": "^9.1.0",
"ts-essentials": "^6.0.7" "ts-essentials": "^6.0.7"
}, },
@ -2159,9 +2159,9 @@
} }
}, },
"node_modules/discord.js": { "node_modules/discord.js": {
"version": "13.0.0-dev.2e078e4.1625529824", "version": "13.0.0-dev.07017a9.1626869177",
"resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.2e078e4.1625529824.tgz", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.07017a9.1626869177.tgz",
"integrity": "sha512-NKNnoEmh3+4eCG44BOIBjlJS0bKQEH8OgWoEjdJ9K53MYa5lfqbSho4NKXe5+hVpMr+U43wJ8ByUvw96ogqu8w==", "integrity": "sha512-awnE/59Sy6tnoAZUP7/f8tudcDT68WXxK0pgZZpA7WTGfyR5+IokWsFmkbS49dDll7OZQbi+L8iRt8ahYo3PGQ==",
"dependencies": { "dependencies": {
"@discordjs/builders": "^0.2.0", "@discordjs/builders": "^0.2.0",
"@discordjs/collection": "^0.1.6", "@discordjs/collection": "^0.1.6",
@ -2169,7 +2169,7 @@
"@sapphire/async-queue": "^1.1.4", "@sapphire/async-queue": "^1.1.4",
"@types/ws": "^7.4.5", "@types/ws": "^7.4.5",
"abort-controller": "^3.0.0", "abort-controller": "^3.0.0",
"discord-api-types": "^0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e", "discord-api-types": "^0.19.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"ws": "^7.5.1" "ws": "^7.5.1"
}, },
@ -2179,9 +2179,9 @@
} }
}, },
"node_modules/discord.js/node_modules/discord-api-types": { "node_modules/discord.js/node_modules/discord-api-types": {
"version": "0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e", "version": "0.19.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e.tgz", "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.19.0.tgz",
"integrity": "sha512-ttRA/8e/WKHDbGFfED5WlS7gID+kalmNr6iMiWBCvkphQ7kFHiTOVbnj/zX9ksaRaYXp/I38SCQ+qZvLu8DJZg==", "integrity": "sha512-t2HKLd43Lbe+rf+ffYfKVv9Kk5f6p7sFqvO6CMV55ZB0PgZv8WigCkt9FoJciYo5S3Q6CGYK+WnE/ZG+6vkBDQ==",
"engines": { "engines": {
"node": ">=12" "node": ">=12"
} }
@ -8034,9 +8034,9 @@
"integrity": "sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg==" "integrity": "sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg=="
}, },
"discord.js": { "discord.js": {
"version": "13.0.0-dev.2e078e4.1625529824", "version": "13.0.0-dev.07017a9.1626869177",
"resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.2e078e4.1625529824.tgz", "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-13.0.0-dev.07017a9.1626869177.tgz",
"integrity": "sha512-NKNnoEmh3+4eCG44BOIBjlJS0bKQEH8OgWoEjdJ9K53MYa5lfqbSho4NKXe5+hVpMr+U43wJ8ByUvw96ogqu8w==", "integrity": "sha512-awnE/59Sy6tnoAZUP7/f8tudcDT68WXxK0pgZZpA7WTGfyR5+IokWsFmkbS49dDll7OZQbi+L8iRt8ahYo3PGQ==",
"requires": { "requires": {
"@discordjs/builders": "^0.2.0", "@discordjs/builders": "^0.2.0",
"@discordjs/collection": "^0.1.6", "@discordjs/collection": "^0.1.6",
@ -8044,15 +8044,15 @@
"@sapphire/async-queue": "^1.1.4", "@sapphire/async-queue": "^1.1.4",
"@types/ws": "^7.4.5", "@types/ws": "^7.4.5",
"abort-controller": "^3.0.0", "abort-controller": "^3.0.0",
"discord-api-types": "^0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e", "discord-api-types": "^0.19.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"ws": "^7.5.1" "ws": "^7.5.1"
}, },
"dependencies": { "dependencies": {
"discord-api-types": { "discord-api-types": {
"version": "0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e", "version": "0.19.0",
"resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e.tgz", "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.19.0.tgz",
"integrity": "sha512-ttRA/8e/WKHDbGFfED5WlS7gID+kalmNr6iMiWBCvkphQ7kFHiTOVbnj/zX9ksaRaYXp/I38SCQ+qZvLu8DJZg==" "integrity": "sha512-t2HKLd43Lbe+rf+ffYfKVv9Kk5f6p7sFqvO6CMV55ZB0PgZv8WigCkt9FoJciYo5S3Q6CGYK+WnE/ZG+6vkBDQ=="
} }
} }
}, },
@ -8877,8 +8877,8 @@
"@typescript-eslint/eslint-plugin": "^4.23.0", "@typescript-eslint/eslint-plugin": "^4.23.0",
"@typescript-eslint/parser": "^4.23.0", "@typescript-eslint/parser": "^4.23.0",
"chai": "^4.3.4", "chai": "^4.3.4",
"discord-api-types": "^0.18.1", "discord-api-types": "^0.19.0-next.836e8fb.1625574825",
"discord.js": "^13.0.0-dev.2e078e4.1625529824", "discord.js": "^13.0.0-dev.07017a9.1626869177",
"eslint": "^7.2.0", "eslint": "^7.2.0",
"husky": "^4.3.8", "husky": "^4.3.8",
"knub-command-manager": "^9.1.0", "knub-command-manager": "^9.1.0",

View file

@ -29,7 +29,7 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"deep-diff": "^1.0.2", "deep-diff": "^1.0.2",
"discord.js": "^13.0.0-dev.2e078e4.1625529824", "discord.js": "^13.0.0-dev.07017a9.1626869177",
"dotenv": "^4.0.0", "dotenv": "^4.0.0",
"emoji-regex": "^8.0.0", "emoji-regex": "^8.0.0",
"erlpack": "github:discord/erlpack", "erlpack": "github:discord/erlpack",

View file

@ -1,5 +1,6 @@
import { Guild, Snowflake } from "discord.js"; import { Guild, Snowflake } from "discord.js";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { isDefaultSticker } from "src/utils/isDefaultSticker";
import { getRepository, Repository } from "typeorm"; import { getRepository, Repository } from "typeorm";
import { renderTemplate } from "../templateFormatter"; import { renderTemplate } from "../templateFormatter";
import { trimLines } from "../utils"; import { trimLines } from "../utils";
@ -13,7 +14,7 @@ const MESSAGE_ARCHIVE_HEADER_FORMAT = trimLines(`
Server: {guild.name} ({guild.id}) Server: {guild.name} ({guild.id})
`); `);
const MESSAGE_ARCHIVE_MESSAGE_FORMAT = const MESSAGE_ARCHIVE_MESSAGE_FORMAT =
"[#{channel.name}] [{user.id}] [{timestamp}] {user.username}#{user.discriminator}: {content}{attachments}"; "[#{channel.name}] [{user.id}] [{timestamp}] {user.username}#{user.discriminator}: {content}{attachments}{stickers}";
export class GuildArchives extends BaseGuildRepository { export class GuildArchives extends BaseGuildRepository {
protected archives: Repository<ArchiveEntry>; protected archives: Repository<ArchiveEntry>;
@ -80,6 +81,12 @@ export class GuildArchives extends BaseGuildRepository {
id: msg.id, id: msg.id,
timestamp: moment.utc(msg.posted_at).format("YYYY-MM-DD HH:mm:ss"), timestamp: moment.utc(msg.posted_at).format("YYYY-MM-DD HH:mm:ss"),
content: msg.data.content, content: msg.data.content,
attachments: msg.data.attachments?.map(att => {
return JSON.stringify({ name: att.name, url: att.url, type: att.contentType });
}),
stickers: msg.data.stickers?.map(sti => {
return JSON.stringify({ name: sti.name, id: sti.id, isDefault: isDefaultSticker(sti.id) });
}),
user, user,
channel, channel,
}); });

View file

@ -1,6 +1,7 @@
import { GuildChannel, Message } from "discord.js"; import { GuildChannel, Message } from "discord.js";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { getRepository, Repository } from "typeorm"; import { getRepository, Repository } from "typeorm";
import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
import { isAPI } from "../globals"; import { isAPI } from "../globals";
import { QueuedEventEmitter } from "../QueuedEventEmitter"; import { QueuedEventEmitter } from "../QueuedEventEmitter";
import { MINUTES, SECONDS } from "../utils"; import { MINUTES, SECONDS } from "../utils";
@ -222,7 +223,7 @@ export class GuildSavedMessages extends BaseGuildRepository {
// FIXME? // FIXME?
{ id }, { id },
{ {
data: newData, data: newData as QueryDeepPartialEntity<ISavedMessageData>,
}, },
); );

View file

@ -1,4 +1,4 @@
import { Client, Intents, TextChannel } from "discord.js"; import { Client, Collection, Intents, Options, TextChannel } from "discord.js";
import fs from "fs"; import fs from "fs";
import yaml from "js-yaml"; import yaml from "js-yaml";
import { Knub, PluginError } from "knub"; import { Knub, PluginError } from "knub";
@ -166,7 +166,7 @@ connect().then(async () => {
// Regular // Regular
Intents.FLAGS.DIRECT_MESSAGES, Intents.FLAGS.DIRECT_MESSAGES,
Intents.FLAGS.GUILD_BANS, Intents.FLAGS.GUILD_BANS,
Intents.FLAGS.GUILD_EMOJIS, Intents.FLAGS.GUILD_EMOJIS_AND_STICKERS,
Intents.FLAGS.GUILD_INVITES, Intents.FLAGS.GUILD_INVITES,
Intents.FLAGS.GUILD_MESSAGE_REACTIONS, Intents.FLAGS.GUILD_MESSAGE_REACTIONS,
Intents.FLAGS.GUILD_MESSAGES, Intents.FLAGS.GUILD_MESSAGES,

View file

@ -1,9 +1,10 @@
import { Permissions, Snowflake, TextChannel } from "discord.js"; import { Permissions, Snowflake, TextChannel, User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
import { resolveUser, stripObjectToScalars, verboseChannelMention } from "../../../utils"; import { resolveUser, verboseChannelMention } from "../../../utils";
import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions"; import { hasDiscordPermissions } from "../../../utils/hasDiscordPermissions";
import { LogsPlugin } from "../../Logs/LogsPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
@ -60,8 +61,8 @@ export async function deleteNextItem(pluginData: GuildPluginData<AutoDeletePlugi
pluginData.state.guildLogs.log(LogType.MESSAGE_DELETE_AUTO, { pluginData.state.guildLogs.log(LogType.MESSAGE_DELETE_AUTO, {
message: itemToDelete.message, message: itemToDelete.message,
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
messageDate, messageDate,
}); });
} }

View file

@ -1,12 +1,12 @@
import { MessageOptions, Permissions, Snowflake, TextChannel, User } from "discord.js"; import { MessageOptions, Permissions, Snowflake, TextChannel, User } from "discord.js";
import * as t from "io-ts"; import * as t from "io-ts";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { renderTemplate } from "../../../templateFormatter"; import { renderTemplate } from "../../../templateFormatter";
import { import {
convertDelayStringToMS, convertDelayStringToMS,
noop, noop,
renderRecursively, renderRecursively,
stripObjectToScalars,
tDelayString, tDelayString,
tMessageContent, tMessageContent,
tNullable, tNullable,
@ -48,7 +48,7 @@ export const ReplyAction = automodAction({
const renderReplyText = async str => const renderReplyText = async str =>
renderTemplate(str, { renderTemplate(str, {
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
}); });
const formatted = const formatted =
typeof actionConfig === "string" typeof actionConfig === "string"

View file

@ -1,7 +1,7 @@
import { User } from "discord.js"; import { User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { stripObjectToScalars } from "../../../utils";
import { LogsPlugin } from "../../Logs/LogsPlugin"; import { LogsPlugin } from "../../Logs/LogsPlugin";
import { runAutomodOnAntiraidLevel } from "../events/runAutomodOnAntiraidLevel"; import { runAutomodOnAntiraidLevel } from "../events/runAutomodOnAntiraidLevel";
import { AutomodPluginType } from "../types"; import { AutomodPluginType } from "../types";
@ -21,7 +21,7 @@ export async function setAntiraidLevel(
if (user) { if (user) {
logs.log(LogType.SET_ANTIRAID_USER, { logs.log(LogType.SET_ANTIRAID_USER, {
level: newLevel ?? "off", level: newLevel ?? "off",
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
}); });
} else { } else {
logs.log(LogType.SET_ANTIRAID_AUTO, { logs.log(LogType.SET_ANTIRAID_AUTO, {

View file

@ -1,9 +1,10 @@
import { Snowflake, TextChannel } from "discord.js"; import { Snowflake, TextChannel, User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { deactivateMentions, disableCodeBlocks } from "knub/dist/helpers"; import { deactivateMentions, disableCodeBlocks } from "knub/dist/helpers";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveUser } from "../../../utils";
import { CensorPluginType } from "../types"; import { CensorPluginType } from "../types";
export async function censorMessage( export async function censorMessage(
@ -21,11 +22,11 @@ export async function censorMessage(
} }
const user = await resolveUser(pluginData.client, savedMessage.user_id); const user = await resolveUser(pluginData.client, savedMessage.user_id);
const channel = pluginData.guild.channels.cache.get(savedMessage.channel_id as Snowflake); const channel = pluginData.guild.channels.resolve(savedMessage.channel_id as Snowflake)!;
pluginData.state.serverLogs.log(LogType.CENSOR, { pluginData.state.serverLogs.log(LogType.CENSOR, {
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
reason, reason,
message: savedMessage, message: savedMessage,
messageText: disableCodeBlocks(deactivateMentions(savedMessage.data.content)), messageText: disableCodeBlocks(deactivateMentions(savedMessage.data.content)),

View file

@ -1,11 +1,14 @@
import { MessageAttachment, MessageOptions, TextChannel } from "discord.js"; import { MessageAttachment, MessageOptions, TextChannel, ThreadChannel } from "discord.js";
import fs from "fs"; import fs from "fs";
import { downloadFile } from "../../utils"; import { downloadFile } from "../../utils";
const fsp = fs.promises; const fsp = fs.promises;
const MAX_ATTACHMENT_REHOST_SIZE = 1024 * 1024 * 8; const MAX_ATTACHMENT_REHOST_SIZE = 1024 * 1024 * 8;
export async function rehostAttachment(attachment: MessageAttachment, targetChannel: TextChannel): Promise<string> { export async function rehostAttachment(
attachment: MessageAttachment,
targetChannel: TextChannel | ThreadChannel,
): Promise<string> {
if (attachment.size > MAX_ATTACHMENT_REHOST_SIZE) { if (attachment.size > MAX_ATTACHMENT_REHOST_SIZE) {
return "Attachment too big to rehost"; return "Attachment too big to rehost";
} }

View file

@ -1,5 +1,5 @@
import { CooldownManager } from "knub"; import { CooldownManager } from "knub";
import { GuildLogs } from "../../../data/GuildLogs"; import { GuildLogs } from "../../data/GuildLogs";
import { trimPluginDescription } from "../../utils"; import { trimPluginDescription } from "../../utils";
import { LogsPlugin } from "../Logs/LogsPlugin"; import { LogsPlugin } from "../Logs/LogsPlugin";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint"; import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";

View file

@ -2,7 +2,6 @@ import humanizeDuration from "humanize-duration";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects"; import { memberToConfigAccessibleMember } from "../../../utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { stripObjectToScalars } from "../../../utils";
import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CasesPlugin } from "../../Cases/CasesPlugin";
import { logsEvt } from "../types"; import { logsEvt } from "../types";
@ -20,7 +19,7 @@ export const LogsGuildMemberAddEvt = logsEvt({
}); });
pluginData.state.guildLogs.log(LogType.MEMBER_JOIN, { pluginData.state.guildLogs.log(LogType.MEMBER_JOIN, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member),
new: member.user.createdTimestamp >= newThreshold ? " :new:" : "", new: member.user.createdTimestamp >= newThreshold ? " :new:" : "",
account_age: accountAge, account_age: accountAge,
}); });

View file

@ -27,8 +27,8 @@ export const LogsGuildMemberUpdateEvt = logsEvt({
} }
if (!isEqual(oldMember.roles, member.roles)) { if (!isEqual(oldMember.roles, member.roles)) {
const addedRoles = diff(member.roles, oldMember.roles); const addedRoles = diff(member.roles.cache.keyArray(), oldMember.roles.cache.keyArray());
const removedRoles = diff(oldMember.roles, member.roles); const removedRoles = diff(oldMember.roles.cache.keyArray(), member.roles.cache.keyArray());
let skip = false; let skip = false;
if ( if (

View file

@ -1,15 +1,16 @@
import { MessageAttachment, Snowflake } from "discord.js"; import { MessageAttachment, Snowflake, User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { resolveUser, stripObjectToScalars, useMediaUrls } from "../../../utils"; import { resolveUser, useMediaUrls } from "../../../utils";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin"; import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types"; import { FORMAT_NO_TIMESTAMP, LogsPluginType } from "../types";
export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType>, savedMessage: SavedMessage) { export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType>, savedMessage: SavedMessage) {
const user = await resolveUser(pluginData.client, savedMessage.user_id); const user = await resolveUser(pluginData.client, savedMessage.user_id);
const channel = pluginData.guild.channels.cache.get(savedMessage.channel_id as Snowflake); const channel = pluginData.guild.channels.resolve(savedMessage.channel_id as Snowflake)!;
if (user) { if (user) {
// Replace attachment URLs with media URLs // Replace attachment URLs with media URLs
@ -27,8 +28,8 @@ export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType
pluginData.state.guildLogs.log( pluginData.state.guildLogs.log(
LogType.MESSAGE_DELETE, LogType.MESSAGE_DELETE,
{ {
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
messageDate: pluginData messageDate: pluginData
.getPlugin(TimeAndDatePlugin) .getPlugin(TimeAndDatePlugin)
.inGuildTz(moment.utc(savedMessage.data.timestamp, "x")) .inGuildTz(moment.utc(savedMessage.data.timestamp, "x"))
@ -42,7 +43,7 @@ export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType
LogType.MESSAGE_DELETE_BARE, LogType.MESSAGE_DELETE_BARE,
{ {
messageId: savedMessage.id, messageId: savedMessage.id,
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
}, },
savedMessage.id, savedMessage.id,
); );

View file

@ -1,6 +1,7 @@
import { MessageEmbed, Snowflake } from "discord.js"; import { MessageEmbed, Snowflake, User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import cloneDeep from "lodash.clonedeep"; import cloneDeep from "lodash.clonedeep";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveUser, stripObjectToScalars } from "../../../utils";
@ -47,11 +48,11 @@ export async function onMessageUpdate(
} }
const user = await resolveUser(pluginData.client, savedMessage.user_id); const user = await resolveUser(pluginData.client, savedMessage.user_id);
const channel = pluginData.guild.channels.cache.get(savedMessage.channel_id as Snowflake); const channel = pluginData.guild.channels.resolve(savedMessage.channel_id as Snowflake)!;
pluginData.state.guildLogs.log(LogType.MESSAGE_EDIT, { pluginData.state.guildLogs.log(LogType.MESSAGE_EDIT, {
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
before: oldSavedMessage, before: oldSavedMessage,
after: savedMessage, after: savedMessage,
}); });

View file

@ -1,10 +1,10 @@
import { Message, Snowflake, TextChannel } from "discord.js"; import { Message, Snowflake, TextChannel, ThreadChannel } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { MessageSaverPluginType } from "./types"; import { MessageSaverPluginType } from "./types";
export async function saveMessagesToDB( export async function saveMessagesToDB(
pluginData: GuildPluginData<MessageSaverPluginType>, pluginData: GuildPluginData<MessageSaverPluginType>,
channel: TextChannel, channel: TextChannel | ThreadChannel,
ids: string[], ids: string[],
) { ) {
const failed: string[] = []; const failed: string[] = [];

View file

@ -1,10 +1,11 @@
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { resolveMember, resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveMember, resolveUser } from "../../../utils";
import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments";
import { modActionsCmd } from "../types"; import { modActionsCmd } from "../types";
@ -83,7 +84,7 @@ export const AddCaseCmd = modActionsCmd({
// Log the action // Log the action
pluginData.state.serverLogs.log(LogType.CASE_CREATE, { pluginData.state.serverLogs.log(LogType.CASE_CREATE, {
mod: stripObjectToScalars(mod.user), mod: userToConfigAccessibleUser(mod.user),
userId: user.id, userId: user.id,
caseNum: theCase.case_number, caseNum: theCase.case_number,
caseType: type.toUpperCase(), caseType: type.toUpperCase(),

View file

@ -1,11 +1,13 @@
import { User } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { getMemberLevel } from "knub/dist/helpers"; import { getMemberLevel } from "knub/dist/helpers";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { resolveMember, resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveMember, resolveUser } from "../../../utils";
import { banLock } from "../../../utils/lockNameHelpers"; import { banLock } from "../../../utils/lockNameHelpers";
import { waitForButtonConfirm } from "../../../utils/waitForInteraction"; import { waitForButtonConfirm } from "../../../utils/waitForInteraction";
import { banUserId } from "../functions/banUserId"; import { banUserId } from "../functions/banUserId";
@ -109,8 +111,8 @@ export const BanCmd = modActionsCmd({
}); });
const logtype = time ? LogType.MEMBER_TIMED_BAN : LogType.MEMBER_BAN; const logtype = time ? LogType.MEMBER_TIMED_BAN : LogType.MEMBER_BAN;
pluginData.state.serverLogs.log(logtype, { pluginData.state.serverLogs.log(logtype, {
mod: stripObjectToScalars(mod.user), mod: userToConfigAccessibleUser(mod.user),
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,
banTime: time ? humanizeDuration(time) : null, banTime: time ? humanizeDuration(time) : null,

View file

@ -1,5 +1,6 @@
import { TextChannel } from "discord.js"; import { TextChannel } from "discord.js";
import { helpers } from "knub"; import { helpers } from "knub";
import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -81,7 +82,7 @@ export const DeleteCaseCmd = modActionsCmd({
const logs = pluginData.getPlugin(LogsPlugin); const logs = pluginData.getPlugin(LogsPlugin);
logs.log(LogType.CASE_DELETE, { logs.log(LogType.CASE_DELETE, {
mod: stripObjectToScalars(message.member, ["user", "roles"]), mod: memberToConfigAccessibleMember(message.member),
case: stripObjectToScalars(theCase), case: stripObjectToScalars(theCase),
}); });
} }

View file

@ -1,10 +1,11 @@
import { Snowflake } from "discord.js"; import { Snowflake } from "discord.js";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { resolveMember, resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveMember, resolveUser } from "../../../utils";
import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments";
import { ignoreEvent } from "../functions/ignoreEvent"; import { ignoreEvent } from "../functions/ignoreEvent";
import { isBanned } from "../functions/isBanned"; import { isBanned } from "../functions/isBanned";
@ -91,7 +92,7 @@ export const ForcebanCmd = modActionsCmd({
// Log the action // Log the action
pluginData.state.serverLogs.log(LogType.MEMBER_FORCEBAN, { pluginData.state.serverLogs.log(LogType.MEMBER_FORCEBAN, {
mod: stripObjectToScalars(mod.user), mod: userToConfigAccessibleUser(mod.user),
userId: user.id, userId: user.id,
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,

View file

@ -1,6 +1,7 @@
import { Snowflake, TextChannel } from "discord.js"; import { Snowflake, TextChannel } from "discord.js";
import { waitForReply } from "knub/dist/helpers"; import { waitForReply } from "knub/dist/helpers";
import { performance } from "perf_hooks"; import { performance } from "perf_hooks";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -80,6 +81,7 @@ export const MassbanCmd = modActionsCmd({
const startTime = performance.now(); const startTime = performance.now();
const failedBans: string[] = []; const failedBans: string[] = [];
const casesPlugin = pluginData.getPlugin(CasesPlugin); const casesPlugin = pluginData.getPlugin(CasesPlugin);
const deleteDays = (await pluginData.config.getForMessage(msg)).ban_delete_message_days;
for (const [i, userId] of args.userIds.entries()) { for (const [i, userId] of args.userIds.entries()) {
if (pluginData.state.unloaded) { if (pluginData.state.unloaded) {
break; break;
@ -92,7 +94,7 @@ export const MassbanCmd = modActionsCmd({
pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_BAN, userId, 120 * 1000); pluginData.state.serverLogs.ignoreLog(LogType.MEMBER_BAN, userId, 120 * 1000);
await pluginData.guild.bans.create(userId as Snowflake, { await pluginData.guild.bans.create(userId as Snowflake, {
days: 1, days: deleteDays,
reason: banReason != null ? encodeURIComponent(banReason) : undefined, reason: banReason != null ? encodeURIComponent(banReason) : undefined,
}); });
@ -128,7 +130,7 @@ export const MassbanCmd = modActionsCmd({
} else { } else {
// Some or all bans were successful. Create a log entry for the mass ban and notify the user. // Some or all bans were successful. Create a log entry for the mass ban and notify the user.
pluginData.state.serverLogs.log(LogType.MASSBAN, { pluginData.state.serverLogs.log(LogType.MASSBAN, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
count: successfulBanCount, count: successfulBanCount,
reason: banReason, reason: banReason,
}); });

View file

@ -1,5 +1,6 @@
import { Snowflake, TextChannel } from "discord.js"; import { Snowflake, TextChannel } from "discord.js";
import { waitForReply } from "knub/dist/helpers"; import { waitForReply } from "knub/dist/helpers";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -87,7 +88,7 @@ export const MassunbanCmd = modActionsCmd({
} else { } else {
// Some or all unbans were successful. Create a log entry for the mass unban and notify the user. // Some or all unbans were successful. Create a log entry for the mass unban and notify the user.
pluginData.state.serverLogs.log(LogType.MASSUNBAN, { pluginData.state.serverLogs.log(LogType.MASSUNBAN, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
count: successfulUnbanCount, count: successfulUnbanCount,
reason: unbanReason, reason: unbanReason,
}); });

View file

@ -1,5 +1,6 @@
import { Snowflake, TextChannel } from "discord.js"; import { Snowflake, TextChannel } from "discord.js";
import { waitForReply } from "knub/dist/helpers"; import { waitForReply } from "knub/dist/helpers";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
@ -87,7 +88,7 @@ export const MassmuteCmd = modActionsCmd({
} else { } else {
// Success on all or some mutes // Success on all or some mutes
pluginData.state.serverLogs.log(LogType.MASSMUTE, { pluginData.state.serverLogs.log(LogType.MASSMUTE, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
count: successfulMuteCount, count: successfulMuteCount,
}); });

View file

@ -1,8 +1,10 @@
import { User } from "discord.js";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveUser } from "../../../utils";
import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CasesPlugin } from "../../Cases/CasesPlugin";
import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments";
import { modActionsCmd } from "../types"; import { modActionsCmd } from "../types";
@ -41,8 +43,8 @@ export const NoteCmd = modActionsCmd({
}); });
pluginData.state.serverLogs.log(LogType.MEMBER_NOTE, { pluginData.state.serverLogs.log(LogType.MEMBER_NOTE, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
user: stripObjectToScalars(user, ["user", "roles"]), user: userToConfigAccessibleUser(user),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,
}); });

View file

@ -1,10 +1,11 @@
import { Snowflake } from "discord.js"; import { Snowflake } from "discord.js";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { hasPermission, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveUser } from "../../../utils";
import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments"; import { formatReasonWithAttachments } from "../functions/formatReasonWithAttachments";
import { ignoreEvent } from "../functions/ignoreEvent"; import { ignoreEvent } from "../functions/ignoreEvent";
import { IgnoredEventType, modActionsCmd } from "../types"; import { IgnoredEventType, modActionsCmd } from "../types";
@ -73,7 +74,7 @@ export const UnbanCmd = modActionsCmd({
// Log the action // Log the action
pluginData.state.serverLogs.log(LogType.MEMBER_UNBAN, { pluginData.state.serverLogs.log(LogType.MEMBER_UNBAN, {
mod: stripObjectToScalars(mod.user), mod: userToConfigAccessibleUser(mod.user),
userId: user.id, userId: user.id,
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,

View file

@ -1,4 +1,5 @@
import { GuildAuditLogs, User } from "discord.js"; import { GuildAuditLogs, User } from "discord.js";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -65,8 +66,8 @@ export const CreateBanCaseOnManualBanEvt = modActionsEvt({
} }
pluginData.state.serverLogs.log(LogType.MEMBER_BAN, { pluginData.state.serverLogs.log(LogType.MEMBER_BAN, {
mod: mod ? stripObjectToScalars(mod, ["user"]) : null, mod: mod ? userToConfigAccessibleUser(mod) : null,
user: stripObjectToScalars(user, ["user"]), user: userToConfigAccessibleUser(user),
caseNumber: createdCase?.case_number ?? 0, caseNumber: createdCase?.case_number ?? 0,
reason, reason,
}); });

View file

@ -1,9 +1,10 @@
import { GuildAuditLogs, User } from "discord.js"; import { GuildAuditLogs, User } from "discord.js";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
import { resolveUser, stripObjectToScalars, UnknownUser } from "../../../utils"; import { resolveUser, UnknownUser } from "../../../utils";
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry"; import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry";
import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CasesPlugin } from "../../Cases/CasesPlugin";
import { clearIgnoredEvents } from "../functions/clearIgnoredEvents"; import { clearIgnoredEvents } from "../functions/clearIgnoredEvents";
@ -58,8 +59,8 @@ export const CreateKickCaseOnManualKickEvt = modActionsEvt({
} }
pluginData.state.serverLogs.log(LogType.MEMBER_KICK, { pluginData.state.serverLogs.log(LogType.MEMBER_KICK, {
user: stripObjectToScalars(member.user), user: userToConfigAccessibleUser(member.user!),
mod: mod ? stripObjectToScalars(mod) : null, mod: mod ? userToConfigAccessibleUser(mod) : null,
caseNumber: createdCase?.case_number ?? 0, caseNumber: createdCase?.case_number ?? 0,
reason: kickAuditLogEntry.reason || "", reason: kickAuditLogEntry.reason || "",
}); });

View file

@ -1,8 +1,9 @@
import { GuildAuditLogs, User } from "discord.js"; import { GuildAuditLogs, User } from "discord.js";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { resolveUser, stripObjectToScalars, UnknownUser } from "../../../utils"; import { resolveUser, UnknownUser } from "../../../utils";
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry"; import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry";
import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CasesPlugin } from "../../Cases/CasesPlugin";
import { clearIgnoredEvents } from "../functions/clearIgnoredEvents"; import { clearIgnoredEvents } from "../functions/clearIgnoredEvents";
@ -63,7 +64,7 @@ export const CreateUnbanCaseOnManualUnbanEvt = modActionsEvt({
} }
pluginData.state.serverLogs.log(LogType.MEMBER_UNBAN, { pluginData.state.serverLogs.log(LogType.MEMBER_UNBAN, {
mod: mod ? stripObjectToScalars(mod, ["user"]) : null, mod: mod ? userToConfigAccessibleUser(mod) : null,
userId: user.id, userId: user.id,
caseNumber: createdCase?.case_number ?? 0, caseNumber: createdCase?.case_number ?? 0,
}); });

View file

@ -1,4 +1,4 @@
import { GuildMember, TextChannel } from "discord.js"; import { GuildMember, TextChannel, ThreadChannel } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { hasPermission } from "knub/dist/helpers"; import { hasPermission } from "knub/dist/helpers";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -19,7 +19,7 @@ export async function actualKickMemberCmd(
reason: string; reason: string;
mod: GuildMember; mod: GuildMember;
notify?: string; notify?: string;
"notify-channel"?: TextChannel; "notify-channel"?: TextChannel | ThreadChannel;
clean?: boolean; clean?: boolean;
}, },
) { ) {

View file

@ -1,4 +1,4 @@
import { GuildMember, Message, TextChannel, User } from "discord.js"; import { GuildMember, Message, TextChannel, ThreadChannel, User } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
@ -19,7 +19,13 @@ export async function actualMuteUserCmd(
pluginData: GuildPluginData<ModActionsPluginType>, pluginData: GuildPluginData<ModActionsPluginType>,
user: User | UnknownUser, user: User | UnknownUser,
msg: Message, msg: Message,
args: { time?: number; reason?: string; mod: GuildMember; notify?: string; "notify-channel"?: TextChannel }, args: {
time?: number;
reason?: string;
mod: GuildMember;
notify?: string;
"notify-channel"?: TextChannel | ThreadChannel;
},
) { ) {
// The moderator who did the action is the message author or, if used, the specified -mod // The moderator who did the action is the message author or, if used, the specified -mod
let mod: GuildMember = msg.member!; let mod: GuildMember = msg.member!;

View file

@ -1,6 +1,7 @@
import { DiscordAPIError, Snowflake, User } from "discord.js"; import { DiscordAPIError, Snowflake, User } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
@ -129,8 +130,8 @@ export async function banUserId(
const mod = await resolveUser(pluginData.client, modId); const mod = await resolveUser(pluginData.client, modId);
const logtype = banTime ? LogType.MEMBER_TIMED_BAN : LogType.MEMBER_BAN; const logtype = banTime ? LogType.MEMBER_TIMED_BAN : LogType.MEMBER_BAN;
pluginData.state.serverLogs.log(logtype, { pluginData.state.serverLogs.log(logtype, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,
banTime: banTime ? humanizeDuration(banTime) : null, banTime: banTime ? humanizeDuration(banTime) : null,

View file

@ -1,5 +1,6 @@
import { GuildMember } from "discord.js"; import { GuildMember } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { renderTemplate } from "../../../templateFormatter"; import { renderTemplate } from "../../../templateFormatter";
@ -40,7 +41,7 @@ export async function kickMember(
guildName: pluginData.guild.name, guildName: pluginData.guild.name,
reason, reason,
moderator: kickOptions.caseArgs?.modId moderator: kickOptions.caseArgs?.modId
? stripObjectToScalars(await resolveUser(pluginData.client, kickOptions.caseArgs.modId)) ? userToConfigAccessibleUser(await resolveUser(pluginData.client, kickOptions.caseArgs.modId))
: {}, : {},
}); });
@ -79,8 +80,8 @@ export async function kickMember(
// Log the action // Log the action
const mod = await resolveUser(pluginData.client, modId); const mod = await resolveUser(pluginData.client, modId);
pluginData.state.serverLogs.log(LogType.MEMBER_KICK, { pluginData.state.serverLogs.log(LogType.MEMBER_KICK, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
user: stripObjectToScalars(member.user), user: userToConfigAccessibleUser(member.user),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,
}); });

View file

@ -4,6 +4,7 @@ import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { LogType } from "src/data/LogType"; import { LogType } from "src/data/LogType";
import { logger } from "src/logger"; import { logger } from "src/logger";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { resolveUser, SECONDS, stripObjectToScalars } from "../../../utils"; import { resolveUser, SECONDS, stripObjectToScalars } from "../../../utils";
import { CasesPlugin } from "../../Cases/CasesPlugin"; import { CasesPlugin } from "../../Cases/CasesPlugin";
@ -57,7 +58,7 @@ export async function outdatedTempbansLoop(pluginData: GuildPluginData<ModAction
// Log the unban // Log the unban
const banTime = moment(tempban.created_at).diff(moment(tempban.expires_at)); const banTime = moment(tempban.created_at).diff(moment(tempban.expires_at));
pluginData.state.serverLogs.log(LogType.MEMBER_TIMED_UNBAN, { pluginData.state.serverLogs.log(LogType.MEMBER_TIMED_UNBAN, {
mod: stripObjectToScalars(await resolveUser(pluginData.client, tempban.mod_id)), mod: userToConfigAccessibleUser(await resolveUser(pluginData.client, tempban.mod_id)),
userId: tempban.user_id, userId: tempban.user_id,
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,

View file

@ -1,9 +1,9 @@
import { TextChannel } from "discord.js"; import { TextChannel, ThreadChannel } from "discord.js";
import { disableUserNotificationStrings, UserNotificationMethod } from "../../../utils"; import { disableUserNotificationStrings, UserNotificationMethod } from "../../../utils";
export function readContactMethodsFromArgs(args: { export function readContactMethodsFromArgs(args: {
notify?: string; notify?: string;
"notify-channel"?: TextChannel; "notify-channel"?: TextChannel | ThreadChannel;
}): null | UserNotificationMethod[] { }): null | UserNotificationMethod[] {
if (args.notify) { if (args.notify) {
if (args.notify === "dm") { if (args.notify === "dm") {

View file

@ -1,5 +1,6 @@
import { GuildMember, Snowflake } from "discord.js"; import { GuildMember, Snowflake } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { renderTemplate } from "../../../templateFormatter"; import { renderTemplate } from "../../../templateFormatter";
@ -30,7 +31,7 @@ export async function warnMember(
guildName: pluginData.guild.name, guildName: pluginData.guild.name,
reason, reason,
moderator: warnOptions.caseArgs?.modId moderator: warnOptions.caseArgs?.modId
? stripObjectToScalars(await resolveUser(pluginData.client, warnOptions.caseArgs.modId)) ? userToConfigAccessibleUser(await resolveUser(pluginData.client, warnOptions.caseArgs.modId))
: {}, : {},
}); });
const contactMethods = warnOptions?.contactMethods const contactMethods = warnOptions?.contactMethods
@ -77,8 +78,8 @@ export async function warnMember(
const mod = await pluginData.guild.members.fetch(modId as Snowflake); const mod = await pluginData.guild.members.fetch(modId as Snowflake);
pluginData.state.serverLogs.log(LogType.MEMBER_WARN, { pluginData.state.serverLogs.log(LogType.MEMBER_WARN, {
mod: stripObjectToScalars(mod), mod: memberToConfigAccessibleMember(mod),
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason, reason,
}); });

View file

@ -1,4 +1,5 @@
import { Snowflake } from "discord.js"; import { Snowflake } from "discord.js";
import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { stripObjectToScalars } from "../../../utils"; import { stripObjectToScalars } from "../../../utils";
import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { memberRolesLock } from "../../../utils/lockNameHelpers";
@ -21,7 +22,7 @@ export const ReapplyActiveMuteOnJoinEvt = mutesEvt({
} }
pluginData.state.serverLogs.log(LogType.MEMBER_MUTE_REJOIN, { pluginData.state.serverLogs.log(LogType.MEMBER_MUTE_REJOIN, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member),
}); });
} }
}, },

View file

@ -1,5 +1,6 @@
import { Snowflake } from "discord.js"; import { Snowflake } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { resolveMember, stripObjectToScalars, UnknownUser } from "../../../utils"; import { resolveMember, stripObjectToScalars, UnknownUser } from "../../../utils";
import { memberRolesLock } from "../../../utils/lockNameHelpers"; import { memberRolesLock } from "../../../utils/lockNameHelpers";
@ -33,7 +34,7 @@ export async function clearExpiredMutes(pluginData: GuildPluginData<MutesPluginT
} catch { } catch {
pluginData.state.serverLogs.log(LogType.BOT_ALERT, { pluginData.state.serverLogs.log(LogType.BOT_ALERT, {
body: `Failed to remove mute role from {userMention(member)}`, body: `Failed to remove mute role from {userMention(member)}`,
member: stripObjectToScalars(member), member: memberToConfigAccessibleMember(member),
}); });
} }
} }
@ -42,7 +43,7 @@ export async function clearExpiredMutes(pluginData: GuildPluginData<MutesPluginT
pluginData.state.serverLogs.log(LogType.MEMBER_MUTE_EXPIRED, { pluginData.state.serverLogs.log(LogType.MEMBER_MUTE_EXPIRED, {
member: member member: member
? stripObjectToScalars(member, ["user", "roles"]) ? memberToConfigAccessibleMember(member)
: { id: mute.user_id, user: new UnknownUser({ id: mute.user_id }) }, : { id: mute.user_id, user: new UnknownUser({ id: mute.user_id }) },
}); });

View file

@ -1,6 +1,7 @@
import { Snowflake, TextChannel, User } from "discord.js"; import { Snowflake, TextChannel, User } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { Case } from "../../../data/entities/Case"; import { Case } from "../../../data/entities/Case";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -156,7 +157,7 @@ export async function muteUser(
reason: reason || "None", reason: reason || "None",
time: timeUntilUnmute, time: timeUntilUnmute,
moderator: muteOptions.caseArgs?.modId moderator: muteOptions.caseArgs?.modId
? stripObjectToScalars(await resolveUser(pluginData.client, muteOptions.caseArgs.modId)) ? userToConfigAccessibleUser(await resolveUser(pluginData.client, muteOptions.caseArgs.modId))
: "", : "",
})); }));
@ -225,16 +226,16 @@ export async function muteUser(
const mod = await resolveUser(pluginData.client, muteOptions.caseArgs?.modId); const mod = await resolveUser(pluginData.client, muteOptions.caseArgs?.modId);
if (muteTime) { if (muteTime) {
pluginData.state.serverLogs.log(LogType.MEMBER_TIMED_MUTE, { pluginData.state.serverLogs.log(LogType.MEMBER_TIMED_MUTE, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
time: timeUntilUnmute, time: timeUntilUnmute,
caseNumber: theCase.case_number, caseNumber: theCase.case_number,
reason, reason,
}); });
} else { } else {
pluginData.state.serverLogs.log(LogType.MEMBER_MUTE, { pluginData.state.serverLogs.log(LogType.MEMBER_MUTE, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
caseNumber: theCase.case_number, caseNumber: theCase.case_number,
reason, reason,
}); });

View file

@ -1,6 +1,7 @@
import { Snowflake } from "discord.js"; import { Snowflake } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { resolveMember, resolveUser, stripObjectToScalars } from "../../../utils"; import { resolveMember, resolveUser, stripObjectToScalars } from "../../../utils";
@ -84,19 +85,19 @@ export async function unmuteUser(
}); });
// Log the action // Log the action
const mod = pluginData.client.users.fetch(modId as Snowflake); const mod = await pluginData.client.users.fetch(modId as Snowflake);
if (unmuteTime) { if (unmuteTime) {
pluginData.state.serverLogs.log(LogType.MEMBER_TIMED_UNMUTE, { pluginData.state.serverLogs.log(LogType.MEMBER_TIMED_UNMUTE, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
time: timeUntilUnmute, time: timeUntilUnmute,
reason: caseArgs.reason, reason: caseArgs.reason,
}); });
} else { } else {
pluginData.state.serverLogs.log(LogType.MEMBER_UNMUTE, { pluginData.state.serverLogs.log(LogType.MEMBER_UNMUTE, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
caseNumber: createdCase.case_number, caseNumber: createdCase.case_number,
reason: caseArgs.reason, reason: caseArgs.reason,
}); });

View file

@ -1,5 +1,6 @@
import { GuildMemberEditData, Permissions } from "discord.js"; import { GuildMemberEditData, Permissions } from "discord.js";
import intersection from "lodash.intersection"; import intersection from "lodash.intersection";
import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { stripObjectToScalars } from "../../../utils"; import { stripObjectToScalars } from "../../../utils";
import { canAssignRole } from "../../../utils/canAssignRole"; import { canAssignRole } from "../../../utils/canAssignRole";
@ -75,7 +76,7 @@ export const LoadDataEvt = persistEvt({
await pluginData.state.persistedData.clear(member.id); await pluginData.state.persistedData.clear(member.id);
pluginData.state.logs.log(LogType.MEMBER_RESTORE, { pluginData.state.logs.log(LogType.MEMBER_RESTORE, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member),
restoredData: restoredData.join(", "), restoredData: restoredData.join(", "),
}); });
} }

View file

@ -2,6 +2,7 @@ import { Channel, Message, TextChannel } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { DBDateFormat, errorMessage, MINUTES, StrictMessageContent, stripObjectToScalars } from "../../../utils"; import { DBDateFormat, errorMessage, MINUTES, StrictMessageContent, stripObjectToScalars } from "../../../utils";
@ -158,8 +159,8 @@ export async function actualPostCmd(
if (opts.repeat) { if (opts.repeat) {
pluginData.state.logs.log(LogType.SCHEDULED_REPEATED_MESSAGE, { pluginData.state.logs.log(LogType.SCHEDULED_REPEATED_MESSAGE, {
author: stripObjectToScalars(msg.author), author: userToConfigAccessibleUser(msg.author),
channel: stripObjectToScalars(targetChannel), channel: channelToConfigAccessibleChannel(targetChannel),
datetime: postAt.format(timeAndDate.getDateFormat("pretty_datetime")), datetime: postAt.format(timeAndDate.getDateFormat("pretty_datetime")),
date: postAt.format(timeAndDate.getDateFormat("date")), date: postAt.format(timeAndDate.getDateFormat("date")),
time: postAt.format(timeAndDate.getDateFormat("time")), time: postAt.format(timeAndDate.getDateFormat("time")),
@ -168,8 +169,8 @@ export async function actualPostCmd(
}); });
} else { } else {
pluginData.state.logs.log(LogType.SCHEDULED_MESSAGE, { pluginData.state.logs.log(LogType.SCHEDULED_MESSAGE, {
author: stripObjectToScalars(msg.author), author: userToConfigAccessibleUser(msg.author),
channel: stripObjectToScalars(targetChannel), channel: channelToConfigAccessibleChannel(targetChannel),
datetime: postAt.format(timeAndDate.getDateFormat("pretty_datetime")), datetime: postAt.format(timeAndDate.getDateFormat("pretty_datetime")),
date: postAt.format(timeAndDate.getDateFormat("date")), date: postAt.format(timeAndDate.getDateFormat("date")),
time: postAt.format(timeAndDate.getDateFormat("time")), time: postAt.format(timeAndDate.getDateFormat("time")),
@ -184,8 +185,8 @@ export async function actualPostCmd(
if (opts.repeat) { if (opts.repeat) {
pluginData.state.logs.log(LogType.REPEATED_MESSAGE, { pluginData.state.logs.log(LogType.REPEATED_MESSAGE, {
author: stripObjectToScalars(msg.author), author: userToConfigAccessibleUser(msg.author),
channel: stripObjectToScalars(targetChannel), channel: channelToConfigAccessibleChannel(targetChannel),
datetime: postAt.format(timeAndDate.getDateFormat("pretty_datetime")), datetime: postAt.format(timeAndDate.getDateFormat("pretty_datetime")),
date: postAt.format(timeAndDate.getDateFormat("date")), date: postAt.format(timeAndDate.getDateFormat("date")),
time: postAt.format(timeAndDate.getDateFormat("time")), time: postAt.format(timeAndDate.getDateFormat("time")),

View file

@ -1,6 +1,7 @@
import { Snowflake, TextChannel, User } from "discord.js"; import { Snowflake, TextChannel, User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
import { DBDateFormat, SECONDS, stripObjectToScalars } from "../../../utils"; import { DBDateFormat, SECONDS, stripObjectToScalars } from "../../../utils";
@ -30,15 +31,15 @@ export async function scheduledPostLoop(pluginData: GuildPluginData<PostPluginTy
post.enable_mentions, post.enable_mentions,
); );
pluginData.state.logs.log(LogType.POSTED_SCHEDULED_MESSAGE, { pluginData.state.logs.log(LogType.POSTED_SCHEDULED_MESSAGE, {
author: stripObjectToScalars(author), author: userToConfigAccessibleUser(author),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
messageId: postedMessage.id, messageId: postedMessage.id,
}); });
} catch { } catch {
pluginData.state.logs.log(LogType.BOT_ALERT, { pluginData.state.logs.log(LogType.BOT_ALERT, {
body: `Failed to post scheduled message by {userMention(author)} to {channelMention(channel)}`, body: `Failed to post scheduled message by {userMention(author)} to {channelMention(channel)}`,
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
author: stripObjectToScalars(author), author: userToConfigAccessibleUser(author),
}); });
logger.warn( logger.warn(
`Failed to post scheduled message to #${channel.name} (${channel.id}) on ${pluginData.guild.name} (${pluginData.guild.id})`, `Failed to post scheduled message to #${channel.name} (${channel.id}) on ${pluginData.guild.name} (${pluginData.guild.id})`,

View file

@ -30,6 +30,7 @@ export async function resolveStatefulCustomId(pluginData: GuildPluginData<Reacti
if (button) { if (button) {
const group = pluginData.config.get().button_groups[button.button_group]; const group = pluginData.config.get().button_groups[button.button_group];
if (!group) return null;
const cfgButton = group.default_buttons[button.button_name]; const cfgButton = group.default_buttons[button.button_name];
return { return {

View file

@ -1,4 +1,5 @@
import { GuildChannel } from "discord.js"; import { GuildChannel } from "discord.js";
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
@ -53,9 +54,9 @@ export const AddRoleCmd = rolesCmd({
await args.member.roles.add(roleId); await args.member.roles.add(roleId);
pluginData.state.logs.log(LogType.MEMBER_ROLE_ADD, { pluginData.state.logs.log(LogType.MEMBER_ROLE_ADD, {
member: stripObjectToScalars(args.member, ["user", "roles"]), member: memberToConfigAccessibleMember(args.member),
roles: role.name, roles: role.name,
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
}); });
sendSuccessMessage( sendSuccessMessage(

View file

@ -1,4 +1,5 @@
import { GuildMember } from "discord.js"; import { GuildMember } from "discord.js";
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
@ -74,9 +75,9 @@ export const MassAddRoleCmd = rolesCmd({
pluginData.state.logs.ignoreLog(LogType.MEMBER_ROLE_ADD, member.id); pluginData.state.logs.ignoreLog(LogType.MEMBER_ROLE_ADD, member.id);
await member.roles.add(roleId); await member.roles.add(roleId);
pluginData.state.logs.log(LogType.MEMBER_ROLE_ADD, { pluginData.state.logs.log(LogType.MEMBER_ROLE_ADD, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member),
roles: role.name, roles: role.name,
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
}); });
assigned++; assigned++;
} catch (e) { } catch (e) {

View file

@ -1,4 +1,5 @@
import { GuildMember } from "discord.js"; import { GuildMember } from "discord.js";
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
@ -74,9 +75,9 @@ export const MassRemoveRoleCmd = rolesCmd({
pluginData.state.logs.ignoreLog(LogType.MEMBER_ROLE_REMOVE, member.id); pluginData.state.logs.ignoreLog(LogType.MEMBER_ROLE_REMOVE, member.id);
await member.roles.remove(roleId); await member.roles.remove(roleId);
pluginData.state.logs.log(LogType.MEMBER_ROLE_REMOVE, { pluginData.state.logs.log(LogType.MEMBER_ROLE_REMOVE, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member),
roles: role.name, roles: role.name,
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
}); });
assigned++; assigned++;
} catch (e) { } catch (e) {

View file

@ -1,4 +1,5 @@
import { GuildChannel } from "discord.js"; import { GuildChannel } from "discord.js";
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
@ -53,9 +54,9 @@ export const RemoveRoleCmd = rolesCmd({
await args.member.roles.remove(roleId); await args.member.roles.remove(roleId);
pluginData.state.logs.log(LogType.MEMBER_ROLE_REMOVE, { pluginData.state.logs.log(LogType.MEMBER_ROLE_REMOVE, {
member: stripObjectToScalars(args.member, ["user", "roles"]), member: memberToConfigAccessibleMember(args.member),
roles: role.name, roles: role.name,
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
}); });
sendSuccessMessage( sendSuccessMessage(

View file

@ -1,3 +1,4 @@
import { ChannelTypeStrings } from "src/types";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { asSingleLine, disableInlineCode } from "../../../utils"; import { asSingleLine, disableInlineCode } from "../../../utils";
@ -37,7 +38,19 @@ export const SlowmodeClearCmd = slowmodeCmd({
} }
try { try {
await clearBotSlowmodeFromUserId(pluginData, args.channel, args.user.id, args.force); if (args.channel.type === ChannelTypeStrings.TEXT) {
await clearBotSlowmodeFromUserId(pluginData, args.channel, args.user.id, args.force);
} else {
sendErrorMessage(
pluginData,
msg.channel,
asSingleLine(`
Failed to clear slowmode from **${args.user.username}#${args.user.discriminator}** in <#${args.channel.id}>:
Threads cannot have Bot Slowmode
`),
);
return;
}
} catch (e) { } catch (e) {
sendErrorMessage( sendErrorMessage(
pluginData, pluginData,

View file

@ -1,5 +1,6 @@
import { Permissions, TextChannel } from "discord.js"; import { Permissions, TextChannel, ThreadChannel } from "discord.js";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { ChannelTypeStrings } from "src/types";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
import { asSingleLine, DAYS, disableInlineCode, HOURS, MINUTES } from "../../../utils"; import { asSingleLine, DAYS, disableInlineCode, HOURS, MINUTES } from "../../../utils";
@ -38,7 +39,7 @@ export const SlowmodeSetCmd = slowmodeCmd({
], ],
async run({ message: msg, args, pluginData }) { async run({ message: msg, args, pluginData }) {
const channel: TextChannel = args.channel || msg.channel; const channel: TextChannel | ThreadChannel = args.channel || msg.channel;
if (args.time === 0) { if (args.time === 0) {
// Workaround until we can call SlowmodeDisableCmd from here // Workaround until we can call SlowmodeDisableCmd from here
@ -122,7 +123,7 @@ export const SlowmodeSetCmd = slowmodeCmd({
if (mode === "native") { if (mode === "native") {
// If there is an existing bot-maintained slowmode, disable that first // If there is an existing bot-maintained slowmode, disable that first
const existingBotSlowmode = await pluginData.state.slowmodes.getChannelSlowmode(channel.id); const existingBotSlowmode = await pluginData.state.slowmodes.getChannelSlowmode(channel.id);
if (existingBotSlowmode) { if (existingBotSlowmode && channel.type === ChannelTypeStrings.TEXT) {
await disableBotSlowmodeForChannel(pluginData, channel); await disableBotSlowmodeForChannel(pluginData, channel);
} }

View file

@ -1,5 +1,6 @@
import { GuildChannel, Permissions, Snowflake, TextChannel } from "discord.js"; import { GuildChannel, Permissions, Snowflake, TextChannel } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { logger } from "../../../logger"; import { logger } from "../../../logger";
import { isDiscordAPIError, stripObjectToScalars, UnknownUser } from "../../../utils"; import { isDiscordAPIError, stripObjectToScalars, UnknownUser } from "../../../utils";
@ -20,7 +21,7 @@ export async function applyBotSlowmodeToUserId(
await channel.permissionOverwrites.create(userId as Snowflake, { SEND_MESSAGES: false }, { type: 1 }); await channel.permissionOverwrites.create(userId as Snowflake, { SEND_MESSAGES: false }, { type: 1 });
} }
} catch (e) { } catch (e) {
const user = pluginData.client.users.fetch(userId as Snowflake) || new UnknownUser({ id: userId }); const user = (await pluginData.client.users.fetch(userId as Snowflake)) || new UnknownUser({ id: userId });
if (isDiscordAPIError(e) && e.code === 50013) { if (isDiscordAPIError(e) && e.code === 50013) {
logger.warn( logger.warn(
@ -28,14 +29,14 @@ export async function applyBotSlowmodeToUserId(
); );
pluginData.state.logs.log(LogType.BOT_ALERT, { pluginData.state.logs.log(LogType.BOT_ALERT, {
body: `Missing permissions to apply bot slowmode to {userMention(user)} in {channelMention(channel)}`, body: `Missing permissions to apply bot slowmode to {userMention(user)} in {channelMention(channel)}`,
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
}); });
} else { } else {
pluginData.state.logs.log(LogType.BOT_ALERT, { pluginData.state.logs.log(LogType.BOT_ALERT, {
body: `Failed to apply bot slowmode to {userMention(user)} in {channelMention(channel)}`, body: `Failed to apply bot slowmode to {userMention(user)} in {channelMention(channel)}`,
user: stripObjectToScalars(user), user: userToConfigAccessibleUser(user),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
}); });
throw e; throw e;
} }

View file

@ -1,11 +1,11 @@
import { GuildChannel, Snowflake, TextChannel } from "discord.js"; import { GuildChannel, Snowflake, TextChannel, ThreadChannel } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { SlowmodePluginType } from "../types"; import { SlowmodePluginType } from "../types";
export async function clearBotSlowmodeFromUserId( export async function clearBotSlowmodeFromUserId(
pluginData: GuildPluginData<SlowmodePluginType>, pluginData: GuildPluginData<SlowmodePluginType>,
channel: GuildChannel & TextChannel, channel: TextChannel,
userId: string, userId: string,
force = false, force = false,
) { ) {

View file

@ -1,11 +1,11 @@
import { GuildChannel, TextChannel } from "discord.js"; import { GuildChannel, TextChannel, ThreadChannel } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { SlowmodePluginType } from "../types"; import { SlowmodePluginType } from "../types";
import { clearBotSlowmodeFromUserId } from "./clearBotSlowmodeFromUserId"; import { clearBotSlowmodeFromUserId } from "./clearBotSlowmodeFromUserId";
export async function disableBotSlowmodeForChannel( export async function disableBotSlowmodeForChannel(
pluginData: GuildPluginData<SlowmodePluginType>, pluginData: GuildPluginData<SlowmodePluginType>,
channel: GuildChannel & TextChannel, channel: TextChannel,
) { ) {
// Disable channel slowmode // Disable channel slowmode
await pluginData.state.slowmodes.deleteChannelSlowmode(channel.id); await pluginData.state.slowmodes.deleteChannelSlowmode(channel.id);

View file

@ -1,6 +1,7 @@
import { Snowflake, TextChannel } from "discord.js"; import { Snowflake, TextChannel } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { channelToConfigAccessibleChannel, memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -185,8 +186,8 @@ export async function logAndDetectMessageSpam(
// Create a log entry // Create a log entry
logs.log(LogType.MESSAGE_SPAM_DETECTED, { logs.log(LogType.MESSAGE_SPAM_DETECTED, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member!),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel!),
description, description,
limit: spamConfig.count, limit: spamConfig.count,
interval: spamConfig.interval, interval: spamConfig.interval,

View file

@ -1,4 +1,5 @@
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { memberToConfigAccessibleMember } from "src/utils/configAccessibleObjects";
import { CaseTypes } from "../../../data/CaseTypes"; import { CaseTypes } from "../../../data/CaseTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin"; import { CasesPlugin } from "../../../plugins/Cases/CasesPlugin";
@ -78,7 +79,7 @@ export async function logAndDetectOtherSpam(
clearRecentUserActions(pluginData, RecentActionType.VoiceChannelMove, userId, actionGroupId); clearRecentUserActions(pluginData, RecentActionType.VoiceChannelMove, userId, actionGroupId);
logs.log(LogType.OTHER_SPAM_DETECTED, { logs.log(LogType.OTHER_SPAM_DETECTED, {
member: stripObjectToScalars(member, ["user", "roles"]), member: memberToConfigAccessibleMember(member!),
description, description,
limit: spamConfig.count, limit: spamConfig.count,
interval: spamConfig.interval, interval: spamConfig.interval,

View file

@ -1,3 +1,4 @@
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { sendErrorMessage } from "../../../pluginUtils"; import { sendErrorMessage } from "../../../pluginUtils";
import { TemplateParseError } from "../../../templateFormatter"; import { TemplateParseError } from "../../../templateFormatter";
@ -20,8 +21,8 @@ export const TagEvalCmd = tagsCmd({
args.body, args.body,
[], [],
{ {
member: stripObjectToScalars(msg.member, ["user"]), member: memberToConfigAccessibleMember(msg.member),
user: stripObjectToScalars(msg.member.user), user: userToConfigAccessibleUser(msg.member.user),
}, },
{ member: msg.member }, { member: msg.member },
); );

View file

@ -2,6 +2,7 @@ import { GuildMember } from "discord.js";
import * as t from "io-ts"; import * as t from "io-ts";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import { parseArguments } from "knub-command-manager"; import { parseArguments } from "knub-command-manager";
import { memberToConfigAccessibleMember, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { TemplateParseError } from "../../../templateFormatter"; import { TemplateParseError } from "../../../templateFormatter";
import { StrictMessageContent, stripObjectToScalars } from "../../../utils"; import { StrictMessageContent, stripObjectToScalars } from "../../../utils";
@ -27,8 +28,8 @@ export async function renderTagFromString(
tagBody, tagBody,
tagArgs, tagArgs,
{ {
member: stripObjectToScalars(member, ["user"]), member: memberToConfigAccessibleMember(member),
user: stripObjectToScalars(member.user), user: userToConfigAccessibleUser(member.user),
}, },
{ member }, { member },
); );

View file

@ -1,6 +1,7 @@
import { Message, Snowflake, TextChannel, User } from "discord.js"; import { Message, Snowflake, TextChannel, User } from "discord.js";
import { GuildPluginData } from "knub"; import { GuildPluginData } from "knub";
import moment from "moment-timezone"; import moment from "moment-timezone";
import { channelToConfigAccessibleChannel, userToConfigAccessibleUser } from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { SavedMessage } from "../../../data/entities/SavedMessage"; import { SavedMessage } from "../../../data/entities/SavedMessage";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
@ -41,8 +42,8 @@ async function cleanMessages(
const archiveUrl = pluginData.state.archives.getUrl(baseUrl, archiveId); const archiveUrl = pluginData.state.archives.getUrl(baseUrl, archiveId);
pluginData.state.logs.log(LogType.CLEAN, { pluginData.state.logs.log(LogType.CLEAN, {
mod: stripObjectToScalars(mod), mod: userToConfigAccessibleUser(mod),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
count: savedMessages.length, count: savedMessages.length,
archiveUrl, archiveUrl,
}); });
@ -172,7 +173,7 @@ export const CleanCmd = utilityCmd({
let responseText = `Cleaned ${messagesToClean.length} ${messagesToClean.length === 1 ? "message" : "messages"}`; let responseText = `Cleaned ${messagesToClean.length} ${messagesToClean.length === 1 ? "message" : "messages"}`;
if (targetChannel.id !== msg.channel.id) { if (targetChannel.id !== msg.channel.id) {
responseText += ` in <#${targetChannel.id}>\n${cleanResult.archiveUrl}`; responseText += ` in <#${targetChannel.id}>: ${cleanResult.archiveUrl}`;
} }
if (args.update) { if (args.update) {

View file

@ -1,4 +1,9 @@
import { VoiceChannel } from "discord.js"; import { VoiceChannel } from "discord.js";
import {
channelToConfigAccessibleChannel,
memberToConfigAccessibleMember,
userToConfigAccessibleUser,
} from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
@ -35,9 +40,9 @@ export const VcdisconnectCmd = utilityCmd({
} }
pluginData.state.logs.log(LogType.VOICE_CHANNEL_FORCE_DISCONNECT, { pluginData.state.logs.log(LogType.VOICE_CHANNEL_FORCE_DISCONNECT, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
member: stripObjectToScalars(args.member, ["user", "roles"]), member: memberToConfigAccessibleMember(args.member),
oldChannel: stripObjectToScalars(channel), oldChannel: channelToConfigAccessibleChannel(channel),
}); });
sendSuccessMessage( sendSuccessMessage(

View file

@ -1,4 +1,9 @@
import { Snowflake, VoiceChannel } from "discord.js"; import { Snowflake, VoiceChannel } from "discord.js";
import {
channelToConfigAccessibleChannel,
memberToConfigAccessibleMember,
userToConfigAccessibleUser,
} from "src/utils/configAccessibleObjects";
import { commandTypeHelpers as ct } from "../../../commandTypes"; import { commandTypeHelpers as ct } from "../../../commandTypes";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils"; import { canActOn, sendErrorMessage, sendSuccessMessage } from "../../../pluginUtils";
@ -74,10 +79,10 @@ export const VcmoveCmd = utilityCmd({
} }
pluginData.state.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, { pluginData.state.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
member: stripObjectToScalars(args.member, ["user", "roles"]), member: memberToConfigAccessibleMember(args.member),
oldChannel: stripObjectToScalars(oldVoiceChannel), oldChannel: channelToConfigAccessibleChannel(oldVoiceChannel!),
newChannel: stripObjectToScalars(channel), newChannel: channelToConfigAccessibleChannel(channel),
}); });
sendSuccessMessage( sendSuccessMessage(
@ -182,10 +187,10 @@ export const VcmoveAllCmd = utilityCmd({
} }
pluginData.state.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, { pluginData.state.logs.log(LogType.VOICE_CHANNEL_FORCE_MOVE, {
mod: stripObjectToScalars(msg.author), mod: userToConfigAccessibleUser(msg.author),
member: stripObjectToScalars(currMember, ["user", "roles"]), member: memberToConfigAccessibleMember(currMember),
oldChannel: stripObjectToScalars(args.oldChannel), oldChannel: channelToConfigAccessibleChannel(args.oldChannel),
newChannel: stripObjectToScalars(channel), newChannel: channelToConfigAccessibleChannel(channel),
}); });
} }

View file

@ -1,4 +1,9 @@
import { Snowflake, TextChannel } from "discord.js"; import { Snowflake, TextChannel } from "discord.js";
import {
channelToConfigAccessibleChannel,
memberToConfigAccessibleMember,
userToConfigAccessibleUser,
} from "src/utils/configAccessibleObjects";
import { LogType } from "../../../data/LogType"; import { LogType } from "../../../data/LogType";
import { renderTemplate, TemplateParseError } from "../../../templateFormatter"; import { renderTemplate, TemplateParseError } from "../../../templateFormatter";
import { createChunkedMessage, stripObjectToScalars } from "../../../utils"; import { createChunkedMessage, stripObjectToScalars } from "../../../utils";
@ -49,7 +54,7 @@ export const SendWelcomeMessageEvt = welcomeMessageEvt({
} catch { } catch {
pluginData.state.logs.log(LogType.DM_FAILED, { pluginData.state.logs.log(LogType.DM_FAILED, {
source: "welcome message", source: "welcome message",
user: stripObjectToScalars(member.user), user: userToConfigAccessibleUser(member.user),
}); });
} }
} }
@ -63,8 +68,8 @@ export const SendWelcomeMessageEvt = welcomeMessageEvt({
} catch { } catch {
pluginData.state.logs.log(LogType.BOT_ALERT, { pluginData.state.logs.log(LogType.BOT_ALERT, {
body: `Failed send a welcome message for {userMention(member)} to {channelMention(channel)}`, body: `Failed send a welcome message for {userMention(member)} to {channelMention(channel)}`,
member: stripObjectToScalars(member), member: memberToConfigAccessibleMember(member),
channel: stripObjectToScalars(channel), channel: channelToConfigAccessibleChannel(channel),
}); });
} }
} }

View file

@ -65,15 +65,18 @@ export interface CommandInfo {
} }
export enum ChannelTypeStrings { export enum ChannelTypeStrings {
TEXT = "text", TEXT = "GUILD_TEXT",
DM = "dm", DM = "DM",
VOICE = "voice", VOICE = "GUILD_VOICE",
GROUP = "group", GROUP = "GROUP_DM",
CATEGORY = "category", CATEGORY = "GUILD_CATEGORY",
NEWS = "news", NEWS = "GUILD_NEWS",
STORE = "store", STORE = "GUILD_STORE",
STAGE = "stage", NEWS_THREAD = "GUILD_NEWS_THREAD",
UNKNOWN = "unknown", PUBLIC_THREAD = "GUILD_PUBLIC_THREAD",
PRIVATE_THREAD = "GUILD_PRIVATE_THREAD",
STAGE = "GUILD_STAGE_VOICE",
UNKNOWN = "UNKNOWN",
} }
export enum MessageTypeStrings { export enum MessageTypeStrings {

View file

@ -8,6 +8,7 @@ import {
GuildChannel, GuildChannel,
GuildMember, GuildMember,
Invite, Invite,
LimitedCollection,
Message, Message,
MessageAttachment, MessageAttachment,
MessageEmbed, MessageEmbed,
@ -17,7 +18,9 @@ import {
PartialChannelData, PartialChannelData,
PartialMessage, PartialMessage,
Snowflake, Snowflake,
Sticker,
TextChannel, TextChannel,
ThreadChannel,
User, User,
} from "discord.js"; } from "discord.js";
import emojiRegex from "emoji-regex"; import emojiRegex from "emoji-regex";
@ -37,6 +40,7 @@ import { waitForButtonConfirm } from "./utils/waitForInteraction";
import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils"; import { decodeAndValidateStrict, StrictValidationError } from "./validatorUtils";
import { isEqual } from "lodash"; import { isEqual } from "lodash";
import humanizeDuration from "humanize-duration"; import humanizeDuration from "humanize-duration";
import { ChannelTypeStrings } from "./types";
const fsp = fs.promises; const fsp = fs.promises;
@ -247,7 +251,7 @@ export type InviteOpts = "withMetadata" | "withCount" | "withoutCount";
export type GuildInvite<CT extends InviteOpts = "withMetadata"> = Invite & { guild: Guild }; export type GuildInvite<CT extends InviteOpts = "withMetadata"> = Invite & { guild: Guild };
export type GroupDMInvite<CT extends InviteOpts = "withMetadata"> = Invite & { export type GroupDMInvite<CT extends InviteOpts = "withMetadata"> = Invite & {
channel: PartialChannelData; channel: PartialChannelData;
type: typeof Constants.ChannelTypes.GROUP; type: typeof Constants.ChannelTypes.GROUP_DM;
}; };
/** /**
@ -1015,7 +1019,7 @@ export type CustomEmoji = {
id: string; id: string;
} & Emoji; } & Emoji;
export type UserNotificationMethod = { type: "dm" } | { type: "channel"; channel: TextChannel }; export type UserNotificationMethod = { type: "dm" } | { type: "channel"; channel: TextChannel | ThreadChannel };
export const disableUserNotificationStrings = ["no", "none", "off"]; export const disableUserNotificationStrings = ["no", "none", "off"];
@ -1312,6 +1316,18 @@ export async function resolveInvite<T extends boolean>(
return promise as ResolveInviteReturnType<T>; return promise as ResolveInviteReturnType<T>;
} }
const internalStickerCache: LimitedCollection<Snowflake, Sticker> = new LimitedCollection(500);
export async function resolveStickerId(bot: Client, id: Snowflake): Promise<Sticker> {
const cachedSticker = internalStickerCache.get(id);
if (cachedSticker) return cachedSticker;
const fetchedSticker = await bot.fetchSticker(id).catch(undefined);
internalStickerCache.set(id, fetchedSticker);
return fetchedSticker;
}
export async function confirm(channel: TextChannel, userId: string, content: MessageOptions): Promise<boolean> { export async function confirm(channel: TextChannel, userId: string, content: MessageOptions): Promise<boolean> {
return waitForButtonConfirm(channel, content, { restrictToId: userId }); return waitForButtonConfirm(channel, content, { restrictToId: userId });
} }
@ -1352,7 +1368,10 @@ export function verboseUserName(user: User | UnknownUser): string {
} }
export function verboseChannelMention(channel: GuildChannel): string { export function verboseChannelMention(channel: GuildChannel): string {
const plainTextName = channel.type === "voice" || channel.type === "stage" ? channel.name : `#${channel.name}`; const plainTextName =
channel.type === ChannelTypeStrings.VOICE || channel.type === ChannelTypeStrings.STAGE
? channel.name
: `#${channel.name}`;
return `<#${channel.id}> (**${plainTextName}**, \`${channel.id}\`)`; return `<#${channel.id}> (**${plainTextName}**, \`${channel.id}\`)`;
} }
@ -1478,7 +1497,7 @@ export function isGuildInvite<CT extends InviteOpts>(invite: Invite): invite is
} }
export function isGroupDMInvite<CT extends InviteOpts>(invite: Invite): invite is GroupDMInvite<CT> { export function isGroupDMInvite<CT extends InviteOpts>(invite: Invite): invite is GroupDMInvite<CT> {
return invite.guild == null && invite.channel?.type === "group"; return invite.guild == null && invite.channel?.type === ChannelTypeStrings.GROUP;
} }
export function inviteHasCounts(invite: Invite): invite is Invite { export function inviteHasCounts(invite: Invite): invite is Invite {

View file

@ -8,15 +8,16 @@ import {
ThreadChannel, ThreadChannel,
User, User,
} from "discord.js"; } from "discord.js";
import { UnknownUser } from "src/utils";
export interface IConfigAccessibleUser { export interface IConfigAccessibleUser {
id: Snowflake; id: Snowflake | string;
username: string; username: string;
discriminator: string; discriminator: string;
mention: string; mention: string;
avatarURL: string; avatarURL?: string;
bot: boolean; bot?: boolean;
createdAt: number; createdAt?: number;
} }
export interface IConfigAccessibleRole { export interface IConfigAccessibleRole {
@ -36,15 +37,27 @@ export interface IConfigAccessibleMember extends IConfigAccessibleUser {
guildName: string; guildName: string;
} }
export function userToConfigAccessibleUser(user: User): IConfigAccessibleUser { export function userToConfigAccessibleUser(user: User | UnknownUser): IConfigAccessibleUser {
if (`${user.username}#${user.discriminator}` === "Unknown#0000") {
const toReturnPartial: IConfigAccessibleUser = {
id: user.id,
username: "Unknown",
discriminator: "0000",
mention: `<@${user.id}>`,
};
return toReturnPartial;
}
const properUser = user as User;
const toReturn: IConfigAccessibleUser = { const toReturn: IConfigAccessibleUser = {
id: user.id, id: properUser.id,
username: user.username, username: properUser.username,
discriminator: user.discriminator, discriminator: properUser.discriminator,
mention: `<@${user.id}>`, mention: `<@${properUser.id}>`,
avatarURL: user.displayAvatarURL({ dynamic: true }), avatarURL: properUser.displayAvatarURL({ dynamic: true }),
bot: user.bot, bot: properUser.bot,
createdAt: user.createdTimestamp, createdAt: properUser.createdTimestamp,
}; };
return toReturn; return toReturn;

View file

@ -4,6 +4,7 @@ import {
MessageEditOptions, MessageEditOptions,
MessageOptions, MessageOptions,
MessageReaction, MessageReaction,
PartialMessageReaction,
PartialUser, PartialUser,
TextChannel, TextChannel,
User, User,
@ -37,7 +38,10 @@ export async function createPaginatedMessage(
let page = 1; let page = 1;
let pageLoadId = 0; // Used to avoid race conditions when rapidly switching pages let pageLoadId = 0; // Used to avoid race conditions when rapidly switching pages
const reactionListener = async (reactionMessage: MessageReaction, reactor: User | PartialUser) => { const reactionListener = async (
reactionMessage: MessageReaction | PartialMessageReaction,
reactor: User | PartialUser,
) => {
if (reactionMessage.message.id !== message.id) { if (reactionMessage.message.id !== message.id) {
return; return;
} }

View file

@ -1,4 +1,4 @@
import { GuildChannel, GuildMember } from "discord.js"; import { GuildChannel, GuildMember, ThreadChannel } from "discord.js";
import { getMissingPermissions } from "./getMissingPermissions"; import { getMissingPermissions } from "./getMissingPermissions";
/** /**
@ -7,7 +7,7 @@ import { getMissingPermissions } from "./getMissingPermissions";
*/ */
export function getMissingChannelPermissions( export function getMissingChannelPermissions(
member: GuildMember, member: GuildMember,
channel: GuildChannel, channel: GuildChannel | ThreadChannel,
requiredPermissions: number | bigint, requiredPermissions: number | bigint,
): bigint { ): bigint {
const memberChannelPermissions = channel.permissionsFor(member.id); const memberChannelPermissions = channel.permissionsFor(member.id);

View file

@ -0,0 +1,306 @@
const defaultStickerIds = [
"749044136589393960",
"749045492352155769",
"749045743976710154",
"749046077629399122",
"749046696482439188",
"749047112028651530",
"749049128012742676",
"749051158542417980",
"749051341325729913",
"749051517964648458",
"749051844663181383",
"749052011751932006",
"749052505308266645",
"749052707536371812",
"749052944682582036",
"749053210760577245",
"749053441527251087",
"749053689419006003",
"749053927907131433",
"749054120345993216",
"749054292937277450",
"749054660769218631",
"749054894585151518",
"749055120263872532",
"754112474868875294",
"755244355563815073",
"755244428305760266",
"755244598799892490",
"755244649655959615",
"755490897143136446",
"781291131828699156",
"781291442961383434",
"781291606493495306",
"781321379546398740",
"781321702805340200",
"781321874650562560",
"781321970301796372",
"781322427820277791",
"781322566060343296",
"781322673527193620",
"781322765641973770",
"781322967127818240",
"781323072102858782",
"781323157239103548",
"781323249505927198",
"781323366921404426",
"781323471249604648",
"781323560756707328",
"781323628267962408",
"781323712640974858",
"781323769960202280",
"781323880723251220",
"781324010952458270",
"781324114685329417",
"781324245468315668",
"781324376884248596",
"781324451014246460",
"781324562905432064",
"781324642736144424",
"781324722394103808",
"813950454420471818",
"813950661292064808",
"813950759296172092",
"813950952436531213",
"813951067557462106",
"813951129544818708",
"813951478803857408",
"813951723822645278",
"813951924604895242",
"813952523408113694",
"813952588650381332",
"813952646083772486",
"813952751200763934",
"813952825520291902",
"813952903064584202",
"809207198856904764",
"809207265092698112",
"809207315822936064",
"809207399054442526",
"809207795999572038",
"809207857773936710",
"809207919115239525",
"809208197235343410",
"809208263987953694",
"809208353884471376",
"809208424419426344",
"809208728251138088",
"809208771834019850",
"809209078261874688",
"809209146846871562",
"809209216966852628",
"809209266556764241",
"809209320494333952",
"809209482902503444",
"809209627450671114",
"809209856321650698",
"809209923765272586",
"809210027524620328",
"809210129978228766",
"809210201033932891",
"809210344311619584",
"809210578433736724",
"809210750702583868",
"809210904263917618",
"809211336633614346",
"818596923887583302",
"818596976521248819",
"818597244017049652",
"818597355619483688",
"818597454483161098",
"818597555608092722",
"818597623397220362",
"818597707132043285",
"818597810047680532",
"818597885671243776",
"818598022798770186",
"818598125077266432",
"818598371324592218",
"818598476883165194",
"818599312882794506",
"754104467573571584",
"754106820079124480",
"754107009720385556",
"754107496884338698",
"754107539200671765",
"754107634172297306",
"754108691493683221",
"754108771852222564",
"754108811354046554",
"754108835895181322",
"754108890559283200",
"754108923509997568",
"754108948356792320",
"754108992195919903",
"754109038693974057",
"754109076933443614",
"754109137830281297",
"754109419821727885",
"754109474691612782",
"754109519113617478",
"754109542526091434",
"754109580069437481",
"754109748999225374",
"754109772449710080",
"754109815877402634",
"754109869325549638",
"754109908995276810",
"754109937872928857",
"754109983108497468",
"754110021574328400",
"823973720266899506",
"823973812748025937",
"823974092700254238",
"823974203929526292",
"823974288897343518",
"823974429834477578",
"823974530686648440",
"823974669748666418",
"823974764057722910",
"823974837156446208",
"823974930399232020",
"823975146263412786",
"823976022025306152",
"823976102976290866",
"823976251269054494",
"751604756748959874",
"751605093065031760",
"751605170818777108",
"751605236476543086",
"751605353585836101",
"751605453842022562",
"751605541687787550",
"751605606070091887",
"751605670654246972",
"751605738270359592",
"751605803932319754",
"751605873083678802",
"751605941375598672",
"751606014054236261",
"751606065447305216",
"751606120493350982",
"751606190383038604",
"751606254073544784",
"751606317936017458",
"751606379340365864",
"751606441315401848",
"751606491542192200",
"751606539600527410",
"751606636698927157",
"751606719611928586",
"751606808837357608",
"751606868115193948",
"751606917494734959",
"751606992849862706",
"751607061762277396",
"819128604311027752",
"819129296374595614",
"819130301702995968",
"819131032259133440",
"819131232642007062",
"819131655738228796",
"819131835635466280",
"819131978401316864",
"819132831023628298",
"819139462373310494",
"819139728128344064",
"819140386551365642",
"819140940018352178",
"819141435474706472",
"819145601031733269",
"772963467622744075",
"772963523630071828",
"772963562553081886",
"772970847232458782",
"772972089963577354",
"772973760457605182",
"772974139053047829",
"772974519786799114",
"772975031487168582",
"772975484874522674",
"772975929998835722",
"772976230718111764",
"772976562831097906",
"772976718939160606",
"772976899152543745",
"773897032485175296",
"773898515990315028",
"773899933131604008",
"773901313578369044",
"773902656442728488",
"773903221272870973",
"773903633951490098",
"773904449440579624",
"773909554005540894",
"773911171987144754",
"773912319839043625",
"773912616425881630",
"773914273075429387",
"773914595756081172",
"773914892800622612",
"776241800930787349",
"776241838813216788",
"776241877862187048",
"776241909374910534",
"776242510334525460",
"776242536820899861",
"776242590148198400",
"776242614663512095",
"776242643717455882",
"776242672562077696",
"776242703834284132",
"776242899662405712",
"776242924542492672",
"776242962072993792",
"776243107654008872",
"776243140750606366",
"776243172258611200",
"776243957259698226",
"776243988038025287",
"776244033244627004",
"776244136725970974",
"776244212806713344",
"776244240753098752",
"776244473184256000",
"776244492948209674",
"776244520928542731",
"776244545096122379",
"776244577509179412",
"776244610917335070",
"776244640239452200",
"816086581509095424",
"816086770541396028",
"816086882823831613",
"816086934266839040",
"816087074310193162",
"816087132447178774",
"816087220753924096",
"816087273548415006",
"816087483640709131",
"816087668630618152",
"816087792291282944",
"816087883252760617",
"816087973053464606",
"816088051121258596",
"816088135334494267",
"831569193391489054",
"831569335696228352",
"831569414746144798",
"831569534459576381",
"831569719814914108",
"831569909288140832",
"831570117057970176",
"831570479415689309",
"831570715471380550",
"831571053569769492",
"831571151535996988",
"831571320377835540",
"831571470824112138",
"831571594055778304",
"831571726223540294",
];
export function isDefaultSticker(id: string): boolean {
return defaultStickerIds.includes(id);
}