Changes in perl/modules/IRC/lib/BarnOwl/Message/IRC.pm [8df6cbb:38a7f22]

File:

• perl/modules/IRC/lib/BarnOwl/Message/IRC.pm (modified) (5 diffs)

perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

@@ -20 +20 @@
     my $inst = shift;
 
-    my ($filter, $ftext);
+    my $filter;
+    my @filter;
 
     if($self->is_private) {
@@ -30 +31 @@
         }
         $filter = "irc-user-$who";
-        my $ftext  =
-             qq{type ^irc\$ and ( ( direction ^in\$ and sender ^$who\$ ) }
-           . qq{or ( direction ^out\$ and recipient ^$who\$ ) ) };
-        BarnOwl::filter("$filter $ftext");
+        @filter  =
+             (qw{( type ^irc$ and filter personal and },
+              qw{( ( direction ^in$ and sender}, "^$who\$",
+              qw{ ) or ( direction ^out$ and recipient}, "^$who\$",
+              qw{) ) ) });
+        BarnOwl::command("filter", "$filter", @filter);
         return $filter;
     } else {
@@ -43 +46 @@
         if ($inst && $self->body =~ /^(\S+):/) {
             $filter = "irc-$network-channel-$channel-$sender-$1";
-            $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$ and ( sender ^$sender\$ or sender ^$1\$ )};
+            @filter =
+                 (qw{type ^irc$ and network}, "^$network\$",
+                  qw{and channel}, "^$channel\$",
+                  qw{and ( sender}, "^$sender\$",
+                  qw{or sender}, "^$1\$",qq{)});
         } else {
             $filter = "irc-$network-channel-$channel";
-            $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$};
+            @filter = (qw{type ^irc$ and network}, "^$network\$",
+                       qw{and channel}, "^$channel\$");
         }
-        BarnOwl::filter("$filter $ftext");
+        BarnOwl::command("filter", "$filter", @filter);
         return $filter;
     }
@@ -56 +64 @@
 sub network {shift->{network}}
 sub channel {shift->{channel}}
+sub action {shift->{action}}
+sub reason {shift->{reason}}
 
 # display
@@ -65 +75 @@
 sub login_type {
     my $self = shift;
-    return " (" . ($self->is_login ? "JOIN" : "PART") . ")";
+    return " (" . uc $self->action . ")";
 }
 
-sub login_extra { shift->channel; }
-
+sub login_extra { 
+    my $self = shift;
+    if ($self->action eq "quit") {
+        return $self->reason;
+    } else {
+        return $self->channel;
+    }
+}
 
 1;