Skip to content

Adds Discord.js v13 support. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamieGrimwood wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Adds Discord.js v13 support. #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
debff9b
Added v13 support
JamieGrimwood Mar 16, 2022
7b4e595
Make it actually use v13
JamieGrimwood Mar 16, 2022
b8496d3
Updating the broadcast eval
JamieGrimwood Mar 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions src/DanBotShards.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ class ShardingClient {
this.manager = manager;

// General config
this.v11 = this.discord.version <= "12.0.0";
this.v12 = this.discord.version >= "12.0.0";
this.v11 = this.discord.version <= "13.0.0";
this.v12 = this.discord.version <= "13.0.0";
this.v13 = this.discord.version >= "13.0.0";
this.activeUsers = [];
this.commandsRun = 0;

Expand Down Expand Up @@ -89,8 +90,13 @@ class ShardingClient {
let guild_count = 0;
let user_count = 0;

// V12 code
if (this.v12) {

if (this.v13) {
// V13 code
guild_count = await getGuildCountV13(this.manager);
user_count = await getUserCountV13(this.manager);
} else if (this.v12) {
// V12 code
guild_count = await getGuildCountV12(this.manager);
user_count = await getUserCountV12(this.manager);
} else if (this.v11) {
Expand All @@ -100,9 +106,9 @@ class ShardingClient {
}

// Get client id
let id = (await this.manager.broadcastEval("this.user.id"))[0];
let id = (await this.manager.broadcastEval(c => c.user.id))[0];
// Get client info
let info = (await this.manager.broadcastEval("this.user"))[0];
let info = (await this.manager.broadcastEval(c => c.user))[0];

// Post data
let requestBody = {
Expand Down Expand Up @@ -157,6 +163,20 @@ class ShardingClient {
}
}

// V12 sharding gets
async function getGuildCountV13(manager) {
return (await manager.fetchClientValues("guilds.cache.size")).reduce(
(prev, current) => prev + current,
0
);
}

async function getUserCountV13(manager) {
const memberNum = await manager.broadcastEval(c => c.guilds.cache.reduce((acc, guild) => acc + guild.memberCount, 0));
return memberNum.reduce((prev, memberCount) => prev + memberCount, 0);
}
// end

// V12 sharding gets
async function getGuildCountV12(manager) {
return (await manager.fetchClientValues("guilds.cache.size")).reduce(
Expand Down