Changeset 8a22ff2

Timestamp:

Mar 30, 2013, 7:37:11 PM (11 years ago)

Author:

William Throwe <wtt6@cornell.edu>

Children:

55758dc

Parents:

0a6a2d6

git-author:

William Throwe <wtt6@cornell.edu> (03/30/13 19:16:22)

git-committer:

William Throwe <wtt6@cornell.edu> (03/30/13 19:37:11)

Message:

Make the -a option to irc-msg more optional

The code now tries to determine the alias from the #channel argument
if one is provided.

File:

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

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

@@ -134 +134 @@
 with C<CHANNEL_ARG>.
 
+=item C<CHANNEL_EXPLICIT>
+
+Do not determine the channel from the current message. Only relevant
+with C<CHANNEL_ARG>.
+
 =item C<ALLOW_DISCONNECTED>
 
@@ -145 +150 @@
 use constant CHANNEL_ARG        => 1;
 use constant CHANNEL_OPTIONAL   => 2;
-
-use constant ALLOW_DISCONNECTED => 4;
+use constant CHANNEL_EXPLICIT   => 4;
+
+use constant ALLOW_DISCONNECTED => 8;
 
 sub register_commands {
@@ -188 +194 @@
 
     BarnOwl::new_command(
-        'irc-msg' => mk_irc_command( \&cmd_msg ),
+        'irc-msg' => mk_irc_command( \&cmd_msg, CHANNEL_ARG|CHANNEL_OPTIONAL|CHANNEL_EXPLICIT ),
         {
             summary => 'Send an IRC message',
-            usage   => 'irc-msg [-a ALIAS] DESTINATION MESSAGE',
+            usage   => 'irc-msg [-a ALIAS] DESTINATION [MESSAGE]',
 
             description => <<END_DESCR
@@ -407 +413 @@
     my $cmd  = shift;
     my $conn = shift;
-    my $to = shift or die("Usage: $cmd [NICK|CHANNEL]\n");
+    my $to = shift || shift or die("Usage: $cmd [NICK|CHANNEL]\n");
     # handle multiple recipients?
     if(@_) {
@@ -587 +593 @@
             $channel = $ARGV[0];
             if(defined($channel) && $channel =~ /^#/) {
+                shift @ARGV;
                 if(my $c = find_channel($channel)) {
-                    shift @ARGV;
                     $conn ||= $c;
                 }
-            } elsif ($m && $m->type eq 'IRC' && !$m->is_private) {
+            } elsif (!($flags & CHANNEL_EXPLICIT) &&
+                     $m && $m->type eq 'IRC' && !$m->is_private) {
                 $channel = $m->channel;
             } else {