refactor: unstaged changes

from who knows when

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-node node_modules/git-commit-msg-linter/commit-msg-linter.js $1
+.git/hooks/commit-msg $1

package.json

@@ -26,34 +26,34 @@
     "src/**/*"
   ],
   "dependencies": {
-    "@aero/sanitizer": "^1.2.0",
-    "axios": "^1.4.0",
-    "axios-retry": "^3.4.0",
-    "canvas": "^2.11.2",
+    "@aero/sanitizer": "1.3.2",
+    "axios": "1.5.1",
+    "axios-retry": "3.8.0",
+    "canvas": "2.11.2",
     "captcha-canvas": "2.3.1",
-    "dayjs": "^1.11.7",
-    "discord.js": "^14.10.2",
-    "humanize-duration": "^3.28.0",
-    "ioredis": "^5.3.2",
-    "pg": "^8.10.0",
+    "dayjs": "1.11.10",
+    "discord.js": "14.13.0",
+    "humanize-duration": "3.30.0",
+    "ioredis": "5.3.2",
+    "pg": "8.11.3",
     "quick-lru": "5.1.1",
-    "trek-captcha": "^0.4.0",
-    "xml2js": "^0.5.0"
+    "trek-captcha": "0.4.0",
+    "xml2js": "0.6.2"
   },
   "devDependencies": {
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
-    "git-commit-msg-linter": "^4.11.0",
-    "husky": "^8.0.3",
-    "is-ci": "^3.0.1",
-    "lint-staged": "^13.2.2",
-    "prettier": "^2.8.8",
-    "pretty-quick": "^3.1.3"
+    "eslint": "8.52.0",
+    "eslint-config-prettier": "8.10.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "git-commit-msg-linter": "5.0.4",
+    "husky": "8.0.3",
+    "is-ci": "3.0.1",
+    "lint-staged": "15.0.2",
+    "prettier": "2.8.8",
+    "pretty-quick": "3.1.3"
   },
   "optionalDependencies": {
-    "bufferutil": "^4.0.7",
-    "utf-8-validate": "^6.0.3",
-    "zlib-sync": "^0.1.8"
+    "bufferutil": "4.0.8",
+    "utf-8-validate": "6.0.3",
+    "zlib-sync": "0.1.8"
   }
 }

src/commands/Information/Info.js

@@ -9,21 +9,35 @@ const embed = new EmbedBuilder()
   .setColor(Constants.color)
   .setDescription(
     "Multi-purpose helper bot for game bots with extras!\n" +
-      "Completely free with no restrictions. Part of [__**Gay & Comfy**__](https://discord.gg/comfy)!"
+      "Completely free with no restrictions. Part of [__**Gay & Comfy**__](https://discord.gg/comfy)!\n"
   )
   .addFields([
     {
       name: "Owners",
-      value: "`Nota#8888`, `⋆˚🌺⃤ Jorgy₊ ˚#5611`, `Alycans#1693`",
+      value:
+        "[`notaa.`](https://discord.com/users/554476322303246388), " +
+        "[`jorgy.js`](https://discord.com/users/304357538101723137), " +
+        "[`alycans`](https://discord.com/users/77256980288253952)",
     },
     {
       name: "Lead Devs",
-      value:
-        "[`JeDaYoshi#7942`](https://jeda.im), [`Liz3#0001`](https://nya.so)",
+      value: "[JeDaYoshi](https://jeda.im), [Liz3](https://nya.so)",
     },
     {
       name: "Team and Collaborators",
-      value: "`⋆˚🌺⃤ Jorgy₊ ˚#5611`, `Nota#8888`, `bappy#3311`",
+      value:
+        "[`jedayoshi`](https://discord.com/users/175408504427905025), " +
+        "[`liz3`](https://discord.com/users/195906408561115137), " +
+        "[`cassakura`](https://discord.com/users/189978735816998913), " +
+        "[`jorgy.js`](https://discord.com/users/304357538101723137), " +
+        "[`notaa.`](https://discord.com/users/554476322303246388)",
+    },
+    {
+      name: "Special Thanks",
+      value:
+        "[`kebab___`](https://discord.com/users/933549055538249728), " +
+        "[`offbeatwitch`](https://discord.com/users/97707213690249216), " +
+        "[`jsh32`](https://discord.com/users/462828548080664577)",
     },
   ])
   .setFooter({ text: "Roleplay images provided by https://waifu.pics" });

src/commands/Other/TypeRace.js

