start moving types into shared library

bot/src/bot/commands/configuration/login.ts

@@ -3,7 +3,7 @@ import { client, dbs } from "../../..";
 import CommandCategory from "../../../struct/commands/CommandCategory";
 import SimpleCommand from "../../../struct/commands/SimpleCommand";
 import MessageCommandContext from "../../../struct/MessageCommandContext";
-import PendingLogin from "../../../struct/PendingLogin";
+import PendingLogin from "automod/types/PendingLogin";
 import logger from "../../logger";
 import { DEFAULT_PREFIX } from "../../modules/command_handler";
 

bot/src/bot/commands/configuration/whitelist.ts

@@ -3,7 +3,7 @@ import { client, dbs } from "../../..";
 import CommandCategory from "../../../struct/commands/CommandCategory";
 import SimpleCommand from "../../../struct/commands/SimpleCommand";
 import MessageCommandContext from "../../../struct/MessageCommandContext";
-import ServerConfig from "../../../struct/ServerConfig";
+import ServerConfig from "automod/types/ServerConfig";
 import { isBotManager, NO_MANAGER_MSG, parseUser } from "../../util";
 
 const SYNTAX = '/whitelist add @user; /whitelist remove @user; /whitelist list';

bot/src/bot/commands/moderation/ban.ts

@@ -1,7 +1,7 @@
 import { ulid } from "ulid";
 import { client } from "../../../index";
-import Infraction from "../../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
-import InfractionType from "../../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
 import SimpleCommand from "../../../struct/commands/SimpleCommand";
 import { fetchUsername, logModAction } from "../../modules/mod_logs";
 import { storeTempBan } from "../../modules/tempbans";

bot/src/bot/commands/moderation/kick.ts

@@ -2,8 +2,8 @@ import { User } from "@janderedev/revolt.js";
 import { SendableEmbed } from "revolt-api";
 import { ulid } from "ulid";
 import { client } from "../../../";
-import Infraction from "../../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
-import InfractionType from "../../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
 import CommandCategory from "../../../struct/commands/CommandCategory";
 import SimpleCommand from "../../../struct/commands/SimpleCommand";
 import logger from "../../logger";

bot/src/bot/commands/moderation/warn.ts

@@ -1,8 +1,8 @@
 import SimpleCommand from "../../../struct/commands/SimpleCommand";
 import { dedupeArray, embed, EmbedColor, generateInfractionDMEmbed, getDmChannel, isModerator, NO_MANAGER_MSG, parseUserOrId, sanitizeMessageContent, storeInfraction } from "../../util";
-import Infraction from "../../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
 import { ulid } from "ulid";
-import InfractionType from "../../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
 import { fetchUsername, logModAction } from "../../modules/mod_logs";
 import CommandCategory from "../../../struct/commands/CommandCategory";
 import { SendableEmbed } from "revolt-api";

bot/src/bot/commands/moderation/warns.ts

@@ -1,7 +1,7 @@
 import SimpleCommand from "../../../struct/commands/SimpleCommand";
-import { client, dbs } from "../../..";
+import { dbs } from "../../..";
-import Infraction from "../../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
-import InfractionType from "../../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
 import { isModerator, NO_MANAGER_MSG, parseUserOrId, uploadFile } from "../../util";
 import Day from 'dayjs';
 import RelativeTime from 'dayjs/plugin/relativeTime';

bot/src/bot/modules/antispam.ts

@@ -1,10 +1,10 @@
 import { Message } from "@janderedev/revolt.js/dist/maps/Messages";
 import { ulid } from "ulid";
 import { dbs } from "../..";
-import AntispamRule from "../../struct/antispam/AntispamRule";
+import AntispamRule from "automod/types/antispam/AntispamRule";
-import Infraction from "../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
-import InfractionType from "../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
-import ModerationAction from "../../struct/antispam/ModerationAction";
+import ModerationAction from "automod/types/antispam/ModerationAction";
 import logger from "../logger";
 import { isModerator, storeInfraction } from "../util";
 

bot/src/bot/modules/api/server_details.ts

@@ -1,7 +1,7 @@
 import { Member } from "@janderedev/revolt.js/dist/maps/Members";
 import { User } from "@janderedev/revolt.js/dist/maps/Users";
 import { client, dbs } from "../../..";
-import ServerConfig from "../../../struct/ServerConfig";
+import ServerConfig from "automod/types/ServerConfig";
 import { getPermissionLevel } from "../../util";
 import { wsEvents, WSResponse } from "../api_communication";
 

bot/src/bot/modules/api_communication.ts

@@ -8,7 +8,7 @@ import crypto from 'crypto';
 import { client as bot, dbs } from '../..';
 import { EventEmitter } from "events";
 import { parseUser } from "../util";
-import PendingLogin from "../../struct/PendingLogin";
+import PendingLogin from "automod/types/PendingLogin";
 import { ulid } from "ulid";
 
 const wsEvents = new EventEmitter();

bot/src/bot/modules/custom_rules/actions/delete.ts

@@ -1,5 +1,5 @@
 import { Message } from "@janderedev/revolt.js/dist/maps/Messages";
