Changeset 344 for scripts/usr/local/lib/7dtd/monitor-log.sh

Timestamp:

Jan 5, 2019, 1:12:17 PM (6 years ago)

Author:

alloc

Message:

Linux scripts 111

File:

• scripts/usr/local/lib/7dtd/monitor-log.sh (modified) (2 diffs)

scripts/usr/local/lib/7dtd/monitor-log.sh

@@ -73 +73 @@
 
 handleChat() {
-        echo "$(timestamp): $1: $2" >> $CHATLOG
+        echo "$(timestamp): $1: $2 (SteamID $3, EntityID $4, Target $5)" >> $CHATLOG
         
         for H in $(getHooksFor chat $INSTANCE); do
-                $H $INSTANCE "$1" "$2"
+                $H $INSTANCE "$1" "$2" "$3" "$4" "$5"
         done
 }
@@ -167 +167 @@
                         handleGmsg "$msg"
                         unset msg
-                #Chat: 'name': .*$
-                elif [ -n "$(echo "$line" | grep -E '^Chat: .+')" ]; then
-                        name=$(expr "$line" : "Chat: '\(.*\)': .*$")
-                        msg=$(expr "$line" : "Chat: '.*': \(.*\)$")
-                        handleChat "$name" "$msg"
-                        unset name msg
+                #Chat (from '<steamid>', entity id '<entityid>', to '<targettype>'): '<senderchatname>': <msg>
+                elif [ -n "$(echo "$line" | grep -E '^Chat .+')" ]; then
+                        steamId=$(expr "$line" : "Chat (from '\(.+\)', entity id '[0-9]+', to '[a-fA-F:0-9.]+'): '.*': .*$") 
+                        entityId=$(expr "$line" : "Chat (from '.+', entity id '\([0-9]+\)', to '[a-fA-F:0-9.]+'): '.*': .*$") 
+                        targetType=$(expr "$line" : "Chat (from '.+', entity id '[0-9]+', to '\([a-fA-F:0-9.]+\)'): '.*': .*$") 
+                        name=$(expr "$line" : "Chat (from '.+', entity id '[0-9]+', to '[a-fA-F:0-9.]+'): '\(.*\)': .*$") 
+                        msg=$(expr "$line" : "Chat (from '.+', entity id '[0-9]+', to '[a-fA-F:0-9.]+'): '.*': \(.*\)$") 
+                        handleChat "$name" "$msg" "$steamId" "$entityId" "$targetType"
+                        unset name msg steamId entityId targetType
                 #Executing command ".*" from client ".*"$ 
                 elif [ -n "$(echo "$line" | grep '^Executing command '.*' from client')" ]; then