really support negative booleans and and return -1 for IsChanConf() when they are...

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

diff --git a/src/Factoids/Update.pl b/src/Factoids/Update.pl
index 68c0cfc7c1c4daa2a45ace0f1cdfb70d5b81351f..400012e52387e126765c803dba173bf3966c8f82 100644 (file)
--- a/src/Factoids/Update.pl
+++ b/src/Factoids/Update.pl
@@ -6,7 +6,7 @@
 #   Created: 1997
 #
 
-if (&IsParam("useStrict")) { use strict; }
+# use strict;  # TODO
 
 sub update {
     my($lhs, $mhs, $rhs) = @_;
@@ -27,7 +27,7 @@ sub update {
     }
 
     # teaching.
-    if (&IsFlag("t") ne "t") {
+    if (&IsFlag("t") ne "t" && &IsFlag("o") ne "o") {
        &msg($who, "permission denied.");
        &status("alert: $who wanted to teach me.");
        return 1;
@@ -52,25 +52,16 @@ sub update {
     my $also    = ($rhs =~ s/^-?also //i);
     my $also_or = ($also and $rhs =~ s/\s+(or|\|\|)\s+//);
 
-    # freshmeat
-    if (&IsChanConf("freshmeatForFactoid")) {
-       # todo: "name" is invalid for fm ][
-       if ( &dbGet("freshmeat", "name", "name=".&dbQuote($lhs)) ) {
-           &msg($who, "permission denied. (freshmeat)");
-           &status("alert: $who wanted to teach me something that freshmeat already has info on.");
-           return 1;
-       }
-    }
-
     # factoid arguments handler.
-    if (&IsChanConf("factoidArguments") and $lhs =~ /\$/) {
+    # must start with a non-variable
+    if (&IsChanConf("factoidArguments") > 0 and $lhs =~ /^[^\$]+.*\$/) {
        &status("Update: Factoid Arguments found.");
        &status("Update: orig lhs => '$lhs'.");
        &status("Update: orig rhs => '$rhs'.");
 
        my @list;
        my $count = 0;
-       $lhs =~ s/^/CMD: /;
+       $lhs =~ s/^/cmd: /;
        while ($lhs =~ s/\$(\S+)/(.*?)/) {
            push(@list, "\$$1");
            $count++;
@@ -79,16 +70,14 @@ sub update {
 
        if ($count >= 10) {
            &msg($who, "error: could not SAR properly.");
-           &DEBUG("error: lhs => '$lhs'.");
-           &DEBUG("error: rhs => '$rhs'.");
+           &DEBUG("error: lhs => '$lhs' rhs => '$rhs'.");
            return;
        }
 
        my $z = join(',',@list);
        $rhs =~ s/^/($z): /;
 
-       &status("Update: new  lhs => '$lhs'.");
-       &status("Update: new  rhs => '$rhs'.");
+       &status("Update: new lhs => '$lhs' rhs => '$rhs'.");
     }
 
     # the fun begins.
@@ -107,18 +96,12 @@ sub update {
 
        &performAddressedReply("okay");
 
-       ### BROKEN!!!
-       if (1) {        # old
-           &setFactInfo($lhs,"created_by", $nuh);
-           &setFactInfo($lhs,"created_time", time());
-           &setFactInfo($lhs,"factoid_value", $rhs);
-       } else {
-           &dbReplace("factoids", (
+       &sqlReplace("factoids", {
+               created_by      => $nuh,
+               created_time    => time(),      # modified time.
                factoid_key     => $lhs,
-               created_by      => time(),
                factoid_value   => $rhs,
-           ) );
-       }
+       } );
 
        if (!defined $rhs or $rhs eq "") {
            &ERROR("Update: rhs1 == NULL.");
@@ -129,13 +112,16 @@ sub update {
 
     # factoid exists.
     if ($exists eq $rhs) {
+       # this catches the following situation: (right or wrong?)
+       #    "test is test"
+       #    "test is also test"
        &performAddressedReply("i already had it that way");
        return 1;
     }
 
     if ($also) {                       # 'is also'.
        if ($exists =~ /^<REPLY> see /i) {
-           &DEBUG("todo: append to linked factoid.");
+           &TODO("Update.pl: append to linked factoid.");
        }
 
        if ($also_or) {                 # 'is also ||'.
@@ -192,8 +178,12 @@ sub update {
 
        $count{'Update'}++;
        &status("update: <$who> \'$lhs\' =$mhs=> \'$rhs\'; was \'$exists\'");
-       &AddModified($lhs,$nuh);
-       &setFactInfo($lhs, "factoid_value", $rhs);
+       &sqlReplace("factoids", {
+               factoid_key     => $lhs,
+               modified_by     => $nuh,
+               modified_time   => time(),
+               factoid_value   => $rhs,
+       } );
 
        if (!defined $rhs or $rhs eq "") {
            &ERROR("Update: rhs1 == NULL.");
@@ -210,7 +200,9 @@ sub update {
 
        my $author = &getFactInfo($lhs, "created_by") || "";
 
-       if (IsFlag("m") ne "m" and $author !~ /^\Q$who\E\!/i) {
+       if (IsFlag("m") ne "m" && IsFlag("o") ne "o" &&
+           $author !~ /^\Q$who\E\!/i
+       ) {
            &msg($who, "you can't change that factoid.");
            return 1;
        }
@@ -220,10 +212,12 @@ sub update {
        $count{'Update'}++;
        &status("update: <$who> \'$lhs\' =$mhs=> \'$rhs\'; was \'$exists\'");
 
-       &delFactoid($lhs);
-       &setFactInfo($lhs,"created_by", $nuh);
-       &setFactInfo($lhs,"created_time", time());
-       &setFactInfo($lhs,"factoid_value", $rhs);
+       &sqlReplace("factoids", {
+               factoid_key     => $lhs,
+               modified_by     => $nuh,
+               modified_time   => time(),
+               factoid_value   => $rhs,
+       } );
 
        if (!defined $rhs or $rhs eq "") {
            &ERROR("Update: rhs1 == NULL.");