Explorar o código

Work for &channel, +channel and !channel. Patch from Hanno Hecker

sbingner %!s(int64=24) %!d(string=hai) anos
pai
achega
e7531140e7
Modificáronse 1 ficheiros con 4 adicións e 4 borrados
  1. 4 4
      modules/Pisg/Parser/Format/pircbot.pm

+ 4 - 4
modules/Pisg/Parser/Format/pircbot.pm

@@ -12,12 +12,12 @@ sub new
 
     my $self = {
         cfg => $args{cfg},
-        normalline => '^(\d+)\s:([^!]+)![^@]+@\S+\sPRIVMSG\s(#\S+)\s:([^' . $ctcpchr . '].*)$'
+        normalline => '^(\d+)\s:([^!]+)![^@]+@\S+\sPRIVMSG\s([#&+!]\S+)\s:([^' . $ctcpchr . '].*)$'
                       . '|' .
-                      '^(\d+)\s(>>>)PRIVMSG\s(#\S+)\s:([^' . $ctcpchr . '].*)$',
-        actionline => '^(\d+)\s:([^!]+)!([^@]+)@(\S+)\sPRIVMSG\s(#\S+)\s:' . $ctcpchr . 'ACTION (.+)' . $ctcpchr . '\s*$'
+                      '^(\d+)\s(>>>)PRIVMSG\s([#&+!]\S+)\s:([^' . $ctcpchr . '].*)$',
+        actionline => '^(\d+)\s:([^!]+)!([^@]+)@(\S+)\sPRIVMSG\s([#&+!]\S+)\s:' . $ctcpchr . 'ACTION (.+)' . $ctcpchr . '\s*$'
                       . '|' . 
-                      '^(\d+)\s(>>>)PRIVMSG\s(#\S+)\s:' . $ctcpchr . 'ACTION (.+)' . $ctcpchr . '\s*$',
+                      '^(\d+)\s(>>>)PRIVMSG\s([#&+!]\S+)\s:' . $ctcpchr . 'ACTION (.+)' . $ctcpchr . '\s*$',
 	thirdline  => '^(\d+)\s:([^!]+)![^@]+@\S+\s(.+)$'
                       . '|' .
                       '^(\d+)\s(>>>)([^P].+)$',