X-Git-Url: http://git.annexia.org/?p=xavierbot.git;a=blobdiff_plain;f=xavierbot.pl.in;h=55ddae6726366f1795b6c06fbd5a8f4d1caea57a;hp=fa59d848754ac8d0b0024585962eefd25394a44f;hb=f53f0a27a73ba81039e7d33cce168cbe82d5e0c5;hpb=27dea572ce631f21e6dd27472a55c79092c682aa

diff --git a/xavierbot.pl.in b/xavierbot.pl.in
index fa59d84..55ddae6 100755
--- a/xavierbot.pl.in
+++ b/xavierbot.pl.in
@@ -1,11 +1,13 @@
-#!/usr/bin/perl -wT
+#!/usr/bin/perl -w
 # xavierbot : an OCaml interpreter IRC bot.
 # By Richard W.M. Jones <rich@annexia.org>.
 # This code is in the Public Domain.
-# $Id: xavierbot.pl.in,v 1.5 2007/06/29 19:39:13 rjones Exp $
+# $Id: xavierbot.pl.in,v 1.10 2010/04/04 19:38:40 rjones Exp $
 
 use strict;
 use POE qw(Component::IRC Wheel::Run);
+use Getopt::Long;
+use POE::Component::IRC::Plugin::NickServID;
 
 #----------------------------------------------------------------------
 # Start of configuration.
@@ -13,20 +15,35 @@ use POE qw(Component::IRC Wheel::Run);
 my $nick = "xavierbot";
 my $ircname = "Xavierbot";		# Printable name.
 my $server = "chat.freenode.net";
-#my $server = "devserv.devel.redhat.com";
 my $port = 6667;
 my $channel = "#ocaml";
 
+my $nickservpw = "123456"; # or undef
+
 # End of configuration.
 #----------------------------------------------------------------------
 
-$ENV{PATH} = "/usr/bin:/bin";
+# Command line args can override configuration.
+GetOptions ("nick=s" => \$nick,
+	    "ircname=s" => \$ircname,
+	    "server=s" => \$server,
+	    "port=i" => \$port,
+	    "channel=s" => \$channel)
+    or die "$0: GetOptions: $!";
 
 # Simple flood protection.  This counts number of lines received from
 # the toplevel, and is reset when we send a line.  If this exceeds
 # some value, then we just eat lines.
+# XXX This ought to count characters, not lines.
 my $flood_lim = 0;
 
+# Are we awake or sleeping?
+my $sleeping = 0;
+
+#----------------------------------------------------------------------
+
+$ENV{PATH} = "/usr/bin:/bin";
+
 POE::Session->create (
   package_states => [
     main => [ qw(_default _start irc_001 irc_public got_stdout got_sigchld) ],
@@ -48,6 +65,11 @@ sub _start
 	 port => $port,
 	 ) or die "POE::Component::IRC->spawn failed: $!";
 
+    $irc->plugin_add('NickServID',
+                     POE::Component::IRC::Plugin::NickServID->new(
+                         Password => $nickservpw,
+                     ));
+
     my $ocaml = start_toplevel ();
 
     $kernel->sig(CHLD => qw(got_sigchld));
@@ -80,27 +102,46 @@ sub irc_public
     my $nick = (split /!/, $who)[0];
     my $channel = $where->[0];
 
+    my @usage =
+	(
+	 "expr ;;  evaluate expr in toplevel and print result",
+	 "help     help message",
+	 "restart  restart the toplevel",
+	 "sleep    go to sleep",
+	 "wake     wake me up from sleep",
+	 );
+
     print "got: $what\n";
-    if (my ($stmt) = $what =~ /^\s*([^#].*;;)\s*$/) {
-	$heap->{ocaml}->put ("$stmt\n");
-        $flood_lim = 0;
-    }
     # XXX How to interpolate $nick into the patterns?
-    elsif ($what =~ /^\s*xavierbot\b.*\bhelp\b/) {
+    if ($what =~ /^\s*xavierbot\b.*\bhelp\b/) {
 	my $nick = (split /!/, $who)[0];
 	$kernel->post ($sender => privmsg => $channel =>
-		       "hello $nick, I am xavierbot, an OCaml toplevel");
-	$kernel->post ($sender => privmsg => $channel =>
-		       "$nick: expr ;;      evaluate expr in OCaml toplevel");
-	$kernel->post ($sender => privmsg => $channel =>
-		       "$nick: help         help message");
-	$kernel->post ($sender => privmsg => $channel =>
-		       "$nick: restart      restart the toplevel");
+	    "hello $nick, I am xavierbot @VERSION@, an OCaml toplevel");
+	$kernel->post ($sender => privmsg => $channel => $_)
+	    foreach (@usage);
     }
     elsif ($what =~ /^\s*xavierbot\b.*\brestart\b/) {
+	$sleeping = 0;
 	print STDOUT "got instruction to restart ...\n";
 	restart_toplevel ($heap->{ocaml});
     }
+    elsif (!$sleeping) {
+	if (my ($stmt) = $what =~ m/^\s*([^\#].*;;)\s*$/) {
+	    $heap->{ocaml}->put ("$stmt\n");
+	    $flood_lim = 0;
+	}
+	elsif ($what =~ /^\s*xavierbot\b.*\b(sleep|shut|quiet)\b/) {
+	    $sleeping = 1;
+	    $kernel->post ($sender => privmsg => $channel =>
+			   "xavierbot goes to sleep (do 'xavierbot wake' to wake)");
+	}
+    } else { # sleeping
+	if ($what =~ /^\s*xavierbot\b.*\bwake\b/) {
+	    $sleeping = 0;
+	    $kernel->post ($sender => privmsg => $channel =>
+			   "xavierbot wakes up");
+	}
+    }
     undef;
 }
 
@@ -128,7 +169,7 @@ sub got_stdout
 {
     my ($kernel,$heap, $input, $wheel_id) = @_[KERNEL,HEAP,ARG0,ARG1];
     print "Child said: $input\n";
-    if ($flood_lim < 16) {
+    if ($flood_lim < 10) {
 	$kernel->post ($heap->{irc} => privmsg => $channel => "$input");
     }
     $flood_lim++;