comment,ws

[infobot.git] / blootbot / src / Factoids / Reply.pl

diff --git a/blootbot/src/Factoids/Reply.pl b/blootbot/src/Factoids/Reply.pl
index 36d0c11da3cf95e5fa3ba8e13e9413ceeba9a40c..0b1f9d0ad4f118811c18c630c924c428723492e9 100644 (file)
--- a/blootbot/src/Factoids/Reply.pl
+++ b/blootbot/src/Factoids/Reply.pl
@@ -27,17 +27,20 @@ sub getReply {
     }
 
     $message =~ tr/A-Z/a-z/;
-    $message =~ s/^cmd:/CMD:/;
 
-    if (!$literal and &IsChanConf("factoidSearch")) {
-       @searches = split(/\s+/, &getChanConf("factoidSearch"));
-    } else {
+    @searches = split(/\s+/, &getChanConfDefault('factoidSearch', '_default', $chan));
+    &::DEBUG("factoidSearch: $chan is: " . join(':', @searches));
+    # requesting the _default one, ignore factoidSearch
+    if ($message =~ /^_default\s+/) {
        @searches = ('_default');
+       $message =~ s/^_default\s+//;
     }
 
     # check for factoids with each prefix
     foreach $search (@searches) {
-       if ($search eq '_default') {
+       if ($search eq '$chan') {
+           $factoid = "$chan $message";
+       } elsif ($search eq '_default') {
            $factoid = $message;
        } else {
            $factoid = "$search $message";
@@ -77,7 +80,7 @@ sub getReply {
        ### FLOOD REPETION AND PROTECTION. -20000124
 
        # stats code.
-       ### FIXME: old mysql doesn't support
+       ### FIXME: old mysql/sqlite doesn't support
        ### "requested_count=requested_count+1".
        $count++;
        &sqlSet("factoids", {'factoid_key' => $factoid}, {
@@ -131,8 +134,6 @@ sub getReply {
        }
     }
 
-    return $reply if ($literal);
-
     # remove excessive beginning and end whitespaces.
     $reply     =~ s/^\s+|\s+$//g;
 
@@ -148,7 +149,7 @@ sub getReply {
     ###
 
     # don't evaluate if it has factoid arguments.
-    if ($message =~ /^CMD:/i) {
+    if ($message =~ /^cmd:/i) {
        &status("Reply: not doing substVars (eval dollar vars)");
     } else {
        $reply = &substVars($reply,1);
@@ -248,6 +249,19 @@ sub SARit {
     }
     &status("Reply.pl: $done SARs done.") if ($done);
 
+    # <URL></URL> type
+    #
+    while ($txt =~ /<URL>(.*)<\/URL>/){
+       &status("we have to norm this <URL></URL> stuff, SARing");
+       my $foobar = $1;
+       if ($foobar =~ m/(http:\/\/[^?]+)\?(.*)/){
+           my ($pig1,$pig2) = ($1,$2);
+           &status("SARing using URLencode");
+           $pig2=~s/([^\w])/sprintf("%%%02x",ord($1))/gie;
+           $foobar=$pig1."?".$pig2;
+       }
+       $txt =~ s/<URL>(.*)<\/URL>/$foobar/;
+    }
     return $txt;
 }