- 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 93725e553cfd1a0b253c6d40decc27bf82c815f0..c51ec75b90c51019dbe1434c0e4261769089aaff 100644 (file)
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -38,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
@@ -170,7 +177,7 @@ sub factoidArgs {
     # 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 @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) );
@@ -184,26 +191,18 @@ sub factoidArgs {
 
        s/^CMD: //i;
 #      &DEBUG("factarg: ''$str' =~ /^$_\$/'");
-       my @vals;
        my $arg = $_;
 
        # todo: <greycat> ~punish apt for (Eating) (Parentheses)
-       # how the hell do I fix the above?
+       # how the hell do I fix the above? -dms.
 
-       # todo: make eval work with $$i's :(
-       # fuck this is an ugly hack. it works though.
+       # eval (evil!) code. cleaned up courtesy of lear.
+       my @vals;
        eval {
-           if ($str =~ /^$arg$/i) {
-               for ($i=1; $i<=5; $i++) {
-                   $val = $$i;
-                   last unless (defined $val);
-
-                   push(@vals, $val);
-               }
-           }
+           @vals = ($str =~ /^$arg$/i);
        };
 
-       if ($@) {   # it failed!!!
+       if ($@) {
            &WARN("factargs: regex failed! '$str' =~ /^$_\$/");
            next;
        }
@@ -229,7 +228,7 @@ sub factoidArgs {
 
        # update stats.
        my $count = &getFactInfo($q, "requested_count") || 0;
-       $count++;   
+       $count++;
        &setFactInfo($q, "requested_by", $nuh);
        &setFactInfo($q, "requested_time", time());
        &setFactInfo($q, "requested_count", $count);