allow -host <nick> <invalid mask>

[infobot.git] / src / Modules / UserDCC.pl

diff --git a/src/Modules/UserDCC.pl b/src/Modules/UserDCC.pl
index f287c76e89e7ebb9fa9f6f77ab859e05aa8b2979..22c244809f582f1def712a2a62a139ebf36ff0d0 100644 (file)
--- a/src/Modules/UserDCC.pl
+++ b/src/Modules/UserDCC.pl
@@ -22,7 +22,7 @@ sub userDCC {
     # quit.
     if ($message =~ /^(exit|quit)$/i) {
        # do ircII clients support remote close? if so, cool!
-       &status("userDCC: quit called. FIXME");
+       &FIXME("userDCC: quit called.");
        &dcc_close($who);
        &status("userDCC: after dcc_close!");
 
@@ -339,7 +339,7 @@ sub userDCC {
 
        &DEBUG("chan => '$1', msg => '$msg'.");
 
-       # todo: add nick destination.
+       # TODO: add nick destination.
        if (&validChan($chan)) {
            &msg($chan, $msg);
        } else {
@@ -349,6 +349,23 @@ sub userDCC {
        return;
     }
 
+    # do.
+    if ($message =~ s/^do\s+(\S+)\s+(.*)//) {
+       return unless (&hasFlag("o"));
+       my ($chan,$msg) = (lc $1, $2);
+
+       &DEBUG("chan => '$1', msg => '$msg'.");
+
+       # TODO: add nick destination.
+       if (&validChan($chan)) {
+           &action($chan, $msg);
+       } else {
+           &msg($who,"i'm not on \002$chan\002, sorry.");
+       }
+
+       return;
+    }
+
     # die.
     if ($message =~ /^die$/) {
        return unless (&hasFlag("n"));
@@ -568,7 +585,7 @@ sub userDCC {
            }
 
            foreach (keys %vals) {
-               &pSReply("  $what = $_: ".join(' ', keys %{ $vals{$_} } ) );
+               &pSReply("  $what = $_(" . scalar(keys %{$vals{$_}}) . "): ".join(' ', keys %{ $vals{$_} } ) );
            }
 
            &pSReply("End of list.");
@@ -581,13 +598,17 @@ sub userDCC {
            &DEBUG("showing channel conf.");
 
            foreach $chan (@chans) {
-               &pSReply("chan: $chan (will also use _default)");
+               if ($chan eq '_default') {
+                   &pSReply("Default channel settings");
+               } else {
+                   &pSReply("chan: $chan (see _default also)");
+               }
                my @items;
                my $str = "";
                foreach (sort keys %{ $chanconf{$chan} }) {
                    my $newstr = join(', ', @items);
                    ### TODO: make length use channel line limit?
-                   if (length $newstr > 400) {
+                   if (length $newstr > 370) {
                        &pSReply(" $str");
                        @items = ();
                    }
@@ -702,8 +723,8 @@ sub userDCC {
            return;
        }
 
-       my $u           = &getUser($who);
-       my $crypt       = &mkcrypt($args[0]);
+       my $u = &getUser($who);
+       my $crypt = &mkcrypt($args[0]);
 
        &pSReply("Set your passwd to '$crypt'");
        $users{$u}{PASS} = $crypt;
@@ -733,7 +754,8 @@ sub userDCC {
            return;
        }
 
-       if (scalar @args == 1) {        # del pass.
+       if (scalar @args == 1) {
+           # del pass.
            if (!&IsFlag("n") and $who !~ /^\Q$verifyUser\E$/i) {
                &pSReply("cannot remove passwd of others.");
                return;
@@ -774,10 +796,12 @@ sub userDCC {
 
        my $chflag;
        my $user;
-       if ($args[0] =~ /^$mask{nick}$/i) {     # <nick>
+       if ($args[0] =~ /^$mask{nick}$/i) {
+           # <nick>
            $user       = &getUser($args[0]);
            $chflag     = $args[1];
-       } else {                                # <flags>
+       } else {
+           # <flags>
            $user       = &getUser($who);
            &DEBUG("user $who... nope.") unless (defined $user);
            $user       = &getUser($verifyUser);
@@ -921,7 +945,7 @@ sub userDCC {
            $user       = &getUser($args[0]);
            $mask       = $args[1];
        } else {                                # <mask>
-           # who or verifyUser. FIXME (don't remember why)
+           # FIXME: who or verifyUser. (don't remember why)
            $user       = &getUser($who);
            $mask       = $args[0];
        }
@@ -932,9 +956,7 @@ sub userDCC {
        }
 
        if (!defined $mask) {
-           ### FIXME.
-           &pSReply("Hostmasks for $user: $users{$user}{HOSTS}");
-
+           &pSReply("Hostmasks for $user: " . join(" ", keys %{$users{$user}{HOSTS}}));
            return;
        }
 
@@ -943,14 +965,14 @@ sub userDCC {
            return;
        }
 
-       if ($mask !~ /^$mask{nuh}$/) {
-           &pSReply("error: mask ($mask) is not a real hostmask.");
-           return;
-       }
-
        my $count = scalar keys %{ $users{$user}{HOSTS} };
 
        if ($state) {                           # add.
+           if ($mask !~ /^$mask{nuh}$/) {
+               &pSReply("error: mask ($mask) is not a real hostmask.");
+               return;
+           }
+
            if (exists $users{$user}{HOSTS}{$mask}) {
                &pSReply("mask $mask already exists.");
                return;
@@ -1160,6 +1182,7 @@ sub userDCC {
 
        &writeUserFile();
        &writeChanFile();
+       &pSReply("saved user and chan files");
 
        return;
     }
@@ -1225,7 +1248,7 @@ sub userDCC {
        }
 
        if ( &ignoreAdd($mask, $chan, $time, $comment) > 1) {
-           &pSReply("warn: $mask already in ignore list; written over anyway. FIXME");
+           &pSReply("FIXME: $mask already in ignore list; written over anyway.");
        } else {
            &pSReply("added $mask to ignore list.");
        }
@@ -1292,7 +1315,7 @@ sub userDCC {
 
        if ($str eq "+") {
            if (scalar @args != 2) {
-               &pSReply(".+host requires hostmask argument.");
+               &pSReply("+user requires hostmask argument.");
                return;
            }
        } elsif (scalar @args != 1) {
@@ -1300,29 +1323,30 @@ sub userDCC {
            return;
        }
 
-       if ($state) {                   # adduser.
+       if ($state) {
+           # adduser.
            if (scalar @args == 1) {
                $args[1]        = &getHostMask($args[0]);
                &pSReply("Attemping to guess $args[0]'s hostmask...");
 
                # crude hack... crappy Net::IRC
                $conn->schedule(5, sub {
-       # hopefully this is right.
-       my $nick = (keys %{ $cache{nuhInfo} })[0];
-       if (!defined $nick) {
-           &pSReply("couldn't get nuhinfo... adding user without a hostmask.");
-           &userAdd($nick);
-           return;
-       }
-
-       my $mask = &makeHostMask( $cache{nuhInfo}{$nick}{NUH} );
+                   # hopefully this is right.
+                   my $nick = (keys %{ $cache{nuhInfo} })[0];
+                   if (!defined $nick) {
+                       &pSReply("couldn't get nuhinfo... adding user without a hostmask.");
+                       &userAdd($nick);
+                       return;
+                   }
+                   my $mask = &makeHostMask( $cache{nuhInfo}{$nick}{NUH} );
 
-       if ( &userAdd($nick, $mask) ) { # success.
-               &pSReply("Added $nick with flags $users{$nick}{FLAGS}");
-               my @hosts = keys %{ $users{$nick}{HOSTS} };
-               &pSReply("hosts: @hosts");
-       }
-});
+                   if ( &userAdd($nick, $mask) ) {
+                       # success.
+                       &pSReply("Added $nick with flags $users{$nick}{FLAGS}");
+                       my @hosts = keys %{ $users{$nick}{HOSTS} };
+                       &pSReply("hosts: @hosts");
+                   }
+               });
                return;
            }