specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix banning guest names, add ban message to chat

Browse source
This commit is contained in:
calzoneman 2013-08-22 15:14:17 -05:00
parent 6f0e1e96a1
commit 1294a7bd50
4 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
channel.js
View file

@ -556,8 +556,17 @@ Channel.prototype.tryNameBan = function(actor, name) {
}
}
self.logger.log("*** " + actor.name + " namebanned " + name);
var notice = {
username: "[server]",
msg: actor.name + " banned " + name,
msgclass: "server-whisper",
time: Date.now()
};
self.users.forEach(function(u) {
if(self.hasPermission(u, "ban")) {
self.sendBanlist(u);
u.socket.emit("chatMsg", notice);
}
});
if(!self.registered) {
@ -614,7 +623,7 @@ Channel.prototype.tryIPBan = function(actor, name, range) {
self.getIPRank(ip, function (err, rank) {
if(err) {
actor.socket.emit("errorMsg", {
msg: "Internal error"
msg: "Internal error: " + err
});
return;
}
@ -644,8 +653,18 @@ Channel.prototype.tryIPBan = function(actor, name, range) {
self.server.db.addChannelBan(self.name, ip, name,
actor.name,
function (err, res) {
var notice = {
username: "[server]",
msg: actor.name + " banned " + $util.maskIP(ip) +
" (" + name + ")",
msgclass: "server-whisper",
time: Date.now()
};
self.users.forEach(function(u) {
if(self.hasPermission(u, "ban")) {
u.socket.emit("chatMsg", notice);
self.sendBanlist(u);
}
});
});
});

4
database.js
View file

@ -925,7 +925,7 @@ Database.prototype.getGlobalRank = function (name, callback) {
}
if(res.length == 0) {
callback("User does not exist", null);
callback(null, 0);
return;
}
@ -956,7 +956,7 @@ Database.prototype.listGlobalRanks = function (names, callback) {
}
if(res.length == 0) {
callback("User does not exist", null);
callback(null, 0);
return;
}

2
package.json
View file

@ -2,7 +2,7 @@
"author": "Calvin Montgomery",
"name": "CyTube",
"description": "Online media synchronizer and chat",
"version": "2.4.0",
"version": "2.4.1",
"repository": {
"url": "http://github.com/calzoneman/sync"
},

2
server.js
View file

@ -6,7 +6,7 @@ var Logger = require("./logger");
var Channel = require("./channel");
var User = require("./user");
const VERSION = "2.4.0";
const VERSION = "2.4.1";
function getIP(req) {
var raw = req.connection.remoteAddress;