Consistent type imports and exports for bot

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

@@ -1,4 +1,4 @@
-import { FindOneResult } from "monk";
+import type { FindOneResult } from "monk";
 import { dbs } from "../../..";
 import CommandCategory from "../../../struct/commands/CommandCategory";
 import SimpleCommand from "../../../struct/commands/SimpleCommand";

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

@@ -23,7 +23,7 @@ import {
 import Day from "dayjs";
 import RelativeTime from "dayjs/plugin/relativeTime";
 import CommandCategory from "../../../struct/commands/CommandCategory";
-import { SendableEmbed } from "revolt-api";
+import type { SendableEmbed } from "revolt-api";
 import { User } from "revolt.js";
 import logger from "../../logger";
 

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

@@ -1,5 +1,5 @@
 import { User } from "revolt.js";
-import { SendableEmbed } from "revolt-api";
+import type { SendableEmbed } from "revolt-api";
 import { ulid } from "ulid";
 import { client } from "../../../";
 import Infraction from "automod/dist/types/antispam/Infraction";

bot/src/bot/commands/moderation/votekick.ts

@@ -114,4 +114,4 @@ export default {
     }
 } as SimpleCommand;
 
-export { VoteEntry }
+export type { VoteEntry }

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

@@ -5,7 +5,7 @@ import { ulid } from "ulid";
 import InfractionType from "automod/dist/types/antispam/InfractionType";
 import { fetchUsername, logModAction } from "../../modules/mod_logs";
 import CommandCategory from "../../../struct/commands/CommandCategory";
-import { SendableEmbed } from "revolt-api";
+import type { SendableEmbed } from "revolt-api";
 import { User } from "revolt.js";
 import logger from "../../logger";
 

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

@@ -3,7 +3,8 @@ import { User } from "revolt.js";
 import { client, dbs } from "../../..";
 import ServerConfig from "automod/dist/types/ServerConfig";
 import { getPermissionLevel } from "../../util";
-import { wsEvents, WSResponse } from "../api_communication";
+import type { WSResponse } from "../api_communication";
+import { wsEvents } from "../api_communication";
 
 type ReqData = { user: string, server: string }
 type APIUser = { id: string, username?: string, avatarURL?: string }
@@ -95,4 +96,4 @@ wsEvents.on('req:getUserServerDetails', async (data: ReqData, cb: (data: WSRespo
     }
 });
 
-export { APIUser }
+export type { APIUser }

bot/src/bot/modules/api/servers.ts

@@ -1,7 +1,8 @@
 import { User } from 'revolt.js';
 import { client } from '../../..';
 import { getMutualServers, getPermissionLevel } from '../../util';
-import { wsEvents, WSResponse } from '../api_communication';
+import type { WSResponse } from "../api_communication";
+import { wsEvents } from "../api_communication";
 
 type ReqData = { user: string }
 

bot/src/bot/modules/api/users.ts

@@ -1,8 +1,9 @@
 import { User } from "revolt.js";
 import { client } from "../../..";
 import { getPermissionLevel, parseUser } from "../../util";
-import { wsEvents, WSResponse } from "../api_communication";
-import { APIUser } from "./server_details";
+import type { WSResponse } from "../api_communication";
+import { wsEvents } from "../api_communication";
+import type { APIUser } from "./server_details";
 
 wsEvents.on('req:getPermissionLevel', async (data: { user: string, server: string }, cb: (data: WSResponse) => void) => {
     try {

bot/src/bot/modules/api_communication.ts

@@ -158,7 +158,8 @@ wsEvents.on("req:stats", async (_data: any, cb: (data: { servers: number }) => v
 	cb({ servers });
 });
 
-export { wsEvents, wsSend, WSResponse };
+export { wsEvents, wsSend };
+export type { WSResponse };
 
 import("./api/servers");
 import("./api/server_details");

bot/src/bot/modules/event_handler.ts

@@ -7,7 +7,7 @@ import { BLACKLIST_BAN_REASON, BLACKLIST_MESSAGE } from "../commands/admin/botad
 import logger from "../logger";
 import { storeInfraction } from "../util";
 import { DEFAULT_PREFIX } from "./command_handler";
-import { SendableEmbed } from "revolt-api";
+import type { SendableEmbed } from "revolt-api";
 import { UserSystemMessage } from "revolt.js";
 
 const DM_SESSION_LIFETIME = 1000 * 60 * 60 * 24 * 30;

bot/src/bot/util.ts

@@ -11,7 +11,7 @@ import logger from "./logger";
 import { Channel } from "revolt.js";
 import { Message } from "revolt.js";
 import { isSudo } from "./commands/admin/botadm";
-import { SendableEmbed } from "revolt-api";
+import type { SendableEmbed } from "revolt-api";
 import ServerConfig from "automod/dist/types/ServerConfig";
 
 const NO_MANAGER_MSG = "🔒 Missing permission";

bot/src/index.ts

@@ -9,7 +9,7 @@ import ServerConfig from 'automod/dist/types/ServerConfig';
 import Infraction from 'automod/dist/types/antispam/Infraction';
 import PendingLogin from 'automod/dist/types/PendingLogin';
 import TempBan from 'automod/dist/types/TempBan';
-import { VoteEntry } from './bot/commands/moderation/votekick';
+import type { VoteEntry } from './bot/commands/moderation/votekick';
 
 logger.info('Initializing client');
 

bot/src/struct/AutomodClient.ts

@@ -1,7 +1,7 @@
 import * as Revolt from "revolt.js";
 import { IMonkManager } from 'monk';
 import logger from '../bot/logger';
-import { ClientOptions } from "revolt.js";
+import type { ClientOptions } from "revolt.js";
 
 class AutomodClient extends Revolt.Client {
     db: IMonkManager;

bot/src/struct/MessageCommandContext.ts

@@ -4,6 +4,12 @@ import { Server } from "revolt.js";
 class MessageCommandContext extends Message {
     // The server to which the command should be applied.
     serverContext: Server;
+
+        constructor(messageData: any, channelData: any, serverContext: Server) {
+        // Assuming `Message` expects `messageData` and `channelData` as its arguments.
+        super(messageData, channelData);
+        this.serverContext = serverContext;
+    }
 }
 
 export default MessageCommandContext;