more babelfish cleanup

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

diff --git a/src/Factoids/Core.pl b/src/Factoids/Core.pl
index 2b6c60295166ef18d3a7259fce5cb21b0e8a7445..6c647309e06e49f8cc5e3d80a2b0a6ed2d1c124c 100644 (file)
--- a/src/Factoids/Core.pl
+++ b/src/Factoids/Core.pl
@@ -37,7 +37,6 @@ sub validFactoid {
        /^learn / and last;             # teach. damn morons.
        /^tell (\S+) about / and last;  # tell.
        /\=\~/ and last;                # substituition.
-       /^\S+ to \S+ \S+/ and last;     # babelfish.
 
        /^\=/ and last;                 # botnick = heh is.
        /wants you to know/ and last;
@@ -152,11 +151,11 @@ sub FactoidStuff {
 
        # if it doesn't exist, well... it doesn't!
        if (!defined $result) {
-           &performReply("i didn't have anything called '$faqtoid'");
+           &performReply("i didn't have anything called '$faqtoid' to forget");
            return;
        }
 
-       # todo: squeeze 3 getFactInfo calls into one?
+       # TODO: squeeze 3 getFactInfo calls into one?
        my $author      = &getFactInfo($faqtoid, "created_by");
        my $count       = &getFactInfo($faqtoid, "requested_count") || 0;
        # don't delete if requested $limit times
@@ -200,7 +199,7 @@ sub FactoidStuff {
 
        # this may eat some memory.
        # prevent deletion if other factoids redirect to it.
-       # todo: use hash instead of array.
+       # TODO: use hash instead of array.
        my @list;
        if (&getChanConf("factoidPreventForgetRedirect")) {
            &status("Factoids/Core: forget: checking for redirect factoids");
@@ -219,7 +218,7 @@ sub FactoidStuff {
 
            $match++;
        }
-       # todo: warn for op aswell, but allow force delete.
+       # TODO: warn for op aswell, but allow force delete.
        if (!$isop and $match) {
            &msg($who, "uhm, other (redirection) factoids depend on this one.");
            return;
@@ -235,8 +234,8 @@ sub FactoidStuff {
            }
 
            # ignore.
-           # todo: make forget limit configurable.
-           # todo: make forget ignore time configurable.
+           # TODO: make forget limit configurable.
+           # TODO: make forget ignore time configurable.
            if ($cache{forget}{$h} > 5) {
                &ignoreAdd(&makeHostMask($nuh), "*", 3*24*60, "abuse of forget");
                &msg($who, "forget: Ignoring you for abuse!");
@@ -307,6 +306,7 @@ sub FactoidStuff {
        }
 
        $faqtoid =~ tr/A-Z/a-z/;
+       $faqtoid =~ s/^cmd:/CMD:/; # basic command undeleteing
        my $result = &getFactoid($faqtoid." #DEL#");
        my $check  = &getFactoid($faqtoid);
 
@@ -325,7 +325,7 @@ sub FactoidStuff {
 #      &setFactInfo($faqtoid, "modified_time", 0);
 
        $check  = &getFactoid($faqtoid);
-       # todo: check if $faqtoid." #DEL#" exists?
+       # TODO: check if $faqtoid." #DEL#" exists?
        if (defined $check) {
            &performReply("Successfully recovered '$faqtoid'.  Have fun now.");
            $count{'Undelete'}++;
@@ -382,16 +382,14 @@ sub FactoidStuff {
            my ($from,$to) = (lc $1, lc $2);
 
            my $result = &getFactoid($from);
-           if (defined $result) {
-               &performReply("i didn't have anything called '$from'");
+           if (!defined $result) {
+               &performReply("i didn't have anything called '$from' to rename");
                return;
            }
 
-           my $author = &getFactInfo($from, "created_by");
-
            # who == nick!user@host.
            if (&IsFlag("m") ne "m" and $author !~ /^\Q$who\E\!/i) {
-               &msg($who, "factoid '$form' is not yours to modify.");
+               &msg($who, "factoid '$from' is not yours to modify.");
                return;
            }
 
@@ -449,7 +447,7 @@ sub FactoidStuff {
                &performReply("that doesn't contain '$op'");
            }
        } else {
-           &performReply("i didn't have anything called '$faqtoid'");
+           &performReply("i didn't have anything called '$faqtoid' to modify");
        }
 
        return;