From 5ca64f839e9d99f3206d67f52e28e0c4351f0132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:12:57 -0600
Subject: [PATCH 1/3] fix: exhaustive user and channel indexing

---
 src/events/ready.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/events/ready.ts b/src/events/ready.ts
index d63ceeb31..a6278013e 100644
--- a/src/events/ready.ts
+++ b/src/events/ready.ts
@@ -5,8 +5,17 @@ export default function ready(client: Client<true>) {
 
   const activities: (() => string)[] = [
     () => `Living in ${client.guilds.cache.size.toLocaleString()} servers`,
-    () => `Serving ${client.users.cache.size.toLocaleString()} users`,
-    () => `Observing ${client.channels.cache.size.toLocaleString()} channels`,
+    () =>
+      `Serving ${client.guilds.cache
+        .reduce((accumulator, guild) => accumulator + guild.memberCount, 0)
+        .toLocaleString()} users`,
+    () =>
+      `Observing ${client.guilds.cache
+        .reduce(
+          (accumulator, guild) => accumulator + guild.channels.cache.size,
+          0,
+        )
+        .toLocaleString()} channels`,
   ];
 
   client.user.setPresence({

From d1d9e9e4d1f33e14930d27b9e03751eabb7a0a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:14:35 -0600
Subject: [PATCH 2/3] feat: changelogs

---
 docs/changelogs/1.15.5.md | 7 +++++++
 package.json              | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 docs/changelogs/1.15.5.md

diff --git a/docs/changelogs/1.15.5.md b/docs/changelogs/1.15.5.md
new file mode 100644
index 000000000..331b343a2
--- /dev/null
+++ b/docs/changelogs/1.15.5.md
@@ -0,0 +1,7 @@
+# Blitzkrieg 1.15.4
+
+Oops, this should've been in the last patch.
+
+## Fixes
+
+- User and channel cache is now guild cache exhaustive
diff --git a/package.json b/package.json
index d9c1af04f..58a4cf0c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blitzkrieg",
-  "version": "1.15.3",
+  "version": "1.15.5",
   "description": "🎉 Tools for everything World of Tanks Blitz",
   "main": "src/server.ts",
   "type": "module",

From 54c5faf92923a1a1db2bff824fb0427e196384f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:15:24 -0600
Subject: [PATCH 3/3] fix: changelog version

---
 docs/changelogs/1.15.5.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelogs/1.15.5.md b/docs/changelogs/1.15.5.md
index 331b343a2..439b14476 100644
--- a/docs/changelogs/1.15.5.md
+++ b/docs/changelogs/1.15.5.md
@@ -1,4 +1,4 @@
-# Blitzkrieg 1.15.4
+# Blitzkrieg 1.15.5
 
 Oops, this should've been in the last patch.