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

Finalised ec6 rewrite! woo!

Browse Source
This commit is contained in:
hydrabolt
2015-08-25 19:06:52 +01:00
parent dea786d90a
commit 8337e3d540
2 changed files with 107 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib/Client.js
View File

@@ -479,6 +479,52 @@ var Client = (function () {
});
});
}
}, {
key: "deleteChannel",
value: function deleteChannel(channel) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err) {} : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
var channelID = channel;
if (channel instanceof Channel) {
channelID = channel.id;
}
request.del(Endpoints.CHANNELS + "/" + channelID).set("authorization", self.token).end(function (err) {
if (err) {
callback(err);
reject(err);
} else {
callback(null);
resolve();
}
});
});
}
}, {
key: "joinServer",
value: function joinServer(invite) {
var callback = arguments.length <= 1 || arguments[1] === undefined ? function (err, server) {} : arguments[1];
var self = this;
return new Promise(function (resolve, reject) {
var id = invite instanceof Invite ? invite.code : invite;
request.post(Endpoints.API + "/invite/" + id).set("authorization", self.token).end(function (err, res) {
if (err) {
callback(err);
reject(err);
} else {
self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
}
});
});
}
}, {
key: "sendMessage",
value: function sendMessage(destination, message) {
@@ -900,6 +946,7 @@ var Client = (function () {
var cbs = self.serverCreateListener.get(data.id);
cbs[0](server); //promise then callback
cbs[1](null, server); //legacy callback
self.serverCreateListener["delete"](data.id);
}
self.trigger("serverCreate", server);

67
src/Client.js
View File

@@ -460,18 +460,18 @@ class Client {
reject(err);
} else {
var logs = [];
var channel = self.getChannel("id", channelID);
for (var message of res.body) {
var mentions = [];
for(var mention of message.mentions){
mentions.push( self.addUser(mention) );
for (var mention of message.mentions) {
mentions.push(self.addUser(mention));
}
var author = self.addUser(message.author);
logs.push(new Message(message, channel, mentions, author));
}
callback(null, logs);
@@ -484,6 +484,58 @@ class Client {
}
deleteChannel(channel, callback = function (err) { }) {
var self = this;
return new Promise(function (resolve, reject) {
var channelID = channel;
if (channel instanceof Channel) {
channelID = channel.id;
}
request
.del(`${Endpoints.CHANNELS}/${channelID}`)
.set("authorization", self.token)
.end(function (err) {
if (err) {
callback(err);
reject(err);
} else {
callback(null);
resolve();
}
});
});
}
joinServer(invite, callback = function (err, server) { }) {
var self = this;
return new Promise(function (resolve, reject) {
var id = (invite instanceof Invite ? invite.code : invite);
request
.post(`${Endpoints.API}/invite/${id}`)
.set("authorization", self.token)
.end(function (err, res) {
if (err) {
callback(err);
reject(err);
} else {
self.serverCreateListener.set(res.body.guild.id, [resolve, callback]);
}
});
});
}
sendMessage(destination, message, callback = function (err, msg) { }, premessage = "") {
var self = this;
@@ -764,6 +816,7 @@ class Client {
var cbs = self.serverCreateListener.get(data.id);
cbs[0](server); //promise then callback
cbs[1](null, server); //legacy callback
self.serverCreateListener.delete(data.id);
}
self.trigger("serverCreate", server);