Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-16 11:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'indev' into indev-prism

Browse Source
This commit is contained in:
Amish Shah
2016-12-29 19:02:54 +00:00
parent f8440ad565 22b1c425ac
commit e9af3f0a1f
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -35,7 +35,7 @@
"pako": "^1.0.0", "pako": "^1.0.0",
"superagent": "^3.3.0", "superagent": "^3.3.0",
"tweetnacl": "^0.14.0", "tweetnacl": "^0.14.0",
"ws": "^1.1.0" "ws": "^1.1.1"
}, },
"peerDependencies": { "peerDependencies": {
"erlpack": "hammerandchisel/erlpack#master", "erlpack": "hammerandchisel/erlpack#master",

1
src/client/websocket/packets/handlers/Ready.js
View File

@@ -10,6 +10,7 @@ class ReadyHandler extends AbstractHandler {
client.ws.heartbeat(); client.ws.heartbeat();
const clientUser = new ClientUser(client, data.user); const clientUser = new ClientUser(client, data.user);
clientUser.settings = data.user_settings;
client.user = clientUser; client.user = clientUser;
client.readyAt = new Date(); client.readyAt = new Date();
client.users.set(clientUser.id, clientUser); client.users.set(clientUser.id, clientUser);

7
src/structures/ClientUser.js
View File

@@ -43,6 +43,13 @@ class ClientUser extends User {
* @type {Collection<string, string>} * @type {Collection<string, string>}
*/ */
this.notes = new Collection(); this.notes = new Collection();
/**
* Discord client settings, such as guild positions
* <warn>This is only filled when using a user account.</warn>
* @type {Object}
*/
this.settings = {};
} }
edit(data) { edit(data) {