Changeset 38a7f22 for perl/modules/Jabber/lib/BarnOwl

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/Jabber/lib/BarnOwl/Message/Jabber.pm (modified) (3 diffs)

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

@@ -56 +56 @@
     my $inst = shift;
 
-    my ($filter, $ftext);
+    my $filter;
 
     if($self->jtype eq 'chat') {
@@ -69 +69 @@
         my $room = $self->room;
         $filter = "jabber-room-$room";
-        $ftext = qq{type ^jabber\$ and room ^$room\$};
-        BarnOwl::filter("$filter $ftext");
+        BarnOwl::command(qw[filter], $filter,
+                         qw[type ^jabber$ and room], "^$room\$");
         return $filter;
     } elsif ($self->login ne 'none') {
@@ -83 +83 @@
     $user   = Net::Jabber::JID->new($user)->GetJID( $inst ? 'full' : 'base' );
     my $filter = "jabber-user-$user";
-    my $ftext  =
-        qq{type ^jabber\$ and ( ( direction ^in\$ and from ^$user ) }
-      . qq{or ( direction ^out\$ and to ^$user ) ) };
-    BarnOwl::filter("$filter $ftext");
+    BarnOwl::command(qw[filter], $filter, qw[type ^jabber$],
+                     qw[and ( ( direction ^in$ and from], "^$user",
+                     qw[) or ( direction ^out$ and to ], "^$user",
+                     qw[ ) ) ]);
     return $filter;