Changeset e0a5480

Timestamp:

Aug 8, 2013, 2:46:57 PM (10 years ago)

Author:

Jason Gross <jasongross9@gmail.com>

Parents:

ecd4edf (diff), 94eb15b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 94eb15beb3290e2797307eb19b018099aef7298a into ecd4edf8785a764941194e565a5129ce1bce8bee

File:

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

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

@@ -138 +138 @@
 argument listed above, and die if no channel argument can be found.
 
+=item C<CHANNEL_OR_USER>
+
+Pass the channel argument, but accept it if it's a username (e.g.
+has no hash).  Only relevant with C<CHANNEL_ARG>.
+
 =item C<CHANNEL_OPTIONAL>
 
@@ -154 +159 @@
 use constant CHANNEL_ARG        => 1;
 use constant CHANNEL_OPTIONAL   => 2;
-
-use constant ALLOW_DISCONNECTED => 4;
+use constant CHANNEL_OR_USER    => 4;
+
+use constant ALLOW_DISCONNECTED => 8;
 
 sub register_commands {
@@ -197 +203 @@
 
     BarnOwl::new_command(
-        'irc-msg' => mk_irc_command( \&cmd_msg ),
+        'irc-msg' => mk_irc_command( \&cmd_msg, CHANNEL_OR_USER|CHANNEL_ARG|CHANNEL_OPTIONAL ),
         {
             summary => 'Send an IRC message',
@@ -608 +614 @@
                     $conn ||= $c;
                 }
+            } elsif (defined($channel) && ($flags & CHANNEL_OR_USER)) {
+                shift @ARGV;
             } elsif ($m && $m->type eq 'IRC' && !$m->is_private) {
                 $channel = $m->channel;