diff --git a/changelog b/changelog index 7a6e35ec..4a0dc827 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +Sat Oct 12 19:43 2013 CDT + * lib/user.js: Fix jumpTo kick bug + * lib/api.js: Fix unloaded channel API listing bug + Sat Oct 12 19:02 2013 CDT * lib/chatcommand.js: Fix poll import diff --git a/lib/api.js b/lib/api.js index f5eb9f4d..ca7e4677 100644 --- a/lib/api.js +++ b/lib/api.js @@ -74,7 +74,7 @@ module.exports = function (Server) { loaded: false }; - if(Server.channelLoaded(name)) + if(Server.isChannelLoaded(name)) data = getChannelData(Server.getChannel(name)); res.type("application/json"); diff --git a/lib/user.js b/lib/user.js index 679fac51..b7ce9e5c 100644 --- a/lib/user.js +++ b/lib/user.js @@ -285,7 +285,6 @@ User.prototype.initCallbacks = function () { }); self.socket.on("jumpTo", function (data) { - data = (typeof data !== "object") ? {} : data; if (self.inChannel()) { self.channel.tryJumpTo(self, data); }