ION_Archive/custom_discordjs
1
0
Fork 0
mirror of https://github.com/ION606/custom_discordjs.git synced 2026-05-14 22:26:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
ION606
2024-05-16 09:52:25 -07:00
parent e2d34a63ad
commit eff76b3960
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package.json
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "iondiscordjs", "name": "iondiscordjs",
"version": "1.0.2", "version": "1.0.2",
"description": "because discord.js is annoying", "description": "because discord.js is annoying",
"main": "tests\\test.js", "main": "tests/test.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
structures/client/client.js
+28 -25
View File
@@ -23,10 +23,10 @@ export class Client extends EventEmitter {
/** @type {gateWayEvents[]} */ /** @type {gateWayEvents[]} */
gwintents; gwintents;
/** @type {String} */ /** @type {String} */
#token; #token;
/** @type {String} */ /** @type {String} */
id; id;
@@ -35,7 +35,7 @@ export class Client extends EventEmitter {
/** @type {Object} */ /** @type {Object} */
user_settings; user_settings;
/** @type {Object} */ /** @type {Object} */
user_profile; user_profile;
@@ -60,7 +60,7 @@ export class Client extends EventEmitter {
async #heartbeat(hbInt, hbSequence) { async #heartbeat(hbInt, hbSequence) {
const toSend = JSON.stringify({ op: 1, d: 0 }); const toSend = JSON.stringify({ op: 1, d: 0 });
this.ws.send((toSend)); this.ws.send((toSend));
setInterval(() => { setInterval(() => {
this.ws.send(toSend); this.ws.send(toSend);
}, hbInt); }, hbInt);
@@ -69,8 +69,7 @@ export class Client extends EventEmitter {
/** /**
* @param {Number} hbint * @param {Number} hbint
*/ */
async #startHeartBeat(hbint) async #startHeartBeat(hbint) {
{
this.heartBeatInterval = hbint; this.heartBeatInterval = hbint;
console.log("INTERVAL SET TO: " + this.heartBeatInterval); console.log("INTERVAL SET TO: " + this.heartBeatInterval);
this.#heartbeat(hbint); this.#heartbeat(hbint);
@@ -87,8 +86,11 @@ export class Client extends EventEmitter {
this.user_settings = response.config; this.user_settings = response.config;
this.id = response.profile.id; this.id = response.profile.id;
const commandsRaw = (await this.axiosCustom.get(`applications/${this.id}/commands`)).data; if (!this.isUser) {
this.commands = new InteractionManager(commandsRaw, this); const commandsRaw = (await this.axiosCustom.get(`applications/${this.id}/commands`)).data;
this.commands = new InteractionManager(commandsRaw, this);
}
this.emit('ready'); this.emit('ready');
} }
@@ -166,12 +168,13 @@ export class Client extends EventEmitter {
return response; return response;
}, function (err) { }, function (err) {
console.log(err.response.data); console.log(err.response.data);
throw `REQUEST FAILED WITH STATUS CODE ${err.response.status} AND REASON "${JSON.stringify(err.response.data)}"`; // throw `REQUEST FAILED WITH STATUS CODE ${err.response.status} AND REASON "${JSON.stringify(err.response.data)}"`;
}); });
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.ws = new WebSocket("wss://gateway.discord.gg/?v=10&encoding=json"); this.ws = new WebSocket("wss://gateway.discord.gg/?v=9&encoding=json");
this.#token = token; this.#token = token;
this.isUser = isUser;
this.ws.on('open', () => { this.ws.on('open', () => {
//Get the user intents //Get the user intents
@@ -179,7 +182,7 @@ export class Client extends EventEmitter {
for (let i of this.gwintents) { for (let i of this.gwintents) {
iCount += (i) ? i : 0; iCount += (i) ? i : 0;
} }
var idObj = { var idObj = {
op: 2, op: 2,
d: { d: {
@@ -192,7 +195,7 @@ export class Client extends EventEmitter {
} }
} }
}; };
this.ws.send(JSON.stringify(idObj)); this.ws.send(JSON.stringify(idObj));
}); });
@@ -203,37 +206,37 @@ export class Client extends EventEmitter {
if (response.op == 10) { return this.#startHeartBeat(response.heartBeat, token); } if (response.op == 10) { return this.#startHeartBeat(response.heartBeat, token); }
else if (response.op == 0) { else if (response.op == 0) {
switch(response.t) { switch (response.t) {
case gateWayEvents.Ready: this.ready(response); case gateWayEvents.Ready: this.ready(response);
break; break;
case gateWayEvents.MessageCreate: case gateWayEvents.MessageCreate:
if (data["d"]["author"]["id"] != this.user_profile.id){ if (data["d"]["author"]["id"] != this.user_profile.id) {
response.message.guild = this.guilds.get(response.message.guild_id); response.message.guild = this.guilds.get(response.message.guild_id);
this.messageRecieved(response.message); this.messageRecieved(response.message);
} }
break; break;
case gateWayEvents.InteractionCreate: this.interactionRecieved(data, response); case gateWayEvents.InteractionCreate: this.interactionRecieved(data, response);
break; break;
case gateWayEvents.GuildCreate: this.guildCreate(response.guild); case gateWayEvents.GuildCreate: this.guildCreate(response.guild);
break; break;
case gateWayEvents.GuildDelete: this.guildDelete(response.guild); case gateWayEvents.GuildDelete: this.guildDelete(response.guild);
break; break;
case gateWayEvents.GuildMemberAdd: this.guildMemberAdd(response.member); case gateWayEvents.GuildMemberAdd: this.guildMemberAdd(response.member);
break; break;
case gateWayEvents.ThreadCreate: this.threadCreate(response.threadRaw); case gateWayEvents.ThreadCreate: this.threadCreate(response.threadRaw);
break; break;
case gateWayEvents.ThreadUpdate: this.threadEdit(response.threadRaw); case gateWayEvents.ThreadUpdate: this.threadEdit(response.threadRaw);
break; break;
case gateWayEvents.ThreadDelete: this.ThreadDelete(response.threadRaw); case gateWayEvents.ThreadDelete: this.ThreadDelete(response.threadRaw);
break; break;
default: // console.log(response.t); default: // console.log(response.t);
} }
@@ -259,4 +262,4 @@ export class Client extends EventEmitter {
//All client properties will be re-routed through this export //All client properties will be re-routed through this export
export {gateWayIntents} from '../gateway/intents.js'; export { gateWayIntents } from '../gateway/intents.js';