Changes in perl/modules/IRC/lib/BarnOwl/Module/IRC.pm [6286f26:b38b0b2]

File:

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

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

@@ -6 +6 @@
 =head1 NAME
 
-BarnOwl::Module::IRC
+BarnOwl::Module::Jabber
 
 =head1 DESCRIPTION
 
-This module implements IRC support for barnowl.
+This module implements Jabber support for barnowl.
 
 =cut
@@ -17 +17 @@
 use BarnOwl::Hooks;
 use BarnOwl::Message::IRC;
-use BarnOwl::Module::IRC::Connection qw(is_private);
+use BarnOwl::Module::IRC::Connection;
 
 use Net::IRC;
 use Getopt::Long;
 
-our $VERSION = 0.02;
+our $VERSION = 0.01;
 
 our $irc;
@@ -30 +30 @@
 
 sub startup {
-    BarnOwl::new_variable_string('irc:nick', {default => $ENV{USER}});
-    BarnOwl::new_variable_string('irc:user', {default => $ENV{USER}});
-    BarnOwl::new_variable_string('irc:name', {default => ""});
-    BarnOwl::new_variable_bool('irc:spew', {default => 0});
+    BarnOwl::new_variable_string(ircnick => {default => $ENV{USER}});
+    BarnOwl::new_variable_string(ircuser => {default => $ENV{USER}});
+    BarnOwl::new_variable_string(ircname => {default => ""});
     register_commands();
     register_handlers();
@@ -41 +40 @@
 sub shutdown {
     for my $conn (values %ircnets) {
-        $conn->disconnect();
+        $conn->disconnect;
     }
 }
@@ -64 +63 @@
     BarnOwl::new_command('irc-disconnect' => \&cmd_disconnect);
     BarnOwl::new_command('irc-msg'     => \&cmd_msg);
-    BarnOwl::new_command('irc-join' => \&cmd_join);
-    BarnOwl::new_command('irc-nick' => \&cmd_nick);
 }
 
@@ -79 +76 @@
     my $cmd = shift;
 
-    my $nick = BarnOwl::getvar('irc:nick');
-    my $username = BarnOwl::getvar('irc:user');
-    my $ircname = BarnOwl::getvar('irc:name');
+    my $nick = BarnOwl::getvar('ircnick');
+    my $username = BarnOwl::getvar('ircuser');
+    my $ircname = BarnOwl::getvar('ircname');
     my $host;
     my $port;
@@ -93 +90 @@
             "alias=s"    => \$alias,
             "ssl"        => \$ssl,
-            "password=s" => \$password,
-            "port=i"     => \$port,
-        );
+            "password=s" => \$password);
         $host = shift @ARGV or die("Usage: $cmd HOST\n");
         if(!$alias) {
@@ -131 +126 @@
     my $conn = get_connection(\@_);
     my $to = shift or die("Usage: $cmd NICK\n");
-    # handle multiple recipients?
     if(@_) {
         process_msg($conn, $to, join(" ", @_));
@@ -154 +148 @@
         body        => $body,
         sender      => $conn->nick,
-        is_private($to) ?
-          (isprivate  => 'true') : (channel => $to),
+        isprivate   => 'true',
         replycmd    => "irc-msg $to",
-        replysendercmd => "irc-msg $to"
+        replysendercmd => "irc-msg " . $conn->nick
        );
     BarnOwl::queue_message($msg);
 }
 
-sub cmd_join {
-    my $cmd = shift;
-    my $conn = get_connection(\@_);
-    my $chan = shift or die("Usage: $cmd channel\n");
-    $conn->join($chan);
-}
-
-sub cmd_nick {
-    my $cmd = shift;
-    my $conn = get_connection(\@_);
-    my $nick = shift or die("Usage: $cmd <new nick>");
-    $conn->nick($nick);
-}
 
 ################################################################################
@@ -197 +177 @@
 
 sub get_connection_by_alias {
-    my $key = shift;
-    die("No such ircnet: $key\n") unless exists $ircnets{$key};
+    die("No such ircnet: $alias\n") unless exists $ircnets{$key};
     return $ircnets{$key};
 }