[807] in BarnOwl Developers
[D-O-H] r808 - / branches/barnowl_sqlite branches/barnowl_unicode branches/par trunk trunk/owl/perl/modules/IRC/lib/BarnOwl/Message trunk/owl/perl/modules/IRC/lib/BarnOwl/Module trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:09:56 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: Wed, 9 Jan 2008 00:26:15 -0500 (EST)
Author: nelhage
Date: 2008-01-09 00:26:15 -0500 (Wed, 09 Jan 2008)
New Revision: 808
Modified:
/
branches/barnowl_sqlite/
branches/barnowl_unicode/
branches/par/
trunk/
trunk/owl/perl/modules/IRC/lib/BarnOwl/Message/IRC.pm
trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
Log:
r27173@lunatique: nelhage | 2008-01-09 00:25:13 -0500
Implement smartnarrow on channels
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:25595
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:22510
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:27173
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/barnowl:22510
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:18636
Property changes on: branches/barnowl_sqlite
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19588
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19588
fe09232e-8620-0410-8e36-e6b4839e121d:/trunk:598
Property changes on: branches/barnowl_unicode
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19588
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:19588
fe09232e-8620-0410-8e36-e6b4839e121d:/trunk:598
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Message/IRC.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Message/IRC.pm 2008-01-09 05:25:56 UTC (rev 807)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Message/IRC.pm 2008-01-09 05:26:15 UTC (rev 808)
@@ -35,13 +35,19 @@
BarnOwl::filter("$filter $ftext");
return $filter;
} else {
- # Unimplemented
- return undef;
+ # To a Channel
+ my $network = $self->network;
+ my $channel = $self->channel;
+ my $filter = "irc-$network-channel-$channel";
+ my $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$};
+ BarnOwl::filter("$filter $ftext");
+ return $filter;
}
}
sub server {shift->{server}}
sub network {shift->{network}}
+sub channel {shift->{channel}}
# display
sub context {shift->{network};}
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-01-09 05:25:56 UTC (rev 807)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-01-09 05:26:15 UTC (rev 808)
@@ -66,7 +66,7 @@
$evt->type eq 'notice' ?
(notice => 'true') : (),
is_private($recipient) ?
- (isprivate => 'true') : (),
+ (isprivate => 'true') : (channel => $recipient),
replycmd => 'irc-msg ' .
(is_private($recipient) ? $evt->nick : $recipient),
replysendercmd => 'irc-msg ' . $evt->nick,
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-01-09 05:25:56 UTC (rev 807)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-01-09 05:26:15 UTC (rev 808)
@@ -153,7 +153,7 @@
body => $body,
sender => $conn->nick,
is_private($to) ?
- (isprivate => 'true') : (),
+ (isprivate => 'true') : (channel => $to),
replycmd => "irc-msg $to",
replysendercmd => "irc-msg $to"
);
