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

Fixed bugs from PR

Browse Source
This commit is contained in:
hydrabolt
2015-11-12 21:01:41 +00:00
parent 9b0f64c736
commit 00fd78f949
8 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Client/Client.js
View File

@@ -222,7 +222,7 @@ var Client = (function (_EventEmitter) {
// def getBans // def getBans
Client.prototype.getBans = function getBans(where) { Client.prototype.getBans = function getBans(where) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, logs) {} : arguments[1]; var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, bans) {} : arguments[1];
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
@@ -619,6 +619,11 @@ var Client = (function (_EventEmitter) {
get: function get() { get: function get() {
return this.internal.private_channels; return this.internal.private_channels;
} }
}, {
key: "voiceConnection",
get: function get() {
return this.internal.voiceConnection;
}
}]); }]);
return Client; return Client;

10
lib/Client/InternalClient.js
View File

@@ -456,19 +456,18 @@ var InternalClient = (function () {
// def getBans // def getBans
InternalClient.prototype.getBans = function getBans(server) { InternalClient.prototype.getBans = function getBans(server) {
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
server = self.resolver.resolveServer(server) server = self.resolver.resolveServer(server);
request.get(Endpoints.SERVER_BANS(server.id)).set("authorization", self.token).end(function (err, res) { request.del("" + Endpoints.SERVER_BANS(server.id)).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {
reject(new Error(err)); reject(new Error(err));
} else { } else {
var bans = []; var bans = [];
res.body.forEach(function (ban) { res.body.forEach(function (ban) {
bans.push(ban.user); bans.push(self.users.add(new User(ban.user, self.client)));
}); });
resolve(bans); resolve(bans);
} }
@@ -538,7 +537,7 @@ var InternalClient = (function () {
user = self.resolver.resolveUser(user); user = self.resolver.resolveUser(user);
server = self.resolver.resolveServer(server); server = self.resolver.resolveServer(server);
request.put(Endpoints.SERVER_BANS(server.id) + "/" + user.id + "?delete-message-days=" + length).set("authorization", self.token).end(function (err, res) { request.put(Endpoints.SERVER_BANS(server.id) + "/" + user.id + "/?delete-message-days=" + length).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {
reject(err); reject(err);
} else { } else {
@@ -555,6 +554,7 @@ var InternalClient = (function () {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
server = self.resolver.resolveServer(server); server = self.resolver.resolveServer(server);
user = self.resolver.resolveUser(user);
request.del(Endpoints.SERVER_BANS(server.id) + "/" + user.id).set("authorization", self.token).end(function (err, res) { request.del(Endpoints.SERVER_BANS(server.id) + "/" + user.id).set("authorization", self.token).end(function (err, res) {
if (err) { if (err) {

36
lib/Structures/Invite.js
View File

@@ -6,27 +6,27 @@ var Server = require("./Server.js");
var ServerChannel = require("./ServerChannel.js"); var ServerChannel = require("./ServerChannel.js");
var Invite = (function () { var Invite = (function () {
function Invite(data, chan, client) { function Invite(data, chan, client) {
_classCallCheck(this, Invite); _classCallCheck(this, Invite);
this.maxAge = data.max_age; this.maxAge = data.max_age;
this.code = data.code; this.code = data.code;
this.server = chan.server; this.server = chan.server;
this.channel = chan; this.channel = chan;
this.revoked = data.revoked; this.revoked = data.revoked;
this.createdAt = Date.parse(data.created_at); this.createdAt = Date.parse(data.created_at);
this.temporary = data.temporary; this.temporary = data.temporary;
this.uses = data.uses; this.uses = data.uses;
this.maxUses = data.uses; this.maxUses = data.uses;
this.inviter = client.internal.users.get("id", data.inviter.id); this.inviter = client.internal.users.get("id", data.inviter.id);
this.xkcd = data.xkcdpass; this.xkcd = data.xkcdpass;
} }
Invite.prototype.toString = function toString() { Invite.prototype.toString = function toString() {
return "https://discord.gg/" + this.code; return "https://discord.gg/" + this.code;
}; };
return Invite; return Invite;
})(); })();
module.exports = Invite; module.exports = Invite;

26
lib/Voice/VoicePacket.js
View File

@@ -3,24 +3,24 @@
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
var VoicePacket = function VoicePacket(data, sequence, time, ssrc) { var VoicePacket = function VoicePacket(data, sequence, time, ssrc) {
_classCallCheck(this, VoicePacket); _classCallCheck(this, VoicePacket);
var audioBuffer = data, var audioBuffer = data,
returnBuffer = new Buffer(audioBuffer.length + 12); returnBuffer = new Buffer(audioBuffer.length + 12);
returnBuffer.fill(0); returnBuffer.fill(0);
returnBuffer[0] = 0x80; returnBuffer[0] = 0x80;
returnBuffer[1] = 0x78; returnBuffer[1] = 0x78;
returnBuffer.writeUIntBE(sequence, 2, 2); returnBuffer.writeUIntBE(sequence, 2, 2);
returnBuffer.writeUIntBE(time, 4, 4); returnBuffer.writeUIntBE(time, 4, 4);
returnBuffer.writeUIntBE(ssrc, 8, 4); returnBuffer.writeUIntBE(ssrc, 8, 4);
for (var i = 0; i < audioBuffer.length; i++) { for (var i = 0; i < audioBuffer.length; i++) {
returnBuffer[i + 12] = audioBuffer[i]; returnBuffer[i + 12] = audioBuffer[i];
} }
return returnBuffer; return returnBuffer;
}; };
module.exports = VoicePacket; module.exports = VoicePacket;

4
src/Client/Client.js
View File

@@ -30,6 +30,10 @@ class Client extends EventEmitter {
return this.internal.private_channels; return this.internal.private_channels;
} }
get voiceConnection(){
return this.internal.voiceConnection;
}
// def login // def login
login(email, password, cb = function (err, token) { }) { login(email, password, cb = function (err, token) { }) {
var self = this; var self = this;

11
src/Client/InternalClient.js
View File

@@ -487,10 +487,10 @@ class InternalClient {
var self = this; var self = this;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
server = self.resolver.resolveChannel(server); server = self.resolver.resolveServer(server);
request request
.del(`${Endpoints.SERVER_BANS(channel.id) }`) .del(`${Endpoints.SERVER_BANS(server.id) }`)
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
@@ -498,7 +498,7 @@ class InternalClient {
} else { } else {
var bans = []; var bans = [];
res.body.forEach((ban) => { res.body.forEach((ban) => {
bans.push(ban.user); bans.push(self.users.add(new User(ban.user, self.client)));
}); });
resolve(bans); resolve(bans);
} }
@@ -589,9 +589,10 @@ class InternalClient {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
server = self.resolver.resolveServer(server); server = self.resolver.resolveServer(server);
user = self.resolver.resolveUser(user);
request request
.delete(`${Endpoints.SERVER_BANS(server.id) }/${user.id}`) .del(`${Endpoints.SERVER_BANS(server.id) }/${user.id}`)
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {
@@ -612,7 +613,7 @@ class InternalClient {
server = self.resolver.resolveServer(server); server = self.resolver.resolveServer(server);
request request
.delete(`${Endpoints.SERVER_MEMBERS(server.id) }/${user.id}`) .del(`${Endpoints.SERVER_MEMBERS(server.id) }/${user.id}`)
.set("authorization", self.token) .set("authorization", self.token)
.end((err, res) => { .end((err, res) => {
if (err) { if (err) {