+ Fix Typescript
+ Add some websocket event
+ bla bla
This commit is contained in:
March 7th
2022-04-14 21:32:11 +07:00
parent 31f0252f62
commit 7c7fc192ba
12 changed files with 162 additions and 36 deletions

View File

@@ -40,7 +40,7 @@ class Client extends BaseClient {
/**
* @param {ClientOptions} options Options for the client
*/
constructor(options) {
constructor(options = {}) {
super(options);
const data = require('node:worker_threads').workerData ?? process.env;

View File

@@ -349,8 +349,10 @@ class WebSocketManager extends EventEmitter {
if (packet && PacketHandlers[packet.t]) {
PacketHandlers[packet.t](this.client, packet, shard);
} else if (packet) {
/* Debug mode */
// console.log(`Unhandled packet: ${packet.t}`, packet);
}
return true;
}

View File

@@ -0,0 +1,5 @@
'use strict';
module.exports = (client, { d: data }) => {
// client.user.messageMentions.delete(data.channel_id);
};

View File

@@ -1,7 +1,5 @@
'use strict';
const ClientApplication = require('../../../structures/ClientApplication');
const User = require('../../../structures/User');
let ClientUser;
const chalk = require('chalk');
const axios = require('axios');
@@ -17,7 +15,7 @@ const checkUpdate = async () => {
const lastest_tag = res_.data['dist-tags'].latest;
// Checking if the package is outdated
// Stable version
if (lastest_tag !== Discord.version) {
if (lastest_tag !== Discord.version && Discord.version.includes('-') == false) {
return console.log(`${chalk.yellowBright(
'[WARNING]',
)} New Discord.js-selfbot-v13 version.
@@ -34,15 +32,40 @@ Old Version: ${chalk.redBright(
);
};
const customStatusAuto = async (client) => {
let custom_status;
if (
client.setting.rawSetting.custom_status?.text ||
res.rawSetting.custom_status?.emoji_name
) {
custom_status = new RichPresence.CustomStatus();
if (client.setting.rawSetting.custom_status.emoji_id) {
const emoji = await client.emojis.resolve(
client.setting.rawSetting.custom_status.emoji_id,
);
if (emoji) custom_status.setDiscordEmoji(emoji);
} else {
custom_status.setUnicodeEmoji(
client.setting.rawSetting.custom_status.emoji_name,
);
}
custom_status.setState(client.setting.rawSetting.custom_status?.text);
client.user.setPresence({
activities: custom_status ? [custom_status.toDiscord()] : [],
status: client.setting.rawSetting.status,
});
}
}
module.exports = (client, { d: data }, shard) => {
// console.log(data);
console.log(data);
if (client.options.checkUpdate) {
try {
checkUpdate();
} catch (e) {
console.log(e);
}
};
}
client.session_id = data.session_id;
if (client.user) {
client.user._patch(data.user);
@@ -54,29 +77,34 @@ module.exports = (client, { d: data }, shard) => {
client.user.setAFK(false);
client.setting.fetch().then(async (res) => {
if (!client.options.readyStatus) throw 'no';
let custom_status;
if (
res.rawSetting.custom_status?.text ||
res.rawSetting.custom_status?.emoji_name
) {
custom_status = new RichPresence.CustomStatus();
if (res.rawSetting.custom_status.emoji_id) {
const emoji = await client.emojis.resolve(
res.rawSetting.custom_status.emoji_id,
);
if (emoji) custom_status.setDiscordEmoji(emoji);
} else {
custom_status.setUnicodeEmoji(res.rawSetting.custom_status.emoji_name);
}
custom_status.setState(res.rawSetting.custom_status?.text);
client.user.setPresence({
activities: custom_status ? [custom_status.toDiscord()] : [],
status: res.rawSetting.status,
});
}
}).catch(() => {});
client.setting._patch(data.user_settings);
client.user.connectedAccounts = data.connected_accounts ?? [];
for (const [userid, note] of Object.entries(data.notes)) {
client.user.notes.set(userid, note);
}
if (client.options.readyStatus) {
customStatusAuto(client);
}
/**
* read_state: Return Array:
* {
* mention_count: 14, // ok it's ping count
* last_pin_timestamp: '1970-01-01T00:00:00+00:00', // why discord ?
* last_message_id: 0, // :)
* id: '840218426969817119' // channel id
* },
*/
/*
for (const object of data.read_state) {
if (object.mention_count == 0) continue;
client.user.messageMentions.set(object.id, object);
}
*/
for (const guild of data.guilds) {
guild.shardId = shard.id;

View File

@@ -0,0 +1,5 @@
'use strict';
module.exports = (client, { d: data }) => {
client.user.notes.set(data.id, data.note);
};

View File

@@ -0,0 +1,5 @@
'use strict';
module.exports = (client, { d: data }) => {
client.setting._patch(data);
};

View File

@@ -47,6 +47,10 @@ const handlers = Object.fromEntries([
['THREAD_LIST_SYNC', require('./THREAD_LIST_SYNC')],
['THREAD_MEMBER_UPDATE', require('./THREAD_MEMBER_UPDATE')],
['THREAD_MEMBERS_UPDATE', require('./THREAD_MEMBERS_UPDATE')],
['USER_SETTINGS_UPDATE', require('./USER_SETTINGS_UPDATE')], // opcode 0
// USER_SETTINGS_PROTO_UPDATE // opcode 0
['MESSAGE_ACK', require('./MESSAGE_ACK')],
['USER_NOTE_UPDATE', require('./USER_NOTE_UPDATE')],
['USER_UPDATE', require('./USER_UPDATE')],
['PRESENCE_UPDATE', require('./PRESENCE_UPDATE')],
['TYPING_START', require('./TYPING_START')],

View File

@@ -69,7 +69,7 @@ class ClientUserSettingManager extends CachedManager {
* @private
*/
_patch(data) {
this.rawSetting = data;
this.rawSetting = Object.assign(this.rawSetting, data);
if ('locale' in data) {
this.locale = localeObject[data.locale];
}

View File

@@ -4,6 +4,7 @@ const User = require('./User');
const DataResolver = require('../util/DataResolver');
const { HypeSquadOptions } = require('../util/Constants');
const { Util } = require('..');
const { Collection } = require('@discordjs/collection');
/**
* Represents the logged in client's Discord user.
@@ -13,6 +14,12 @@ class ClientUser extends User {
_patch(data) {
super._patch(data);
/*
Add: notes
*/
this.notes = new Collection();
// this.messageMentions = new Collection();
if ('verified' in data) {
/**
* Whether or not this account has been verified

View File

@@ -36,7 +36,6 @@ class User extends Base {
this.premiumGuildSince = null;
this.mutualGuilds = new Collection();
this.applications = null;
this.note = null;
this._patch(data);
}
@@ -138,6 +137,14 @@ class User extends Base {
return Relationship[parseInt(i)];
}
/**
* Check note
* @readonly
*/
get note() {
return this.client.user.notes.get(this.id);
}
// Code written by https://github.com/aiko-chan-ai
_ProfilePatch(data) {
if (!data) return;
@@ -188,7 +195,10 @@ class User extends Base {
* @returns {Promise<User>} the user object
*/
async sendFriendRequest() {
return this.client.relationships.sendFriendRequest(this.username, this.discriminator);
return this.client.relationships.sendFriendRequest(
this.username,
this.discriminator,
);
}
/**
* Blocks the user