diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gateway/src/commands/delete.ts | 7 | ||||
| -rw-r--r-- | packages/gateway/src/commands/utilities.ts | 3 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/mediaModeration.ts | 14 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/aiCommandHandler.ts (renamed from packages/gateway/src/listeners/aiCommandHandler.ts) | 0 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/announcementReaction.ts (renamed from packages/gateway/src/listeners/announcementReaction.ts) | 0 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/artMediaModeration.ts (renamed from packages/gateway/src/listeners/artMediaModeration.ts) | 2 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/index.ts (renamed from packages/gateway/src/listeners/messageCreate.ts) | 2 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/iqdbModeration.ts (renamed from packages/gateway/src/listeners/iqdbModeration.ts) | 2 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/moderationAgent/constants.ts (renamed from packages/gateway/src/listeners/moderationAgent/constants.ts) | 0 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/moderationAgent/index.ts (renamed from packages/gateway/src/listeners/moderationAgent/index.ts) | 0 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/moderationAgent/utilities.ts (renamed from packages/gateway/src/listeners/moderationAgent/utilities.ts) | 26 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/roleMentionCooldown.ts (renamed from packages/gateway/src/listeners/roleMentionCooldown.ts) | 0 | ||||
| -rw-r--r-- | packages/gateway/src/listeners/messageCreate/roleplayUmagram.ts (renamed from packages/gateway/src/listeners/roleplayUmagram.ts) | 0 |
13 files changed, 29 insertions, 27 deletions
diff --git a/packages/gateway/src/commands/delete.ts b/packages/gateway/src/commands/delete.ts index 773e72f..3d01455 100644 --- a/packages/gateway/src/commands/delete.ts +++ b/packages/gateway/src/commands/delete.ts @@ -66,7 +66,6 @@ export const handleDeleteCommand = async (message: Message) => { } try { - let deletedCount = 0; let failedCount = 0; for (const messageId of messageIds) { @@ -74,8 +73,6 @@ export const handleDeleteCommand = async (message: Message) => { const targetMessage = await targetChannel.messages.fetch(messageId); await targetMessage.delete(); - - deletedCount += 1; } catch { failedCount += 1; } @@ -84,7 +81,9 @@ export const handleDeleteCommand = async (message: Message) => { await message.delete(); if (failedCount > 0) - console.warn(`Failed to delete ${failedCount} out of ${messageIds.length} messages`); + console.warn( + `Failed to delete ${failedCount} out of ${messageIds.length} messages`, + ); } catch (error) { console.error("Error deleting messages:", error); await message.reply( diff --git a/packages/gateway/src/commands/utilities.ts b/packages/gateway/src/commands/utilities.ts index ba6c854..fd3b84d 100644 --- a/packages/gateway/src/commands/utilities.ts +++ b/packages/gateway/src/commands/utilities.ts @@ -64,8 +64,7 @@ export const sendAuditLog = async ( for (let i = 0; i < chunks.length; i++) { const chunk = chunks[i]; - const header = - chunks.length > 1 ? `## Part ${i + 1}\n\n` : ""; + const header = chunks.length > 1 ? `## Part ${i + 1}\n\n` : ""; await (channel as any).send(`${header}${chunk}`); } diff --git a/packages/gateway/src/listeners/mediaModeration.ts b/packages/gateway/src/listeners/mediaModeration.ts index 0570026..1a62acd 100644 --- a/packages/gateway/src/listeners/mediaModeration.ts +++ b/packages/gateway/src/listeners/mediaModeration.ts @@ -1,6 +1,5 @@ import { Client, Events, Message } from "discord.js"; import { GUILD_ID } from "../constants"; -import { IQDBSearchResultItem } from "iqdb-client"; const MONITORED_CHANNEL_ID = "1410333697701314791"; @@ -12,8 +11,9 @@ export const handleMediaModeration = (client: Client) => { if (message.attachments.size > 0) { try { - const hasSensitiveFlag = message.attachments.some(attachment => - attachment.flags && (Number(attachment.flags) & 0x10) !== 0 + const hasSensitiveFlag = message.attachments.some( + (attachment) => + attachment.flags && (Number(attachment.flags) & 0x10) !== 0, ); if (hasSensitiveFlag) { @@ -36,8 +36,7 @@ export const handleMediaModeration = (client: Client) => { (item) => item.similarity !== null && item.similarity > 0.75, ) || []; - if (matches.length === 0) - continue; + if (matches.length === 0) continue; await message.delete(); @@ -48,7 +47,10 @@ export const handleMediaModeration = (client: Client) => { } } } catch (error) { - console.error("Error checking/deleting message with sensitive content:", error); + console.error( + "Error checking/deleting message with sensitive content:", + error, + ); } } }); diff --git a/packages/gateway/src/listeners/aiCommandHandler.ts b/packages/gateway/src/listeners/messageCreate/aiCommandHandler.ts index 652069e..652069e 100644 --- a/packages/gateway/src/listeners/aiCommandHandler.ts +++ b/packages/gateway/src/listeners/messageCreate/aiCommandHandler.ts diff --git a/packages/gateway/src/listeners/announcementReaction.ts b/packages/gateway/src/listeners/messageCreate/announcementReaction.ts index e0c12ce..e0c12ce 100644 --- a/packages/gateway/src/listeners/announcementReaction.ts +++ b/packages/gateway/src/listeners/messageCreate/announcementReaction.ts diff --git a/packages/gateway/src/listeners/artMediaModeration.ts b/packages/gateway/src/listeners/messageCreate/artMediaModeration.ts index 73208c6..177a930 100644 --- a/packages/gateway/src/listeners/artMediaModeration.ts +++ b/packages/gateway/src/listeners/messageCreate/artMediaModeration.ts @@ -2,7 +2,7 @@ import { Message } from "discord.js"; import { ART_MEDIA_NSFW_CHANNEL_ID, NSFW_DISCUSSION_CHANNEL_ID, -} from "./constants"; +} from "../constants"; export const handleArtMediaModeration = async (message: Message) => { if (message.channelId !== ART_MEDIA_NSFW_CHANNEL_ID) return; diff --git a/packages/gateway/src/listeners/messageCreate.ts b/packages/gateway/src/listeners/messageCreate/index.ts index 27072f9..c099142 100644 --- a/packages/gateway/src/listeners/messageCreate.ts +++ b/packages/gateway/src/listeners/messageCreate/index.ts @@ -1,7 +1,7 @@ import { Client, Events, Message } from "discord.js"; import { handleIqdbModeration } from "./iqdbModeration"; import { handleRoleplayUmagram } from "./roleplayUmagram"; -import { handleArtMediaModeration } from "./artMediaModeration"; +// import { handleArtMediaModeration } from "./artMediaModeration"; import { handleAIModeration } from "./moderationAgent"; import { handleAnnouncementReaction } from "./announcementReaction"; import { handleRoleMentionCooldown } from "./roleMentionCooldown"; diff --git a/packages/gateway/src/listeners/iqdbModeration.ts b/packages/gateway/src/listeners/messageCreate/iqdbModeration.ts index fb1c640..d4ff7ed 100644 --- a/packages/gateway/src/listeners/iqdbModeration.ts +++ b/packages/gateway/src/listeners/messageCreate/iqdbModeration.ts @@ -1,5 +1,5 @@ import { Message } from "discord.js"; -import { sendAuditLog } from "../commands/utilities"; +import { sendAuditLog } from "../../commands/utilities"; const IQDB_MODERATION_CHANNEL_IDS = [ "1410333697701314791", diff --git a/packages/gateway/src/listeners/moderationAgent/constants.ts b/packages/gateway/src/listeners/messageCreate/moderationAgent/constants.ts index 9316c67..9316c67 100644 --- a/packages/gateway/src/listeners/moderationAgent/constants.ts +++ b/packages/gateway/src/listeners/messageCreate/moderationAgent/constants.ts diff --git a/packages/gateway/src/listeners/moderationAgent/index.ts b/packages/gateway/src/listeners/messageCreate/moderationAgent/index.ts index 66aa52c..66aa52c 100644 --- a/packages/gateway/src/listeners/moderationAgent/index.ts +++ b/packages/gateway/src/listeners/messageCreate/moderationAgent/index.ts diff --git a/packages/gateway/src/listeners/moderationAgent/utilities.ts b/packages/gateway/src/listeners/messageCreate/moderationAgent/utilities.ts index 3a7cf7b..9d91071 100644 --- a/packages/gateway/src/listeners/moderationAgent/utilities.ts +++ b/packages/gateway/src/listeners/messageCreate/moderationAgent/utilities.ts @@ -1,5 +1,10 @@ import { Message, TextChannel, ThreadChannel } from "discord.js"; -import { MESSAGE_HISTORY_SIZE, MAX_COMPLETION_TOKENS, MODEL, SERVER_RULES } from "./constants"; +import { + MESSAGE_HISTORY_SIZE, + MAX_COMPLETION_TOKENS, + MODEL, + SERVER_RULES, +} from "./constants"; export const fetchMessageContext = async ( channel: TextChannel | ThreadChannel, @@ -73,13 +78,10 @@ export const analyzeMessageWithAI = async ( : "No Category"; const guildName = guild?.name || "Unknown Server"; const guildId = guild?.id || "Unknown"; - const messageLength = message.content?.length || 0; const hasAttachments = message.attachments.size > 0; const hasEmbeds = message.embeds.length > 0; const authorId = author.id; const member = guild?.members.cache.get(authorId); - const authorRoles = - member?.roles.cache.map((role) => role.name).join(", ") || "No roles"; const authorJoinedAt = member?.joinedAt?.toISOString() || "Unknown"; let repliedToMessage = null; @@ -391,16 +393,16 @@ Remember: Only enforce the exact rules provided. Do not make assumptions or inte if (!jsonContent.endsWith("}")) { const openBraces = (jsonContent.match(/\{/g) || []).length; const closeBraces = (jsonContent.match(/\}/g) || []).length; - + if (openBraces > closeBraces) { let truncatedJson = jsonContent; - + if (truncatedJson.match(/"[^"]*$/)) truncatedJson = truncatedJson.replace(/"[^"]*$/, '""'); - + const missingBraces = openBraces - closeBraces; - truncatedJson += '}'.repeat(missingBraces); + truncatedJson += "}".repeat(missingBraces); jsonContent = truncatedJson; } } @@ -451,16 +453,16 @@ Remember: Only enforce the exact rules provided. Do not make assumptions or inte if (!fallbackContent.endsWith("}")) { const openBraces = (fallbackContent.match(/\{/g) || []).length; const closeBraces = (fallbackContent.match(/\}/g) || []).length; - + if (openBraces > closeBraces) { let truncatedJson = fallbackContent; - + if (truncatedJson.match(/"[^"]*$/)) truncatedJson = truncatedJson.replace(/"[^"]*$/, '""'); - + const missingBraces = openBraces - closeBraces; - truncatedJson += '}'.repeat(missingBraces); + truncatedJson += "}".repeat(missingBraces); fallbackContent = truncatedJson; } } diff --git a/packages/gateway/src/listeners/roleMentionCooldown.ts b/packages/gateway/src/listeners/messageCreate/roleMentionCooldown.ts index d1fba37..d1fba37 100644 --- a/packages/gateway/src/listeners/roleMentionCooldown.ts +++ b/packages/gateway/src/listeners/messageCreate/roleMentionCooldown.ts diff --git a/packages/gateway/src/listeners/roleplayUmagram.ts b/packages/gateway/src/listeners/messageCreate/roleplayUmagram.ts index a60a1b6..a60a1b6 100644 --- a/packages/gateway/src/listeners/roleplayUmagram.ts +++ b/packages/gateway/src/listeners/messageCreate/roleplayUmagram.ts |