From 47ecc934f1dd444b9918cb8c264af2ff47539a68 Mon Sep 17 00:00:00 2001 From: abalabahaha Date: Sat, 20 Feb 2016 18:33:36 -0800 Subject: [PATCH] Attempting forceFetchUser callback --- lib/Client/Client.js | 4 +- lib/Client/InternalClient.js | 344 ++++++++++++++++++++--------------- lib/Structures/Server.js | 11 +- lib/Util/Cache.js | 3 +- src/Client/Client.js | 4 +- src/Client/InternalClient.js | 35 +++- src/Structures/Server.js | 11 +- src/Util/Cache.js | 3 +- 8 files changed, 244 insertions(+), 171 deletions(-) diff --git a/lib/Client/Client.js b/lib/Client/Client.js index b24c74947..71feaea0d 100644 --- a/lib/Client/Client.js +++ b/lib/Client/Client.js @@ -1034,8 +1034,8 @@ var Client = (function (_EventEmitter) { //def forceFetchUsers - Client.prototype.forceFetchUsers = function forceFetchUsers() { - return this.internal.forceFetchUsers(); + Client.prototype.forceFetchUsers = function forceFetchUsers(callback) { + return this.internal.forceFetchUsers().then(callback); }; _createClass(Client, [{ diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js index d3f2c26ef..ac7f7f9c4 100644 --- a/lib/Client/InternalClient.js +++ b/lib/Client/InternalClient.js @@ -322,22 +322,48 @@ var InternalClient = (function () { // def forceFetchUsers InternalClient.prototype.forceFetchUsers = function forceFetchUsers() { + var _this4 = this; + this.sendWS({ op: 8, d: { - guild_id: this.servers.map(function (srv) { + guild_id: this.servers.filter(function (srv) { + return srv.large && srv.memberCount > srv.members.length; + }).map(function (srv) { return srv.id; }), query: "", limit: 0 } }); + this.chunkloaderCount = {}; + for (var _iterator2 = this.servers.filter(function (srv) { + return srv.large && srv.memberCount > srv.members.length; + }), _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) { + var _ref2; + + if (_isArray2) { + if (_i2 >= _iterator2.length) break; + _ref2 = _iterator2[_i2++]; + } else { + _i2 = _iterator2.next(); + if (_i2.done) break; + _ref2 = _i2.value; + } + + var server = _ref2; + + this.chunkloaderCount[server.id] = Math.ceil(server.memberCount / 1000); + } + return new Promise(function (resolve, reject) { + _this4.chunkloaderCallback = resolve; + }); }; // def createServer InternalClient.prototype.createServer = function createServer(name) { - var _this4 = this; + var _this5 = this; var region = arguments.length <= 1 || arguments[1] === undefined ? "london" : arguments[1]; @@ -346,7 +372,7 @@ var InternalClient = (function () { return this.apiRequest('post', _Constants.Endpoints.SERVERS, true, { name: name, region: region }).then(function (res) { // valid server, wait until it is cached return waitFor(function () { - return _this4.servers.get("id", res.id); + return _this5.servers.get("id", res.id); }); }); }; @@ -354,7 +380,7 @@ var InternalClient = (function () { //def joinServer InternalClient.prototype.joinServer = function joinServer(invite) { - var _this5 = this; + var _this6 = this; invite = this.resolver.resolveInviteID(invite); if (!invite) { @@ -364,7 +390,7 @@ var InternalClient = (function () { return this.apiRequest("post", _Constants.Endpoints.INVITE(invite), true).then(function (res) { // valid server, wait until it is received via ws and cached return waitFor(function () { - return _this5.servers.get("id", res.guild.id); + return _this6.servers.get("id", res.guild.id); }); }); }; @@ -372,7 +398,7 @@ var InternalClient = (function () { //def updateServer InternalClient.prototype.updateServer = function updateServer(server, name, region) { - var _this6 = this; + var _this7 = this; var server = this.resolver.resolveServer(server); if (!server) { @@ -382,7 +408,7 @@ var InternalClient = (function () { return this.apiRequest("patch", _Constants.Endpoints.SERVER(server.id), true, { name: name || server.name, region: region || server.region }).then(function (res) { // wait until the name and region are updated return waitFor(function () { - return _this6.servers.get("name", res.name) ? _this6.servers.get("name", res.name).region === res.region ? _this6.servers.get("id", res.id) : false : false; + return _this7.servers.get("name", res.name) ? _this7.servers.get("name", res.name).region === res.region ? _this7.servers.get("id", res.id) : false : false; }); }); }; @@ -390,7 +416,7 @@ var InternalClient = (function () { //def leaveServer InternalClient.prototype.leaveServer = function leaveServer(srv) { - var _this7 = this; + var _this8 = this; var server = this.resolver.resolveServer(srv); if (!server) { @@ -399,24 +425,24 @@ var InternalClient = (function () { return this.apiRequest("del", _Constants.Endpoints.SERVER(server.id), true).then(function () { // remove channels of server then the server - for (var _iterator2 = server.channels, _isArray2 = Array.isArray(_iterator2), _i2 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) { - var _ref2; + for (var _iterator3 = server.channels, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) { + var _ref3; - if (_isArray2) { - if (_i2 >= _iterator2.length) break; - _ref2 = _iterator2[_i2++]; + if (_isArray3) { + if (_i3 >= _iterator3.length) break; + _ref3 = _iterator3[_i3++]; } else { - _i2 = _iterator2.next(); - if (_i2.done) break; - _ref2 = _i2.value; + _i3 = _iterator3.next(); + if (_i3.done) break; + _ref3 = _i3.value; } - var chan = _ref2; + var chan = _ref3; - _this7.channels.remove(chan); + _this8.channels.remove(chan); } // remove server - _this7.servers.remove(server); + _this8.servers.remove(server); }); }; @@ -424,7 +450,7 @@ var InternalClient = (function () { // email and password are optional InternalClient.prototype.loginWithToken = function loginWithToken(token, email, password) { - var _this8 = this; + var _this9 = this; this.state = _ConnectionState2["default"].LOGGED_IN; this.token = token; @@ -432,7 +458,7 @@ var InternalClient = (function () { this.password = password; return this.getGateway().then(function (url) { - _this8.createWS(url); + _this9.createWS(url); return token; }); }; @@ -440,14 +466,14 @@ var InternalClient = (function () { // def login InternalClient.prototype.login = function login(email, password) { - var _this9 = this; + var _this10 = this; var client = this.client; if (!this.tokenCacher.done) { return new Promise(function (resolve, reject) { setTimeout(function () { - _this9.login(email, password).then(resolve)["catch"](reject); + _this10.login(email, password).then(resolve)["catch"](reject); }, 20); }); } else { @@ -468,15 +494,15 @@ var InternalClient = (function () { email: email, password: password }).then(function (res) { - _this9.client.emit("debug", "direct API login, cached token was unavailable"); + _this10.client.emit("debug", "direct API login, cached token was unavailable"); var token = res.token; - _this9.tokenCacher.setToken(email, password, token); - return _this9.loginWithToken(token, email, password); + _this10.tokenCacher.setToken(email, password, token); + return _this10.loginWithToken(token, email, password); }, function (error) { - _this9.websocket = null; + _this10.websocket = null; throw error; })["catch"](function (error) { - _this9.state = _ConnectionState2["default"].DISCONNECTED; + _this10.state = _ConnectionState2["default"].DISCONNECTED; client.emit("disconnected"); throw error; }); @@ -485,28 +511,28 @@ var InternalClient = (function () { // def logout InternalClient.prototype.logout = function logout() { - var _this10 = this; + var _this11 = this; if (this.state === _ConnectionState2["default"].DISCONNECTED || this.state === _ConnectionState2["default"].IDLE) { return Promise.reject(new Error("Client is not logged in!")); } return this.apiRequest("post", _Constants.Endpoints.LOGOUT, true).then(function () { - if (_this10.websocket) { - _this10.websocket.close(); - _this10.websocket = null; + if (_this11.websocket) { + _this11.websocket.close(); + _this11.websocket = null; } - _this10.token = null; - _this10.email = null; - _this10.password = null; - _this10.state = _ConnectionState2["default"].DISCONNECTED; + _this11.token = null; + _this11.email = null; + _this11.password = null; + _this11.state = _ConnectionState2["default"].DISCONNECTED; }); }; // def startPM InternalClient.prototype.startPM = function startPM(resUser) { - var _this11 = this; + var _this12 = this; var user = this.resolver.resolveUser(resUser); if (!user) { @@ -516,7 +542,7 @@ var InternalClient = (function () { return this.apiRequest("post", _Constants.Endpoints.USER_CHANNELS(user.id), true, { recipient_id: user.id }).then(function (res) { - return _this11.private_channels.add(new _StructuresPMChannel2["default"](res, _this11.client)); + return _this12.private_channels.add(new _StructuresPMChannel2["default"](res, _this12.client)); }); }; @@ -531,19 +557,19 @@ var InternalClient = (function () { // def sendMessage InternalClient.prototype.sendMessage = function sendMessage(where, _content) { - var _this12 = this; + var _this13 = this; var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; return this.resolver.resolveChannel(where).then(function (destination) { //var destination; - var content = _this12.resolver.resolveString(_content); + var content = _this13.resolver.resolveString(_content); - return _this12.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(destination.id), true, { + return _this13.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(destination.id), true, { content: content, tts: options.tts }).then(function (res) { - return destination.messages.add(new _StructuresMessage2["default"](res, destination, _this12.client)); + return destination.messages.add(new _StructuresMessage2["default"](res, destination, _this13.client)); }); }); }; @@ -551,7 +577,7 @@ var InternalClient = (function () { // def deleteMessage InternalClient.prototype.deleteMessage = function deleteMessage(_message) { - var _this13 = this; + var _this14 = this; var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1]; @@ -562,7 +588,7 @@ var InternalClient = (function () { var chain = options.wait ? delay(options.wait) : Promise.resolve(); return chain.then(function () { - return _this13.apiRequest("del", _Constants.Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id), true); + return _this14.apiRequest("del", _Constants.Endpoints.CHANNEL_MESSAGE(message.channel.id, message.id), true); }).then(function () { return message.channel.messages.remove(message); }); @@ -571,7 +597,7 @@ var InternalClient = (function () { // def updateMessage InternalClient.prototype.updateMessage = function updateMessage(msg, _content) { - var _this14 = this; + var _this15 = this; var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; @@ -587,14 +613,14 @@ var InternalClient = (function () { content: content, tts: options.tts }).then(function (res) { - return message.channel.messages.update(message, new _StructuresMessage2["default"](res, message.channel, _this14.client)); + return message.channel.messages.update(message, new _StructuresMessage2["default"](res, message.channel, _this15.client)); }); }; // def sendFile InternalClient.prototype.sendFile = function sendFile(where, _file, name) { - var _this15 = this; + var _this16 = this; if (!name) { if (_file instanceof String || typeof _file === "string") { @@ -608,12 +634,12 @@ var InternalClient = (function () { } return this.resolver.resolveChannel(where).then(function (channel) { - return _this15.resolver.resolveFile(_file).then(function (file) { - return _this15.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(channel.id), true, null, { + return _this16.resolver.resolveFile(_file).then(function (file) { + return _this16.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(channel.id), true, null, { name: name, file: file }).then(function (res) { - return channel.messages.add(new _StructuresMessage2["default"](res, channel, _this15.client)); + return channel.messages.add(new _StructuresMessage2["default"](res, channel, _this16.client)); }); }); }); @@ -622,7 +648,7 @@ var InternalClient = (function () { // def getChannelLogs InternalClient.prototype.getChannelLogs = function getChannelLogs(_channel) { - var _this16 = this; + var _this17 = this; var limit = arguments.length <= 1 || arguments[1] === undefined ? 50 : arguments[1]; var options = arguments.length <= 2 || arguments[2] === undefined ? {} : arguments[2]; @@ -630,21 +656,21 @@ var InternalClient = (function () { return this.resolver.resolveChannel(_channel).then(function (channel) { var qsObject = { limit: limit }; if (options.before) { - var res = _this16.resolver.resolveMessage(options.before); + var res = _this17.resolver.resolveMessage(options.before); if (res) { qsObject.before = res.id; } } if (options.after) { - var res = _this16.resolver.resolveMessage(options.after); + var res = _this17.resolver.resolveMessage(options.after); if (res) { qsObject.after = res.id; } } - return _this16.apiRequest("get", _Constants.Endpoints.CHANNEL_MESSAGES(channel.id) + "?" + _querystring2["default"].stringify(qsObject), true).then(function (res) { + return _this17.apiRequest("get", _Constants.Endpoints.CHANNEL_MESSAGES(channel.id) + "?" + _querystring2["default"].stringify(qsObject), true).then(function (res) { return res.map(function (msg) { - return channel.messages.add(new _StructuresMessage2["default"](msg, channel, _this16.client)); + return channel.messages.add(new _StructuresMessage2["default"](msg, channel, _this17.client)); }); }); }); @@ -653,13 +679,13 @@ var InternalClient = (function () { // def getBans InternalClient.prototype.getBans = function getBans(server) { - var _this17 = this; + var _this18 = this; server = this.resolver.resolveServer(server); return this.apiRequest("get", _Constants.Endpoints.SERVER_BANS(server.id), true).then(function (res) { return res.map(function (ban) { - return _this17.users.add(new _StructuresUser2["default"](ban.user, _this17.client)); + return _this18.users.add(new _StructuresUser2["default"](ban.user, _this18.client)); }); }); }; @@ -667,7 +693,7 @@ var InternalClient = (function () { // def createChannel InternalClient.prototype.createChannel = function createChannel(server, name) { - var _this18 = this; + var _this19 = this; var type = arguments.length <= 2 || arguments[2] === undefined ? "text" : arguments[2]; @@ -679,23 +705,23 @@ var InternalClient = (function () { }).then(function (res) { var channel; if (res.type === "text") { - channel = new _StructuresTextChannel2["default"](res, _this18.client, server); + channel = new _StructuresTextChannel2["default"](res, _this19.client, server); } else { - channel = new _StructuresVoiceChannel2["default"](res, _this18.client, server); + channel = new _StructuresVoiceChannel2["default"](res, _this19.client, server); } - return server.channels.add(_this18.channels.add(channel)); + return server.channels.add(_this19.channels.add(channel)); }); }; // def deleteChannel InternalClient.prototype.deleteChannel = function deleteChannel(_channel) { - var _this19 = this; + var _this20 = this; return this.resolver.resolveChannel(_channel).then(function (channel) { - return _this19.apiRequest("del", _Constants.Endpoints.CHANNEL(channel.id), true).then(function () { + return _this20.apiRequest("del", _Constants.Endpoints.CHANNEL(channel.id), true).then(function () { channel.server.channels.remove(channel); - _this19.channels.remove(channel); + _this20.channels.remove(channel); }); }); }; @@ -733,7 +759,7 @@ var InternalClient = (function () { // def moveMember InternalClient.prototype.moveMember = function moveMember(user, channel) { - var _this20 = this; + var _this21 = this; user = this.resolver.resolveUser(user); return this.resolver.resolveChannel(channel).then(function (channel) { @@ -743,7 +769,7 @@ var InternalClient = (function () { if (channel.type !== "voice") { throw new Error("Can't moveMember into a non-voice channel"); } else { - return _this20.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id, true, { channel_id: channel.id }).then(function (res) { + return _this21.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id, true, { channel_id: channel.id }).then(function (res) { user.voiceChannel = channel; return res; }); @@ -754,15 +780,15 @@ var InternalClient = (function () { // def createRole InternalClient.prototype.createRole = function createRole(server, data) { - var _this21 = this; + var _this22 = this; server = this.resolver.resolveServer(server); return this.apiRequest("post", _Constants.Endpoints.SERVER_ROLES(server.id), true).then(function (res) { - var role = server.roles.add(new _StructuresRole2["default"](res, server, _this21.client)); + var role = server.roles.add(new _StructuresRole2["default"](res, server, _this22.client)); if (data) { - return _this21.updateRole(role, data); + return _this22.updateRole(role, data); } return role; }); @@ -771,7 +797,7 @@ var InternalClient = (function () { // def updateRole InternalClient.prototype.updateRole = function updateRole(role, data) { - var _this22 = this; + var _this23 = this; role = this.resolver.resolveRole(role); var server = this.resolver.resolveServer(role.server); @@ -785,19 +811,19 @@ var InternalClient = (function () { if (data.permissions) { newData.permissions = 0; - for (var _iterator3 = data.permissions, _isArray3 = Array.isArray(_iterator3), _i3 = 0, _iterator3 = _isArray3 ? _iterator3 : _iterator3[Symbol.iterator]();;) { - var _ref3; + for (var _iterator4 = data.permissions, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) { + var _ref4; - if (_isArray3) { - if (_i3 >= _iterator3.length) break; - _ref3 = _iterator3[_i3++]; + if (_isArray4) { + if (_i4 >= _iterator4.length) break; + _ref4 = _iterator4[_i4++]; } else { - _i3 = _iterator3.next(); - if (_i3.done) break; - _ref3 = _i3.value; + _i4 = _iterator4.next(); + if (_i4.done) break; + _ref4 = _i4.value; } - var perm = _ref3; + var perm = _ref4; if (perm instanceof String || typeof perm === "string") { newData.permissions |= _Constants.Permissions[perm] || 0; @@ -808,7 +834,7 @@ var InternalClient = (function () { } return this.apiRequest("patch", _Constants.Endpoints.SERVER_ROLES(server.id) + "/" + role.id, true, newData).then(function (res) { - return server.roles.update(role, new _StructuresRole2["default"](res, server, _this22.client)); + return server.roles.update(role, new _StructuresRole2["default"](res, server, _this23.client)); }); }; @@ -821,7 +847,7 @@ var InternalClient = (function () { //def addMemberToRole InternalClient.prototype.addMemberToRole = function addMemberToRole(member, roles) { - var _this23 = this; + var _this24 = this; member = this.resolver.resolveUser(member); @@ -838,7 +864,7 @@ var InternalClient = (function () { } } else { roles = roles.map(function (r) { - return _this23.resolver.resolveRole(r); + return _this24.resolver.resolveRole(r); }); } @@ -886,7 +912,7 @@ var InternalClient = (function () { //def removeMemberFromRole InternalClient.prototype.removeMemberFromRole = function removeMemberFromRole(member, roles) { - var _this24 = this; + var _this25 = this; member = this.resolver.resolveUser(member); @@ -903,7 +929,7 @@ var InternalClient = (function () { } } else { roles = roles.map(function (r) { - return _this24.resolver.resolveRole(r); + return _this25.resolver.resolveRole(r); }); } @@ -911,19 +937,19 @@ var InternalClient = (function () { return r.id; }); - for (var _iterator4 = roles, _isArray4 = Array.isArray(_iterator4), _i4 = 0, _iterator4 = _isArray4 ? _iterator4 : _iterator4[Symbol.iterator]();;) { - var _ref4; + for (var _iterator5 = roles, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) { + var _ref5; - if (_isArray4) { - if (_i4 >= _iterator4.length) break; - _ref4 = _iterator4[_i4++]; + if (_isArray5) { + if (_i5 >= _iterator5.length) break; + _ref5 = _iterator5[_i5++]; } else { - _i4 = _iterator4.next(); - if (_i4.done) break; - _ref4 = _i4.value; + _i5 = _iterator5.next(); + if (_i5.done) break; + _ref5 = _i5.value; } - var role = _ref4; + var role = _ref5; if (!role.server.memberMap[member.id]) { return Promise.reject(new Error("member not in server")); @@ -944,7 +970,7 @@ var InternalClient = (function () { // def createInvite InternalClient.prototype.createInvite = function createInvite(chanServ, options) { - var _this25 = this; + var _this26 = this; chanServ = this.resolver.resolveChannel(chanServ); @@ -964,7 +990,7 @@ var InternalClient = (function () { } return this.apiRequest("post", _Constants.Endpoints.CHANNEL_INVITES(chanServ.id), true, options).then(function (res) { - return new _StructuresInvite2["default"](res, _this25.channels.get("id", res.channel.id), _this25.client); + return new _StructuresInvite2["default"](res, _this26.channels.get("id", res.channel.id), _this26.client); }); }; @@ -981,7 +1007,7 @@ var InternalClient = (function () { //def getInvite InternalClient.prototype.getInvite = function getInvite(invite) { - var _this26 = this; + var _this27 = this; invite = this.resolver.resolveInviteID(invite); if (!invite) { @@ -989,11 +1015,11 @@ var InternalClient = (function () { } return this.apiRequest("get", _Constants.Endpoints.INVITE(invite), true).then(function (res) { - if (!_this26.channels.has("id", res.channel.id)) { - return new _StructuresInvite2["default"](res, null, _this26.client); + if (!_this27.channels.has("id", res.channel.id)) { + return new _StructuresInvite2["default"](res, null, _this27.client); } - return _this26.apiRequest("post", _Constants.Endpoints.CHANNEL_INVITES(res.channel.id), true, { validate: invite }).then(function (res2) { - return new _StructuresInvite2["default"](res2, _this26.channels.get("id", res.channel.id), _this26.client); + return _this27.apiRequest("post", _Constants.Endpoints.CHANNEL_INVITES(res.channel.id), true, { validate: invite }).then(function (res2) { + return new _StructuresInvite2["default"](res2, _this27.channels.get("id", res.channel.id), _this27.client); }); }); }; @@ -1001,22 +1027,22 @@ var InternalClient = (function () { //def getInvites InternalClient.prototype.getInvites = function getInvites(channel) { - var _this27 = this; + var _this28 = this; if (!(channel instanceof _StructuresChannel2["default"])) { var server = this.resolver.resolveServer(channel); if (server) { return this.apiRequest("get", _Constants.Endpoints.SERVER_INVITES(server.id), true).then(function (res) { return res.map(function (data) { - return new _StructuresInvite2["default"](data, _this27.channels.get("id", data.channel.id), _this27.client); + return new _StructuresInvite2["default"](data, _this28.channels.get("id", data.channel.id), _this28.client); }); }); } } return this.resolver.resolveChannel(channel).then(function (channel) { - return _this27.apiRequest("get", _Constants.Endpoints.CHANNEL_INVITES(channel.id), true).then(function (res) { + return _this28.apiRequest("get", _Constants.Endpoints.CHANNEL_INVITES(channel.id), true).then(function (res) { return res.map(function (data) { - return new _StructuresInvite2["default"](data, _this27.channels.get("id", data.channel.id), _this27.client); + return new _StructuresInvite2["default"](data, _this28.channels.get("id", data.channel.id), _this28.client); }); }); }); @@ -1025,14 +1051,14 @@ var InternalClient = (function () { //def overwritePermissions InternalClient.prototype.overwritePermissions = function overwritePermissions(channel, role, updated) { - var _this28 = this; + var _this29 = this; return this.resolver.resolveChannel(channel).then(function (channel) { var user; if (role instanceof _StructuresUser2["default"]) { user = role; } else { - role = _this28.resolver.resolveRole(role); + role = _this29.resolver.resolveRole(role); } var data = {}; @@ -1068,7 +1094,7 @@ var InternalClient = (function () { } } - return _this28.apiRequest("put", _Constants.Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id, true, data); + return _this29.apiRequest("put", _Constants.Endpoints.CHANNEL_PERMISSIONS(channel.id) + "/" + data.id, true, data); }); }; @@ -1107,49 +1133,49 @@ var InternalClient = (function () { //def sendTyping InternalClient.prototype.sendTyping = function sendTyping(channel) { - var _this29 = this; + var _this30 = this; return this.resolver.resolveChannel(channel).then(function (channel) { - return _this29.apiRequest("post", _Constants.Endpoints.CHANNEL(channel.id) + "/typing", true); + return _this30.apiRequest("post", _Constants.Endpoints.CHANNEL(channel.id) + "/typing", true); }); }; //def startTyping InternalClient.prototype.startTyping = function startTyping(channel) { - var _this30 = this; + var _this31 = this; return this.resolver.resolveChannel(channel).then(function (channel) { - if (_this30.intervals.typing[channel.id]) { + if (_this31.intervals.typing[channel.id]) { // typing interval already exists, leave it alone throw new Error("Already typing in that channel"); } - _this30.intervals.typing[channel.id] = setInterval(function () { - return _this30.sendTyping(channel)["catch"](function (error) { - return _this30.emit("error", error); + _this31.intervals.typing[channel.id] = setInterval(function () { + return _this31.sendTyping(channel)["catch"](function (error) { + return _this31.emit("error", error); }); }, 4000); - return _this30.sendTyping(channel); + return _this31.sendTyping(channel); }); }; //def stopTyping InternalClient.prototype.stopTyping = function stopTyping(channel) { - var _this31 = this; + var _this32 = this; return this.resolver.resolveChannel(channel).then(function (channel) { - if (!_this31.intervals.typing[channel.id]) { + if (!_this32.intervals.typing[channel.id]) { // typing interval doesn"t exist throw new Error("Not typing in that channel"); } - clearInterval(_this31.intervals.typing[channel.id]); - _this31.intervals.typing[channel.id] = false; + clearInterval(_this32.intervals.typing[channel.id]); + _this32.intervals.typing[channel.id] = false; }); }; @@ -1183,12 +1209,12 @@ var InternalClient = (function () { //def setChannelTopic InternalClient.prototype.setChannelTopic = function setChannelTopic(chann) { - var _this32 = this; + var _this33 = this; var topic = arguments.length <= 1 || arguments[1] === undefined ? "" : arguments[1]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this32.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this33.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: channel.name, position: channel.position, topic: topic @@ -1201,12 +1227,12 @@ var InternalClient = (function () { //def setChannelName InternalClient.prototype.setChannelName = function setChannelName(chann) { - var _this33 = this; + var _this34 = this; var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this33.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this34.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: name, position: channel.position, topic: channel.topic @@ -1219,13 +1245,13 @@ var InternalClient = (function () { //def setChannelNameAndTopic InternalClient.prototype.setChannelNameAndTopic = function setChannelNameAndTopic(chann) { - var _this34 = this; + var _this35 = this; var name = arguments.length <= 1 || arguments[1] === undefined ? "discordjs_is_the_best" : arguments[1]; var topic = arguments.length <= 2 || arguments[2] === undefined ? "" : arguments[2]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this34.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this35.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: name, position: channel.position, topic: topic @@ -1239,12 +1265,12 @@ var InternalClient = (function () { //def setTopic InternalClient.prototype.setChannelPosition = function setChannelPosition(chann) { - var _this35 = this; + var _this36 = this; var position = arguments.length <= 1 || arguments[1] === undefined ? 0 : arguments[1]; return this.resolver.resolveChannel(chann).then(function (channel) { - return _this35.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { + return _this36.apiRequest("patch", _Constants.Endpoints.CHANNEL(channel.id), true, { name: channel.name, position: position, topic: channel.topic @@ -1279,7 +1305,7 @@ var InternalClient = (function () { }; InternalClient.prototype.createWS = function createWS(url) { - var _this36 = this; + var _this37 = this; var self = this; var client = self.client; @@ -1362,6 +1388,10 @@ var InternalClient = (function () { client.emit("debug", "ready with " + self.servers.length + " servers, " + self.channels.length + " channels and " + self.users.length + " users cached."); self.readyTime = Date.now(); + + if (self.client.options.forceFetchUsers) { + self.forceFetchUsers(); + } break; case _Constants.PacketType.MESSAGE_CREATE: @@ -1440,19 +1470,19 @@ var InternalClient = (function () { var server = self.servers.get("id", data.id); if (server) { if (!data.unavailable) { - for (var _iterator5 = server.channels, _isArray5 = Array.isArray(_iterator5), _i5 = 0, _iterator5 = _isArray5 ? _iterator5 : _iterator5[Symbol.iterator]();;) { - var _ref5; + for (var _iterator6 = server.channels, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) { + var _ref6; - if (_isArray5) { - if (_i5 >= _iterator5.length) break; - _ref5 = _iterator5[_i5++]; + if (_isArray6) { + if (_i6 >= _iterator6.length) break; + _ref6 = _iterator6[_i6++]; } else { - _i5 = _iterator5.next(); - if (_i5.done) break; - _ref5 = _i5.value; + _i6 = _iterator6.next(); + if (_i6.done) break; + _ref6 = _i6.value; } - var channel = _ref5; + var channel = _ref6; self.channels.remove(channel); } @@ -1653,7 +1683,7 @@ var InternalClient = (function () { break; case _Constants.PacketType.PRESENCE_UPDATE: - var user = self.users.get("id", data.user.id) || self.users.add(new _StructuresUser2["default"](data.user, client)); + var user = self.users.add(new _StructuresUser2["default"](data.user, client)); var server = self.servers.get("id", data.guild_id); if (user && server) { @@ -1688,7 +1718,7 @@ var InternalClient = (function () { data.id = data.id || user.id; data.avatar = data.avatar || user.avatar; data.discriminator = data.discriminator || user.discriminator; - _this36.email = data.email || _this36.email; + _this37.email = data.email || _this37.email; var presenceUser = new _StructuresUser2["default"](data, client); @@ -1775,22 +1805,38 @@ var InternalClient = (function () { if (server) { - for (var _iterator6 = data.members, _isArray6 = Array.isArray(_iterator6), _i6 = 0, _iterator6 = _isArray6 ? _iterator6 : _iterator6[Symbol.iterator]();;) { - var _ref6; + var testtime = new Date().getTime(); - if (_isArray6) { - if (_i6 >= _iterator6.length) break; - _ref6 = _iterator6[_i6++]; + for (var _iterator7 = data.members, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) { + var _ref7; + + if (_isArray7) { + if (_i7 >= _iterator7.length) break; + _ref7 = _iterator7[_i7++]; } else { - _i6 = _iterator6.next(); - if (_i6.done) break; - _ref6 = _i6.value; + _i7 = _iterator7.next(); + if (_i7.done) break; + _ref7 = _i7.value; } - var user = _ref6; + var user = _ref7; - server.members.add(self.users.get("id", user.id) || self.users.add(new _StructuresUser2["default"](user, client))); + if (!server.members.get('id', user.user.id)) count++; + server.members.add(self.users.add(new _StructuresUser2["default"](user.user, client))); } + + if (self.chunkloaderCallback && server.id in self.chunkloaderCount) { + self.chunkloaderCount[server.id]--; + if (self.chunkloaderCount[server.id] <= 0) { + delete self.chunkloaderCount[server.id]; + if (Object.keys(self.chunkloaderCount).length == 0) { + self.chunkloaderCallback(); + self.chunkloaderCallback = null; + } + } + } + + client.emit("debug", new Date().getTime() - testtime + "ms for " + data.members.length + " user chunk for server with id " + server.id); } else { client.emit("warn", "chunk update received but server not in cache"); } diff --git a/lib/Structures/Server.js b/lib/Structures/Server.js index affef987d..fd210e3cb 100644 --- a/lib/Structures/Server.js +++ b/lib/Structures/Server.js @@ -69,6 +69,8 @@ var Server = (function (_Equality) { this.afkTimeout = data.afkTimeout; this.afkChannelID = data.afk_channel_id || data.afkChannelID; this.memberMap = {}; + this.memberCount = data.member_count || data.memberCount; + this.large = data.large || this.memberCount > 250; var self = this; @@ -98,8 +100,7 @@ var Server = (function (_Equality) { self_deaf: dataUser.self_deaf, joinedAt: Date.parse(dataUser.joined_at) }; - var user = client.internal.users.add(new _User2["default"](dataUser.user, client)); - _this.members.add(user); + _this.members.add(client.internal.users.add(new _User2["default"](dataUser.user, client))); }); } @@ -110,11 +111,9 @@ var Server = (function (_Equality) { } else { data.channels.forEach(function (dataChannel) { if (dataChannel.type === "text") { - var channel = client.internal.channels.add(new _TextChannel2["default"](dataChannel, client, _this)); - _this.channels.add(channel); + _this.channels.add(client.internal.channels.add(new _TextChannel2["default"](dataChannel, client, _this))); } else { - var channel = client.internal.channels.add(new _VoiceChannel2["default"](dataChannel, client, _this)); - _this.channels.add(channel); + _this.channels.add(client.internal.channels.add(new _VoiceChannel2["default"](dataChannel, client, _this))); } }); } diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js index 650bce8e9..b7206a736 100644 --- a/lib/Util/Cache.js +++ b/lib/Util/Cache.js @@ -18,6 +18,7 @@ var Cache = (function (_Array) { _Array.call(this); this[discrimS] = discrim || "id"; this[discrimCacheS] = {}; + this.limit = limit; } Cache.prototype.get = function get(key, value) { @@ -101,7 +102,7 @@ var Cache = (function (_Array) { }; Cache.prototype.add = function add(data) { - var cacheKey = this[discrimS] === "id" ? data.id : data[this[discrimS]]; + var cacheKey = data[this[discrimS]]; if (this[discrimCacheS][cacheKey]) { return this[discrimCacheS][cacheKey]; } diff --git a/src/Client/Client.js b/src/Client/Client.js index fbb3a008e..40cb3760e 100644 --- a/src/Client/Client.js +++ b/src/Client/Client.js @@ -979,7 +979,7 @@ export default class Client extends EventEmitter { } //def forceFetchUsers - forceFetchUsers(){ - return this.internal.forceFetchUsers(); + forceFetchUsers(callback){ + return this.internal.forceFetchUsers().then(callback); } } diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js index cd1ea71fa..6420e50d6 100644 --- a/src/Client/InternalClient.js +++ b/src/Client/InternalClient.js @@ -254,11 +254,18 @@ export default class InternalClient { this.sendWS({ op : 8, d : { - guild_id : this.servers.map(srv => srv.id), + guild_id : this.servers.filter(srv => srv.large && srv.memberCount > srv.members.length).map(srv => srv.id), query : "", limit : 0 } }); + this.chunkloaderCount = {}; + for (var server of this.servers.filter(srv => srv.large && srv.memberCount > srv.members.length)) { + this.chunkloaderCount[server.id] = Math.ceil(server.memberCount / 1000); + } + return new Promise((resolve, reject) => { + this.chunkloaderCallback = resolve; + }); } // def createServer @@ -1154,6 +1161,10 @@ export default class InternalClient { client.emit("debug", `ready with ${self.servers.length} servers, ${self.channels.length} channels and ${self.users.length} users cached.`); self.readyTime = Date.now(); + + if (self.client.options.forceFetchUsers) { + self.forceFetchUsers(); + } break; case PacketType.MESSAGE_CREATE: @@ -1195,7 +1206,6 @@ export default class InternalClient { // potentially blank var msg = channel.messages.get("id", data.id); - if (msg) { // old message exists data.nonce = data.nonce || msg.nonce; @@ -1436,7 +1446,7 @@ export default class InternalClient { break; case PacketType.PRESENCE_UPDATE: - var user = self.users.get("id", data.user.id) || self.users.add(new User(data.user, client)); + var user = self.users.add(new User(data.user, client)); var server = self.servers.get("id", data.guild_id); if (user && server) { @@ -1562,10 +1572,27 @@ export default class InternalClient { if (server) { + var testtime = new Date().getTime(); + for (var user of data.members) { - server.members.add(self.users.get("id", user.id) || self.users.add(new User(user, client))); + if(!server.members.get('id',user.user.id)) + count++; + server.members.add(self.users.add(new User(user.user, client))); } + if (self.chunkloaderCallback && server.id in self.chunkloaderCount) { + self.chunkloaderCount[server.id]--; + if (self.chunkloaderCount[server.id] <= 0) { + delete self.chunkloaderCount[server.id]; + if (Object.keys(self.chunkloaderCount).length == 0) { + self.chunkloaderCallback(); + self.chunkloaderCallback = null; + } + } + } + + client.emit("debug", (new Date().getTime() - testtime) + "ms for " + data.members.length + " user chunk for server with id " + server.id); + } else { client.emit("warn", "chunk update received but server not in cache"); } diff --git a/src/Structures/Server.js b/src/Structures/Server.js index 2e0d048aa..2fc8b7510 100644 --- a/src/Structures/Server.js +++ b/src/Structures/Server.js @@ -38,6 +38,8 @@ export default class Server extends Equality { this.afkTimeout = data.afkTimeout; this.afkChannelID = data.afk_channel_id || data.afkChannelID; this.memberMap = {}; + this.memberCount = data.member_count || data.memberCount; + this.large = data.large || this.memberCount > 250; var self = this; @@ -61,8 +63,7 @@ export default class Server extends Equality { self_deaf: dataUser.self_deaf, joinedAt: Date.parse(dataUser.joined_at) }; - var user = client.internal.users.add(new User(dataUser.user, client)); - this.members.add(user); + this.members.add(client.internal.users.add(new User(dataUser.user, client))); }); } @@ -71,11 +72,9 @@ export default class Server extends Equality { } else { data.channels.forEach((dataChannel) => { if (dataChannel.type === "text") { - var channel = client.internal.channels.add(new TextChannel(dataChannel, client, this)); - this.channels.add(channel); + this.channels.add(client.internal.channels.add(new TextChannel(dataChannel, client, this))); } else { - var channel = client.internal.channels.add(new VoiceChannel(dataChannel, client, this)); - this.channels.add(channel); + this.channels.add(client.internal.channels.add(new VoiceChannel(dataChannel, client, this))); } }); } diff --git a/src/Util/Cache.js b/src/Util/Cache.js index 52b092a68..21362f2ce 100644 --- a/src/Util/Cache.js +++ b/src/Util/Cache.js @@ -8,6 +8,7 @@ export default class Cache extends Array { super(); this[discrimS] = discrim || "id"; this[discrimCacheS] = {}; + this.limit = limit; } get(key, value) { @@ -65,7 +66,7 @@ export default class Cache extends Array { } add(data) { - var cacheKey = this[discrimS] === "id" ? data.id : data[this[discrimS]]; + var cacheKey = data[this[discrimS]]; if (this[discrimCacheS][cacheKey]) { return this[discrimCacheS][cacheKey]; }