feat: multiple changes

- Remove supporter role - Fix button execution - Type definitions in config - Revamp /ping command - Define config constants in ExtendedClient
wdhdev · Jul 29, 2023 · 46b9066 · 46b9066
1 parent 4e6f573
commit 46b9066
Show file tree

Hide file tree

Showing 19 changed files with 62 additions and 219 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "global-chat",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "A Discord bot which connects many servers together using a text channel!",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/classes/ExtendedClient.ts b/src/classes/ExtendedClient.ts
@@ -1,14 +1,16 @@
 import { Client, Collection, Snowflake } from "discord.js";
 import * as Sentry from "@sentry/node";
 
+import config from "../config";
+
 export default class extends Client {
     public buttons: Collection<string, any>;
     public commandIds: Collection<string, Snowflake>;
     public commands: Collection<string, any>;
-    public config_channels: any;
-    public config_embeds: any;
-    public config_main: any;
-    public config_roles: any;
+    public config_channels: typeof config.channels;
+    public config_embeds: typeof config.embeds;
+    public config_main: typeof config.main;
+    public config_roles: typeof config.roles;
     public contextCommands: Collection<string, any>;
     public events: Collection<string, any>;
     public logButtonError: Function;

diff --git a/src/classes/Roles.ts b/src/classes/Roles.ts
@@ -4,11 +4,10 @@ export default class {
     public mod: Boolean;
     public donator: Boolean;
     public verified: Boolean;
-    public supporter: Boolean;
     public immunity: Boolean;
 
     constructor(roles: Role[]) {
-        const validRoles = ["owner", "dev", "mod", "donator", "verified", "supporter", "immunity"];
+        const validRoles = ["owner", "dev", "mod", "donator", "verified", "immunity"];
 
         for(const role of roles) {
             if(!validRoles.includes(role)) throw new Error(`Invalid role: ${role}`);
@@ -19,7 +18,6 @@ export default class {
         this.mod = roles.includes("mod");
         this.donator = roles.includes("donator");
         this.verified = roles.includes("verified");
-        this.supporter = roles.includes("supporter");
         this.immunity = roles.includes("immunity");
     }
 
@@ -31,7 +29,6 @@ export default class {
         if(this.mod) roles.push("mod");
         if(this.donator) roles.push("donator");
         if(this.verified) roles.push("verified");
-        if(this.supporter) roles.push("supporter");
         if(this.immunity) roles.push("immunity");
 
         return roles;
@@ -44,7 +41,6 @@ export function roleProperCase(role: Role) {
     if(role === "mod") return "Moderator";
     if(role === "donator") return "Donator";
     if(role === "verified") return "Verified";
-    if(role === "supporter") return "Supporter";
     if(role === "immunity") return "Immunity";
 }
 
@@ -54,8 +50,7 @@ export function roleWithEmoji(role: Role) {
     if(role === "mod") return "🔨 Moderator";
     if(role === "donator") return "💸 Donator";
     if(role === "verified") return "✅ Verified";
-    if(role === "supporter") return "💖 Supporter";
     if(role === "immunity") return "😇 Immunity";
 }
 
-export type Role = "owner" | "dev" | "mod" | "donator" | "verified" | "supporter" | "immunity";
+export type Role = "owner" | "dev" | "mod" | "donator" | "verified" | "immunity";
diff --git a/src/commands/dev/admin.ts b/src/commands/dev/admin.ts
@@ -10,7 +10,7 @@ import User from "../../models/User";
 
 const command: Command = {
     name: "admin",
-    description: "Admin Commands",
+    description: "Developer Commands",
     options: [
         {
             type: 1,
@@ -427,35 +427,6 @@ const command: Command = {
                 return;
             }
 
-            if(interaction.options.getSubcommand() === "supporters") {
-                const guild = await client.guilds.fetch(client.config_main.primaryGuild);
-                const members = await guild.members.fetch();
-                const boosters = members.filter((member: GuildMember) => member.premiumSinceTimestamp);
-
-                const users = [];
-
-                for(const [userId, guildMember] of boosters) {
-                    users.push(userId);
-                }
-
-                if(!users.length) {
-                    const error = new Discord.EmbedBuilder()
-                        .setColor(client.config_embeds.error)
-                        .setDescription(`${emoji.cross} There are no supporters!`)
-
-                    await interaction.editReply({ embeds: [error] });
-                    return;
-                }
-
-                const supporters = new Discord.EmbedBuilder()
-                    .setColor(client.config_embeds.default)
-                    .setTitle("💖 Supporters")
-                    .setDescription(`<@${users.join(">, <@")}>`)
-
-                await interaction.editReply({ embeds: [supporters] });
-                return;
-            }
-
             if(interaction.options.getSubcommand() === "unverify") {
                 const user = interaction.options.getUser("user");
 

diff --git a/src/commands/info/bot.ts b/src/commands/info/bot.ts
@@ -3,10 +3,8 @@ import ExtendedClient from "../../classes/ExtendedClient";
 import { CommandInteraction, GuildMember } from "discord.js";
 
 const bot = require("../../../package.json");
-import { emojis as emoji } from "../../config";
 
 import BlockedMessage from "../../models/BlockedMessage";
-import GitHubUser from "../../models/GitHubUser";
 import Message from "../../models/Message";
 import User from "../../models/User";
 
@@ -31,33 +29,24 @@ const command: Command = {
                 .setDescription("A Discord bot which connects many servers together using a text channel!")
                 .addFields (
                     { name: "📈 Version", value: bot.version, inline: true },
-                    { name: "🟢 Online Since", value: `<t:${(Date.now() - client.uptime).toString().slice(0, -3)}:f> (<t:${(Date.now() - client.uptime).toString().slice(0, -3)}:R>)`, inline: true }
+                    { name: "🟢 Online Since", value: `<t:${(Date.now() - client.uptime).toString().slice(0, -3)}:f>`, inline: true }
                 )
 
             const developers = await User.find({ dev: true });
             const moderators = await User.find({ mod: true });
             const verified = await User.find({ verified: true });
             const donators = await User.find({ donator: true });
 
-            const githubUsers = await GitHubUser.find();
-
             const messages = await Message.find();
             const blockedMessages = await BlockedMessage.find();
 
-            const guild = await client.guilds.fetch(client.config_main.primaryGuild);
-            const members = await guild.members.fetch();
-            const boosters = members.filter((member: GuildMember) => member.premiumSinceTimestamp);
-
             const stat_guilds = `🗄️ ${client.guilds.cache.size} Guild${client.guilds.cache.size === 1 ? "" : "s"}`;
             const stat_users = `👤 ${client.users.cache.size} User${client.users.cache.size === 1 ? "" : "s"}`;
 
             const stat_developers = `💻 ${developers.length} Developer${developers.length === 1 ? "" : "s"}`;
             const stat_moderators = `🔨 ${moderators.length} Moderator${moderators.length === 1 ? "" : "s"}`;
             const stat_donators = `💸 ${donators.length} Donator${donators.length === 1 ? "" : "s"}`;
             const stat_verified = `✅ ${verified.length} Verified User${verified.length === 1 ? "" : "s"}`;
-            const stat_supporters = `💖 ${boosters.size} Supporter${boosters.size === 1 ? "" : "s"}`;
-
-            const stat_github = `${emoji.github} ${githubUsers.length}`;
 
             const stat_messages = `💬 ${messages.length} Message${messages.length === 1 ? "" : "s"}`;
             const stat_blocked_messages = `⛔ ${blockedMessages.length} Blocked Message${messages.length === 1 ? "" : "s"}`;
@@ -67,8 +56,7 @@ const command: Command = {
                 .setTitle("Statistics")
                 .addFields (
                     { name: "🤖 Bot", value: `${stat_guilds}\n${stat_users}`, inline: true },
-                    { name: "🎭 Roles", value: `${stat_developers}\n${stat_moderators}\n${stat_donators}\n${stat_verified}\n${stat_supporters}`, inline: true },
-                    { name: "🔗 Linked Accounts", value: `${stat_github}`, inline: true },
+                    { name: "🎭 Roles", value: `${stat_developers}\n${stat_moderators}\n${stat_donators}\n${stat_verified}`, inline: true },
                     { name: "🌐 Global Chat", value: `${stat_messages}\n${stat_blocked_messages}`, inline: true }
                 )
 

diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts
@@ -15,47 +15,40 @@ const command: Command = {
     enabled: true,
     allowWhileBanned: false,
     staffOnly: false,
-    deferReply: true,
-    ephemeral: true,
+    deferReply: false,
+    ephemeral: false,
     async execute(interaction: CommandInteraction, client: ExtendedClient, Discord: any) {
         try {
-            const pinging = new Discord.EmbedBuilder()
-                .setColor(client.config_embeds.default)
-                .setDescription(`${emoji.ping} Pinging...`)
-
-            const i = await interaction.editReply({ embeds: [pinging] });
-
-            const botLatency = i.createdTimestamp - interaction.createdTimestamp;
+            const botLatency = Date.now() - interaction.createdTimestamp;
             const apiLatency = Math.round(client.ws.ping);
 
             let botLatencyValue;
             let apiLatencyValue;
 
             if(botLatency >= 0 && botLatency <= 99) {
-                botLatencyValue = `🟢 ${botLatency}ms`;
+                botLatencyValue = `${emoji.connection_excellent} ${botLatency}ms`;
             } else if(botLatency >= 100 && botLatency <= 199) {
-                botLatencyValue = `🟠 ${botLatency}ms`;
+                botLatencyValue = `${emoji.connection_good} ${botLatency}ms`;
             } else {
-                botLatencyValue = `🔴 ${botLatency}ms`;
+                botLatencyValue = `${emoji.connection_bad} ${botLatency}ms`;
             }
 
             if(apiLatency >= 0 && apiLatency <= 99) {
-                apiLatencyValue = `🟢 ${apiLatency}ms`;
+                apiLatencyValue = `${emoji.connection_excellent} ${apiLatency}ms`;
             } else if(apiLatency >= 100 && apiLatency <= 199) {
-                apiLatencyValue = `🟠 ${apiLatency}ms`;
+                apiLatencyValue = `${emoji.connection_good} ${apiLatency}ms`;
             } else {
-                apiLatencyValue = `🔴 ${apiLatency}ms`;
+                apiLatencyValue = `${emoji.connection_bad} ${apiLatency}ms`;
             }
 
             const ping = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)
-                .setTitle("🏓 Pong!")
                 .addFields (
                     { name: "Bot Latency", value: botLatencyValue, inline: true },
                     { name: "API Latency", value: apiLatencyValue, inline: true }
                 )
 
-            await interaction.editReply({ embeds: [ping] });
+            await interaction.reply({ embeds: [ping] });
         } catch(err) {
             client.logCommandError(err, interaction, Discord);
         }

diff --git a/src/commands/mod/user.ts b/src/commands/mod/user.ts
@@ -5,6 +5,7 @@ import { CommandInteraction } from "discord.js";
 import { emojis as emoji } from "../../config";
 import { getInfractions } from "../../classes/Infraction";
 import getRoles from "../../functions/roles/get";
+import { Role } from "../../classes/Roles";
 
 import BannedUser from "../../models/BannedUser";
 import BlockedMessage from "../../models/BlockedMessage";
@@ -48,17 +49,7 @@ const command: Command = {
             const banData = banned ? `🕰️ <t:${banInfo.timestamp.slice(0, -3)}> (<t:${banInfo.timestamp.slice(0, -3)}:R>)\n📜 ${banInfo.allowAppeal ? "Appealable" : "Not Appealable"}\n❓ ${banInfo.reason}\n🔨 <@${banInfo.mod}>` : null;
 
             // Roles
-            const role = await getRoles(user.id, client);
-
-            const roles = [];
-
-            if(role.owner) roles.push("👑 Owner");
-            if(role.dev) roles.push("💻 Developer");
-            if(role.mod) roles.push("🔨 Moderator");
-            if(role.donator) roles.push("💸 Donator");
-            if(role.verified) roles.push("✅ Verified");
-            if(role.supporter) roles.push("💖 Supporter");
-            if(role.immunity) roles.push("😇 Immunity");
+            const roles: Role[] = (await getRoles(interaction.user.id, client)).get();
 
             // Linked Accounts
             const accounts = [];

diff --git a/src/commands/user/me.ts b/src/commands/user/me.ts
@@ -4,6 +4,7 @@ import { CommandInteraction } from "discord.js";
 
 import { emojis as emoji } from "../../config";
 import getRoles from "../../functions/roles/get";
+import { Role } from "../../classes/Roles";
 
 import BlockedMessage from "../../models/BlockedMessage";
 import GitHubUser from "../../models/GitHubUser";
@@ -25,17 +26,7 @@ const command: Command = {
     async execute(interaction: CommandInteraction, client: ExtendedClient, Discord: any) {
         try {
             // Roles
-            const role = await getRoles(interaction.user.id, client);
-
-            const roles = [];
-
-            if(role.owner) roles.push("👑 Owner");
-            if(role.dev) roles.push("💻 Developer");
-            if(role.mod) roles.push("🔨 Moderator");
-            if(role.donator) roles.push("💸 Donator");
-            if(role.verified) roles.push("✅ Verified");
-            if(role.supporter) roles.push("💖 Supporter");
-            if(role.immunity) roles.push("😇 Immunity");
+            const roles: Role[] = (await getRoles(interaction.user.id, client)).get();
 
             // Linked Accounts
             const accounts = [];

diff --git a/src/commands/user/my-roles.ts b/src/commands/user/my-roles.ts
@@ -3,6 +3,7 @@ import ExtendedClient from "../../classes/ExtendedClient";
 import { CommandInteraction } from "discord.js";
 
 import getRoles from "../../functions/roles/get";
+import { Role } from "../../classes/Roles";
 
 const command: Command = {
     name: "my-roles",
@@ -19,16 +20,7 @@ const command: Command = {
     ephemeral: true,
     async execute(interaction: CommandInteraction, client: ExtendedClient, Discord: any) {
         try {
-            const role = await getRoles(interaction.user.id, client);
-
-            const roles = [];
-
-            if(role.owner) roles.push("👑 Owner");
-            if(role.dev) roles.push("💻 Developer");
-            if(role.mod) roles.push("🔨 Moderator");
-            if(role.donator) roles.push("💸 Donator");
-            if(role.verified) roles.push("✅ Verified");
-            if(role.supporter) roles.push("💖 Supporter");
+            const roles: Role[] = (await getRoles(interaction.user.id, client)).get();
 
             const rolesEmbed = new Discord.EmbedBuilder()
                 .setColor(client.config_embeds.default)

diff --git a/src/config.ts b/src/config.ts
@@ -1,6 +1,6 @@
-import { ColorResolvable } from "discord.js";
+import { ColorResolvable, EmojiResolvable, RoleResolvable, Snowflake } from "discord.js";
 
-const channels = {
+const channels: { [key: string]: Snowflake } = {
     appeals: "1083298359319736320",
     blocked: "1078093240105975848",
     logs: "1117236422164885514",
@@ -9,17 +9,21 @@ const channels = {
     reports: "1067341548393615430"
 }
 
-const embeds = {
-    default: "#0096FF" as ColorResolvable,
-    error: "#E74C3C" as ColorResolvable,
-    github: "#171515" as ColorResolvable,
-    gray: "#80838D" as ColorResolvable,
-    green: "#57F287" as ColorResolvable,
-    red: "#ED4245" as ColorResolvable
+const embeds: { [key: string]: ColorResolvable } = {
+    default: "#0096FF",
+    error: "#E74C3C",
+    github: "#171515",
+    gray: "#80838D",
+    green: "#57F287",
+    red: "#ED4245"
 }
 
-const emojis = {
+const emojis: { [key: string]: EmojiResolvable } = {
+    connection_bad: "<:connection_bad:1134804962732429332>",
+    connection_good: "<:connection_good:1134804958793977928>",
+    connection_excellent: "<:connection_excellent:1134809429783617557>",
     cross: "<:cross:1127043491642478592>",
+    developer: "<:developer:1134808090496208938>",
     discord: "<:discord:1134618172625006742>",
     github: "<:github:1129227804693774346>",
     ping: "<a:ping:1127044182352072786>",
@@ -28,15 +32,11 @@ const emojis = {
 }
 
 const main = {
-    hasGuildOnlyCommands: [
-        "1067023529226293248" // Global Chat Support
-    ],
-    owner: "853158265466257448", // williamharrison
-    primaryGuild: "1067023529226293248" // Global Chat Support
+    owner: "853158265466257448" as Snowflake, // williamharrison
+    primaryGuild: "1067023529226293248" as Snowflake // Global Chat Support
 }
 
-const roles = {
-    booster: "1115056722042703942",
+const roles: { [key: string]: RoleResolvable } = {
     dev: "1067023529305976898",
     donator: "1127426331286712320",
     mod: "1082167230357307402",