tf2_line_parser 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f62b3222dd89877b6ce919788a689fb437bfbc7ca75a981f4d35fade570ec629
-  data.tar.gz: 4ddd3fcfea754c47b36fd4fd726f210cc9a5b407fa88273029c475e8388f0940
+  metadata.gz: f18e216a4247d37720754f3a66281d93c88af477875335fd9a3d3a79228f2a8b
+  data.tar.gz: f3ce9a46e96f0b37820c02e5b876f98bf8232fff6e42733ebd79727a4fd9e46a
 SHA512:
-  metadata.gz: 99198496cdaf2a68406b0a106b189133c02bf753d816738d99a2f7abd0065d6f0df640f3fce4fb1604ba49898d18b2855015b80e4ae5b7ddb1b03163b2fb05f6
-  data.tar.gz: c509657ae00cbf328d70b1685aee1d4dd9e0119a328331534b7bad6f47c656d2ce9b58c54caf8903c51c95afba28c9ae9d7d9e2b8a5574b3d763295baa162972
+  metadata.gz: d9daf5c5f614d817d09d8de35539f5d7acbc61bbb7b47863e4a12551cdae2a00ba521ede013cfa485eed863520a157007496a34173dfdb46b388dcdb9dd7934e
+  data.tar.gz: 985510a7d6108b80db1ae408e32dfa6e0d5da41293b4f50d74abae403a79f3ad4774b750693d85438e86969f48f2d1373fd2dbcc79a533e33e5784de777a9030

data/lib/tf2_line_parser/events/chat.rb

@@ -27,13 +27,13 @@ module TF2LineParser
 
     class Say < Chat
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} say #{regex_message}/.freeze
+        @regex ||= /#{regex_time} #{regex_chat_player} say #{regex_message}/.freeze
       end
     end
 
     class TeamSay < Chat
       def self.regex
-        @regex ||= /#{regex_time} #{regex_player} say_team #{regex_message}/.freeze
+        @regex ||= /#{regex_time} #{regex_chat_player} say_team #{regex_message}/.freeze
       end
     end
   end

data/lib/tf2_line_parser/events/event.rb

@@ -18,6 +18,15 @@ module TF2LineParser
         @regex_player ||= /"(?<player_section>.*?)"/
       end
 
+      # A chat line's player section ends at the first unescaped " say " or
+      # " say_team " that follows a <uid><steamid><team> tag, so tags or events
+      # typed into the message can't make the line look like it came from
+      # someone else, or like another event. Requiring the tag keeps names
+      # like 'x" say "' from turning that player's other lines into chat.
+      def self.regex_chat_player
+        @regex_chat_player ||= /"(?<player_section>(?:\\.|(?!" say(?:_team)? ").)*?<\d+><[^<>"]*><[^<>"]*>)"/
+      end
+
       def self.regex_target
         @regex_target ||= /"(?<target_section>.*?)"/
       end

data/lib/tf2_line_parser/line.rb

@@ -65,6 +65,10 @@ module TF2LineParser
       Events::ConsoleSay, Events::Unknown
     ].freeze
 
+    CHAT_REGEX = /#{Events::Event.regex_time} #{Events::Event.regex_chat_player} (?<chat_type>say|say_team) "/
+    CHAT_TYPES = [Events::Say, Events::ConsoleSay].freeze
+    TEAM_CHAT_TYPES = [Events::TeamSay].freeze
+
     def initialize(line)
       @line = line
     end
@@ -89,6 +93,12 @@ module TF2LineParser
       private
 
       def find_candidate_types(line)
+        # Chat first: the message is player-controlled and may contain text
+        # that looks like other events (triggered "killed", connected, ...)
+        if line.include?('" say') && (chat = match_tidied(line, CHAT_REGEX))
+          return chat[:chat_type] == 'say' ? CHAT_TYPES : TEAM_CHAT_TYPES
+        end
+
         # Fast path: check for "triggered" which covers most events
         if line.include?('triggered "')
           start_idx = line.index('triggered "')
@@ -116,18 +126,19 @@ module TF2LineParser
 
       def try_parse_types(line, types)
         types.each do |type|
-          begin
-            match = line.match(type.regex)
-          rescue ArgumentError
-            # Handle invalid byte sequences by forcing UTF-8 encoding
-            tidied_line = line.encode('UTF-8', 'UTF-8', invalid: :replace, undef: :replace, replace: '')
-            match = tidied_line.match(type.regex)
-          end
+          match = match_tidied(line, type.regex)
           return type.new(*type.regex_results(match)) if match
         end
         nil
       end
 
