Merge 014fca0 into d7cd162

Author: Lioness100

package-lock.json

@@ -47,6 +47,7 @@
     "promise.allsettled": "^1.0.2"
   },
   "devDependencies": {
+    "@discordjs/collection": "^0.1.6",
     "@types/jest": "^26.0.15",
     "@types/node": "^14.0.5",
     "@types/promise.allsettled": "^1.0.3",

package.json

@@ -19,7 +19,7 @@ export class ClientFiller {
     this.client = client
   }
 
-  /** Gets the amount of users the bot has cached. */
+  /** Gets the amount of users the bot can reach. */
   get userCount(): number | undefined {
     return 0
   }

src/Interface/ClientFiller.ts

@@ -1,3 +1,4 @@
+import { AnyObject } from '../../Utils/Util'
 import { Shard } from '../../Utils/Constants'
 import { ClientFiller } from '../ClientFiller'
 
@@ -7,8 +8,13 @@ import { ClientFiller } from '../ClientFiller'
  */
 export default class DiscordIO extends ClientFiller {
   get userCount() {
-    if (!this.client.users) return undefined
-    return Object.keys(this.client.users).length
+    if (!this.client.servers) return undefined
+    return Object.keys(this.client.servers)
+      .map((id) => this.client.servers[id])
+      .reduce(
+        (count: number, guild: AnyObject) => count + guild.member_count,
+        0
+      )
   }
 
   get serverCount() {

src/Interface/Clients/DiscordIO.ts

@@ -1,3 +1,4 @@
+import { AnyObject } from '../../Utils/Util'
 import { Shard } from '../../Utils/Constants'
 import { ClientFiller } from '../ClientFiller'
 
@@ -7,9 +8,16 @@ import { ClientFiller } from '../ClientFiller'
  */
 export default class DiscordJS extends ClientFiller {
   get userCount(): number {
-    if (this.client.users?.constructor?.name === 'UserManager')
-      return this.client.users?.cache?.size
-    else return this.client.users?.size
+    if (this.client.guilds?.constructor?.name === 'GuildManager')
+      return this.client.guilds?.cache?.reduce(
+        (count: number, guild: AnyObject) => count + guild.memberCount,
+        0
+      )
+    else
+      return this.client.guilds?.reduce(
+        (count: number, guild: AnyObject) => count + guild.memberCount,
+        0
+      )
   }
 
   get serverCount(): number {

src/Interface/Clients/DiscordJS.ts

@@ -1,3 +1,4 @@
+import { AnyObject } from '../../Utils/Util'
 import { Shard } from '../../Utils/Constants'
 import { ClientFiller } from '../ClientFiller'
 
@@ -7,11 +8,14 @@ import { ClientFiller } from '../ClientFiller'
  */
 export default class Discordie extends ClientFiller {
   get userCount(): number {
-    return this.client.Guilds?.size
+    return this.client.Guilds?.toArray().reduce(
+      (count: number, guild: AnyObject) => count + guild.member_count,
+      0
+    )
   }
 
   get serverCount(): number {
-    return this.client.Users?.size
+    return this.client.Guilds?.size
   }
 
   get voiceConnections(): number {

src/Interface/Clients/Discordie.ts

@@ -1,3 +1,4 @@
+import { AnyObject } from '../../Utils/Util'
 import { ClientFiller } from '../ClientFiller'
 
 /**
@@ -6,7 +7,10 @@ import { ClientFiller } from '../ClientFiller'
  */
 export default class Eris extends ClientFiller {
   get userCount(): number {
-    return this.client.users?.size
+    return this.client.guilds?.reduce(
+      (count: number, guild: AnyObject) => count + guild.memberCount,
+      0
+    )
   }
 
   get serverCount(): number {

src/Interface/Clients/Eris.ts

@@ -1,12 +1,17 @@
+import { AnyObject } from '../../Utils/Util'
 import { ClientFiller } from '../ClientFiller'
 
 /**
  * Represents the client filler for Paracord clients.
  * @private
  */
 export default class Paracord extends ClientFiller {
-  get userCount(): number {
-    return this.client.users?.size
+  get userCount() {
+    if (!this.client.guilds) return undefined
+    return Array.from(this.client.guilds.values as ArrayLike<AnyObject>).reduce(
+      (count: number, guild: AnyObject) => count + guild.member_count,
+      0
+    )
   }
 
   get serverCount(): number {

src/Interface/Clients/Paracord.ts

@@ -1,3 +1,4 @@
+import Collection from '@discordjs/collection'
 import * as PosterModule from '../../src/Interface/Poster'
 import { Service } from '../../src/Interface/Service'
 import TopGG from '../../src/Interface/Lists/TopGG'
@@ -6,6 +7,11 @@ import { PosterOptions } from '../../src/Utils/Constants'
 describe('Poster module', () => {
   describe('Poster class', () => {
     const { Poster } = PosterModule
+    const fakeClientGuilds = new Collection(
+      Array(123)
+        .fill('a')
+        .map((_value, index) => [index, { memberCount: 2 }]) as [number, any][]
+    )
 
     describe('constructor', () => {
       it('should throw when instatiated without options', () => {
@@ -109,12 +115,17 @@ describe('Poster module', () => {
         expect(fn).toHaveBeenCalled()
       })
 
-      it('should use the clientFiller', () => {
+      it('should use the clientFiller', (done) => {
         const p = new Poster({
-          client: { users: { size: 123 } },
+          client: { guilds: fakeClientGuilds },
           clientLibrary: 'discord.js'
         })
-        expect(p.getUserCount()).resolves.toBe(123)
+        p.getUserCount()
+          .then((res) => {
+            expect(res).toBe(123 * 2)
+            done()
+          })
+          .catch(() => done.fail())
       })
 
       it('should default to 0', () => {
@@ -219,7 +230,7 @@ describe('Poster module', () => {
     describe('post method', () => {
       const p = new Poster({
         client: {
-          guilds: { size: 123 },
+          guilds: fakeClientGuilds,
           users: { size: 456 },
           broadcasts: { size: 789 }
         },
@@ -242,7 +253,7 @@ describe('Poster module', () => {
         await p.post('service')
         expect(p.postManual).toHaveBeenLastCalledWith('service', {
           serverCount: 123,
-          userCount: 456,
+          userCount: 123 * 2,
           voiceConnections: 789
         })
       })