Merge branch 'main' of https://github.com/night0721/cath.exe

client/NYX.js

@@ -55,9 +55,17 @@ class NYX extends Client {
       "534027706325532694", // Cat drinking a cat
       "381442059111759883", // Thunder
       "556808365574193194", // chunchunmaru
+      "687622268037365774", // Tac Shadow
+      "309681798957498368", // Sideload
+      "707177879984668673", // Random rock
+      "757530324686340197", // Madhav
+      "804712098625486848", // hcs
+      "1078015817184182414", // gaba
+      "774390900411465769" // Alphaus
     ];
     this.currency = "<:nyx_currency:918584872333893703>";
     this.xp = "<:nyx_xp:900309007472926720>";
+    this.dev = "<:discord_bot_dev:840231906200387666>"
     this.path = [
       "614423108388126731", // Camper on Duty
       "767173194943168542", // Dark Bonker

command/Information/userinfo.js

@@ -29,15 +29,11 @@ module.exports = {
       Date.now() - interaction.guild.members.cache.get(member.id).joinedAt;
     const created = Math.floor(x / 86400000);
     const joined = Math.floor(y / 86400000);
-    const nickname =
+    const nickname = member.nickname || "None";
-      member.nickname !== undefined && member.nickname !== null
-        ? member.nickname
-        : "None";
     const roles = member.roles.cache
       .filter(r => r.id != interaction.guild.id)
       .sort((a, b) => b.position - a.position)
-      .map(role => role.toString())
+      .map(role => role.toString());
-      .slice(0, -1);
     const createDateFormatted = utils.parseDate(
       new Date(member.user.createdAt)
     );
@@ -45,21 +41,21 @@ module.exports = {
     const embed = new EmbedBuilder()
       .setAuthor({
         name: member.user.tag,
-        iconURL: member.user.displayAvatarURL({ dynamic: true, size: 2048 }),
+        iconURL: member.user.displayAvatarURL({ dynamic: true, size: 4096 }),
       })
       .setTimestamp()
       .setColor(member.displayHexColor || client.color)
       .setURL(client.web)
       .setFooter({
         text: `Made by ${client.author}`,
-        iconURL: client.user.displayAvatarURL({ dynamic: true }),
+        iconURL: client.user.displayAvatarURL({ dynamic: true, size: 4096 }),
       })
-      .setThumbnail(member.user.displayAvatarURL({ dynamic: true, size: 512 }))
+      .setThumbnail(member.user.displayAvatarURL({ dynamic: true, size: 4096 }))
-      .setColor(member.displayHexColor || client.color)
       .addFields([
         {
           name: "User",
-          value: `**❯ Username:** ${member.user.username}
+          value: `**❯ User Tag:** ${member.user.tag} ${client.owners.includes(member.id) ? client.dev : ""}
+        **❯ Username:** ${member.user.username}
         **❯ Discriminator:** ${member.user.discriminator}
         **❯ Nickname:** ${nickname}
         **❯ User ID:** ${member.id}
@@ -67,7 +63,7 @@ module.exports = {
           dynamic: true,
           size: 2048,
         })})
-        **❯ Time Created:** ${createDateFormatted} \nSince ${created} day(s) ago
+        **❯ Time Created:** ${createDateFormatted} \nSince ${created} day${created <= 1 ? "" : "s"} ago
         \u200b`,
         },
         {
@@ -77,13 +73,13 @@ module.exports = {
               ? "None"
               : member.roles.highest.name
           }
-            **❯ Server Join Date:** ${joinDateFormatted} \nSince ${joined} day(s) ago
+            **❯ Server Join Date:** ${joinDateFormatted} \nSince ${joined} day${joined <= 1 ? "" : "s"} ago
             **❯ Roles [${roles.length}]:** ${
-            roles.length < 10
+            roles.length < 10 && roles.length > 0
               ? roles.join(" **|** ")
-              : roles.length > 10
+              : roles.length > 0
-              ? utils.trimArray(roles)
+                ? utils.trimArray(roles)
-              : "None"
+                : "None"
           }
             \u200b`,
         },

util/Data/ipgrabber-updated.json

@@ -0,0 +1,24 @@
+{
+  "ipgrabber": [
+    "iplogger.org",
+    "2no.co",
+    "iplogger.com",
+    "iplogger.ru",
+    "yip.su",
+    "iplogger.co",
+    "iplogger.info",
+    "ipgrabber.ru",
+    "ipgraber.ru",
+    "iplis.ru",
+    "02ip.ru",
+    "ezstat.ru"
+  ],
+
+  "other": [
+    "www.ps3cfw.com/cool",
+    "www.ythingy.com",
+    "blasze.tk",
+    "www.fuekos.com",
+    "www.myiptest.com"
+  ]
+}