Changeset 161

Timestamp:

07/19/10 14:03:33 (7 weeks ago)

Author:

mike

Message:

change source order for Define, add config option 'sourcelist' for it

Location:

trunk

Files:

• conf/whatbot.conf-example (modified) (1 diff)
• lib/whatbot/Command/Define.pm (modified) (4 diffs)

trunk/conf/whatbot.conf-example

@@ -27 +27 @@
         <commands>
             <admin user="adminuser" />
+            <define sourcelist="urbandictionary google wikipedia" />
         </commands>
         <log directory="/var/log/whatbot" />

trunk/lib/whatbot/Command/Define.pm

@@ -94 +94 @@
     $def =~ s/ ,/,/g;
 
-    return $def . " (U)";
+    return $def . " (UD)";
 }
 
@@ -112 +112 @@
     $def =~ s/ ,/,/g;
 
-    return $def . " (G)";
+    return $def . " (GG)";
 }
 
@@ -169 +169 @@
     $def =~ s/\(help·info\)//g;
 
-    $def =~ s/\[citation needed\]//g; # this makes me want to stab people, just for the record
-
-    return $def . " (W)";
+    $def =~ s/\[[^\]]+\]//g;
+
+    return $def . " (WP)";
 }
 
@@ -205 +205 @@
     my ( $self, $phrase ) = @_;
 
-    my @default_sources = qw( wikipedia urbandictionary google );
+    my @default_sources;
+    if (!exists($self->my_config->{sourcelist})) {
+        @default_sources = qw(urbandictionary google wikipedia);
+    }
+    else {
+        @default_sources = split / /, $self->my_config->{sourcelist};
+    }
+
     my @sources;
     $_ = $phrase;