X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ndawn.pl;h=f2eafaa9f74c7dbeb16599badcadf953ffb62509;hb=dffb2b9f212ffb49763d329bc8ca044d95e72da1;hp=b8d35bbd3c451094102097a4b0bdfdfd77100c61;hpb=5d4dd5ffef163d270f0244c24731561ff4f69936;p=NDIRC.git

diff --git a/ndawn.pl b/ndawn.pl
old mode 100644
new mode 100755
index b8d35bb..f2eafaa
--- a/ndawn.pl
+++ b/ndawn.pl
@@ -1,3 +1,5 @@
+#!/usr/bin/perl -w
+
 #**************************************************************************
 #   Copyright (C) 2009 by Michael Andreen <harvATruinDOTnu>               *
 #                                                                         *
@@ -15,96 +17,42 @@
 #   along with this program; if not, write to the                         *
 #   Free Software Foundation, Inc.,                                       *
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
-#**************************************************************************/
+#**************************************************************************
 
 use strict;
 use warnings;
-use vars qw($VERSION %IRSSI);
-
-use Irssi;
-use Irssi::Irc;
-
-$VERSION = "0.1";
-%IRSSI = (
-    authors => "harv",
-    contact => "harv\@ruin.nu",
-    name    => "NewDawn testbot script",
-    description => "Testbot used for implementing commands for nd bots",
-    license => "GPL-2 or (at your option) any later version",
-    url     => "",
-    changed => "",
-);
-
-$ND::refresh = 0;
+use feature ':5.10';
+use POE qw(Component::IRC::Qnet::State);
 
-$SIG{USR1} = sub{
-	print "USR1";
-	$ND::refresh = 1;
-};
 
+use NDIRC::CommonStates;
+use NDIRC::Delling;
 
-use again 'ND::DB';
-use again 'ND::Include';
-use again 'NDIRC::Dispatcher';
-use again 'NDIRC::Context';
-use again 'NDIRC::Command';
-use again 'NDIRC::Misc';
+my $nickname = 'ndbot';
+my $ircname = 'ND test bot';
+my $server = 'irc.netgamers.org';
 
-my $DBH = DB();
-my $TICK = $DBH->selectrow_array('SELECT tick()');
+# We create a new PoCo-IRC object
+my $irc = POE::Component::IRC::Qnet::State->spawn(
+	nick => $nickname,
+	ircname => $ircname,
+	server => $server,
+	servers => [$server, 'underworld.no.eu.netgamers.org', ]
+) or die "Oh noooo! $!";
 
-my $disp = new NDIRC::Dispatcher;
-
-$disp->load('Basic','SMS');
+$irc->service_bots(QBOT => 'P@cservice.netgamers.org');
 
 $ND::scanchan = '#testarmer';
 $ND::defchan = '#testarlite';
 $ND::memchan = '#testarmer';
-$disp->add_channel($ND::defchan, ['pub','help','channel','def']);
-$disp->add_channel($ND::scanchan, ['pub','help','channel','scan','member']);
-$disp->add_channel('pm', ['pub','help','pm']);
-
-sub event_pubmsg {
-	my ($server, $msg, $nick, $address, $channel) = @_;
-
-	eval {
-		if ($msg =~ /^(\S+): (.+)$/ && $disp->has_command('anon',$channel)){
-			my $_ = $1;
-			my $text = $2;
-			my $channel = $server->channel_find($channel);
-			my $nick = $channel->nick_find($1);
-			unless ($nick || /(Constructing|Researching)/){
-				print ".anon $_ $text";
-				$msg = ".anon $_ $text";
-			}
-
-		}
-		if (parseCommand($msg,$server,$nick,$address,$channel,$disp,DB())){
-			#Command parsed and run successfully
-		}
-	};
-	print $@ if $@;
-}
-
-sub event_privmsg {
-	my ($server, $msg, $nick, $address) = @_;
-
-	eval {
-		if (parseCommand($msg,$server,$nick,$address,'pm',$disp,DB())){
-			#Command parsed and run successfully
-		}
-	};
-	print $@ if $@;
-}
-
-sub refresh {
-	print "SiG" if $ND::refresh;
-	$ND::refresh = 0;
-}
-
-Irssi::timeout_add(60*1000, 'refresh', undef);
-Irssi::timeout_add(1000, sub{refresh if $ND::refresh}, undef);
-Irssi::signal_add('message public','event_pubmsg');
-Irssi::signal_add('message private','event_privmsg');
 
+POE::Session->create(
+	package_states => [
+		'NDIRC::CommonStates' => [ qw(_default _start irc_001 sig_DIE sig_usr1 sig_usr2
+			signal_handler irc_disconnected irc_invite) ],
+		'NDIRC::Delling' => [ qw(irc_public irc_msg refresh irc_join) ],
+	],
+	heap => { irc => $irc},
+);
 
+$poe_kernel->run();