-import CustomRuleAction from "../../../../struct/antispam/CustomRuleAction";
+import CustomRuleAction from "automod/types/antispam/CustomRuleAction";
 
 async function execute(message: Message, action: CustomRuleAction) {
     setTimeout(() => message.delete().catch(console.warn), (action.duration ?? 0) * 1000);

bot/src/bot/modules/custom_rules/actions/sendMessage.ts

@@ -1,6 +1,6 @@
 import { Message } from "@janderedev/revolt.js/dist/maps/Messages";
 import { client } from "../../../..";
-import CustomRuleAction from "../../../../struct/antispam/CustomRuleAction";
+import CustomRuleAction from "automod/types/antispam/CustomRuleAction";
 
 async function execute(message: Message, action: CustomRuleAction) {
     let text = action.text || "Error: No text specified for `sendMessage` action";

bot/src/bot/modules/custom_rules/actions/warn.ts

@@ -1,9 +1,9 @@
 import { Message } from "@janderedev/revolt.js/dist/maps/Messages";
-import CustomRuleAction from "../../../../struct/antispam/CustomRuleAction";
+import CustomRuleAction from "automod/types/antispam/CustomRuleAction";
 import { storeInfraction } from '../../../util';
-import Infraction from "../../../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
 import { ulid } from "ulid";
-import InfractionType from "../../../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
 
 async function execute(message: Message, action: CustomRuleAction) {
     let warnMsg = action.text

bot/src/bot/modules/custom_rules/message_content_trigger.ts

@@ -1,6 +1,6 @@
 import { Message } from "@janderedev/revolt.js/dist/maps/Messages";
 import { client } from "../../..";
-import CustomRuleTrigger from "../../../struct/antispam/CustomRuleTrigger";
+import CustomRuleTrigger from "automod/types/antispam/CustomRuleTrigger";
 import VM from 'vm';
 
 let ruleTimeouts: Map<string, number> = new Map();

bot/src/bot/modules/event_handler.ts

@@ -1,8 +1,8 @@
 import { ulid } from "ulid";
 import crypto from "crypto";
 import { client, dbs } from "../..";
-import Infraction from "../../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
-import InfractionType from "../../struct/antispam/InfractionType";
+import InfractionType from "automod/types/antispam/InfractionType";
 import { BLACKLIST_BAN_REASON, BLACKLIST_MESSAGE } from "../commands/admin/botadm";
 import logger from "../logger";
 import { hasPermForChannel, storeInfraction } from "../util";

bot/src/bot/modules/mod_logs.ts

@@ -1,9 +1,7 @@
 import { Member } from "@janderedev/revolt.js/dist/maps/Members";
 import { Server } from "@janderedev/revolt.js/dist/maps/Servers";
 import { client, dbs } from "../..";
-import Infraction from "../../struct/antispam/Infraction";
+import LogMessage from "automod/types/LogMessage";
-import LogMessage from "../../struct/LogMessage";
-import ServerConfig from "../../struct/ServerConfig";
 import logger from "../logger";
 import { getAutumnURL, sanitizeMessageContent, sendLogMessage } from "../util";
 

bot/src/bot/modules/tempbans.ts

@@ -1,6 +1,6 @@
 import { FindResult } from "monk";
 import { client, dbs } from "../..";
-import TempBan from "../../struct/TempBan";
+import TempBan from "automod/types/TempBan";
 import logger from "../logger";
 
 // Array of ban IDs which should not get processed in this session

bot/src/bot/util.ts

@@ -1,12 +1,12 @@
 import { Member } from "@janderedev/revolt.js/dist/maps/Members";
 import { User } from "@janderedev/revolt.js/dist/maps/Users";
 import { client, dbs } from "..";
-import Infraction from "../struct/antispam/Infraction";
+import Infraction from "automod/types/antispam/Infraction";
 import FormData from 'form-data';
 import axios from 'axios';
 import { Server } from "@janderedev/revolt.js/dist/maps/Servers";
-import LogConfig from "../struct/LogConfig";
+import LogConfig from "automod/types/LogConfig";
-import LogMessage from "../struct/LogMessage";
+import LogMessage from "automod/types/LogMessage";
 import { ColorResolvable, MessageEmbed } from "discord.js";
 import logger from "./logger";
 import { ulid } from "ulid";
@@ -16,7 +16,7 @@ import { Message } from "@janderedev/revolt.js/dist/maps/Messages";
 import { isSudo } from "./commands/admin/botadm";
 import { SendableEmbed } from "revolt-api";
 import MessageCommandContext from "../struct/MessageCommandContext";
-import ServerConfig from "../struct/ServerConfig";
+import ServerConfig from "automod/types/ServerConfig";
 
 const NO_MANAGER_MSG = '🔒 Missing permission';
 const ULID_REGEX = /^[0-9A-HJ-KM-NP-TV-Z]{26}$/i;

bot/src/index.ts

@@ -4,15 +4,15 @@ config();
 import logger from './bot/logger';
 import AutomodClient, { login } from './struct/AutomodClient';
 import MongoDB from './bot/db';
-import DbUser from './struct/DbUser';
+import DbUser from 'automod/types/DbUser';
-import ServerConfig from './struct/ServerConfig';
+import ServerConfig from 'automod/types/ServerConfig';
-import Infraction from './struct/antispam/Infraction';
+import Infraction from 'automod/types/antispam/Infraction';
-import PendingLogin from './struct/PendingLogin';
+import PendingLogin from 'automod/types/PendingLogin';
-import TempBan from './struct/TempBan';
+import TempBan from 'automod/types/TempBan';
 import { VoteEntry } from './bot/commands/moderation/votekick';
-import BridgeRequest from './struct/BridgeRequest';
+import BridgeRequest from 'automod/types/BridgeRequest';
-import BridgeConfig from './struct/BridgeConfig';
+import BridgeConfig from 'automod/types/BridgeConfig';
-import BridgedMessage from './struct/BridgedMessage';
+import BridgedMessage from 'automod/types/BridgedMessage';
 
 logger.info('Initializing client');
 

bot/src/struct/commands/SimpleCommand.ts

@@ -1,6 +1,6 @@
 import CommandCategory from "./CommandCategory";
 import MessageCommandContext from "../MessageCommandContext";
-import ServerConfig from "../ServerConfig";
+import ServerConfig from "automod/types/ServerConfig";
 
 /**
  * A basic command, consisting of basic attributes