Changes in perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm [0e52069:b38b0b2]

File:

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

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

@@ -15 +15 @@
 =cut
 
-use base qw(Net::IRC::Connection Class::Accessor Exporter);
+use base qw(Net::IRC::Connection Class::Accessor);
 __PACKAGE__->mk_accessors(qw(alias channels));
-our @EXPORT_OK = qw(&is_private);
 
 use BarnOwl;
@@ -31 +30 @@
     bless($self, $class);
 
-    $self->add_global_handler(376 => sub { goto &on_connect });
-    $self->add_global_handler(['msg', 'notice', 'public', 'caction'],
-            sub { goto &on_msg });
-    $self->add_global_handler(cping => sub { goto &on_ping });
+    $self->add_global_handler(endofmotd => sub { goto &on_connect });
+    $self->add_global_handler(msg => sub { goto &on_msg });
+    $self->add_global_handler(notice => sub { goto &on_msg });
     $self->add_default_handler(sub { goto &on_event; });
 
@@ -51 +49 @@
 sub on_msg {
     my ($self, $evt) = @_;
-    my ($recipient) = $evt->to;
-    my $body = strip_irc_formatting([$evt->args]->[0]);
-    $body = BarnOwl::Style::boldify($evt->nick.' '.$body) if $evt->type eq 'caction';
+    my $replycmd = "irc-msg " . $evt->nick;
     my $msg = BarnOwl::Message->new(
         type        => 'IRC',
@@ -59 +55 @@
         server      => $self->server,
         network     => $self->alias,
-        recipient   => $recipient,
-        body        => $body,
+        recipient   => $self->nick,
+        body        => strip_irc_formatting([$evt->args]->[0]),
         sender      => $evt->nick,
         hostname    => $evt->host,
         from        => $evt->from,
-        $evt->type eq 'notice' ?
-          (notice     => 'true') : (),
-        is_private($recipient) ?
-          (isprivate  => 'true') : (channel => $recipient),
-        replycmd    => 'irc-msg ' .
-            (is_private($recipient) ? $evt->nick : $recipient),
-        replysendercmd => 'irc-msg ' . $evt->nick,
+        notice      => $evt->type eq 'notice' ? 'true' : '',
+        isprivate   => 'true',
+        replycmd    => $replycmd,
+        replysendercmd => $replycmd
        );
     BarnOwl::queue_message($msg);
-}
-
-sub on_ping {
-    my ($self, $evt) = @_;
-    $self->ctcp_reply($evt->nick, join (' ', ($evt->args)));
-}
-
-sub on_event {
-    my ($self, $evt) = @_;
-    BarnOwl::admin_message("IRC",
-            "Unhandled IRC event of type " . $evt->type . ":\n"
-            . strip_irc_formatting(join("\n", $evt->args)))
-        if BarnOwl::getvar('irc:spew') eq 'on';
 }
 
@@ -103 +83 @@
 }
 
-# Determines if the given message recipient is a username, as opposed to
-# a channel that starts with # or &.
-sub is_private {
-    return shift !~ /^[\#\&]/;
-}
 
 1;