4
0
Эх сурвалжийг харах

Patch from Andrew <andy@lewman.com> (see
http://sourceforge.net/tracker/?func=detail&atid=403713&aid=502158&group_id=31862)

Morten Brix Pedersen 24 жил өмнө
parent
commit
fb3dff4f76

+ 6 - 8
modules/Pisg/Parser/Format/axur.pm

@@ -10,8 +10,8 @@ sub new
     my ($type, %args) = @_;
     my $self = {
         cfg => $args{cfg},
-        normalline => '^\[\d+/\d+/\d+ @ (\d+):\d+:\d+\] <([^>\s]+)>\s+(.*)',
-        actionline => '^\[\d+/\d+/\d+ @ (\d+):\d+:\d+\] \*\s+(\S+) (.*)',
+        normalline => '^\[\d+/\d+/\d+ @ (\d+):\d+:\d+\] [\>\(|<]+([^>\s]+)[\)|>]\s+(.*)',
+        actionline => '^\[\d+/\d+/\d+ @ (\d+):\d+:\d+\] [\>\*|\*]+\s+(\S+) (.*)',
         thirdline  => '^\[\d+/\d+/\d+ @ (\d+):(\d+):\d+\] \*\*\*\s+(\S+) (\S+) (\S+) (\S+) (\S+) (.*)',
     };
 
@@ -71,23 +71,20 @@ sub thirdline
         } elsif (($4.$5) eq 'haschanged') {
             $hash{newtopic} = $8;
 
-        } elsif (($4.$5) eq 'giveschannel') {
+        } elsif (($7) eq '+o') {
             $hash{newmode} = '+o';
 
-        } elsif (($4.$5) eq 'removeschannel') {
+        } elsif (($7) eq '-o') {
             $hash{newmode} = '-o';
 
         } elsif (($4.$5) eq 'hasjoined') {
             $hash{newjoin} = $3;
 
-        } elsif (($4.$5) eq 'nowknown') {
+        } elsif ((($4.$5) eq 'nowknown') || (($4.$5) eq 'nowknow')) {
             $hash{newnick} = $7;
 
-        } elsif (($4.$5) eq 'nowknow') { # To fix an error in some axur's
-            $hash{newnick} = $7;
         }
 
-
         return \%hash;
 
     } else {
@@ -96,3 +93,4 @@ sub thirdline
 }
 
 1;
+