Basic conversion to POE::Component::IRC

[NDIRC.git] / Misc.pm

diff --git a/Misc.pm b/Misc.pm
index 6f923897b3c748edab1c84bd7246e68a2fbc0edc..bada45151b3df42dc46c3c60f289a7937021727d 100644 (file)
--- a/Misc.pm
+++ b/Misc.pm
@@ -49,7 +49,7 @@ sub parseCommand {
        my ($p,$command,$args) = ($msg =~ /^([.!~])(\S+)(?: (.+))?/);
 
        if ($msg =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}){
-               unless ($command){
+               if (!$command || $command =~ m{^http://}){
                        ($p,$command,$args) = ('.','addscan',$msg);
                }elsif($command ne 'addscan'){
                        parseCommand (".addscan $msg", $server, $nick, $address, $channel, $disp,$model)
@@ -61,10 +61,10 @@ sub parseCommand {
        my $reply_string;
        given ($p){
                when ('!'){
-                       $reply_string = "msg $nick";
+                       $reply_string = "privmsg $nick";
                }
                when ('~'){
-                       $reply_string = "msg $channel";
+                       $reply_string = "privmsg $channel";
                }
                default {
                        $reply_string = "notice $nick";