feat: file filter rule

virtual-designer · web-flow · commit f1da20a8b4f3 · 2024-06-14T16:37:54.000Z
diff --git a/build_src/src/main/typescript/BuildPlugin.ts b/build_src/src/main/typescript/BuildPlugin.ts
@@ -2,6 +2,7 @@ import { Awaitable, BlazePlugin } from "blazebuild";
 import CleanTask from "./tasks/CleanTask";
 import CompileTask from "./tasks/CompileTask";
 import CompileTypeScriptTask from "./tasks/CompileTypeScriptTask";
+import CopyResourcesTask from "./tasks/CopyResourcesTask";
 import DependenciesTask from "./tasks/DependenciesTask";
 import LintTask from "./tasks/LintTask";
 import ProcessCoverageReportsTask from "./tasks/ProcessCoverageReportsTask";
@@ -11,7 +12,7 @@ import TestTask from "./tasks/TestTask";
 class BuildPlugin extends BlazePlugin {
     public override boot(): Awaitable<void> {
         this.blaze.taskManager.named("build", {
-            dependsOn: ["compile", "lint", "test"],
+            dependsOn: ["compile", "copyResources", "lint", "test"],
             outputs: [this.blaze.projectManager.properties.structure?.buildOutputDirectory ?? ""]
         });
     }
@@ -25,7 +26,8 @@ class BuildPlugin extends BlazePlugin {
             LintTask,
             ProcessCoverageReportsTask,
             RunTask,
-            TestTask
+            TestTask,
+            CopyResourcesTask
         ];
     }
 }
diff --git a/build_src/src/main/typescript/tasks/CompileTask.ts b/build_src/src/main/typescript/tasks/CompileTask.ts
@@ -8,6 +8,7 @@ import {
     files,
     type Awaitable
 } from "blazebuild";