@@ -36,10 +36,13 @@ module.exports = {
       cd.has(message.channel.id) &&
       Date.now() - cd.get(message.channel.id) < 8000
     ) {
-      return queue.addItem(() => message.react("🕘").catch(() => null));
+      queue.addItem(() => message.react("🕘").catch(() => null));
+      return true;
+    }
+    if (channelMap[message.channel.id]) {
+      queue.addItem(() => message.react("🕘").catch(() => null));
+      return true;
     }
-    if (channelMap[message.channel.id])
-      return queue.addItem(() => message.react("🕘").catch(() => null));
 
     let di = args.length > 0 ? args.shift().toLowerCase() : false;
     const tier =
@@ -177,6 +180,7 @@ module.exports = {
       message.channel.send({ embeds: [result] });
       cd.set(message.channel.id, Date.now());
     });
+
     return true;
   },
   info,

src/commands/Owner/SpawnTyperace.js

@@ -78,7 +78,7 @@ module.exports = {
               `<:Sirona_NoCross:762606114444935168> No card found for that criteria.`
             )
             .setColor(Color.red);
-          message.channel.send({ embeds: [embed] });
+          message.channel.send({ embeds: [embed] }).catch(() => null);
           return null;
         }
 

src/commands/Shoob/Card.js

@@ -58,7 +58,7 @@ module.exports = {
           `<:Sirona_NoCross:762606114444935168> No card found for that criteria.`
         )
         .setColor(Color.red);
-      message.reply({ embeds: [embed] });
+      message.channel.send({ embeds: [embed] }).catch(() => null);
       return true;
     }
 

src/commands/Shoob/ClansLeaderboardPcnt.js

@@ -7,7 +7,7 @@ const info = {
   matchCase: false,
   category: "Shoob",
   cooldown: 2,
-  disabled: process.env.NODE_ENV === "development",
+  disabled: true,
 };
 
 const clans = {

src/commands/Shoob/Inventory.js

@@ -77,7 +77,7 @@ module.exports = {
           `<:Sirona_NoCross:762606114444935168> No card found for that criteria.`
         )
         .setColor(Color.red);
-      message.channel.send({ embeds: [embed] });
+      message.channel.send({ embeds: [embed] }).catch(() => null);
       return true;
     }
     if (card) tier = card.tier;

src/commands/Shoob/Market.js

@@ -231,7 +231,7 @@ module.exports = {
           `<:Sirona_NoCross:762606114444935168> No card found for that criteria.`
         )
         .setColor(Color.red);
-      await message.reply({ embeds: [embed] });
+      await message.channel.send({ embeds: [embed] });
       return true;
     }
     await processWithCard(instance, message, option, card);

src/commands/Shoob/utils.js

@@ -94,8 +94,8 @@ exports.getCard = async (instance, message, card, tracked, botMessage) => {
           // card info & market listings
           const [top, listings] = await Promise.all([
             tracked
-              ? DbFetcher.fetchTopOwners(instance, card.id, "0", "5")
-              : Fetcher.fetchTopOwners(instance, card.id, "0", "5"),
+              ? DbFetcher.fetchTopOwners(instance, card.id, "0", "10")
+              : Fetcher.fetchTopOwners(instance, card.id, "0", "10"),
             Fetcher.fetchMarketByCardId(instance, card.id, "0", "10"),
           ]);
 

src/config-dev.js

@@ -3,7 +3,7 @@ dayjs.extend(require("dayjs/plugin/utc"));
 dayjs.extend(require("dayjs/plugin/timezone"));
 
 const tz = "America/New_York";
-const birth = dayjs.tz("2020-11-08 00:00:00", tz);
+const birth = dayjs.tz("2020-11-03 00:00:00", tz);
 
 module.exports = {
   prefix: "k!",

src/config-prod.js

@@ -3,7 +3,7 @@ dayjs.extend(require("dayjs/plugin/utc"));
 dayjs.extend(require("dayjs/plugin/timezone"));
 
 const tz = "America/New_York";
-const birth = dayjs.tz("2020-11-08 00:00:00", tz);
+const birth = dayjs.tz("2020-11-03 00:00:00", tz);
 
 module.exports = {
   prefix: "s!",
@@ -35,7 +35,7 @@ module.exports = {
     "933549055538249728", // bappy#3311
     "189978735816998913", // cass#9999
   ],
-  shardCount: 6,
+  shardCount: 4,
   get season() {
     return dayjs.tz(Date.now(), tz).diff(birth, "month");
   },