* Correction to factoid updates to treat appending as a modification

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

diff --git a/src/Factoids/Update.pl b/src/Factoids/Update.pl
index c41c9e6e4c00fee09635b2885de70eb583c0f3b9..75714dad450beb74c2a8a12b3c4ebd17d945fb72 100644 (file)
--- a/src/Factoids/Update.pl
+++ b/src/Factoids/Update.pl
@@ -21,13 +21,13 @@ sub update {
     return if (&IsLocked($lhs) == 1);
 
     # profanity.
-    if (&IsParam("profanityCheck") and &hasProfanity($rhs)) {
+    if (&IsParam('profanityCheck') and &hasProfanity($rhs)) {
        &performReply("please, watch your language.");
        return 1;
     }
 
     # teaching.
-    if (&IsFlag("t") ne "t" && &IsFlag("o") ne "o") {
+    if (&IsFlag('t') ne 't' && &IsFlag('o') ne 'o') {
        &msg($who, "permission denied.");
        &status("alert: $who wanted to teach me.");
        return 1;
@@ -52,16 +52,36 @@ sub update {
     my $also    = ($rhs =~ s/^-?also //i);
     my $also_or = ($also and $rhs =~ s/\s+(or|\|\|)\s+//);
 
+    if ($also or $also_or) {
+        my $author  = &getFactInfo($from, 'created_by');
+        $author =~ /^(.*)!/;
+        my $created_by = $1;
+
+        # Can they even modify factoids?
+        if (&IsFlag('m') ne 'm' and &IsFlag('M') ne 'M' and &IsFlag('o') ne 'o') {
+            &performReply("You do not have permission to modify factoids");
+            return 1;
+
+        # If they have +M but they didnt create the factoid
+        } elsif (&IsFlag('M') eq 'M' and
+                 $who !~ /^\Q$created_by\E$/i
+                 &IsFlag('m') ne 'm'
+                 &IsFlag('o') ne 'o') {
+            &performReply("factoid '$lhs' is not yours to modify.");
+            return 1;
+        }
+    }
+
     # factoid arguments handler.
     # must start with a non-variable
-    if (&IsChanConf("factoidArguments") and $lhs =~ /^[^\$]+.*\$/) {
+    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++;
@@ -87,23 +107,23 @@ sub update {
        # nice 'are' hack (or work-around).
        if ($mhs =~ /^are$/i and $rhs !~ /<\S+>/) {
            &status("Update: 'are' hack detected.");
-           $mhs = "is";
+           $mhs = 'is';
            $rhs = "<REPLY> are ". $rhs;
        }
 
        &status("enter: <$who> \'$lhs\' =$mhs=> \'$rhs\'");
        $count{'Update'}++;
 
-       &performAddressedReply("okay");
+       &performAddressedReply('okay');
 
-       &sqlReplace("factoids", {
+       &sqlInsert('factoids', {
                created_by      => $nuh,
                created_time    => time(),      # modified time.
                factoid_key     => $lhs,
                factoid_value   => $rhs,
        } );
 
-       if (!defined $rhs or $rhs eq "") {
+       if (!defined $rhs or $rhs eq '') {
            &ERROR("Update: rhs1 == NULL.");
        }
 
@@ -120,8 +140,24 @@ sub update {
     }
 
     if ($also) {                       # 'is also'.
-       if ($exists =~ /^<REPLY> see /i) {
-           &DEBUG("Update.pl: todo: append to linked factoid.");
+        my $redircount = 5;
+        my $origlhs = $lhs;
+        while ($exists =~ /^<REPLY> ?see (.*)/i) {
+            $redircount--;
+            unless ($redircount) {
+                &msg($who, "$origlhs has too many levels of redirection.");
+                return 1;
+            }
+
+            $lhs = $1;
+            $exists = &getFactoid($lhs);
+            unless( $exists ) {
+                &msg($who, "$1 is a dangling redirection.");
+                return 1;
+            }
+        }
+       if ($exists =~ /^<REPLY> ?see (.*)/i) {
+           &TODO("Update.pl: append to linked factoid.");
        }
 
        if ($also_or) {                 # 'is also ||'.
@@ -174,21 +210,20 @@ sub update {
            }
        }
 
-       &performAddressedReply("okay");
+       &performAddressedReply('okay');
 
        $count{'Update'}++;
        &status("update: <$who> \'$lhs\' =$mhs=> \'$rhs\'; was \'$exists\'");
-       &sqlReplace("factoids", {
-               factoid_key     => $lhs,
+       &sqlSet('factoids', {'factoid_key' => $lhs}, {
                modified_by     => $nuh,
                modified_time   => time(),
                factoid_value   => $rhs,
        } );
 
-       if (!defined $rhs or $rhs eq "") {
+       if (!defined $rhs or $rhs eq '') {
            &ERROR("Update: rhs1 == NULL.");
        }
-    } else {                           # not "also"
+    } else {                           # not 'also'
 
        if (!$correction_plausible) {   # "no, blah is ..."
            if ($addressed) {
@@ -198,28 +233,27 @@ sub update {
            return 1;
        }
 
-       my $author = &getFactInfo($lhs, "created_by") || "";
+       my $author = &getFactInfo($lhs, 'created_by') || '';
 
-       if (IsFlag("m") ne "m" && IsFlag("o") ne "o" &&
+       if (IsFlag('m') ne 'm' && IsFlag('o') ne 'o' &&
            $author !~ /^\Q$who\E\!/i
        ) {
            &msg($who, "you can't change that factoid.");
            return 1;
        }
 
-       &performAddressedReply("okay");
+       &performAddressedReply('okay');
 
        $count{'Update'}++;
        &status("update: <$who> \'$lhs\' =$mhs=> \'$rhs\'; was \'$exists\'");
 
-       &sqlReplace("factoids", {
-               factoid_key     => $lhs,
+       &sqlSet('factoids', {'factoid_key' => $lhs}, {
                modified_by     => $nuh,
                modified_time   => time(),
                factoid_value   => $rhs,
        } );
 
-       if (!defined $rhs or $rhs eq "") {
+       if (!defined $rhs or $rhs eq '') {
            &ERROR("Update: rhs1 == NULL.");
        }
     }
@@ -228,3 +262,5 @@ sub update {
 }
 
 1;
+
+# vim:ts=4:sw=4:expandtab:tw=80