+      def match_tidied(line, regex)
+        line.match(regex)
+      rescue ArgumentError
+        # Handle invalid byte sequences by forcing UTF-8 encoding
+        line.encode('UTF-8', 'UTF-8', invalid: :replace, undef: :replace, replace: '').match(regex)
+      end
+
       def check_damage_subtypes(line)
         damage_attr_pos = line.index('(damage "')
         return [Events::Damage] unless damage_attr_pos

data/lib/tf2_line_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TF2LineParser
-  VERSION = '0.6.3'
+  VERSION = '0.6.5'
 end

data/spec/lib/tf2_line_parser/parser_spec.rb

@@ -855,6 +855,63 @@ module TF2LineParser
         expect(event.player.team).to eq('Red')
         expect(event.message).to eq('hello world')
       end
+
+      context 'with player tags or events typed into chat' do
+        let(:prefix) { 'L 10/17/2026 - 12:00:00: ' }
+
+        it 'credits say lines with a fake say_team tag in the message to the real speaker' do
+          event = parse(prefix + '"Troll<4><[U:1:111]><Blue>" say "x" "Owner<3><[U:1:999]><Red>" say_team "!end"')
+
+          expect(event).to be_a(Events::Say)
+          expect(event.player.steam_id).to eq('[U:1:111]')
+          expect(event.message).to eq('x" "Owner<3><[U:1:999]><Red>" say_team "!end')
+        end
+
+        it 'credits say_team lines with a fake say tag in the message to the real speaker' do
+          event = parse(prefix + '"Troll<4><[U:1:111]><Blue>" say_team "x" "Owner<3><[U:1:999]><Red>" say "!end"')
+
+          expect(event).to be_a(Events::TeamSay)
+          expect(event.player.steam_id).to eq('[U:1:111]')
+        end
+
+        it "doesn't parse chat mentioning a triggered connect as a connect" do
+          event = parse(prefix + '"Troll<4><[U:1:111]><Blue>" say "triggered "connected, address" "Victim<5><[U:1:555]><>" connected, address "6.6.6.6:27005"')
+
+          expect(event).to be_a(Events::Say)
+          expect(event.player.steam_id).to eq('[U:1:111]')
+        end
+
+        it "doesn't parse chat mentioning a triggered kill as a kill" do
+          event = parse(prefix + '"Troll<4><[U:1:111]><Blue>" say "triggered "killed" "Troll<4><[U:1:111]><Blue>" killed "Vic<6><[U:1:456]><Red>" with "scattergun" (attacker_position "0 0 0")"')
+
+          expect(event).to be_a(Events::Say)
+        end
+
+        it "doesn't parse chat containing a kill as a kill" do
+          event = parse(prefix + '"Troll<4><[U:1:111]><Blue>" say "x" "Troll<4><[U:1:111]><Blue>" killed "Vic<6><[U:1:456]><Red>" with "scattergun""')
+
+          expect(event).to be_a(Events::Say)
+        end
+
+        it "doesn't parse chat containing damage as damage" do
+          event = parse(prefix + '"Troll<4><[U:1:111]><Blue>" say "x" "Troll<4><[U:1:111]><Blue>" triggered "damage" against "Vic<6><[U:1:456]><Red>" (damage "500")"')
+
+          expect(event).to be_a(Events::Say)
+        end
+
+        it 'still parses kills of players whose name looks like chat' do
+          event = parse(prefix + '"x" say "<4><[U:1:111]><Blue>" killed "Vic<6><[U:1:456]><Red>" with "scattergun" (attacker_position "0 0 0") (victim_position "0 0 0")')
+
+          expect(event).to be_a(Events::Kill)
+          expect(event.player.steam_id).to eq('[U:1:111]')
+        end
+
+        it 'still parses kills of players whose name contains say' do
+          event = parse(prefix + '"say hi<4><[U:1:111]><Blue>" killed "Vic<6><[U:1:456]><Red>" with "scattergun" (attacker_position "0 0 0") (victim_position "0 0 0")')
+
+          expect(event).to be_a(Events::Kill)
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tf2_line_parser
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Arie
 bindir: bin
 cert_chain: []
-date: 2026-03-28 00:00:00.000000000 Z
+date: 2026-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls_reborn