From e38aed08bf9a42340c6ce6ec0b7e4b77df9e67e6 Mon Sep 17 00:00:00 2001
From: Danielv123 <tranen.bananen@gmail.com>
Date: Sat, 28 Apr 2018 02:19:42 +0200
Subject: [PATCH] Sanitizing !shout chat

---
 master.js                         | 2 +-
 sharedPlugins/globalChat/index.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/master.js b/master.js
index b23a721b..a36d6429 100644
--- a/master.js
+++ b/master.js
@@ -1017,7 +1017,7 @@ io.on('connection', function (socket) {
 		prometheusWsUsageCounter.labels("registerAlertReciever").inc();
 		if(!global.wsAlertRecievers) global.wsAlertRecievers = [];
 		global.wsAlertRecievers.push(socket);
-	}
+	});
 });
 
 module.exports = app;
diff --git a/sharedPlugins/globalChat/index.js b/sharedPlugins/globalChat/index.js
index aa6cf3f9..d121efaf 100644
--- a/sharedPlugins/globalChat/index.js
+++ b/sharedPlugins/globalChat/index.js
@@ -12,9 +12,11 @@ module.exports = class remoteCommands {
 					message.shift();
 					message.shift();
 					message.shift();
-					message.join(" ");
-					let chatMessage = "["+data.instanceID+"]"+ message;
-					this.messageInterface("/c game.print('"+chatMessage+"')");
+					let chatMessage = "["+data.instanceID+"]"+ message.join(" ");
+					while(chatMessage.includes("'")){
+						chatMessage = chatMessage.replace("'", "");
+					}
+					this.messageInterface("/silent-command game.print('"+chatMessage.replace("!shout ","")+"')");
 				}
 			}
 		});