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

Merge pull request #29 from hydrabolt/code-refactor

Browse Source 
New event listeners
This commit is contained in:
Amish Shah
2015-10-03 15:38:43 +01:00
parent 4c91390217 b1f2ed64d3
commit 5541fb8738
14 changed files with 89 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
lib/Client.js
View File

@@ -64,6 +64,7 @@ var Client = (function () {
this.pmChannelCache = []; this.pmChannelCache = [];
this.readyTime = null; this.readyTime = null;
this.checkingQueue = {}; this.checkingQueue = {};
this.userTypingListener = {};
this.queue = {}; this.queue = {};
this.__idleTime = null; this.__idleTime = null;
@@ -352,7 +353,7 @@ var Client = (function () {
var self = this; var self = this;
var prom = new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
if (timeout) { if (timeout) {
setTimeout(remove, timeout); setTimeout(remove, timeout);
} else { } else {
@@ -360,37 +361,25 @@ var Client = (function () {
} }
function remove() { function remove() {
if (self.options.queue) { request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
if (!self.queue[message.channel.id]) { if (err) {
self.queue[message.channel.id] = []; bad();
} else {
good();
} }
self.queue[message.channel.id].push({ });
action: "deleteMessage",
message: message,
then: good,
error: bad
});
self.checkQueue(message.channel.id);
} else {
self._deleteMessage(message).then(good)["catch"](bad);
}
} }
function good() { function good() {
prom.success = true; callback();
callback(null);
resolve(); resolve();
} }
function bad(err) { function bad(err) {
prom.error = err;
callback(err); callback(err);
reject(err); reject(err);
} }
}); });
return prom;
} }
}, { }, {
key: "updateMessage", key: "updateMessage",
@@ -1127,6 +1116,30 @@ var Client = (function () {
break; break;
case "TYPING_START":
var userInCache = self.getUser("id", data.user_id);
var channelInCache = self.getChannel("id", data.channel_id);
if (!self.userTypingListener[data.user_id] || self.userTypingListener[data.user_id] === -1) {
self.trigger("startTyping", userInCache, channelInCache);
}
self.userTypingListener[data.user_id] = Date.now();
setTimeout(function () {
if (self.userTypingListener[data.user_id] === -1) {
return;
}
if (Date.now() - self.userTypingListener[data.user_id] > 6000) {
// stopped typing
self.trigger("stopTyping", userInCache, channelInCache);
self.userTypingListener[data.user_id] = -1;
}
}, 6000);
break;
default: default:
self.debug("received unknown packet"); self.debug("received unknown packet");
self.trigger("unknown", dat); self.trigger("unknown", dat);
@@ -1598,102 +1611,6 @@ var Client = (function () {
}); });
}); });
} }
}, {
key: "_deleteMessage",
value: function _deleteMessage(message) {
var self = this;
return new Promise(function (resolve, reject) {
request.del(Endpoints.CHANNELS + "/" + message.channel.id + "/messages/" + message.id).set("authorization", self.token).end(function (err, res) {
if (err) {
reject(err);
} else {
resolve();
}
});
});
}
}, {
key: "checkQueue",
value: function checkQueue(channelID) {
var _this = this;
var self = this;
if (!this.checkingQueue[channelID]) {
(function () {
var doNext = function doNext() {
if (self.queue[channelID].length === 0) {
done();
return;
}
var queuedEvent = self.queue[channelID][0];
switch (queuedEvent.action) {
case "sendMessage":
var msgToSend = queuedEvent;
self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions).then(function (msg) {
msgToSend.then(msg);
self.queue[channelID].shift();
doNext();
})["catch"](function (err) {
msgToSend.error(err);
self.queue[channelID].shift();
doNext();
});
break;
case "sendFile":
var fileToSend = queuedEvent;
self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName).then(function (msg) {
fileToSend.then(msg);
self.queue[channelID].shift();
doNext();
})["catch"](function (err) {
fileToSend.error(err);
self.queue[channelID].shift();
doNext();
});
break;
case "updateMessage":
var msgToUpd = queuedEvent;
self._updateMessage(msgToUpd.message, msgToUpd.content).then(function (msg) {
msgToUpd.then(msg);
self.queue[channelID].shift();
doNext();
})["catch"](function (err) {
msgToUpd.error(err);
self.queue[channelID].shift();
doNext();
});
break;
case "deleteMessage":
var msgToDel = queuedEvent;
self._deleteMessage(msgToDel.message).then(function (msg) {
msgToDel.then(msg);
self.queue[channelID].shift();
doNext();
})["catch"](function (err) {
msgToDel.error(err);
self.queue[channelID].shift();
doNext();
});
break;
default:
done();
break;
}
};
var done = function done() {
self.checkingQueue[channelID] = false;
return;
};
//if we aren't already checking this queue.
_this.checkingQueue[channelID] = true;
doNext();
})();
}
}
}, { }, {
key: "getGateway", key: "getGateway",
value: function getGateway() { value: function getGateway() {
@@ -1925,4 +1842,4 @@ var Client = (function () {
return Client; return Client;
})(); })();
module.exports = Client; module.exports = Client;

2
lib/Endpoints.js
View File

@@ -10,4 +10,4 @@ exports.LOGIN = exports.AUTH + "/login";
exports.LOGOUT = exports.AUTH + "/logout"; exports.LOGOUT = exports.AUTH + "/logout";
exports.USERS = exports.API + "/users"; exports.USERS = exports.API + "/users";
exports.SERVERS = exports.API + "/guilds"; exports.SERVERS = exports.API + "/guilds";
exports.CHANNELS = exports.API + "/channels"; exports.CHANNELS = exports.API + "/channels";

2
lib/Member.js
View File

@@ -18,4 +18,4 @@ var Member = (function (_User) {
} }
return Member; return Member;
})(User); })(User);

