- woops. forgot to check +o aswell.

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

diff --git a/src/Factoids/Question.pl b/src/Factoids/Question.pl
index a356f82a402fe07f3f066223b48a1f75c9940f66..c51ec75b90c51019dbe1434c0e4261769089aaff 100644 (file)
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -19,14 +19,13 @@ use vars qw(%bots %forked);
 sub doQuestion {
     # my doesn't allow variables to be inherinted, local does.
     # following is used in math()...
-    local($query) = @_;
-    local($reply) = "";
-    local $finalQMark = $query =~ s/\?+\s*$//;
-    $finalQMark += $query =~ s/\?\s*$//;
-    $query =~ s/^\s+|\s+$//g;
+    local($query)      = @_;
+    local($reply)      = "";
+    local $finalQMark  = $query =~ s/\?+\s*$//;
+    $finalQMark                += $query =~ s/\?\s*$//;
+    $query             =~ s/^\s+|\s+$//g;
 
     if (!defined $query or $query =~ /^\s*$/) {
-       &FIXME("doQ: query == NULL");
        return '';
     }
 
@@ -39,6 +38,13 @@ sub doQuestion {
     } else {
        ### TODO: this should be caught in Process.pl?
        return '' unless ($talkok);
+
+       # there is no flag to disable/enable asking factoids...
+       # so it was added... thanks zyxep! :)
+       if (&IsFlag("a") ne "a" && &IsFlag("o") ne "o") {
+           &status("$who tried to ask us when not allowed.");
+           return;
+       }
     }
 
     # dangerous; common preambles should be stripped before here
@@ -46,6 +52,11 @@ sub doQuestion {
        return if (exists $bots{$nuh});
     }
 
+    if ($query =~ s/^literal\s+//i) {
+       &status("literal ask of '$query'.");
+       $literal = 1;
+    }
+
     # convert to canonical reference form
     my $x;
     my @query;
@@ -69,7 +80,7 @@ sub doQuestion {
     $query =~ s/^explain\s*(\?*)/$1/i; # explain x
     $query = " $query ";               # side whitespaces.
 
-    my $qregex = join '|', keys %{$lang{'qWord'}};
+    my $qregex = join '|', keys %{ $lang{'qWord'} };
 
     # what's whats => what is; who'?s => who is, etc
     $query =~ s/ ($qregex)\'?s / $1 is /i;
@@ -81,6 +92,12 @@ sub doQuestion {
        $questionWord = "where";
     }
 
+    if (&IsChanConf("factoidArguments")) {
+       $result = &factoidArgs($query[0]);
+
+       return $result if (defined $result);
+    }
+
     my @link;
     for (my$i=0; $i<scalar @query; $i++) {
        $query  = $query[$i];
@@ -113,7 +130,7 @@ sub doQuestion {
        }
 
        if ($i != 0) {
-           &DEBUG("Question: '$query[0]' did not exist; '$query[$i]' ($i) did");
+           &VERB("Question.pl: '$query[0]' did not exist; '$query[$i]' ($i) did",2);
        }
 
        return $result;
@@ -152,4 +169,117 @@ sub doQuestion {
     return $reply;
 }
 
+sub factoidArgs {
+    my($str)   = @_;
+    my $result;
+
+    # to make it eleeter, split each arg and use "blah OR blah or BLAH"
+    # which will make it less than linear => quicker!
+    # todo: cache this, update cache when altered. !!! !!! !!!
+#    my $t = &timeget();
+    my @list = &searchTable("factoids", "factoid_key", "factoid_key", "^CMD: ");
+#    my $delta_time = &timedelta($t);
+#    &DEBUG("factArgs: delta_time = $delta_time s");
+#    &DEBUG("factArgs: list => ".scalar(@list) );
+
+    # from a design perspective, it's better to have the regex in
+    # the factoid key to reduce repetitive processing.
+
+    # it does not matter if it's not alphabetically sorted.
+    foreach (sort { length($b) <=> length($a) } @list) {
+       next if (/#DEL#/);      # deleted.
+
+       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 {
+           @vals = ($str =~ /^$arg$/i);
+       };
+
+       if ($@) {
+           &WARN("factargs: regex failed! '$str' =~ /^$_\$/");
+           next;
+       }
+
+       next unless (@vals);
+
+       if (defined $result) {
+           &WARN("factargs: '$_' matches aswell.");
+           next;
+       }
+
+#      &DEBUG("vals => @vals");
+
+       &status("Question: factoid Arguments for '$str'");
+       # todo: use getReply() - need to modify it :(
+       my $i   = 0;
+       my $q   = "CMD: $_";
+       my $r   = &getFactoid($q);
+       if (!defined $r) {
+           &DEBUG("question: !result... should this happen?");
+           return;
+       }
+
+       # update stats.
+       my $count = &getFactInfo($q, "requested_count") || 0;
+       $count++;
+       &setFactInfo($q, "requested_by", $nuh);
+       &setFactInfo($q, "requested_time", time());
+       &setFactInfo($q, "requested_count", $count);
+       # end of update stats.
+
+       $result = $r;
+       $result =~ s/^\((.*?)\): //;
+
+       foreach ( split(',', $1) ) {
+           my $val = $vals[$i];
+#          &DEBUG("val => $val");
+
+           if (!defined $val) {
+               &status("factArgs: vals[$i] == undef; not SARing '$_' for '$str'");
+               next;
+           }
+
+           my $done = 0;
+           my $old = $result;
+           while (1) {
+#              &DEBUG("Q: result => $result (1before)");
+               $result = &substVars($result);
+#              &DEBUG("Q: result => $result (1after)");
+
+               last if ($old eq $result);
+               $old = $result;
+               $done++;
+           }
+
+           # hack.
+           $vals[$i] =~ s/^me$/$who/gi;
+
+           if (!$done) {
+               &status("factArgs: SARing '$_' to '$vals[$i]'.");
+               $result =~ s/\Q$_\E/$vals[$i]/g;
+           }
+           $i++;
+       }
+
+       # nasty hack to get partial &getReply() functionality.
+       $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.
+#      return $result;
+       $cmdstats{'Factoid Commands'}++;
+    }
+
+    return $result;
+}
+
 1;