Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!301

.envrc

@@ -0,0 +1 @@
+dotenv

src/commands-contextmenu/resetnick.ts

@@ -41,7 +41,7 @@ export default {
 
         await target.setNickname(
             target.user.username,
-            "Reset by " + interaction.user.username + "#" + interaction.user.discriminator
+            "Reset by " + interaction.user.username
         )
         interaction.reply({
             content: `Reset ${target.user.username}'s nickname.`,

src/commands/forceverify.ts

@@ -57,19 +57,8 @@ export default {
             return
         }
 
-        let username = ""
+        const username = user.user.username
-        if (user.user.discriminator == "0") {
+        const modName = mod.username
-            username = user.user.username
-        } else {
-            username = user.user.username + "#" + user.user.discriminator
-        }
-
-        let modName = ""
-        if (mod.discriminator == "0") {
-            modName = mod.username
-        } else {
-            modName = mod.username + "#" + mod.discriminator
-        }
 
         await interaction.editReply({
             embeds: [{

src/commands/verify.ts

@@ -88,12 +88,7 @@ export default {
             return
         }
 
-        let username = ""
+        const username = user.user.username
-        if (user.user.discriminator === "0") {
-            username = user.user.username
-        } else {
-            username = user.user.username + "#" + user.user.discriminator
-        }
 
         await interaction.editReply({
             embeds: [{

src/components/buttons/guildapplicationaccept.ts

@@ -22,7 +22,7 @@ export default {
         const applicantId = embed.footer!.text.split(" ")[1]
 
         const applicant = await guild.members.fetch(applicantId)
-        const applicantUsername = applicant.user.username + "#" + applicant.user.discriminator
+        const applicantUsername = applicant.user.username
 
         await message.edit({
             components: [

src/components/buttons/guildapply.ts

@@ -259,7 +259,7 @@ export default {
         const channel = guild.channels.cache.get(applicationsChannel) as TextChannel
         await channel.send({
             embeds: [{
-                title: user.user.username + "#" + user.user.discriminator + " - Guild Application",
+                title: user.user.username + " - Guild Application",
                 color: embedColor,
                 thumbnail: {
                     url: user.avatarURL() || ""

src/components/buttons/guildinactivitylog.ts

@@ -147,7 +147,7 @@ export default {
 
         await appChannel.send({
             embeds: [{
-                title: user.user.username + "#" + user.user.discriminator + " - Inactivity Application",
+                title: user.user.username + " - Inactivity Application",
                 color: embedColor,
                 thumbnail: {
                     url: user.avatarURL() || ""

src/components/buttons/staffapplicationaccept.ts

@@ -19,7 +19,7 @@ export default {
         const applicantId = embed.footer!.text.split(" ")[1]
 
         const applicant = await guild.members.fetch(applicantId)
-        const applicantUsername = applicant.user.username + "#" + applicant.user.discriminator
+        const applicantUsername = applicant.user.username
 
         await applicant.send({
             embeds: [{

src/components/buttons/staffapply.ts

@@ -236,7 +236,7 @@ export default {
 
             await channel.send({
                 embeds: [{
-                    title: user.user.username + "#" + user.user.discriminator + " - Staff Application",
+                    title: user.user.username + " - Staff Application",
                     color: embedColor,
                     thumbnail: {
                         url: user.avatarURL() || ""

src/components/modals/verifyModal.ts

@@ -60,12 +60,7 @@ export default {
             return
         }
 
-        let username = ""
+        const username = user.user.username
-        if (user.user.discriminator === "0") {
-            username = user.user.username
-        } else {
-            username = user.user.username + "#" + user.user.discriminator
-        }
 
         await interaction.editReply({
             embeds: [{

src/events/server/interactions/logBtnsCmds.ts

@@ -17,8 +17,7 @@ export default {
             if (subcommand) {
                 console.log(
                     color(
-                        interaction.user.username + "#" +
+                        interaction.user.username + " ran " +
-                            interaction.user.discriminator + " ran " +
                             interaction.commandName + " " +
                             subcommand,
                         "pink"
@@ -27,8 +26,7 @@ export default {
             } else {
                 console.log(
                     color(
-                        interaction.user.username + "#" +
+                        interaction.user.username + " ran " +
-                            interaction.user.discriminator + " ran " +
                             interaction.commandName,
                         "pink"
                     )
@@ -47,9 +45,7 @@ export default {
 
             console.log(
                 color(
-                    interaction.user.username + "#" +
+                    interaction.user.username + " clicked " + btnId,
-                        interaction.user.discriminator + " clicked " +
-                        btnId,
                     "pink"
                 )
             )