Changeset d6bc343 for perl/modules/IRC/lib/BarnOwl/Module/IRC

Timestamp:

Aug 8, 2013, 3:52:05 PM (11 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Parents:

ecd4edf (diff), 76e80de (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 76e80dee6b4f058b982a12b57bc4ec5220eb2e13 into ecd4edf8785a764941194e565a5129ce1bce8bee

Location:

perl/modules/IRC/lib/BarnOwl/Module/IRC

Files:

• Completion.pm (modified) (2 diffs)
• Connection.pm (modified) (4 diffs)

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

@@ -57 +57 @@
 }
 
+sub complete_irc_join_part {
+    my $ctx = shift;
+    return complete_flags($ctx,
+        [qw(-t)],
+        {
+            "-a" => \&complete_networks,
+        },
+        \&complete_channels
+       );
+}
+
 sub complete_irc_channel {
     my $ctx = shift;
@@ -95 +106 @@
 BarnOwl::Completion::register_completer('irc-msg'        => \&complete_irc_dest);
 BarnOwl::Completion::register_completer('irc-mode'       => \&complete_irc_dest);
-BarnOwl::Completion::register_completer('irc-join'       => \&complete_irc_channel);
-BarnOwl::Completion::register_completer('irc-part'       => \&complete_irc_channel);
+BarnOwl::Completion::register_completer('irc-join'       => \&complete_irc_join_part);
+BarnOwl::Completion::register_completer('irc-part'       => \&complete_irc_join_part);
 BarnOwl::Completion::register_completer('irc-names'      => \&complete_irc_channel);
 BarnOwl::Completion::register_completer('irc-whois'      => \&complete_irc_nick);

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

@@ -39 +39 @@
     my $self = bless({}, $class);
     $self->conn($conn);
-    $self->autoconnect_channels([]);
+    # TODO(jgross): use // when we move to requiring perl 5.10
+    $self->autoconnect_channels(defined $args->{autoconnect_channels} ? $args->{autoconnect_channels} : []);
     $self->alias($alias);
     $self->server($host);
@@ -412 +413 @@
         $self->{reconnect_timer}->stop;
     }
-    $self->{reconnect_timer} = 
+    $self->{reconnect_timer} =
         BarnOwl::Timer->new( {
             name  => 'IRC (' . $self->alias . ') reconnect_timer',
@@ -445 +446 @@
             $self->conn->send_msg(join => $c);
         }
-        $self->autoconnect_channels([]);
     }
     $self->conn->enable_ping(60, sub {
@@ -458 +458 @@
     my $backoff = $self->backoff;
 
-    $self->autoconnect_channels([keys(%{$self->{channel_list}})]);
     $self->conn->connect(@{$self->connect_args});
 }