Changeset dace02a for perl/modules/IRC/lib

Timestamp:

Apr 3, 2011, 3:06:02 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

ab6d8f0

Parents:

b9a642a

git-author:

Nelson Elhage <nelhage@mit.edu> (03/12/11 11:41:48)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/03/11 15:06:02)

Message:

Use AnyEvent::IRC::Client's channel tracking, instead our own.

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

• IRC.pm (modified) (6 diffs)
• IRC/Completion.pm (modified) (1 diff)
• IRC/Connection.pm (modified) (1 diff)

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

@@ -30 +30 @@
 # Hash alias -> BarnOwl::Module::IRC::Connection object
 our %ircnets;
-our %channels;
 
 sub startup {
@@ -96 +95 @@
         $list .= "\n";
 
-        for my $chan (keys %channels) {
-            next unless grep $_ eq $conn, @{$channels{$chan}};
+        for my $chan (keys %{$conn->conn->{channel_list}}) {
             $list .= "  $chan\n";
         }
@@ -466 +464 @@
     my $conn = shift;
     my $chan = shift or die("Usage: $cmd channel\n");
-    $channels{$chan} ||= [];
-    push @{$channels{$chan}}, $conn;
     $conn->conn->send_msg(join => $chan, @_);
     return;
@@ -476 +472 @@
     my $conn = shift;
     my $chan = shift;
-    $channels{$chan} = [grep {$_ ne $conn} @{$channels{$chan} || []}];
     $conn->conn->send_msg(part => $chan);
     return;
@@ -557 +552 @@
 ########################### Utilities/Helpers ##################################
 ################################################################################
+
+sub find_channel {
+    my $channel = shift;
+    my @found;
+    for my $conn (values %ircnets) {
+        if($conn->conn->{channel_list}{lc $channel}) {
+            push @found, $conn;
+        }
+    }
+    return $found[0] if(scalar @found == 1);
+}
 
 sub mk_irc_command {
@@ -580 +586 @@
             $channel = $ARGV[0];
             if(defined($channel) && $channel =~ /^#/) {
-                if($channels{$channel} && @{$channels{$channel}} == 1) {
+                if(my $c = find_channel($channel)) {
                     shift @ARGV;
-                    $conn = $channels{$channel}[0] unless $conn;
+                    $conn ||= $c;
                 }
             } elsif ($m && $m->type eq 'IRC' && !$m->is_private) {

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

@@ -11 +11 @@
 sub complete_networks { keys %BarnOwl::Module::IRC::ircnets }
 sub complete_dests    { keys %users, complete_channels() }
-sub complete_channels { keys %BarnOwl::Module::IRC::channels }
+sub complete_channels {
+    my %channels;
+    for my $conn (values %BarnOwl::Module::IRC::ircnets) {
+        for my $chan (keys %{$conn->conn->{channel_list}}) {
+            $channels{$chan} = 1;
+        }
+    }
+    return keys %channels;
+}
 sub complete_nicks    { keys %users }
 sub complete_servers  { keys %servers }

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

@@ -452 +452 @@
     my $backoff = shift;
 
-    $self->autoconnect_channels([keys(%{$self->channel_list})]);
+    $self->autoconnect_channels([keys(%{$self->{channel_list}})]);
     $self->conn->connect;
     if ($self->conn->connected) {