From 43f2c3625bfe7fa5afc9313e657a69667a8f8afc Mon Sep 17 00:00:00 2001 From: cobalt <61329810+cobaltt7@users.noreply.github.com> Date: Sat, 21 Dec 2024 20:45:54 -0600 Subject: [PATCH] Remove permission, position, and likely spammer logs Signed-off-by: cobalt <61329810+cobaltt7@users.noreply.github.com> --- modules/board/generate.ts | 4 ++-- modules/logging/channels.ts | 47 ------------------------------------- modules/logging/index.ts | 21 +---------------- modules/logging/messages.ts | 4 +--- modules/logging/users.ts | 17 -------------- 5 files changed, 4 insertions(+), 89 deletions(-) diff --git a/modules/board/generate.ts b/modules/board/generate.ts index b6510d32a..e19fd629e 100644 --- a/modules/board/generate.ts +++ b/modules/board/generate.ts @@ -16,8 +16,8 @@ export default async function generateBoardMessage( info instanceof Message ? info.reactions.resolve(BOARD_EMOJI)?.count || 0 : info.reactions; async function messageToBoardData(message: Message): Promise { - const { files, embeds } = await extractMessageExtremities(message, ); - embeds.unshift(await messageToEmbed(message,)); + const { files, embeds } = await extractMessageExtremities(message); + embeds.unshift(await messageToEmbed(message)); return { allowedMentions: { users: [] }, diff --git a/modules/logging/channels.ts b/modules/logging/channels.ts index addc1b714..42aff8af5 100644 --- a/modules/logging/channels.ts +++ b/modules/logging/channels.ts @@ -3,17 +3,13 @@ import type { AuditLog } from "./util.ts"; import { unifiedDiff } from "difflib"; import { - AuditLogOptionsType, - Base, BaseChannel, channelMention, ChannelType, ForumLayoutType, - roleMention, SortOrderType, TextChannel, ThreadAutoArchiveDuration, - userMention, VideoQualityMode, } from "discord.js"; import { formatAnyEmoji } from "strife.js"; @@ -56,42 +52,6 @@ export async function channelDelete(entry: AuditLog LogSeverity.ImportantUpdate, ); } -export async function channelOverwriteCreate( - entry: AuditLog, -): Promise { - await log( - `${LoggingEmojis.Channel} Permissions for ${ - entry.extra instanceof Base ? entry.extra.toString() - : entry.extra.type === AuditLogOptionsType.Member ? userMention(entry.extra.id) - : roleMention(entry.extra.id) - } in ${channelMention(entry.target.id)} changed${extraAuditLogsInfo(entry)}`, - LogSeverity.ServerChange, - ); -} -export async function channelOverwriteUpdate( - entry: AuditLog, -): Promise { - await log( - `${LoggingEmojis.Channel} Permissions for ${ - entry.extra instanceof Base ? entry.extra.toString() - : entry.extra.type === AuditLogOptionsType.Member ? userMention(entry.extra.id) - : roleMention(entry.extra.id) - } in ${channelMention(entry.target.id)} changed${extraAuditLogsInfo(entry)}`, - LogSeverity.ServerChange, - ); -} -export async function channelOverwriteDelete( - entry: AuditLog, -): Promise { - await log( - `${LoggingEmojis.Channel} Permissions for ${ - entry.extra instanceof Base ? entry.extra.toString() - : entry.extra.type === AuditLogOptionsType.Member ? userMention(entry.extra.id) - : roleMention(entry.extra.id) - } in ${channelMention(entry.target.id)} changed${extraAuditLogsInfo(entry)}`, - LogSeverity.ServerChange, - ); -} export async function channelUpdate( oldChannel: DMChannel | NonThreadGuildBasedChannel, @@ -159,13 +119,6 @@ export async function channelUpdate( }`, LogSeverity.ImportantUpdate, ); - if (oldChannel.rawPosition !== newChannel.rawPosition) - await log( - `${LoggingEmojis.Channel} ${newChannel.toString()} moved to position ${ - newChannel.rawPosition - }`, - LogSeverity.ServerChange, - ); if (oldChannel.type !== newChannel.type) { await log( `${LoggingEmojis.Channel} ${newChannel.toString()} converted to a${ diff --git a/modules/logging/index.ts b/modules/logging/index.ts index f7898710e..e16043fcc 100644 --- a/modules/logging/index.ts +++ b/modules/logging/index.ts @@ -5,20 +5,12 @@ import { AuditLogEvent, AutoModerationRule, AutoModerationRuleTriggerType, - userMention, WebhookType, } from "discord.js"; import { defineEvent } from "strife.js"; import config from "../../common/config.ts"; -import { - channelCreate, - channelDelete, - channelOverwriteCreate, - channelOverwriteDelete, - channelOverwriteUpdate, - channelUpdate, -} from "./channels.ts"; +import { channelCreate, channelDelete, channelUpdate } from "./channels.ts"; import { guildUpdate, inviteCreate, inviteDelete } from "./guild.ts"; import { messageDelete, @@ -49,9 +41,6 @@ import { const events: { [Event in AuditLogEvent]?: (entry: AuditLog) => Awaitable } = { [AuditLogEvent.ChannelCreate]: channelCreate, [AuditLogEvent.ChannelDelete]: channelDelete, - [AuditLogEvent.ChannelOverwriteCreate]: channelOverwriteCreate, - [AuditLogEvent.ChannelOverwriteUpdate]: channelOverwriteUpdate, - [AuditLogEvent.ChannelOverwriteDelete]: channelOverwriteDelete, [AuditLogEvent.MemberKick]: memberKick, [AuditLogEvent.MemberPrune]: memberPrune, [AuditLogEvent.MemberBanAdd]: memberBanAdd, @@ -107,14 +96,6 @@ const events: { [Event in AuditLogEvent]?: (entry: AuditLog) => Awaitable [AuditLogEvent.GuildScheduledEventUpdate]: guildScheduledEventUpdate, [AuditLogEvent.ThreadCreate]: threadCreate, [AuditLogEvent.ThreadDelete]: threadDelete, - async [AuditLogEvent.ApplicationCommandPermissionUpdate](entry) { - await log( - `${LoggingEmojis.Integration} Permissions for ${userMention( - entry.extra.applicationId, - )}’s commands changed${extraAuditLogsInfo(entry)}`, - LogSeverity.ServerChange, - ); - }, async [AuditLogEvent.AutoModerationRuleCreate](entry) { if (!(entry.target instanceof AutoModerationRule)) return; await log( diff --git a/modules/logging/messages.ts b/modules/logging/messages.ts index 362eef11d..0bdb2b0f5 100644 --- a/modules/logging/messages.ts +++ b/modules/logging/messages.ts @@ -34,9 +34,7 @@ export async function messageDelete(message: Message | PartialMessage): Promise< const content = !shush && messageToText(message, false); const { embeds, files } = - shush ? - { embeds: [], files: [] } - : await extractMessageExtremities(message, undefined, false); + shush ? { embeds: [], files: [] } : await extractMessageExtremities(message, false); const unknownAttachments = message.attachments.filter((file) => isFileExpired(file.url)); diff --git a/modules/logging/users.ts b/modules/logging/users.ts index 1849ac8b9..da98c6151 100644 --- a/modules/logging/users.ts +++ b/modules/logging/users.ts @@ -45,13 +45,6 @@ export async function memberBanRemove( export async function guildMemberAdd(member: GuildMember): Promise { if (member.guild.id !== config.guild.id) return; await log(`${LoggingEmojis.Member} ${member.toString()} joined`, LogSeverity.Resource); - - if (member.user.flags?.has("Spammer")) { - await log( - `${LoggingEmojis.Punishment} ${member.toString()} marked as likely spammer`, - LogSeverity.Alert, - ); - } } export async function guildMemberRemove(member: GuildMember | PartialGuildMember): Promise { if (member.guild.id !== config.guild.id) return; @@ -141,14 +134,4 @@ export async function userUpdate(oldUser: PartialUser | User, newUser: User): Pr LogSeverity.Alert, ); } - - const spammer = !!newUser.flags?.has("Spammer"); - if (!!oldUser.flags?.has("Spammer") !== spammer) { - await log( - `${LoggingEmojis.Punishment} ${newUser.toString()} ${ - spammer ? "" : "un" - }marked as likely spammer`, - LogSeverity.Alert, - ); - } }