Changeset 130633c for perl

Timestamp:

Jul 17, 2009, 9:46:45 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

2f2a643, f9c93cd

Parents:

a52d13a (diff), c08a725 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'automake'

Conflicts:
	Makefile.in
	libfaim/Makefile.in
	owl.h

Location:

perl

Files:

• modules/Makefile.in (added)
• lib/BarnOwl.pm (modified) (2 diffs)
• lib/BarnOwl/Editwin.pm (added)
• lib/BarnOwl/Message.pm (modified) (1 diff)
• lib/BarnOwl/Message/Zephyr.pm (modified) (1 diff)
• lib/BarnOwl/Style/Default.pm (modified) (2 diffs)
• modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (16 diffs)
• modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (1 diff)

perl/lib/BarnOwl.pm

@@ -18 +18 @@
 use BarnOwl::Style;
 use BarnOwl::Timer;
+use BarnOwl::Editwin;
 
 =head1 NAME
@@ -316 +317 @@
 }
 
+=head2 Modify filters by appending text
+
+=cut
+
+BarnOwl::new_command("filterappend",
+    sub { filter_append_helper('appending', '', @_); },
+    {
+        summary => "append '<text>' to filter",
+        usage => "filterappend <filter> <text>",
+    });
+
+BarnOwl::new_command("filterand",
+    sub { filter_append_helper('and-ing', 'and', @_); },
+    {
+        summary => "append 'and <text>' to filter",
+        usage => "filterand <filter> <text>",
+    });
+
+BarnOwl::new_command("filteror",
+    sub { filter_append_helper('or-ing', 'or', @_); },
+    {
+        summary => "append 'or <text>' to filter",
+        usage => "filteror <filter> <text>",
+    });
+
+=head3 filter_append_helper ACTION SEP FUNC FILTER APPEND_TEXT
+
+Helper to append to filters.
+
+=cut
+
+sub filter_append_helper
+{
+    my $action = shift;
+    my $sep = shift;
+    my $func = shift;
+    my $filter = shift;
+    my @append = @_;
+    my $oldfilter = BarnOwl::getfilter($filter);
+    chomp $oldfilter;
+    my $newfilter = join(' ', $oldfilter, $sep, @_);
+    my $msgtext = "To filter '$filter' $action\n'".join(' ', @append)."' to get\n'$newfilter'";
+    if (BarnOwl::getvar('showfilterchange') eq 'on') {
+        BarnOwl::admin_message("Filter", $msgtext);
+    }
+    BarnOwl::filter($filter, $newfilter);
+    return;
+}
+BarnOwl::new_variable_bool("showfilterchange",
+                           { default => 1,
+                             summary => 'Show modifications to filters by filterappend and friends.'});
 
 1;

perl/lib/BarnOwl/Message.pm

@@ -22 +22 @@
 sub direction   { return shift->{"direction"}; }
 sub time        { return shift->{"time"}; }
+sub unix_time   { return shift->{"unix_time"}; }
 sub id          { return shift->{"id"}; }
 sub body        { return shift->{"body"}; }

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -179 +179 @@
 
     my $cmd;
-    if(lc $self->opcode eq 'crypt') {
+    if(lc $self->opcode eq 'crypt' and ( not $sender or $self->is_private)) {
+        # Responses to zcrypted messages should be zcrypted, so long as we
+        # aren't switching to personals
         $cmd = 'zcrypt';
     } else {

perl/lib/BarnOwl/Style/Default.pm

@@ -3 +3 @@
 
 package BarnOwl::Style::Default;
+use POSIX qw(strftime);
+
 ################################################################################
 # Branching point for various formatting functions in this style.
@@ -40 +42 @@
     my $self = shift;
     my $m = shift;
-    my ($time) = $m->time =~ /(\d\d:\d\d)/;
-    return $time;
+    return strftime('%H:%M', localtime($m->unix_time));
 }
 

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

@@ -60 +60 @@
     register_commands();
     register_handlers();
-    BarnOwl::filter('irc type ^IRC$');
+    BarnOwl::filter('irc type ^IRC$ or ( type ^admin$ and adminheader ^IRC$ )');
 }
 
@@ -375 +375 @@
     $conn->conn->disconnect;
     delete $ircnets{$conn->alias};
+    return;
 }
 
@@ -387 +388 @@
         BarnOwl::start_edit_win("/msg -a " . $conn->alias . " $to", sub {process_msg($conn, $to, @_)});
     }
+    return;
 }
 
@@ -415 +417 @@
        );
     BarnOwl::queue_message($msg);
+    return;
 }
 
@@ -423 +426 @@
     $target ||= shift;
     $conn->conn->mode($target, @_);
+    return;
 }
 
@@ -432 +436 @@
     push @{$channels{$chan}}, $conn;
     $conn->conn->join($chan, @_);
+    return;
 }
 
@@ -440 +445 @@
     $channels{$chan} = [grep {$_ ne $conn} @{$channels{$chan} || []}];
     $conn->conn->part($chan);
+    return;
 }
 
@@ -447 +453 @@
     my $nick = shift or die("Usage: $cmd <new nick>\n");
     $conn->conn->nick($nick);
+    return;
 }
 
@@ -455 +462 @@
     $conn->names_tmp([]);
     $conn->conn->names($chan);
+    return;
 }
 
@@ -462 +470 @@
     my $who = shift || die("Usage: $cmd <user>\n");
     $conn->conn->whois($who);
+    return;
 }
 
@@ -468 +477 @@
     my $conn = shift;
     $conn->conn->motd;
+    return;
 }
 
@@ -477 +487 @@
     }
     BarnOwl::popless_ztext($message);
+    return;
 }
 
@@ -485 +496 @@
     BarnOwl::error("WHO $cmd $conn $who");
     $conn->conn->who($who);
+    return;
 }
 
@@ -492 +504 @@
     my $type = shift || die("Usage: $cmd <chiklmouy> [server] \n");
     $conn->conn->stats($type, @_);
+    return;
 }
 
@@ -499 +512 @@
     my $chan = shift;
     $conn->conn->topic($chan, @_ ? join(" ", @_) : undef);
+    return;
 }
 
@@ -505 +519 @@
     my $conn = shift;
     $conn->conn->sl(join(" ", @_));
+    return;
 }
 

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -273 +273 @@
         $self->whois_tmp
     );
-    $self->whois_tmp([]);
+    $self->whois_tmp('');
 }