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

Timestamp:

Jul 24, 2008, 1:55:35 AM (16 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

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

Children:

4789b17

Parents:

38cfdb5d

Message:

IRC: Support for displaying :irc-whois replies, and various bugfixes.

File:

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

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

@@ -45 +45 @@
     $self->motd("");
     $self->connected(0);
-    $self->names_tmp([]);
+    $self->names_tmp(0);
     $self->whois_tmp("");
 
@@ -71 +71 @@
     $self->conn->add_handler(namreply  => sub { shift; $self->on_namreply(@_) });
     $self->conn->add_handler(endofnames=> sub { shift; $self->on_endofnames(@_) });
+    $self->conn->add_handler(endofwhois=> sub { shift; $self->on_endofwhois(@_) });
 
     return $self;
@@ -132 +133 @@
             BarnOwl::Style::boldify('IRC ' . $evt->type . ' message from '
                 . $self->alias) . "\n"
-            . strip_irc_formatting(join '\n', $evt->args));
+            . strip_irc_formatting(join ' ', cdr($evt->args)));
 }
 
@@ -164 +165 @@
         loginout   => 'login',
         channel    => $evt->to,
-        replycmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick,
+        replycmd => 'irc-msg -a ' . $self->alias . ' ' . join(' ', $evt->to),
         replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
         );
@@ -175 +176 @@
         loginout   => 'logout',
         channel    => $evt->to,
-        replycmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick,
+        replycmd => 'irc-msg -a ' . $self->alias . ' ' . join(' ', $evt->to),
         replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
         );
@@ -218 +219 @@
 }
 
+# IRC gives us a bunch of namreply messages, followed by an endofnames.
+# We need to collect them from the namreply and wait for the endofnames message.
+# After this happens, the names_tmp variable is cleared.
+
+sub on_namreply {
+    my ($self, $evt) = @_;
+    return unless $self->names_tmp;
+    $self->names_tmp([@{$self->names_tmp}, split(' ', [$evt->args]->[3])]);
+}
+
+sub on_endofnames {
+    my ($self, $evt) = @_;
+    return unless $self->names_tmp;
+    my $names = BarnOwl::Style::boldify("Members of " . [$evt->args]->[1] . ":\n");
+    for my $name (@{$self->names_tmp}) {
+        $names .= "  $name\n";
+    }
+    BarnOwl::popless_ztext($names);
+    $self->names_tmp(0);
+}
+
+sub on_whois {
+    my ($self, $evt) = @_;
+    $self->whois_tmp(
+      $self->whois_tmp . "\n" . $evt->type . ":\n  " .
+      join("\n  ", cdr(cdr($evt->args))) . "\n"
+    );
+}
+
+sub on_endofwhois {
+    my ($self, $evt) = @_;
+    BarnOwl::popless_ztext(
+        BarnOwl::Style::boldify("/whois for " . [$evt->args]->[1] . ":\n") .
+        $self->whois_tmp
+    );
+    $self->whois_tmp([]);
+}
+
 sub on_event {
     my ($self, $evt) = @_;
+    return on_whois(@_) if ($evt->type =~ /^whois/);
     BarnOwl::admin_message("IRC",
             "[" . $self->alias . "] Unhandled IRC event of type " . $evt->type . ":\n"
             . strip_irc_formatting(join("\n", $evt->args)))
         if BarnOwl::getvar('irc:spew') eq 'on';
-}
-
-# IRC gives us a bunch of namreply messages, followed by an endofnames.
-# We need to collect them from the namreply and wait for the endofnames message.
-# After this happens, the names_tmp variable is cleared.
-
-sub on_namreply {
-    my ($self, $evt) = @_;
-    $self->names_tmp([@{$self->names_tmp}, split(' ', [$evt->args]->[3])]);
-}
-
-sub on_endofnames {
-    my ($self, $evt) = @_;
-    my $names = BarnOwl::Style::boldify("Members of " . [$evt->args]->[1] . ":\n");
-    for my $name (@{$self->names_tmp}) {
-        $names .= "  $name\n";
-    }
-    BarnOwl::popless_ztext($names);
-    $self->names_tmp([]);
 }