Merge pull request #159 from Global-Tags/development

fix: Fix circular dependencies

Author: RappyTV

src/bot/buttons/ManageIcon.ts

@@ -1,10 +1,11 @@
 import { ButtonInteraction, Message, GuildMember, User, EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } from "discord.js";
 import Button from "../structs/Button";
-import players, { GlobalIcon } from "../../database/schemas/players";
+import players from "../../database/schemas/players";
 import { colors } from "../bot";
 import { constantCase } from "change-case";
 import { getCustomIconUrl } from "../../routes/icon";
 import { Permission } from "../../libs/RoleManager";
+import GlobalIcon from "../../types/GlobalIcon";
 
 export default class ManageIcon extends Button {
     constructor() {

src/bot/buttons/SetIconType.ts

@@ -1,9 +1,10 @@
 import { ButtonInteraction, Message, GuildMember, User, EmbedBuilder, StringSelectMenuBuilder, StringSelectMenuOptionBuilder, ActionRowBuilder } from "discord.js";
 import Button from "../structs/Button";
-import players, { GlobalIcon } from "../../database/schemas/players";
+import players from "../../database/schemas/players";
 import { colors } from "../bot";
 import { constantCase, pascalCase } from "change-case";
 import { Permission } from "../../libs/RoleManager";
+import GlobalIcon from "../../types/GlobalIcon";
 
 const icons = Object.keys(GlobalIcon)
     .filter((icon) => isNaN(Number(icon)))

src/bot/buttons/SetPosition.ts

@@ -1,9 +1,10 @@
 import { ButtonInteraction, Message, GuildMember, User, EmbedBuilder, StringSelectMenuBuilder, StringSelectMenuOptionBuilder, ActionRowBuilder } from "discord.js";
 import Button from "../structs/Button";
-import players, { GlobalPosition } from "../../database/schemas/players";
+import players from "../../database/schemas/players";
 import { colors } from "../bot";
 import { constantCase, pascalCase } from "change-case";
 import { Permission } from "../../libs/RoleManager";
+import GlobalPosition from "../../types/GlobalPosition";
 
 const positions = Object.keys(GlobalPosition)
     .filter((pos) => isNaN(Number(pos)))

src/bot/commands/CustomIcon.ts

@@ -1,6 +1,6 @@
 import { ApplicationCommandOptionType, CacheType, CommandInteraction, CommandInteractionOptionResolver, EmbedBuilder, GuildMember, User } from "discord.js";
 import Command from "../structs/Command";
-import players, { GlobalIcon } from "../../database/schemas/players";
+import players from "../../database/schemas/players";
 import { colors } from "../bot";
 import { constantCase } from "change-case";
 import { join } from 'path';
@@ -9,6 +9,7 @@ import { generateSecureCode } from "../../routes/connections";
 import { NotificationType, sendMessage } from "../../libs/DiscordNotifier";
 import { config } from "../../libs/Config";
 import { Permission } from "../../libs/RoleManager";
+import GlobalIcon from "../../types/GlobalIcon";
 
 export default class CustomIcon extends Command {
     constructor() {

src/database/schemas/players.ts

@@ -6,50 +6,7 @@ import { constantCase } from "change-case";
 import { generateSecureCode } from "../../routes/connections";
 import { getRole, getRoles, Permission } from "../../libs/RoleManager";
 import { config } from "../../libs/Config";
-
-export enum GlobalPosition {
-    Above,
-    Below,
-    Right,
-    Left
-}
-
-export enum GlobalIcon {
-    None,
-    Custom,
-    Android,
-    Apple,
-    Bereal,
-    Crown,
-    Discord,
-    Duolingo,
-    Ebio,
-    Epicgames,
-    Gamescom,
-    Github,
-    Gitlab,
-    Heart,
-    Instagram,
-    Kick,
-    Labynet,
-    Paypal,
-    Pinterest,
-    Playstation,
-    Reddit,
-    Snapchat,
-    Soundcloud,
-    Spotify,
-    Star,
-    Statsfm,
-    Steam,
-    Telegram,
-    Threads,
-    Tiktok,
-    Twitch,
-    X,
-    Xbox,
-    Youtube
-}
+import GlobalIcon from "../../types/GlobalIcon";
 
 export interface IPlayer {
     uuid: string,

src/index.ts

@@ -1,6 +1,7 @@
 import { Context, Elysia, t } from "elysia";
 import { swagger } from "@elysiajs/swagger";
 import Logger from "./libs/Logger";
+import players from "./database/schemas/players";
 import { connect as connectDatabase } from "./database/mongo";
 import { getRouter } from "./libs/RouteLoader";
 import { version } from "../package.json";
@@ -21,7 +22,6 @@ import cors from "@elysiajs/cors";
 import { verify as verifyMailOptions } from "./libs/Mailer";
 import { getLatestCommit, retrieveData } from "./libs/GitCommitData";
 import { startEntitlementExpiry, startMetrics, startReferralReset } from "./libs/CronJobs";
-import players from "./database/schemas/players";
 import { formatUUID } from "./routes/root";
 import { config } from "./libs/Config";
 import('./libs/RoleManager');

src/libs/Metrics.ts

@@ -1,11 +1,13 @@
 import metrics from "../database/schemas/metrics";
-import players, { GlobalIcon, GlobalPosition } from "../database/schemas/players";
+import players from "../database/schemas/players";
 import Logger from "./Logger";
 import axios from "axios";
 import { client } from "../bot/bot";
 import { args } from "..";
 import { constantCase } from "change-case";
 import { config } from "./Config";
+import GlobalPosition from "../types/GlobalPosition";
+import GlobalIcon from "../types/GlobalIcon";
 
 let requests: number;
 

src/routes/icon.ts

@@ -1,11 +1,12 @@
 import Elysia, { t } from "elysia";
-import players, { GlobalIcon } from "../database/schemas/players";
+import players from "../database/schemas/players";
 import fetchI18n from "../middleware/FetchI18n";
 import getAuthProvider from "../middleware/GetAuthProvider";
 import { join } from "path";
 import { constantCase } from "change-case";
 import { config } from "../libs/Config";
 import { Permission } from "../libs/RoleManager";
+import GlobalIcon from "../types/GlobalIcon";
 
 const icons = Object.keys(GlobalIcon)
     .filter((pos) => isNaN(Number(pos)))

src/routes/position.ts

@@ -1,8 +1,9 @@
 import Elysia, { t } from "elysia";
-import players, { GlobalPosition } from "../database/schemas/players";
+import players from "../database/schemas/players";
 import fetchI18n from "../middleware/FetchI18n";
 import getAuthProvider from "../middleware/GetAuthProvider";
 import { Permission } from "../libs/RoleManager";
+import GlobalPosition from "../types/GlobalPosition";
 
 const positions = Object.keys(GlobalPosition)
     .filter((pos) => isNaN(Number(pos)))

src/routes/root.ts

@@ -1,5 +1,5 @@
 import Elysia, { t } from "elysia";
-import players, { GlobalIcon, GlobalPosition } from "../database/schemas/players";
+import players from "../database/schemas/players";
 import Logger from "../libs/Logger";
 import { sendMessage, NotificationType, ModLogType } from "../libs/DiscordNotifier";
 import fetchI18n, { getI18nFunctionByLanguage } from "../middleware/FetchI18n";
@@ -10,6 +10,8 @@ import { sendTagChangeEmail, sendTagClearEmail } from "../libs/Mailer";
 import { saveLastLanguage } from "../libs/I18n";
 import { config } from "../libs/Config";
 import { getRole, Permission } from "../libs/RoleManager";
+import GlobalIcon from "../types/GlobalIcon";
+import GlobalPosition from "../types/GlobalPosition";
 
 const { validation } = config;
 const { min, max, blacklist, watchlist } = validation.tag;
@@ -40,7 +42,7 @@ export default new Elysia()
     return {
         uuid: formatUUID(player.uuid),
         tag: player.isBanned() ? null : player.tag || null,
-        position: snakeCase(player.position || GlobalIcon[GlobalPosition.Above]),
+        position: snakeCase(player.position || GlobalPosition[GlobalPosition.Above]),
         icon: {
             type: snakeCase(player.icon.name || GlobalIcon[GlobalIcon.None]),
             hash: player.icon.hash || null