style: flatten after rebase

Tinaël Devresse · Tinaël Devresse · commit 9aa83bcfd5b4 · 2024-10-30T12:44:35.000+01:00
diff --git a/scripts/deploy-commands.cjs b/scripts/deploy-commands.cjs
@@ -3,6 +3,7 @@ const { Client, Collection, REST, Routes } = require("discord.js");
 const path = require("node:path");
 const fsp = require("node:fs/promises");
 const synchronizeSlashCommands = require("discord-sync-commands");
+
 const { botId: botProdId } = require("../config.production.json");
 const { guildId, botId: botDevId } = require("../config.development.json");
 
diff --git a/src/commands/admins/announce.ts b/src/commands/admins/announce.ts
@@ -13,7 +13,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()
diff --git a/src/commands/others/link.ts b/src/commands/others/link.ts
@@ -7,7 +7,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()
diff --git a/src/commands/others/pin.ts b/src/commands/others/pin.ts
@@ -6,7 +6,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new ContextMenuCommandBuilder()
diff --git a/src/commands/owner/eval.ts b/src/commands/owner/eval.ts
@@ -7,7 +7,7 @@
 
 import type { DatadropClient } from "../../datadrop.js";
 import { clean } from "../../helpers.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()
diff --git a/src/commands/owner/reload.ts b/src/commands/owner/reload.ts
@@ -5,7 +5,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()
diff --git a/src/commands/owner/restart.ts b/src/commands/owner/restart.ts
@@ -5,7 +5,7 @@
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder()
diff --git a/src/commands/utility/email.ts b/src/commands/utility/email.ts
@@ -5,7 +5,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 const people = [
     {
diff --git a/src/commands/utility/ping.ts b/src/commands/utility/ping.ts
@@ -4,7 +4,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../../datadrop.js";
-import type { Command } from "../../models/Command.js";
+import type { Command } from "../../models/index.js";
 
 export default {
     data: new SlashCommandBuilder().setName("ping").setDescription("Pong!"),
diff --git a/src/datadrop.ts b/src/datadrop.ts
@@ -37,7 +37,7 @@ import {
 
 import { PostgresDatabaseService, SMTPService } from './services/index.js';
 import { getErrorMessage, readFilesFrom } from './helpers.js';
-import { Configuration, IDatabaseService, User } from './models/index.js';
+import type { Command, Event, Configuration, IDatabaseService, User } from './models/index.js';
 import { readConfig } from './config.js';
 
 export class DatadropClient extends Client {
diff --git a/src/events/error.ts b/src/events/error.ts
@@ -1,4 +1,4 @@
-import { DatadropClient } from '../datadrop.js';
+import type { DatadropClient } from '../datadrop.js';
 
 export default async function error(client: DatadropClient, error: Error) {
     client.logger.error(`${error.name}: ${error.message}\n${error.cause}\n${error.stack}`);
diff --git a/src/events/guildMemberAdd.ts b/src/events/guildMemberAdd.ts
@@ -8,8 +8,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { AnnounceConfiguration } from "../models/Configuration.js";
-import type { Event } from "../models/Event.js";
+import type { Event, AnnounceConfiguration } from "../models/index.js";
 
 export default {
     name: Events.GuildMemberAdd,
diff --git a/src/events/guildMemberRemove.ts b/src/events/guildMemberRemove.ts
@@ -1,7 +1,7 @@
 import { Events, type GuildMember } from "discord.js";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { Event } from "../models/Event.js";
+import type { Event } from "../models/index.js";
 
 export default {
     name: Events.GuildMemberRemove,
diff --git a/src/events/interactionCreate.ts b/src/events/interactionCreate.ts
@@ -16,7 +16,7 @@ import {
 } from "discord.js";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { Event } from "../models/Event.js";
+import type { Event } from "../models/index.js";
 import { CommandHandler } from "../services/CommandHandler.js";
 
 export default {
@@ -220,7 +220,7 @@ async function showVerificationButton(
         .setCustomId(`lacb${interaction.user.id}`)
         .setDisabled(
             content.includes(client.errorMessage) ||
-                content.includes(client.activeAccountMessage),
+            content.includes(client.activeAccountMessage),
         );
     const buttonComponent = new ActionRowBuilder<ButtonBuilder>().addComponents(
         linkAccountButton,
diff --git a/src/events/ready.ts b/src/events/ready.ts
@@ -3,8 +3,7 @@ import { ButtonStyle, Events, Role, bold, roleMention } from "discord.js";
 import type { RoleToEmojiData } from "@hunteroi/discord-selfrole";
 
 import type { DatadropClient } from "../datadrop.js";
-import type { Configuration } from "../models/Configuration.js";
-import type { Event } from "../models/Event.js";
+import type { Event, Configuration } from "../models/index.js";
 
 export default {
     name: Events.ClientReady,
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -1,5 +1,6 @@
 import * as fsp from "node:fs/promises";
 import * as path from "node:path";
+
 import { ConsoleLogger, type DefaultLogger } from "@hunteroi/advanced-logger";
 
 const console = new ConsoleLogger();
diff --git a/src/models/Configuration.ts b/src/models/Configuration.ts
@@ -1,6 +1,6 @@
 import type { Snowflake } from "discord.js";
 
-import { SMTPServiceOptions } from '../services/SMTPService.js';
+import type { SMTPServiceOptions } from '../services/SMTPService.js';
 
 export interface SpecialRoleConfiguration {
     roleid: Snowflake;
diff --git a/src/models/Event.ts b/src/models/Event.ts
@@ -1,4 +1,5 @@
 import type { ClientEvents } from "discord.js";
+
 import type { DatadropClient } from "../datadrop.js";
 
 export interface Event {
diff --git a/src/models/index.ts b/src/models/index.ts
@@ -1,5 +1,7 @@
-import { Configuration } from './Configuration.js';
+import { Command } from './Command.js';
+import { SpecialRoleConfiguration, GroupConfiguration, YearConfiguration, AnnounceConfiguration, Configuration } from './Configuration.js';
+import { Event } from './Event.js';
 import { IDatabaseService } from './IDatabaseService.js';
 import { User } from './User.js';
 
-export { Configuration, IDatabaseService, User };
+export { Command, SpecialRoleConfiguration, GroupConfiguration, YearConfiguration, AnnounceConfiguration, Configuration, Event, IDatabaseService, User };
diff --git a/src/services/PostgresDatabaseService.ts b/src/services/PostgresDatabaseService.ts
@@ -8,7 +8,7 @@ import {
 
 import type { ConsoleLogger } from "@hunteroi/advanced-logger";
 
-import { User, IDatabaseService } from '../models/index.js';
+import type { User, IDatabaseService } from '../models/index.js';
 
 export default class PostgresDatabaseService implements IDatabaseService {
     readonly #logger: ConsoleLogger;
@@ -104,7 +104,7 @@ export default class PostgresDatabaseService implements IDatabaseService {
      */
     public async readBy(
         argument: // biome-ignore lint/suspicious/noExplicitAny: DB values can be of any type
-        Map<string, any> | ((user: User, index: string | number) => boolean),
+            Map<string, any> | ((user: User, index: string | number) => boolean),
     ): Promise<User | undefined | null> {
         if (!(argument instanceof Map))
             throw new Error("Method not implemented.");
diff --git a/src/services/SMTPService.ts b/src/services/SMTPService.ts
@@ -1,7 +1,7 @@
 import { createTransport } from 'nodemailer';
-import SMTPTransport from 'nodemailer/lib/smtp-transport';
+import type SMTPTransport from 'nodemailer/lib/smtp-transport';
 
-import { ISenderAPI, SenderAPIData } from '@hunteroi/discord-verification';
+import type { ISenderAPI, SenderAPIData } from '@hunteroi/discord-verification';
 
 export type SMTPServiceOptions = SMTPTransport.Options;
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import {`
`5`	`5`	`} from "discord.js";`
`6`	`6`
`7`	`7`	`import type { DatadropClient } from "../../datadrop.js";`
`8`		`-import type { Command } from "../../models/Command.js";`
	`8`	`+import type { Command } from "../../models/index.js";`
`9`	`9`
`10`	`10`	`const people = [`
`11`	`11`	`{`