KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #417 from zoff-music/feature/kick-ban-in-chat

Browse Source 
Added ban/unban functionality in chat
This commit is contained in:
Kasper Rynning-Tønnesen
2018-09-27 12:30:18 +02:00
committed by GitHub
parent c0864b3311 c0d36b368c
commit de9a43c653
2 changed files with 255 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
server/handlers/chat.js
View File

@@ -58,6 +58,18 @@ function getAndSendLogs(channel, all, socket, pass, query) {
});
}
function checkIfUserIsBanned(channel, socket, guid, callback) {
var connection_id = Functions.hash_pass(socket.handshake.headers["user-agent"] + socket.handshake.address + socket.handshake.headers["accept-language"]);
db.collection(channel + "_banned_chat").find({connection_id: connection_id}, function(err, docs) {
if(docs.length == 0) callback();
else {
db.collection("user_names").update({guid, guid}, {$addToSet:{channels: channel}}, function(){
socket.emit('chat', {from: "System", msg: ": You can't chat in this channel, you are banned. The reason is: " + docs[0].reason, icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
});
}
})
}
function chat(msg, guid, offline, socket) {
if(typeof(msg) !== 'object' || !msg.hasOwnProperty('data') ||
@@ -82,14 +94,16 @@ function chat(msg, guid, offline, socket) {
var coll = msg.channel.toLowerCase();//.replace(/ /g,'');
coll = Functions.removeEmojis(coll).toLowerCase();
//coll = filter.clean(coll);
Functions.getSessionAdminUser(Functions.getSession(socket), coll, function(userpass) {
checkIfUserIsBanned(coll, socket, guid, function() {
Functions.getSessionAdminUser(Functions.getSession(socket), coll, function(userpass, adminpass) {
if(userpass != "" || msg.pass == undefined) {
msg.pass = userpass;
} else {
msg.pass = crypto.createHash('sha256').update(Functions.decrypt_string(msg.pass)).digest("base64");
}
db.collection(coll + "_settings").find(function(err, docs){
if(docs.length > 0 && (docs[0].userpass == undefined || docs[0].userpass == "" || (msg.hasOwnProperty('pass') && docs[0].userpass == msg.pass))) {
db.collection(coll + "_settings").find(function(err, conf){
if(conf.length > 0 && (conf[0].userpass == undefined || conf[0].userpass == "" || (msg.hasOwnProperty('pass') && conf[0].userpass == msg.pass))) {
var data = msg.data;
Functions.check_inlist(coll, guid, socket, offline, function() {
@@ -103,6 +117,63 @@ function chat(msg, guid, offline, socket) {
data.length < 151 && data.replace(/\s/g, '').length){
db.collection("user_names").find({"guid": guid}, function(err, docs) {
if(docs.length == 1) {
var splitData = data.split(" ");
if((data.startsWith("/ban") && splitData.length >= 3) || (data.startsWith("/unban") && splitData.length >= 2)) {
if(splitData[1].length > 0) {
var passToCompare = Functions.hash_pass(adminpass);
if(passToCompare == conf[0].adminpass) {
db.collection("user_names").find({name: splitData[1]}, function(err, name) {
if(name.length == 1) {
if(data.startsWith("/ban") && splitData.length >= 3) {
var reason = splitData.slice(2, splitData.length).join(" ");
var connection_id = name[0].connection_id;
var yourSelf = Functions.hash_pass(socket.handshake.headers["user-agent"] + socket.handshake.address + socket.handshake.headers["accept-language"]);
if(connection_id != yourSelf) {
db.collection(coll + "_banned_chat").update({
connection_id: connection_id
}, {
connection_id: connection_id,
by: docs[0].name,
reason: reason
}, {
upsert: true
}, function(err, results) {
io.to(coll).emit('chat', {from: "System", msg: ": " + docs[0].name + " has banned " + splitData[1] + " for: " + reason, icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
});
} else {
socket.emit('chat', {from: "System", msg: ": I'm sorry but you can't ban yourself..", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
}
} else if(data.startsWith("/unban")) {
db.collection(coll + "_banned_chat").remove({connection_id: name[0].connection_id}, function(err, results) {
if(results.hasOwnProperty("n") && results.n == 1 && results.hasOwnProperty("deletedCount") && results.deletedCount == 1) {
io.to(coll).emit('chat', {from: "System", msg: ": " + docs[0].name + " has unbanned " + splitData[1], icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
} else {
socket.emit('chat', {from: "System", msg: ": Cannot find anyone with that username in this chat.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
}
})
} else if(data.startsWith("/ban") && splitData.length < 3) {
socket.emit('chat', {from: "System", msg: ": You are doing that command wrong. its /ban USERNAME", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
}
} else {
socket.emit('chat', {from: "System", msg: ": No user by that name.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
}
});
} else {
socket.emit('chat', {from: "System", msg: ": You are not logged in as an admin to the channel, don't try any funnybusiness.", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
}
} else {
socket.emit('chat', {from: "System", msg: ": You are doing that command wrong. its /ban USERNAME REASON or /unban USERNAME", icon: "https://zoff.me/assets/images/favicon-32x32.png"});
return;
}
} else {
db.collection("registered_users").find({"_id": docs[0].name}, function(err, n) {
var icon = false;
if(n.length > 0 && n[0].icon) {
@@ -111,8 +182,9 @@ function chat(msg, guid, offline, socket) {
db.collection("chat_logs").insert({ "createdAt": new Date(), all: false, channel: coll, from: docs[0].name, msg: ": " + data, icon: icon });
io.to(coll).emit('chat', {from: docs[0].name, msg: ": " + data, icon: icon});
});
}
} else if(docs.length == 0){
get_name(guid, {announce: false, channel: coll, message: data, all: false});
get_name(guid, {announce: false, channel: coll, message: data, all: false, socket: socket});
}
});
}
@@ -122,6 +194,7 @@ function chat(msg, guid, offline, socket) {
}
});
});
});
}
function all_chat(msg, guid, offline, socket) {
@@ -159,7 +232,7 @@ function all_chat(msg, guid, offline, socket) {
io.sockets.emit('chat.all', {from: docs[0].name, msg: ": " + data, channel: coll, icon: icon});
});
} else if(docs.length == 0) {
get_name(guid, {announce: false, channel: coll, message: data, all: true});
get_name(guid, {announce: false, channel: coll, message: data, all: true, socket: socket});
}
});
}
@@ -169,6 +242,7 @@ function all_chat(msg, guid, offline, socket) {
function namechange(data, guid, socket, tried, callback) {
/*if(!data.hasOwnProperty("channel") ||
typeof(data.channel) != "string") return;*/
checkIfUserIsBanned(data.channel, socket, guid, function() {
var pw = "";
var new_password;
var first = false;
@@ -266,7 +340,7 @@ function namechange(data, guid, socket, tried, callback) {
});
});
} else {
if(tried < 3 || tried == undefined) {
if(tried < 3 || tried == undefined) {
if(tried == undefined) {
tried = 1;
}
@@ -281,6 +355,7 @@ function namechange(data, guid, socket, tried, callback) {
}
});
});
});
}
function removename(guid, coll, socket) {
@@ -306,10 +381,14 @@ function generate_name(guid, announce_payload, second, round, channel) {
if(docs.length == 0) {
db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: tmp_name}}, {upsert: true}, function(err, updated) {
if(updated.nModified == 1 || (updated.hasOwnProperty("upserted") && updated.hasOwnProperty("n") && updated.n == 1)) {
var updateElement = {$set: {name: tmp_name, icon: false}};
var connection_id = Functions.hash_pass(announce_payload.socket.handshake.headers["user-agent"] + announce_payload.socket.handshake.address + announce_payload.socket.handshake.headers["accept-language"]);
var updateElement = {$set: {name: tmp_name, icon: false, connection_id: connection_id}};
if(channel != undefined && channel != "") {
updateElement["$addToSet"] = {channels: channel};
}
if(announce_payload.hasOwnProperty("channel") && announce_payload.channel != "") {
updateElement["$addToSet"] = {channels: announce_payload.channel};
}
db.collection("user_names").update({"guid": guid}, updateElement, {upsert: true}, function(err, update){
name = tmp_name;
if(announce_payload.announce) {
@@ -346,7 +425,10 @@ function get_name(guid, announce_payload, first) {
}
Functions.setSessionChatPass(Functions.getSession(announce_payload.socket), name.toLowerCase(), pass, function() {
});
db.collection("user_names").update({"guid": guid}, {$set: {name: name, icon: icon}}, {upsert: true}, function(err, docs) {
var connection_id = Functions.hash_pass(announce_payload.socket.handshake.headers["user-agent"] + announce_payload.socket.handshake.address + announce_payload.socket.handshake.headers["accept-language"]);
var updateElement = {$set: {name: name, icon: icon, connection_id: connection_id}};
if(announce_payload.hasOwnProperty("channel") && announce_payload.channel != "") updateElement["$addToSet"] = {channel: announce_payload.channel};
db.collection("user_names").update({"guid": guid}, updateElement, {upsert: true}, function(err, docs) {
db.collection("user_names").update({"_id": "all_names"}, {$addToSet: {names: name}}, function(err, docs) {
name = name;
});

10
server/public/assets/js/chat.js
View File

@@ -2,6 +2,10 @@ var Chat = {
channel_received: 0,
all_received: 0,
chat_admin_help: [
"/ban USERNAME REASON to ban user",
"/unban USERNAME to unban a user"
],
chat_help: [
"/login <new name> <password> to register and save a password for a nickname, or to log in with a password on a name.",
"/login <name> <new_password> <old_password> to change the password on a nickname",
@@ -62,7 +66,9 @@ var Chat = {
}
add = "chatchannel";
}
for(var x = 0; x < Chat.chat_help.length; x++) {
var help = Chat.chat_help;
if(Admin.logged_in) help = help.concat(Chat.chat_admin_help);
for(var x = 0; x < help.length; x++) {
var color = Helper.intToARGB(Helper.hashCode("System"));
if(color.length < 6) {
for(x = color.length; x < 6; x++) {
@@ -75,7 +81,7 @@ var Chat = {
var color_temp = Helper.rgbToHsl([color.r, color.g, color.b], false);
document.querySelector("#" + add).insertAdjacentHTML("beforeend", "<li title='Zoff''><span class='time_color'>" + time + "</span> <img class='chat-icon' src='https://zoff.me/assets/images/favicon-32x32.png' alt='System'><span style='color:" + color_temp + ";'>System</span>: </li>");
var in_text = document.createTextNode(Chat.chat_help[x]);
var in_text = document.createTextNode(help[x]);
document.querySelector("#" + add).children[document.querySelector("#" + add).children.length - 1].appendChild(in_text);
document.getElementById("" + add).scrollTop = document.getElementById("" + add).scrollHeight;
}