Changeset eab7a4c for perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

Timestamp:

Jan 14, 2008, 12:24:43 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:

ff13a6f

Parents:

e4db5ae

Message:

Right, _connected doesn't work either. I think I need to refactor this
to not be a subclass...

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 _connected _motd));
+__PACKAGE__->mk_accessors(qw(alias channels owl_connected owl_motd));
 our @EXPORT_OK = qw(&is_private);
 
@@ -29 +29 @@
     $self->alias($alias);
     $self->channels([]);
-    $self->_motd("");
-    $self->_connected(0);
+    $self->owl_motd("");
+    $self->owl_connected(0);
     bless($self, $class);
 
@@ -110 +110 @@
 sub on_motdstart {
     my ($self, $evt) = @_;
-    $self->_motd(join "\n", cdr $evt->args);
+    $self->owl_motd(join "\n", cdr $evt->args);
 }
 
 sub on_motd {
     my ($self, $evt) = @_;
-    $self->_motd(join "\n", $self->_motd, cdr $evt->args);
+    $self->owl_motd(join "\n", $self->owl_motd, cdr $evt->args);
 }
 
 sub on_endofmotd {
     my ($self, $evt) = @_;
-    $self->_motd(join "\n", $self->_motd, cdr $evt->args);
-    if(!$self->_connected) {
+    $self->owl_motd(join "\n", $self->owl_motd, cdr $evt->args);
+    if(!$self->owl_connected) {
         BarnOwl::admin_message("IRC", "Connected to " .
                                $self->server . " (" . $self->alias . ")");
-        $self->_connected(1);
+        $self->owl_connected(1);
         
     }
     BarnOwl::admin_message("IRC",
             BarnOwl::Style::boldify('MOTD for ' . $self->alias) . "\n"
-            . strip_irc_formatting($self->_motd));
+            . strip_irc_formatting($self->owl_motd));
 }
 
@@ -163 +163 @@
                            "[" . $self->alias . "] " .
                            [$evt->args]->[1] . ": Nick already in use");
+    unless($self->owl_connected) {
+        $self->disconnect;
+    }
 }