Changes in / [69c3878:e1e59a7]

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

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

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

@@ -545 +545 @@
             $conn = get_connection_by_alias($alias);
         }
-        if($use_channel) {
+        if(!$conn && $use_channel) {
             $channel = $ARGV[0];
             if(defined($channel) && $channel =~ /^#/) {
                 if($channels{$channel} && @{$channels{$channel}} == 1) {
                     shift @ARGV;
-                    $conn = $channels{$channel}[0] unless $conn;
+                    $conn = $channels{$channel}[0];
+                }  
+            } else {
+                if($m && $m->type eq 'IRC' && !$m->is_private) {
+                    $channel = $m->channel;
+                } else {
+                    undef $channel;
                 }
-            } elsif ($m && $m->type eq 'IRC' && !$m->is_private) {
-                $channel = $m->channel;
-            } else {
-                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(@_) });
-    $self->conn->add_handler(nosuchchannel => sub { shift; $self->on_nosuchchannel(@_) });
+
+    # * nosuchchannel
+    # * 
 
     return $self;
@@ -202 +204 @@
     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',
@@ -288 +282 @@
                            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])
 }