Christoph Berg 21 ani în urmă
părinte
comite
7f7c34f8da
2 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 2 0
      docs/Changelog
  2. 2 2
      modules/Pisg/Parser/Format/psybnc.pm

+ 2 - 0
docs/Changelog

@@ -4,6 +4,8 @@ pisg (0.67) - ??
        ChartsRegexp.
        ChartsRegexp.
      + Documentation: Local options override global ones, not vice-versa.
      + Documentation: Local options override global ones, not vice-versa.
      + Notes on using mIRC.
      + Notes on using mIRC.
+     + psybnc.pm: Fix ACTION pattern, require PRIVMSG on normal lines
+       (SF #1251680).
    Torbjörn Svensson:
    Torbjörn Svensson:
      + Added support for multiple channels in config with the same name.
      + Added support for multiple channels in config with the same name.
        Even multiple channel directives for the very same channel are
        Even multiple channel directives for the very same channel are

+ 2 - 2
modules/Pisg/Parser/Format/psybnc.pm

@@ -10,8 +10,8 @@ sub new
     my ($type, %args) = @_;
     my ($type, %args) = @_;
     my $self = {
     my $self = {
         cfg => $args{cfg},
         cfg => $args{cfg},
-        normalline => '^\d+-\d+-\d+-(\d+)-\d+-\d+:[^:]+::([^!]+)[^:]+:(.*)',
-        actionline => '^\d+-\d+-\d+-(\d+)-\d+-\d+:[^:]+::([^!]+)[^:]+:\001ACTION (.*)',
+        normalline => '^\d+-\d+-\d+-(\d+)-\d+-\d+:[^:]+::([^!]+)[^:]+ PRIVMSG [^:]+:([^\001]+)',
+        actionline => '^\d+-\d+-\d+-(\d+)-\d+-\d+:[^:]+::([^!]+)[^:]+:\001ACTION ([^\001]*)',
         thirdline  => '^\d+-\d+-\d+-(\d+)-(\d+)-\d+:[^:]+::([^!]+)[^ ]+ (\w+) (.*)',
         thirdline  => '^\d+-\d+-\d+-(\d+)-(\d+)-\d+:[^:]+::([^!]+)[^ ]+ (\w+) (.*)',
     };
     };