$date,$time,$day

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1240 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/files/blootbot.help b/files/blootbot.help
index efe5c145c863c670d3ecfcb0f71a6193352df45d..2e3ea85317b7d4dcddb6cf489f5d9ea5f9d10e03 100644 (file)
--- a/files/blootbot.help
+++ b/files/blootbot.help
@@ -15,7 +15,8 @@ dollar variables: $Fdunno      - ...
 dollar variables: $Fquestion   - ...
 dollar variables: $Fupdate     - ...
 dollar variables: $channel     - channel from which the factoid was requested
-dollar variables: $date        - current date
+dollar variables: $date        - current date (GMT)
+dollar variables: $day         - day of week (full name, locale)
 dollar variables: $factoids    - factoid count
 dollar variables: $host        - hostname of factoid requester
 dollar variables: $ident       - bot nick
@@ -24,7 +25,7 @@ dollar variables: $memusage    - ...
 dollar variables: $rand        - random number, also $rand100.2
 dollar variables: $randnick    - random nick
 dollar variables: $startTime   - start time
-dollar variables: $time        - current time
+dollar variables: $time        - current time (GMT)
 dollar variables: $uptime      - ...
 dollar variables: $user        - username of factoid requester
 dollar variables: $who         - nick of factoid requester

diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index d2152c1165c4034ab246f6d4c0320b88959529a3..fb69ebffed122dbe3f0c020bf3e1ae44fa732101 100644 (file)
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -11,6 +11,7 @@
 ##
 
 # use strict;  # TODO
+use POSIX qw(strftime);
 
 use vars qw($msgType $uh $lastWho $ident);
 use vars qw(%lang %lastWho);
@@ -268,16 +269,17 @@ sub SARit {
 sub substVars {
     my($reply,$flag) = @_;
 
-    # $date, $time.
+    # $date, $time, $day.
     # TODO: support localtime.
-    my $date   =  scalar(gmtime());
-    $date      =~ s/\:\d+(\s+\w+)\s+\d+$/$1/;
+    my $date   =  strftime("%Y.%m.%d", gmtime());
     $reply     =~ s/\$date/$date/gi;
-    $date      =~ s/\w+\s+\w+\s+\d+\s+//;
-    $reply     =~ s/\$time/$date/gi;
+    my $time   =  strftime("%k:%M:%S", gmtime());
+    $reply     =~ s/\$time/$time/gi;
+    my $day    =  strftime("%A", gmtime());
+    $reply     =~ s/\$day/$day/gi;
 
     # support $ident when I have multiple nicks
-    my $mynick = $conn->nick();
+    my $mynick = $conn->nick() if $conn;
 
     # dollar variables.
     if ($flag) {