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

Testing nickname support

Browse Source
This commit is contained in:
abalabahaha
2016-04-29 19:25:06 -07:00
parent 68e1549361
commit b47540d6eb
6 changed files with 89 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
lib/Client/InternalClient.js
View File

@@ -258,15 +258,9 @@ var InternalClient = (function () {
_this2.setup();
// Check whether the email is set (if not, only a token has been used for login)
if (_this2.email) {
_this2.login(_this2.email, _this2.password)["catch"](function () {
return _this2.disconnected(true);
});
} else {
_this2.loginWithToken(_this2.token)["catch"](function () {
return _this2.disconnected(true);
});
}
_this2.loginWithToken(_this2.token, _this2.email, _this2.password)["catch"](function () {
return _this2.disconnected(true);
});
}, this.autoReconnectInterval);
}
@@ -1030,6 +1024,15 @@ var InternalClient = (function () {
return this.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id, true, { deaf: false });
};
// def setNickname
InternalClient.prototype.setNickname = function setNickname(server, nick, user) {
nick = nick || "";
user = this.resolver.resolveUser(user);
server = this.resolver.resolveServer(server);
return this.apiRequest("patch", _Constants.Endpoints.SERVER_MEMBERS(server.id) + "/" + user.id, true, { nick: nick });
};
// def createRole
InternalClient.prototype.createRole = function createRole(server, data) {
@@ -1381,24 +1384,22 @@ var InternalClient = (function () {
this.idleStatus = this.idleStatus || null; //undefined
}
this.game = game === null ? null : game || this.game;
this.game = game === null ? null : !game ? this.game || null : {
name: game
};
var packet = {
op: 3,
d: {
idle_since: this.idleStatus,
game: {
name: this.game
}
game: this.game
}
};
this.sendWS(packet);
this.user.status = this.idleStatus ? "idle" : "online";
this.user.game = {
name: this.game
};
this.user.game = this.game;
return Promise.resolve();
};
@@ -2028,10 +2029,11 @@ var InternalClient = (function () {
return server.roles.get("id", pid);
}),
mute: false,
self_mute: false,
selfMute: false,
deaf: false,
self_deaf: false,
joinedAt: Date.parse(data.joined_at)
selfDeaf: false,
joinedAt: Date.parse(data.joined_at),
nick: data.nick
};
server.memberCount++;
@@ -2090,9 +2092,10 @@ var InternalClient = (function () {
return server.roles.get("id", pid);
});
server.memberMap[data.user.id].mute = data.mute;
server.memberMap[data.user.id].self_mute = data.self_mute;
server.memberMap[data.user.id].selfMute = data.self_mute;
server.memberMap[data.user.id].deaf = data.deaf;
server.memberMap[data.user.id].self_deaf = data.self_deaf;
server.memberMap[data.user.id].selfDeaf = data.self_deaf;
server.memberMap[data.user.id].nick = data.nick;
client.emit("serverMemberUpdated", server, user);
} else {
client.emit("warn", "server member removed but user doesn't exist in cache");
@@ -2257,10 +2260,11 @@ var InternalClient = (function () {
return server.roles.get("id", pid);
}),
mute: user.mute,
self_mute: false,
selfMute: false,
deaf: user.deaf,
self_deaf: false,
joinedAt: Date.parse(user.joined_at)
selfDeaf: false,
joinedAt: Date.parse(user.joined_at),
nick: user.nick
};
server.members.add(self.users.add(new _StructuresUser2["default"](user.user, client)));
}