X-Git-Url: http://git.annexia.org/?p=xavierbot.git;a=blobdiff_plain;f=xavierbot.pl.in;h=55ddae6726366f1795b6c06fbd5a8f4d1caea57a;hp=8f01f0b80ab25c6ef4a5c0a081e417446b5c6359;hb=e510484ab8b113b43cf95a18820ad3a0629edf4b;hpb=cf77e53fed9a4870a5774825127c670f51a645b7

diff --git a/xavierbot.pl.in b/xavierbot.pl.in
index 8f01f0b..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.7 2007/06/29 21:44:02 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,13 +15,21 @@ 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.
 #----------------------------------------------------------------------
-# Current state.
+
+# 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
@@ -55,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));
@@ -105,6 +120,11 @@ sub irc_public
 	$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");
@@ -121,11 +141,6 @@ sub irc_public
 	    $kernel->post ($sender => privmsg => $channel =>
 			   "xavierbot wakes up");
 	}
-	elsif ($what =~ /^\s*xavierbot\b.*\brestart\b/) {
-	    $sleeping = 0;
-	    print STDOUT "got instruction to restart ...\n";
-	    restart_toplevel ($heap->{ocaml});
-	}
     }
     undef;
 }