dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-09-20 06:53:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats 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) {

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) {