2
lib/PMChannel.js
View File

@@ -68,4 +68,4 @@ var PMChannel = (function () {
return PMChannel; return PMChannel;
})(); })();
module.exports = PMChannel; module.exports = PMChannel;

2
lib/Permissions.js
View File

@@ -45,4 +45,4 @@ var Permission = (function () {
}]); }]);
return Permission; return Permission;
})(); })();

2
lib/channel.js
View File

@@ -98,4 +98,4 @@ var Channel = (function () {
return Channel; return Channel;
})(); })();
module.exports = Channel; module.exports = Channel;

2
lib/index.js
View File

@@ -9,4 +9,4 @@ var Discord = {
Client: Client Client: Client
}; };
module.exports = Discord; module.exports = Discord;

2
lib/internal.js
View File

@@ -200,4 +200,4 @@ Internal.XHR.setUsername = function (token, avatar, email, newPassword, password
}); });
}; };
exports.Internal = Internal; exports.Internal = Internal;

2
lib/invite.js
View File

@@ -32,4 +32,4 @@ var Invite = (function () {
return Invite; return Invite;
})(); })();
module.exports = Invite; module.exports = Invite;

2
lib/message.js
View File

@@ -76,4 +76,4 @@ var Message = (function () {
return Message; return Message;
})(); })();
module.exports = Message; module.exports = Message;

2
lib/server.js
View File

@@ -180,4 +180,4 @@ var Server = (function () {
return Server; return Server;
})(); })();
module.exports = Server; module.exports = Server;

2
lib/user.js
View File

@@ -54,4 +54,4 @@ var User = (function () {
return User; return User;
})(); })();
module.exports = User; module.exports = User;

159
src/Client.js
View File

