Changeset dcc3f80 for perl

Timestamp:

Oct 10, 2009, 9:24:41 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:

68ab07c

Parents:

69c3878 (diff), 32ad44d (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 'zephyr-fixes'

Location:

perl

Files:

• lib/BarnOwl.pm (modified) (1 diff)
• lib/BarnOwl/Zephyr.pm (added)
• modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (2 diffs)
• modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (3 diffs)
• modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)

perl/lib/BarnOwl.pm

@@ -32 +32 @@
 use BarnOwl::Message;
 use BarnOwl::Style;
+use BarnOwl::Zephyr;
 use BarnOwl::Timer;
 use BarnOwl::Editwin;

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

@@ -399 +399 @@
     $body =~ tr/\n\r/  /;
     if ($body =~ /^\/me (.*)/) {
-        $conn->conn->me($to, $1);
+        $conn->conn->me($to, Encode::encode('utf-8', $1));
         $body = '* '.$conn->nick.' '.$1;
     } else {
-        $conn->conn->privmsg($to, $body);
+        $conn->conn->privmsg($to, Encode::encode('utf-8', $body));
     }
     my $msg = BarnOwl::Message->new(
@@ -545 +545 @@
             $conn = get_connection_by_alias($alias);
         }
-        if(!$conn && $use_channel) {
+        if($use_channel) {
             $channel = $ARGV[0];
             if(defined($channel) && $channel =~ /^#/) {
                 if($channels{$channel} && @{$channels{$channel}} == 1) {
                     shift @ARGV;
-                    $conn = $channels{$channel}[0];
-                }  
+                    $conn = $channels{$channel}[0] unless $conn;
+                }
+            } elsif ($m && $m->type eq 'IRC' && !$m->is_private) {
+                $channel = $m->channel;
             } else {
-                if($m && $m->type eq 'IRC' && !$m->is_private) {
-                    $channel = $m->channel;
-                } else {
-                    undef $channel;
-                }
+                undef $channel;
             }
         }
+
         if(!$channel && $use_channel == REQUIRE_CHANNEL) {
             die("Usage: $cmd <channel>\n");

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

@@ -74 +74 @@
     $self->conn->add_handler(endofwhois=> sub { shift; $self->on_endofwhois(@_) });
     $self->conn->add_handler(mode      => sub { shift; $self->on_mode(@_) });
-
-    # * nosuchchannel
-    # * 
+    $self->conn->add_handler(nosuchchannel => sub { shift; $self->on_nosuchchannel(@_) });
 
     return $self;
@@ -204 +202 @@
     my $self = shift;
     delete $BarnOwl::Module::IRC::ircnets{$self->alias};
+    for my $k (keys %BarnOwl::Module::IRC::channels) {
+        my @conns = grep {$_ ne $self} @{$BarnOwl::Module::IRC::channels{$k}};
+        if(@conns) {
+            $BarnOwl::Module::IRC::channels{$k} = \@conns;
+        } else {
+            delete $BarnOwl::Module::IRC::channels{$k};
+        }
+    }
     BarnOwl::remove_dispatch($self->{FD});
     BarnOwl::admin_message('IRC',
@@ -282 +288 @@
                            join(" ", $evt->args) . "on " . $evt->to->[0]
                           );
+}
+
+sub on_nosuchchannel {
+    my ($self, $evt) = @_;
+    BarnOwl::admin_message("IRC",
+                           "[" . $self->alias . "] " .
+                           "No such channel: " . [$evt->args]->[1])
 }
 

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

@@ -321 +321 @@
               . "add <jid>     Adds <jid> to your roster.\n\n"
               . "unsub <jid>   Unsubscribe from <jid>'s presence.\n\n"
-              . "remove <jid>  Removes <jid> to your roster. (implicit unsub)\n\n"
+              . "remove <jid>  Removes <jid> from your roster. (implicit unsub)\n\n"
               . "auth <jid>    Authorizes <jid> to subscribe to your presence.\n\n"
               . "deauth <jid>  De-authorizes <jid>'s subscription to your presence.\n\n"