Christoph Berg 21 лет назад
Родитель
Сommit
7f7c34f8da
2 измененных файлов с 4 добавлено и 2 удалено
  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.
      + Documentation: Local options override global ones, not vice-versa.
      + Notes on using mIRC.
+     + psybnc.pm: Fix ACTION pattern, require PRIVMSG on normal lines
+       (SF #1251680).
    Torbjörn Svensson:
      + Added support for multiple channels in config with the same name.
        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 $self = {
         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+) (.*)',
     };