@@ -54,6 +54,7 @@ class Client {
this.pmChannelCache = []; this.pmChannelCache = [];
this.readyTime = null; this.readyTime = null;
this.checkingQueue = {}; this.checkingQueue = {};
this.userTypingListener = {};
this.queue = {}; this.queue = {};
this.__idleTime = null; this.__idleTime = null;
@@ -389,7 +390,7 @@ class Client {
var self = this; var self = this;
var prom = new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
if (timeout) { if (timeout) {
setTimeout(remove, timeout) setTimeout(remove, timeout)
} else { } else {
@@ -397,37 +398,29 @@ class Client {
} }
function remove() { function remove() {
if (self.options.queue) { request
if (!self.queue[message.channel.id]) { .del(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`)
self.queue[message.channel.id] = []; .set("authorization", self.token)
.end(function (err, res) {
if(err){
bad();
}else{
good();
} }
self.queue[message.channel.id].push({ });
action: "deleteMessage",
message: message,
then: good,
error: bad
});
self.checkQueue(message.channel.id);
} else {
self._deleteMessage(message).then(good).catch(bad);
}
} }
function good() { function good() {
prom.success = true; callback();
callback(null);
resolve(); resolve();
} }
function bad(err) { function bad(err) {
prom.error = err;
callback(err); callback(err);
reject(err); reject(err);
} }
}); });
return prom;
} }
updateMessage(message, content, callback = function (err, msg) { }) { updateMessage(message, content, callback = function (err, msg) { }) {
@@ -1031,6 +1024,30 @@ class Client {
} }
break; break;
case "TYPING_START":
var userInCache = self.getUser("id", data.user_id);
var channelInCache = self.getChannel("id", data.channel_id);
if(!self.userTypingListener[data.user_id] || self.userTypingListener[data.user_id] === -1){
self.trigger("startTyping", userInCache, channelInCache);
}
self.userTypingListener[data.user_id] = Date.now();
setTimeout(function(){
if(self.userTypingListener[data.user_id] === -1){
return;
}
if( Date.now() - self.userTypingListener[data.user_id] > 6000 ){
// stopped typing
self.trigger("stopTyping", userInCache, channelInCache);
self.userTypingListener[data.user_id] = -1;
}
}, 6000);
break;
default: default:
self.debug("received unknown packet"); self.debug("received unknown packet");
@@ -1338,108 +1355,6 @@ class Client {
}); });
} }
_deleteMessage(message) {
var self = this;
return new Promise(function (resolve, reject) {
request
.del(`${Endpoints.CHANNELS}/${message.channel.id}/messages/${message.id}`)
.set("authorization", self.token)
.end(function (err, res) {
if (err) {
reject(err);
} else {
resolve();
}
});
});
}
checkQueue(channelID) {
var self = this;
if (!this.checkingQueue[channelID]) {
//if we aren't already checking this queue.
this.checkingQueue[channelID] = true;
doNext();
function doNext() {
if (self.queue[channelID].length === 0) {
done();
return;
}
var queuedEvent = self.queue[channelID][0];
switch (queuedEvent.action) {
case "sendMessage":
var msgToSend = queuedEvent;
self._sendMessage(channelID, msgToSend.content, msgToSend.tts, msgToSend.mentions)
.then(function (msg) {
msgToSend.then(msg);
self.queue[channelID].shift();
doNext();
})
.catch(function (err) {
msgToSend.error(err);
self.queue[channelID].shift();
doNext();
});
break;
case "sendFile":
var fileToSend = queuedEvent;
self._sendFile(channelID, fileToSend.attachment, fileToSend.attachmentName)
.then(function (msg) {
fileToSend.then(msg);
self.queue[channelID].shift();
doNext();
})
.catch(function (err) {
fileToSend.error(err);
self.queue[channelID].shift();
doNext();
});
break;
case "updateMessage":
var msgToUpd = queuedEvent;
self._updateMessage(msgToUpd.message, msgToUpd.content)
.then(function (msg) {
msgToUpd.then(msg);
self.queue[channelID].shift();
doNext();
})
.catch(function (err) {
msgToUpd.error(err);
self.queue[channelID].shift();
doNext();
});
break;
case "deleteMessage":
var msgToDel = queuedEvent;
self._deleteMessage(msgToDel.message)
.then(function (msg) {
msgToDel.then(msg);
self.queue[channelID].shift();
doNext();
})
.catch(function (err) {
msgToDel.error(err);
self.queue[channelID].shift();
doNext();
});
break;
default:
done();
break;
}
}
function done() {
self.checkingQueue[channelID] = false;
return;
}
}
}
getGateway() { getGateway() {
var self = this; var self = this;
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {

7
test/bot.1.js
View File

@@ -52,6 +52,13 @@ mybot.on("channelUpdate", function(oldChan, newChan){
}); });
mybot.on("startTyping", function(user, channel){
console.log("start", user);
});
mybot.on("stopTyping", function(user, channel){
console.log("stop", user);
});
function dump(msg) { function dump(msg) {
console.log(msg); console.log(msg);
} }