*Fixup missing semicolon

[infobot.git] / src / Factoids / Question.pl

diff --git a/src/Factoids/Question.pl b/src/Factoids/Question.pl
index 3e93b05ca22f6df4470b5486bf017415181c24d7..2c2506ffcf3aed711d08fed75f679c2bfb613182 100644 (file)
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -32,9 +32,10 @@ sub doQuestion {
     my $questionWord   = "";
 
     if (!$addressed) {
+       return ''; #never respond if we're not addressed
        return '' unless ($finalQMark);
-       return '' if (&IsParam("minVolunteerLength") == 0);
-       return '' if (length $query < $param{'minVolunteerLength'});
+       return '' unless &IsChanConf("minVolunteerLength") > 0;
+       return '' if (length $query < &::getChanConf('minVolunteerLength'));
     } else {
        ### TODO: this should be caught in Process.pl?
        return '' unless ($talkok);
@@ -93,7 +94,7 @@ sub doQuestion {
     $query =~ s/^\s+|\s+$//g; # bleh. hacked.
     push(@query, $query) if ($query ne $x);
 
-    if (&IsChanConf("factoidArguments")) {
+    if (&IsChanConf("factoidArguments") > 0) {
        $result = &factoidArgs($query[0]);
 
        return $result if (defined $result);
@@ -132,8 +133,7 @@ sub doQuestion {
                # support command redirection.
                # recursive cmdHooks aswell :)
                my $done = 0;
-               $done++ if &parseCmdHook("main", $link);
-               $done++ if &parseCmdHook("extra", $link);
+               $done++ if &parseCmdHook($link);
                $message        = $link;
                $done++ unless (&Modules());
 
@@ -155,8 +155,8 @@ sub doQuestion {
     }
 
     ### TODO: Use &Forker(); move function to Debian.pl
-    if (&IsChanConf("debianForFactoid")) {
-       &loadMyModule($myModules{'debian'});
+    if (&IsChanConf('debianForFactoid') > 0) {
+       &loadMyModule('Debian');
        $result = &Debian::DebianFind($query);  # ???
        ### TODO: debian module should tell, through shm, that it went
        ###       ok or not.
@@ -189,6 +189,9 @@ sub factoidArgs {
     # TODO: cache this, update cache when altered. !!! !!! !!!
 #    my $t = &timeget();
     my ($first) = split(/\s+/, $str);
+
+    # ignore split to commands [dumb commands vs. factoids]
+    return undef if $str =~ /\s+\=\~\s+s[\#\/\:]/;
     my @list = &searchTable("factoids", "factoid_key", "factoid_key", "^CMD: $first ");
 #    my $delta_time = &timedelta($t);
 #    &DEBUG("factArgs: delta_time = $delta_time s");
@@ -201,13 +204,10 @@ sub factoidArgs {
     foreach (sort { length($b) <=> length($a) } @list) {
        next if (/#DEL#/);      # deleted.
 
-       s/^CMD: //i;
+       s/^cmd: //i;
 #      &DEBUG("factarg: '$str' =~ /^$_\$/");
        my $arg = $_;
 
-       # TODO: <greycat> ~punish apt for (Eating) (Parentheses)
-       # how the hell do I fix the above? -dms.
-
        # eval (evil!) code. cleaned up courtesy of lear.
        my @vals;
        eval {
@@ -231,28 +231,35 @@ sub factoidArgs {
        &status("Question: factoid Arguments for '$str'");
        # TODO: use getReply() - need to modify it :(
        my $i   = 0;
-       my $q   = "CMD: $_";
+       my $q   = "cmd: $_";
        my $r   = &getFactoid($q);
        if (!defined $r) {
            &DEBUG("question: !result... should this happen?");
            return;
        }
 
-       # update stats.
-       &sqlUpdate("factoids", { factoid_key => $q }, {
-           requested_by        => $nuh,
-           requested_time      => time(),
-           -requested_count    => "requested_count+1",
+       # update stats. old mysql/sqlite don't do +1
+       my ($count) = &sqlSelect("factoids", "requested_count", { factoid_key => $q });
+       $count++;
+       &sqlSet("factoids", {'factoid_key' => $q}, {
+               requested_by    => $nuh,
+               requested_time  => time(),
+               requested_count => $count
        } );
 
        # end of update stats.
 
        $result = $r;
+
        $result =~ s/^\((.*?)\): //;
+       my $vars = $1;
 
-       foreach ( split(',', $1) ) {
+       # start nasty hack to get partial &getReply() functionality.
+       $result = &SARit($result);
+
+       foreach ( split(',', $vars) ) {
            my $val = $vals[$i];
-#          &DEBUG("val => $val");
+           &DEBUG("val => $val");
 
            if (!defined $val) {
                &status("factArgs: vals[$i] == undef; not SARing '$_' for '$str'");
@@ -262,9 +269,9 @@ sub factoidArgs {
            my $done = 0;
            my $old = $result;
            while (1) {
-#              &DEBUG("Q: result => $result (1before)");
-               $result = &substVars($result);
-#              &DEBUG("Q: result => $result (1after)");
+               &DEBUG("Q: result => $result (1before)");
+               $result = &substVars($result,1);
+               &DEBUG("Q: result => $result (1after)");
 
                last if ($old eq $result);
                $old = $result;
@@ -274,17 +281,17 @@ sub factoidArgs {
            # hack.
            $vals[$i] =~ s/^me$/$who/gi;
 
-           if (!$done) {
+#          if (!$done) {
                &status("factArgs: SARing '$_' to '$vals[$i]'.");
                $result =~ s/\Q$_\E/$vals[$i]/g;
-           }
+#          }
            $i++;
        }
 
        # nasty hack to get partial &getReply() functionality.
+       $result = &SARit($result);
        $result =~ s/^\s*<action>\s*(.*)/\cAACTION $1\cA/i;
        $result =~ s/^\s*<reply>\s*//i;
-       $result = &SARit($result);
 
 # well... lets go through all of them. not advisable if we have like
 # 1000 commands, heh.