[361] in BarnOwl Developers
[D-O-H] r503 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:20 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 8 Jan 2007 23:19:17 -0500 (EST)
Author: nelhage
Date: 2007-01-08 23:19:16 -0500 (Mon, 08 Jan 2007)
New Revision: 503
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r17888@phanatique: nelhage | 2007-01-08 23:19:14 -0500
Adding jabber smartnarrow support for muc
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17886
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17888
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-09 03:10:55 UTC (rev 502)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-09 04:19:16 UTC (rev 503)
@@ -1163,13 +1163,16 @@
sub jtype { shift->{jtype} };
sub from { shift->{from} };
sub to { shift->{to} };
+sub room { shift->{room} };
sub smartfilter {
my $self = shift;
my $inst = shift;
+ my ($filter, $ftext);
+
if($self->jtype eq 'chat') {
- my ($user, $filter, $ftext);
+ my $user;
if($self->direction eq 'in') {
$user = $self->from;
} else {
@@ -1181,6 +1184,12 @@
qq{or ( direction ^out\$ and to ^$user ) ) };
owl::filter("$filter $ftext");
return $filter;
+ } elsif ($self->jtype eq 'groupchat') {
+ my $room = $self->room;
+ $filter = "jabber-room-$room";
+ $ftext = qq{type ^jabber\$ and room ^$room\$};
+ owl::filter("$filter $ftext");
+ return $filter;
}
}
