Changeset 38a7f22 for perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

Timestamp:

Aug 21, 2008, 2:08:39 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

a82e091

Parents:

c4ba74d

Message:

Convert Message::IRC and Message::Jabber to use the new BarnOwl::command()

We should now be able to properly narrow to MUCs and users and
channels containing whitespace or quotation marks.

File:

• perl/modules/IRC/lib/BarnOwl/Message/IRC.pm (modified) (3 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 filter personal and }
-           . qq{( ( direction ^in\$ and sender ^$who\$ ) 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;
     }