Changeset 3baf77f for perl/modules

Timestamp:

Jan 13, 2008, 6:10:44 PM (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:

e4db5ae

Parents:

1fd5041b

Message:

'motd' is a method of Net::IRC::Connection, don't clobber it

File:

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

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

@@ -16 +16 @@
 
 use base qw(Net::IRC::Connection Class::Accessor Exporter);
-__PACKAGE__->mk_accessors(qw(alias channels motd));
+__PACKAGE__->mk_accessors(qw(alias channels connected _motd));
 our @EXPORT_OK = qw(&is_private);
 
@@ -29 +29 @@
     $self->alias($alias);
     $self->channels([]);
-    $self->motd("");
+    $self->_motd("");
+    $self->connected(0);
     bless($self, $class);
 
     $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 });
@@ -57 +57 @@
 ############################### IRC callbacks ##################################
 ################################################################################
-
-sub on_connect {
-    my ($self, $evt) = @_;
-    BarnOwl::admin_message("IRC", "Connected to " . $self->server . " (" . $self->alias . ")");
-}
 
 sub new_message {
@@ -115 +110 @@
 sub on_motdstart {
     my ($self, $evt) = @_;
-    $self->motd(join "\n", cdr $evt->args);
+    $self->_motd(join "\n", cdr $evt->args);
 }
 
 sub on_motd {
     my ($self, $evt) = @_;
-    $self->motd(join "\n", $self->motd, cdr $evt->args);
+    $self->_motd(join "\n", $self->_motd, cdr $evt->args);
 }
 
 sub on_endofmotd {
     my ($self, $evt) = @_;
-    $self->motd(join "\n", $self->motd, cdr $evt->args);
-    BarnOwl::admin_message("IRC",
-            BarnOwl::Style::boldify('MOTD for ' . $evt->alias) . "\n"
-            . strip_irc_formatting($self->motd));
+    $self->_motd(join "\n", $self->_motd, cdr $evt->args);
+    if(!$self->connected) {
+        BarnOwl::admin_message("IRC", "Connected to " .
+                               $self->server . " (" . $self->alias . ")");
+        $self->connected(1);
+        
+    }
+    BarnOwl::admin_message("IRC",
+            BarnOwl::Style::boldify('MOTD for ' . $self->alias) . "\n"
+            . strip_irc_formatting($self->_motd));
 }