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

Attempted assorted fixes

Browse Source
This commit is contained in:
abalabahaha
2016-03-12 21:44:07 -08:00
parent 25f25f5506
commit 5e64d96272
6 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Client/InternalClient.js
View File

@@ -1510,6 +1510,8 @@ var InternalClient = (function () {
var server = self.servers.get("id", data.id);
if (server) {
if (!data.unavailable) {
client.emit("serverDeleted", server);
for (var _iterator7 = server.channels, _isArray7 = Array.isArray(_iterator7), _i7 = 0, _iterator7 = _isArray7 ? _iterator7 : _iterator7[Symbol.iterator]();;) {
var _ref7;
@@ -1529,7 +1531,7 @@ var InternalClient = (function () {
self.servers.remove(server);
for (var _iterator8 = self.users, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
for (var _iterator8 = server.members, _isArray8 = Array.isArray(_iterator8), _i8 = 0, _iterator8 = _isArray8 ? _iterator8 : _iterator8[Symbol.iterator]();;) {
var _ref8;
if (_isArray8) {
@@ -1549,8 +1551,6 @@ var InternalClient = (function () {
self.users.remove(user);
}
}
client.emit("serverDeleted", server);
} else {
client.emit("warn", "server was unavailable, could not update");
}
@@ -1714,10 +1714,10 @@ var InternalClient = (function () {
if (server) {
var user = self.users.get("id", data.user.id);
if (user) {
client.emit("serverMemberRemoved", server, user);
server.memberMap[data.user.id] = null;
server.members.remove(user);
server.memberCount--;
client.emit("serverMemberRemoved", server, user);
if (!self.servers.find(function (s) {
return !!s.members.get("id", user.id);
})) {

2
lib/Structures/VoiceChannel.js
View File

@@ -25,7 +25,7 @@ var VoiceChannel = (function (_ServerChannel) {
_classCallCheck(this, VoiceChannel);
_ServerChannel.call(this, data, client, server);
this.members = new _UtilCache2["default"]();
this.members = data.members || new _UtilCache2["default"]();
}
VoiceChannel.prototype.join = function join() {

1
lib/Voice/VoiceConnection.js
View File

@@ -127,7 +127,6 @@ var VoiceConnection = (function (_EventEmitter) {
onWarning = false,
lastVolume = this.volume !== undefined ? this.volume.get() : 1;
this.volume = stream;
this.playing = true;
this.playingIntent = retStream;

10
src/Client/InternalClient.js
View File

@@ -1265,19 +1265,19 @@ export default class InternalClient {
var server = self.servers.get("id", data.id);
if (server) {
if (!data.unavailable) {
client.emit("serverDeleted", server);
for (var channel of server.channels) {
self.channels.remove(channel);
}
self.servers.remove(server);
for (var user of self.users) {
for (var user of server.members) {
if (!self.servers.find((s) => !!s.members.get("id", user.id))) {
self.users.remove(user);
}
}
client.emit("serverDeleted", server);
} else {
client.emit("warn", "server was unavailable, could not update");
}
@@ -1437,7 +1437,7 @@ export default class InternalClient {
"serverNewMember",
server,
server.members.add(self.users.add(new User(data.user, client)))
);
);
} else {
client.emit("warn", "server member added but server doesn't exist in cache");
@@ -1448,10 +1448,10 @@ export default class InternalClient {
if (server) {
var user = self.users.get("id", data.user.id);
if (user) {
client.emit("serverMemberRemoved", server, user);
server.memberMap[data.user.id] = null;
server.members.remove(user);
server.memberCount--;
client.emit("serverMemberRemoved", server, user);
if (!self.servers.find((s) => !!s.members.get("id", user.id))) {
self.users.remove(user);
}

2
src/Structures/VoiceChannel.js
View File

@@ -7,7 +7,7 @@ import {reg} from "../Util/ArgumentRegulariser";
export default class VoiceChannel extends ServerChannel{
constructor(data, client, server){
super(data, client, server);
this.members = new Cache();
this.members = data.members || new Cache();
}
join(callback = function () { }) {

1
src/Voice/VoiceConnection.js
View File

@@ -92,7 +92,6 @@ export default class VoiceConnection extends EventEmitter {
onWarning = false,
lastVolume = this.volume !== undefined ? this.volume.get() : 1;
this.volume = stream;
this.playing = true;
this.playingIntent = retStream;