rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Fix #291

Browse source
This commit is contained in:
calzoneman 2013-10-07 10:04:08 -05:00
parent 718a70bc60
commit f5cbdb2f24
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -1,3 +1,7 @@
Mon Oct 07 10:02 2013 CDT
* lib/channel.js: Fix several cases where an unregistered channel
might attempt to make a database call which then fails.
Mon Oct 07 00:08 2013 CDT Mon Oct 07 00:08 2013 CDT
* lib/playlist.js: Fix /clean not behaving properly (actually was a * lib/playlist.js: Fix /clean not behaving properly (actually was a
consequence of the remove() function) consequence of the remove() function)

22
lib/channel.js
View file

@ -509,11 +509,7 @@ Channel.prototype.getIPRank = function (ip, callback) {
self.server.db.listAliases(ip, function (err, names) { self.server.db.listAliases(ip, function (err, names) {
if (self.dead) if (self.dead)
return; return;
self.server.db.listChannelUserRanks(self.name, names, self.server.db.listGlobalRanks(names, function (err, res) {
function (err, res) {
if (self.dead)
return;
if(err) { if(err) {
callback(err, null); callback(err, null);
return; return;
@ -524,7 +520,16 @@ Channel.prototype.getIPRank = function (ip, callback) {
rank = (res[i] > rank) ? res[i] : rank; rank = (res[i] > rank) ? res[i] : rank;
} }
self.server.db.listGlobalRanks(names, function (err, res) { if (!self.registered) {
callback(null, rank);
return;
}
self.server.db.listChannelUserRanks(self.name, names,
function (err, res) {
if (self.dead)
return;
if(err) { if(err) {
callback(err, null); callback(err, null);
return; return;
@ -536,6 +541,7 @@ Channel.prototype.getIPRank = function (ip, callback) {
callback(null, rank); callback(null, rank);
}); });
}); });
}); });
} }
@ -621,6 +627,8 @@ Channel.prototype.unbanName = function(actor, name) {
self.namebans[name] = null; self.namebans[name] = null;
delete self.namebans[name]; delete self.namebans[name];
self.logger.log("*** " + actor.name + " un-namebanned " + name); self.logger.log("*** " + actor.name + " un-namebanned " + name);
if (!self.registered)
return;
self.server.db.clearChannelNameBan(self.name, name, function (err, res) { self.server.db.clearChannelNameBan(self.name, name, function (err, res) {
if (self.dead) if (self.dead)
@ -1673,6 +1681,8 @@ Channel.prototype.tryUncache = function(user, data) {
if(typeof data.id != "string") { if(typeof data.id != "string") {
return; return;
} }
if (!self.registered)
return;
self.server.db.removeFromLibrary(self.name, data.id, self.server.db.removeFromLibrary(self.name, data.id,
function (err, res) { function (err, res) {
if (self.dead) if (self.dead)