fix chat message detection

chatMessages dont include playerName anymore...
CatalysmsServerManager · Jul 12, 2024 · 07cdb6c · 07cdb6c
1 parent 9143207
commit 07cdb6c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/api/hooks/sdtdLogs/index.js b/api/hooks/sdtdLogs/index.js
@@ -181,6 +181,7 @@ module.exports = function sdtdLogs(sails) {
       });
 
       eventEmitter.on('chatMessage', function (chatMessage) {
+        if(!chatMessage.playerName) {chatMessage.playerName = chatMessage.player.name;};
         chatMessage.server = _.omit(server, 'authName', 'authToken');
         chatMessage.player = _.omit(chatMessage.player, 'inventory');
 

diff --git a/worker/processors/logs/handleLogLine.js b/worker/processors/logs/handleLogLine.js
@@ -22,7 +22,8 @@ const entityKilledRegex = /(killed .*)/g;
 const gmsgDeathRegex = /GMSG: Player '(\w+)' died/;
 const gmsgPvPDeathRegex = /GMSG: Player (.+) killed by (.+)/;
 
-const chatRegex = /Chat \(from '(?<steamId>[\w\d-]+)', entity id '(?<entityId>[-\d]+)', to '(?<channel>\w+)'\): '(?<playerName>.+)':(?<messageText>.+)/;
+const chatRegex =
+  /Chat \(from '(?<steamId>[\w\d-]+)', entity id '(?<entityId>[-\d]+)', to '(?<channel>\w+)'\): ('(?<playerName>.+)':)?(?<messageText>.+)/;
 
 module.exports = logLine => {