StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-23 09:35:02 +00:00
Code Releases Activity

almeida fixes

Browse source
This commit is contained in:
metal 2021-09-05 09:24:21 +00:00 • committed by GitHub
parent 05256c1985
commit 3b14d83065
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
backend/src/plugins/Automod/actions/startThread.ts
View file

@ -2,6 +2,7 @@ import { GuildFeature, ThreadAutoArchiveDuration } from "discord-api-types";
import { TextChannel } from "discord.js"; import { TextChannel } from "discord.js";
import * as t from "io-ts"; import * as t from "io-ts";
import { renderTemplate, TemplateSafeValueContainer } from "src/templateFormatter"; import { renderTemplate, TemplateSafeValueContainer } from "src/templateFormatter";
import { ChannelTypeStrings } from "src/types";
import { convertDelayStringToMS, MINUTES, tDelayString, tNullable } from "src/utils"; import { convertDelayStringToMS, MINUTES, tDelayString, tNullable } from "src/utils";
import { savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser } from "src/utils/templateSafeObjects"; import { savedMessageToTemplateSafeSavedMessage, userToTemplateSafeUser } from "src/utils/templateSafeObjects";
import { noop } from "../../../utils"; import { noop } from "../../../utils";
@ -25,17 +26,14 @@ export const StartThreadAction = automodAction({
const threads = contexts.filter(c => { const threads = contexts.filter(c => {
if (!c.message || !c.user) return false; if (!c.message || !c.user) return false;
const channel = pluginData.guild.channels.cache.get(c.message.channel_id); const channel = pluginData.guild.channels.cache.get(c.message.channel_id);
if (channel?.type !== "GUILD_TEXT" || !channel.isText()) return false; // for some reason the typing here for channel.type defaults to ThreadChannelTypes (?) if (channel?.type !== ChannelTypeStrings.TEXT || !channel.isText()) return false; // for some reason the typing here for channel.type defaults to ThreadChannelTypes (?)
// check against max threads per channel // check against max threads per channel
if (actionConfig.limit_per_channel && actionConfig.limit_per_channel > 0) { if (actionConfig.limit_per_channel && actionConfig.limit_per_channel > 0) {
const threadCount = [ const threadCount = [
...channel.threads.cache ...channel.threads.cache
.filter( .filter(
tr => tr =>
tr.ownerId === pluginData.client.application!.id && tr.ownerId === pluginData.client.user!.id && !tr.deleted && !tr.archived && tr.parentId === channel.id,
!tr.deleted &&
!tr.archived &&
tr.parentId === channel.id,
) )
.keys(), .keys(),
].length; // very short line, yes yes ].length; // very short line, yes yes
@ -44,29 +42,35 @@ export const StartThreadAction = automodAction({
return channel.messages.cache.has(c.message.id); return channel.messages.cache.has(c.message.id);
}); });
const guild = await pluginData.guild; const guild = pluginData.guild;
const archiveSet = actionConfig.auto_archive const archiveSet = actionConfig.auto_archive
? Math.ceil(Math.max(convertDelayStringToMS(actionConfig.auto_archive) ?? 0, 0) / MINUTES) ? Math.ceil(Math.max(convertDelayStringToMS(actionConfig.auto_archive) ?? 0, 0) / MINUTES)
: 1400; : 1400;
let autoArchive: ThreadAutoArchiveDuration; let autoArchive: ThreadAutoArchiveDuration;
if (archiveSet === 1440) { if (archiveSet === ThreadAutoArchiveDuration.OneDay) {
autoArchive = ThreadAutoArchiveDuration.OneDay; autoArchive = ThreadAutoArchiveDuration.OneDay;
} else if (archiveSet === 4320 && guild.features.includes(GuildFeature.ThreeDayThreadArchive)) { } else if (
archiveSet === ThreadAutoArchiveDuration.ThreeDays &&
guild.features.includes(GuildFeature.ThreeDayThreadArchive)
) {
autoArchive = ThreadAutoArchiveDuration.ThreeDays; autoArchive = ThreadAutoArchiveDuration.ThreeDays;
} else if (archiveSet === 10080 && guild.features.includes(GuildFeature.SevenDayThreadArchive)) { } else if (
archiveSet === ThreadAutoArchiveDuration.OneWeek &&
guild.features.includes(GuildFeature.SevenDayThreadArchive)
) {
autoArchive = ThreadAutoArchiveDuration.OneWeek; autoArchive = ThreadAutoArchiveDuration.OneWeek;
} else { } else {
autoArchive = ThreadAutoArchiveDuration.OneHour; autoArchive = ThreadAutoArchiveDuration.OneHour;
} }
for (const c of threads) { for (const threadContext of threads) {
const channel = pluginData.guild.channels.cache.get(c.message!.channel_id) as TextChannel; const channel = pluginData.guild.channels.cache.get(threadContext.message!.channel_id) as TextChannel;
const renderThreadName = async str => const renderThreadName = async (str: string) =>
renderTemplate( renderTemplate(
str, str,
new TemplateSafeValueContainer({ new TemplateSafeValueContainer({
user: userToTemplateSafeUser(c.user!), user: userToTemplateSafeUser(threadContext.user!),
msg: savedMessageToTemplateSafeSavedMessage(c.message!), msg: savedMessageToTemplateSafeSavedMessage(threadContext.message!),
}), }),
); );
const threadName = await renderThreadName(actionConfig.name ?? "{user.tag}s thread"); const threadName = await renderThreadName(actionConfig.name ?? "{user.tag}s thread");
@ -76,10 +80,12 @@ export const StartThreadAction = automodAction({
autoArchiveDuration: autoArchive, autoArchiveDuration: autoArchive,
type: type:
actionConfig.private && guild.features.includes(GuildFeature.PrivateThreads) actionConfig.private && guild.features.includes(GuildFeature.PrivateThreads)
? "GUILD_PRIVATE_THREAD" ? ChannelTypeStrings.PRIVATE_THREAD
: "GUILD_PUBLIC_THREAD", : ChannelTypeStrings.PUBLIC_THREAD,
startMessage: startMessage:
!actionConfig.private && guild.features.includes(GuildFeature.PrivateThreads) ? c.message!.id : undefined, !actionConfig.private && guild.features.includes(GuildFeature.PrivateThreads)
? threadContext.message!.id
: undefined,
}) })
.catch(noop); .catch(noop);
if (actionConfig.slowmode && thread) { if (actionConfig.slowmode && thread) {