+import { $ } from "bun";
 import path from "path";
 
 @Task({
@@ -16,7 +17,18 @@ import path from "path";
 })
 class CompileTask extends AbstractTask {
     @TaskAction
-    protected override async run(): Promise<void> {}
+    protected override async run(): Promise<void> {
+        const buildOutputDirectory =
+            this.blaze.projectManager.properties.structure?.buildOutputDirectory;
+
+        if (!buildOutputDirectory) {
+            throw new Error("buildOutputDirectory is not defined in project properties");
+        }
+
+        await $`mv ${buildOutputDirectory}/out/src ${buildOutputDirectory}/out.tmp`;
+        await $`rm -rf ${buildOutputDirectory}/out`;
+        await $`mv ${buildOutputDirectory}/out.tmp ${buildOutputDirectory}/out`;
+    }
 
     @TaskDependencyGenerator
     protected override async dependencies() {
diff --git a/build_src/src/main/typescript/tasks/CopyResourcesTask.ts b/build_src/src/main/typescript/tasks/CopyResourcesTask.ts
@@ -0,0 +1,77 @@
+import {
+    AbstractTask,
+    Task,
+    TaskAction,
+    TaskInputGenerator,
+    TaskOutputGenerator
+} from "blazebuild";
+import { $ } from "bun";
+
+@Task({
+    description: "Copies the resources",
+    group: "Build"
+})
+class CopyResourcesTask extends AbstractTask {
+    @TaskAction
+    protected override async run(): Promise<void> {
+        const sourcesRootDirectory =
+            this.blaze.projectManager.properties.structure?.sourcesRootDirectory;
+        const buildOutputDirectory =
+            this.blaze.projectManager.properties.structure?.buildOutputDirectory;
+        const modules = this.blaze.projectManager.properties.structure?.sourceModules;
+
+        if (!buildOutputDirectory) {
+            throw new Error("buildOutputDirectory is not defined in project properties");
+        }
+
+        if (!modules) {
+            throw new Error("sourceModules is not defined in project properties");
+        }
+
+        if (!sourcesRootDirectory) {
+            throw new Error("sourcesRootDirectory is not defined in project properties");
+        }
+
+        for (const module of modules) {
+            await $`cp -r ${sourcesRootDirectory}/${module}/resources ${buildOutputDirectory}/out/${module}/resources`;
+        }
+    }
+
+    @TaskOutputGenerator
+    protected override generateOutput() {
+        const sourcesRootDirectory =
+            this.blaze.projectManager.properties.structure?.sourcesRootDirectory;
+        const buildOutputDirectory =
+            this.blaze.projectManager.properties.structure?.buildOutputDirectory;
+        const modules = this.blaze.projectManager.properties.structure?.sourceModules;
+
+        if (!buildOutputDirectory) {
+            throw new Error("buildOutputDirectory is not defined in project properties");
+        }
+
+        if (!modules) {
+            throw new Error("sourceModules is not defined in project properties");
+        }
+
+        return modules.map(module => `${buildOutputDirectory}/out/${module}/resources`);
+    }
+
+    @TaskInputGenerator
+    protected override generateInput() {
+        const sourcesRootDirectory =
+            this.blaze.projectManager.properties.structure?.sourcesRootDirectory;
+        const modules = this.blaze.projectManager.properties.structure?.sourceModules;
+
+        if (!modules) {
+            throw new Error("sourceModules is not defined in project properties");
+        }
+
+        if (!sourcesRootDirectory) {
+            throw new Error("sourcesRootDirectory is not defined in project properties");
+        }
+
+        return modules.map(module => `${sourcesRootDirectory}/${module}/resources`);
+    }
+}
+
+export default CopyResourcesTask;
diff --git a/src/framework/typescript/import/ClassLoader.ts b/src/framework/typescript/import/ClassLoader.ts
@@ -92,7 +92,10 @@ class ClassLoader {
             return this.modules;
         }
 
-        const srcDir = path.resolve(this.application.projectRootPath, "src");
+        const srcDir = path.resolve(
+            this.application.projectRootPath,
+            process.isBun ? "src" : "out"
+        );
         const modules = await readdir(srcDir);
 
         for (const module of modules) {
@@ -116,7 +119,13 @@ class ClassLoader {
         const modules = module ? [module] : await this.loadModules();
 
         for (const moduleName of modules) {
-            const filePath = path.join(this.application.projectRootPath, "src", moduleName, "resources/", name);
+            const filePath = path.join(
+                this.application.projectRootPath,
+                process.isBun ? "src" : "out",
+                moduleName,
+                "resources/",
+                name
+            );
             const file = File.of(filePath);
 
             if (!file.exists) {
diff --git a/src/main/typescript/automod/RuleModerationService.ts b/src/main/typescript/automod/RuleModerationService.ts
@@ -1,13 +1,14 @@
 import { Inject } from "@framework/container/Inject";
+import { GatewayEventListener } from "@framework/events/GatewayEventListener";
 import { Name } from "@framework/services/Name";
 import { Service } from "@framework/services/Service";
 import { HasEventListeners } from "@framework/types/HasEventListeners";
 import { LogEventType } from "@main/schemas/LoggingSchema";
 import { GuildMember, Message, Snowflake, TextChannel } from "discord.js";
 import { MessageAutoModServiceContract } from "../contracts/MessageAutoModServiceContract";
 import {
-    type default as ModerationRuleHandlerContract,
-    MessageRuleScope
+    MessageRuleScope,
+    type default as ModerationRuleHandlerContract
 } from "../contracts/ModerationRuleHandlerContract";
 import { MessageRuleType } from "../schemas/MessageRuleSchema";
 import ModerationRuleHandler from "../security/ModerationRuleHandler";
@@ -16,7 +17,6 @@ import type ConfigurationManager from "../services/ConfigurationManager";
 import type ModerationActionService from "../services/ModerationActionService";
 import type PermissionManagerService from "../services/PermissionManagerService";
 import { safeMemberFetch } from "../utils/fetch";
-import { GatewayEventListener } from "@framework/events/GatewayEventListener";
 
 @Name("ruleModerationService")
 class RuleModerationService
@@ -93,27 +93,33 @@ class RuleModerationService
 
     @GatewayEventListener("guildMemberUpdate")
     public async onGuildMemberUpdate(oldMember: GuildMember, newMember: GuildMember) {
-        if (oldMember.nickname === newMember.nickname &&
+        if (
+            oldMember.nickname === newMember.nickname &&
             oldMember.user.displayName === newMember.user.displayName &&
             oldMember.user.username === newMember.user.username &&
             oldMember.presence === newMember.presence
         ) {
             return;
         }
 
-        presence:
-        if (oldMember.presence && newMember.presence) {
+        presence: if (oldMember.presence && newMember.presence) {
             for (let index = 0; index < oldMember.presence.activities.length; index++) {
                 const oldActivity = oldMember.presence.activities[index];
                 const newActivity = newMember.presence.activities[index];
 
-                if (oldActivity?.name !== newActivity?.name || oldActivity?.state !== newActivity?.state || oldActivity?.details !== newActivity?.details) {
+                if (
+                    oldActivity?.name !== newActivity?.name ||
+                    oldActivity?.state !== newActivity?.state ||
+                    oldActivity?.details !== newActivity?.details
+                ) {
                     break presence;
                 }
             }
         }
 
-        this.application.logger.debug(`Checking member profile ${newMember.user.id} in guild ${newMember.guild.id}`);
+        this.application.logger.debug(
+            `Checking member profile ${newMember.user.id} in guild ${newMember.guild.id}`
+        );
         await this.moderateMemberOrMessage({
             member: newMember,
             guildId: newMember.guild.id,
@@ -153,7 +159,7 @@ class RuleModerationService
         }
 
         if (message) {
-            let fetchedMember;
+            let fetchedMember: GuildMember | null = member;
 
             if (!member) {
                 fetchedMember = await safeMemberFetch(message.guild!, message.author.id);
@@ -183,8 +189,9 @@ class RuleModerationService
             if (
                 scopes !== undefined &&
                 options.scopes !== undefined &&
-                scopes?.[rule.type]?.find((scope: MessageRuleScope) => options.scopes?.includes(scope)) ===
-                    undefined
+                scopes?.[rule.type]?.find((scope: MessageRuleScope) =>
+                    options.scopes?.includes(scope)
+                ) === undefined
             ) {
                 continue;
             }
diff --git a/src/main/typescript/schemas/GuildConfigSchema.ts b/src/main/typescript/schemas/GuildConfigSchema.ts
@@ -301,48 +301,6 @@ export const GuildConfigSchema = z.object({
                 .default({})
         })
         .optional(),
-    welcomer: z
-        .object({
-            enabled: z.boolean().optional().default(false),
-            custom_message: z.string().optional(),
-            randomize: z.boolean().optional().default(false),
-            mention: z.boolean().optional().default(false),
-            say_hi_button: z.boolean().optional().default(false),
-            say_hi_label: z.string().min(1).optional(),
-            say_hi_emoji: z.string().optional().default("default"),
-            say_hi_reply: z.string().optional(),
-            say_hi_expire_after: z
-                .number()
-                .int()
-                .min(5_000)
-                .max(10 * 60_000)
-                .default(5 * 60_000)
-                .nullable(),
-            delete_messages: z
-                .number()
-                .int()
-                .min(5_000)
-                .max(10 * 60_000)
-                .nullable()
-                .default(null),
-            channel: zSnowflake,
-            embed: z.boolean().optional().default(true),
-            color: z
-                .number()
-                .int()
-                .min(0x000000)
-                .max(0xffffff)
-                .default(0x007bff)
-                .or(z.string().startsWith("#"))
-        })
-        .optional(),
-    file_filter: z
-        .object({
-            enabled: z.boolean().optional().default(false),
-            disabled_channels: z.array(zSnowflake).default([]),
-            blocked_hashes: z.record(z.string(), z.string().nullable()).default({})
-        })
-        .optional(),
     auto_triggers: z
         .object({
             enabled: z.boolean().default(false),
diff --git a/src/main/typescript/schemas/MessageRuleSchema.ts b/src/main/typescript/schemas/MessageRuleSchema.ts
@@ -157,6 +157,13 @@ export const WordFilter = z.object({
     normalize: z.boolean().default(true)
 });
 
+export const FileFilter = z.object({
+    ...Common,
+    type: z.literal("file_filter"),
+    hashes: z.record(z.string(), z.string().nullable()).default({}),
+    check_mime_types: z.boolean().default(false)
+});
+
 export const ProfileFilter = z.object({
     ...Common,
     type: z.literal("profile_filter"),
@@ -179,7 +186,8 @@ export const MessageRuleSchema = z.union([
     URLCrawlRule,
     NSFWFilter,
     WordFilter,
-    ProfileFilter
+    ProfileFilter,
+    FileFilter
 ]);
 
 export type MessageRuleType = z.infer<typeof MessageRuleSchema>;
diff --git a/src/main/typescript/security/ModerationRuleHandler.ts b/src/main/typescript/security/ModerationRuleHandler.ts
