From bbaf2205ade0fb76e2f82b879c99c48e8c4aab5b Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Tue, 24 Jun 2025 02:28:24 +0200 Subject: [PATCH 1/5] Add unique members to getGuildInfo --- util/getGuildInfo.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/util/getGuildInfo.js b/util/getGuildInfo.js index 87540c6..30b80fe 100644 --- a/util/getGuildInfo.js +++ b/util/getGuildInfo.js @@ -1,9 +1,16 @@ module.exports = function(client){ let guildCount = 0; let totalMembers = 0; + let uniqueMembers = new Map(); client.guilds.cache.each(guild => { guildCount++ totalMembers += guild.memberCount; + guild.members.cache.each(member => { + if(!uniqueMembers.get(member.id)){ + uniqueMembers.set(member.id, true); + } + }) }); - return {guildCount: guildCount, totalMembers: totalMembers}; + let uniqueMemberCount = uniqueMembers.size; + return {guildCount, totalMembers, uniqueMemberCount}; } \ No newline at end of file From 9611046393c7dff74e71cc7e26ffc901d42da5bd Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Tue, 24 Jun 2025 02:32:32 +0200 Subject: [PATCH 2/5] Add uniqueMemberCount as a variable in setPresence --- util/setPresence.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/setPresence.js b/util/setPresence.js index 62b4633..8f1fd6d 100644 --- a/util/setPresence.js +++ b/util/setPresence.js @@ -22,7 +22,8 @@ module.exports = function ({presenceText, presenceType, client}) { guilds: guildInfo.guildCount, prefix: globalPrefix, uptime: uptimeFormat, - members: guildInfo.totalMembers + members: guildInfo.totalMembers, + uniqueMemberCount: guildInfo.uniqueMemberCount } const regex = /(?<=\${)(.*?)(?=})/g; From 4f0e948a84d815f42fa06000a0d71d7aa07c32b9 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Tue, 24 Jun 2025 02:47:01 +0200 Subject: [PATCH 3/5] Remove getGuildCount test This function has been renamed and stuff so I have to rethink how I'll implement tests for it. --- tests/getGuildCount.test.js | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 tests/getGuildCount.test.js diff --git a/tests/getGuildCount.test.js b/tests/getGuildCount.test.js deleted file mode 100644 index cc86368..0000000 --- a/tests/getGuildCount.test.js +++ /dev/null @@ -1,17 +0,0 @@ -const getGuildInfo = require('../util/getGuildInfo'); - - - -test("Testing getGuildCount", () => { - for(let i = 1; i < 200000; i = i+i*30 ){ - let client = {guilds: {cache: new Map()}} - client.guilds.cache.each = client.guilds.cache.forEach; - - for(let j = 0; j < i; j++){ - client.guilds.cache.set(`num: ${j}`, j); - } - - expect(getGuildInfo(client).guildCount).toBe(i); - - } -}) \ No newline at end of file From 28cc7d6f15e29a0516db0078ee21e2a889029da8 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Tue, 24 Jun 2025 02:48:10 +0200 Subject: [PATCH 4/5] Use const --- util/getGuildInfo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/getGuildInfo.js b/util/getGuildInfo.js index 30b80fe..f1043fa 100644 --- a/util/getGuildInfo.js +++ b/util/getGuildInfo.js @@ -1,7 +1,7 @@ module.exports = function(client){ let guildCount = 0; let totalMembers = 0; - let uniqueMembers = new Map(); + const uniqueMembers = new Map(); client.guilds.cache.each(guild => { guildCount++ totalMembers += guild.memberCount; @@ -11,6 +11,6 @@ module.exports = function(client){ } }) }); - let uniqueMemberCount = uniqueMembers.size; + const uniqueMemberCount = uniqueMembers.size; return {guildCount, totalMembers, uniqueMemberCount}; } \ No newline at end of file From b9e0b6abd3f185aa7fafc7b9865cf4c269b0bc46 Mon Sep 17 00:00:00 2001 From: SileNce5k Date: Tue, 24 Jun 2025 02:49:52 +0200 Subject: [PATCH 5/5] Use has instead of get --- util/getGuildInfo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/getGuildInfo.js b/util/getGuildInfo.js index f1043fa..5d1b74e 100644 --- a/util/getGuildInfo.js +++ b/util/getGuildInfo.js @@ -6,7 +6,7 @@ module.exports = function(client){ guildCount++ totalMembers += guild.memberCount; guild.members.cache.each(member => { - if(!uniqueMembers.get(member.id)){ + if(!uniqueMembers.has(member.id)){ uniqueMembers.set(member.id, true); } })