Changeset 618a980 for perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

Timestamp:

Dec 23, 2009, 5:42:08 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

36a16fc

Parents:

0cfa6ee

git-author:

Alex Vandiver <alexmv@mit.edu> (12/20/09 01:11:03)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/23/09 17:42:08)

Message:

irc-disconnect on a pending reconnect should cancel the reconnect

File:

• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (2 diffs)

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

@@ -167 +167 @@
 
     BarnOwl::new_command(
-        'irc-disconnect' => mk_irc_command( \&cmd_disconnect ),
+        'irc-disconnect' => \&cmd_disconnect,
         {
             summary => 'Disconnect from an IRC server',
@@ -391 +391 @@
 
 sub cmd_disconnect {
-    my $cmd = shift;
-    my $conn = shift;
-    $conn->conn->disconnect;
-    return;
+    # Such a hack
+    local *get_connection_by_alias = sub {
+        my $key = shift;
+        return $ircnets{$key} if exists $ircnets{$key};
+        return $reconnect{$key}{conn} if exists $reconnect{$key};
+        die("No such ircnet: $key\n");
+    };
+
+    mk_irc_command(
+        sub {
+            my $cmd = shift;
+            my $conn = shift;
+            if ($conn->conn->connected) {
+                $conn->conn->disconnect;
+            } elsif ($reconnect{$conn->alias}) {
+                BarnOwl::admin_message('IRC',
+                                       "[" . $conn->alias . "] Reconnect cancelled");
+                delete $reconnect{$conn->alias};
+            }
+        }
+    )->(@_);
 }