Changeset 9e02bb7 for perl/modules/IRC/lib/BarnOwl/Module/IRC

Timestamp:

Jan 11, 2008, 1:38:50 AM (17 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

fe8cad8, 61abb18

Parents:

b0c8011

Message:

Handle `nickinuse' errors and disconnects

File:

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

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

@@ -32 +32 @@
     bless($self, $class);
 
-    $self->add_global_handler(376 => sub { goto &on_connect });
-    $self->add_global_handler(['msg', 'notice', 'public', 'caction'],
+    $self->add_default_handler(sub { goto &on_event; });
+    $self->add_handler(376 => sub { goto &on_connect });
+    $self->add_handler(['msg', 'notice', 'public', 'caction'],
             sub { goto &on_msg });
-    $self->add_global_handler(['welcome', 'yourhost', 'created',
+    $self->add_handler(['welcome', 'yourhost', 'created',
             'luserclient', 'luserop', 'luserchannels', 'luserme'],
             sub { goto &on_admin_msg });
-    $self->add_global_handler(['myinfo', 'map', 'n_local', 'n_global',
+    $self->add_handler(['myinfo', 'map', 'n_local', 'n_global',
             'luserconns'],
             sub { });
-    $self->add_handler(375 => sub { goto &on_motdstart });
-    $self->add_handler(372 => sub { goto &on_motd });
-    $self->add_handler(376 => sub { goto &on_endofmotd });
-    $self->add_global_handler(cping => sub { goto &on_ping });
-    $self->add_global_handler(join  => sub { goto &on_join });
-    $self->add_global_handler(part  => sub { goto &on_part });
-    $self->add_default_handler(sub { goto &on_event; });
+    $self->add_handler(motdstart => sub { goto &on_motdstart });
+    $self->add_handler(motd      => sub { goto &on_motd });
+    $self->add_handler(endofmotd => sub { goto &on_endofmotd });
+    $self->add_handler(join      => sub { goto &on_join });
+    $self->add_handler(part      => sub { goto &on_part });
+    $self->add_handler(disconnect => sub { goto &on_disconnect });
+    $self->add_handler(nicknameinuse => sub { goto &on_nickinuse });
+    $self->add_handler(cping     => sub { goto &on_ping });
 
     return $self;
@@ -147 +149 @@
 }
 
+sub on_disconnect {
+    my $self = shift;
+    delete $BarnOwl::Module::IRC::ircnets{$self->alias};
+
+    BarnOwl::admin_message('IRC',
+                           "[" . $self->alias . "] Disconnected from server");
+}
+
+sub on_nickinuse {
+    my ($self, $evt) = @_;
+    BarnOwl::admin_message("IRC",
+                           "[" . $self->alias . "] " .
+                           [$evt->args]->[1] . ": Nick already in use");
+}
+
 sub on_event {
     my ($self, $evt) = @_;
@@ -154 +171 @@
         if BarnOwl::getvar('irc:spew') eq 'on';
 }
+
 
 ################################################################################