take a few more things literally

[infobot.git] / src / Modules / botmail.pl

diff --git a/src/Modules/botmail.pl b/src/Modules/botmail.pl
index fcb5e8a695716dc0afb9c9c99d8708dc4c3f003b..be246d0b9931c2815df1f0d3f0e16e1e4b793083 100644 (file)
--- a/src/Modules/botmail.pl
+++ b/src/Modules/botmail.pl
@@ -3,7 +3,7 @@
 #      Author: dms
 #     Version: v0.1 (20021122).
 #     Created: 20021122
-#       NOTE: Motivated by BZFlag.
+#       NOTE: Motivated by TimRiker.
 #        TODO: full-fledged notes services (optional auth, etc)
 #
 
@@ -15,11 +15,11 @@ sub parse {
     my($what) = @_;
 
     if (!defined $what or $what =~ /^\s*$/) {
-       &::help("botmail");
+       &::help('botmail');
        return;
     }
 
-    if ($what =~ /^(for|add)\s+(.*)$/i) {
+    if ($what =~ /^(to|for|add)\s+(.*)$/i) {
        &add( split(/\s+/, $2, 2) );
 
     } elsif ($what =~ /^stats?$/i) {
@@ -36,8 +36,8 @@ sub parse {
 }
 
 sub stats {
-    my $botmail        = &::countKeys("botmail");
-    &::msg($::who, "I have \002$botmail\002 ". &::fixPlural("message", $botmail). ".");
+    my $botmail        = &::countKeys('botmail');
+    &::msg($::who, "I have \002$botmail\002 ". &::fixPlural('message', $botmail). ".");
 }
 
 #####
@@ -46,7 +46,7 @@ sub check {
     my($recipient, $always) = @_;
     $recipient ||= $::who;
 
-    my %from = &::sqlSelectColHash("botmail", "srcwho,time", {
+    my %from = &::sqlSelectColHash('botmail', "srcwho,time", {
        dstwho => lc $recipient
     } );
     my $t      = keys %from;
@@ -64,7 +64,7 @@ sub check {
 sub next {
     my($recipient) = @_;
 
-    my %hash = &::sqlSelectRowHash("botmail", "*", {
+    my %hash = &::sqlSelectRowHash('botmail', '*', {
        dstwho => lc $recipient
     } );
 
@@ -75,7 +75,7 @@ sub next {
        my $ago = &::Time2String(time() - $hash{'time'});
        &::msg($recipient, "From $hash{srcwho} ($hash{srcuh}) on $date ($ago ago):");
        &::msg($recipient, $hash{'msg'});
-       &::sqlDelete("botmail", { 'dstwho'=>$hash{dstwho}, 'srcwho'=>$hash{srcwho}});
+       &::sqlDelete('botmail', { 'dstwho'=>$hash{dstwho}, 'srcwho'=>$hash{srcwho}});
     }
 }
 
@@ -85,11 +85,15 @@ sub add {
     my($recipient, $msg) = @_;
     &::DEBUG("botmail::add(@_)");
 
+    # allow optional trailing : ie: botmail for foo[:] hello
+    $recipient =~ s/:$//;
+
     # only support 1 botmail with unique dstwho/srcwho to have same
     # functionality as botmail from infobot.
-    my %hash = &::sqlSelectRowHash("botmail", "*", {
-       srcwho => &::sqlQuote(lc $::who),
-       dstwho => &::sqlQuote(lc $recipient)
+    # Note: I removed the &::sqlQuote reference. Seems to be working and inserting fine without it here. -- troubled
+    my %hash = &::sqlSelectRowHash('botmail', '*', {
+       srcwho => lc $::who,
+       dstwho => lc $recipient
     } );
 
     if (scalar (keys %hash) > 1) {
@@ -97,7 +101,7 @@ sub add {
        return;
     }
 
-    &::sqlReplace("botmail", {
+    &::sqlInsert('botmail', {
        'dstwho'        => lc $recipient,
        'srcwho'        => lc $::who,
        'srcuh'         => $::nuh,