From 827dca1b13ddf19dce2dee7406888c676ca1fd8a Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Fri, 22 Jan 2010 15:09:19 +0100 Subject: [PATCH] Let Delling take over Eos' responsibilities --- Commands/Basic.pm | 15 +++++ Commands/Def.pm | 14 ---- Commands/Scans.pm | 14 ---- Delling.pm | 89 ++++++++++++++++++++++++- Eos.pm | 163 --------------------------------------------- database/roles.sql | 15 ++--- 6 files changed, 108 insertions(+), 202 deletions(-) delete mode 100644 Eos.pm diff --git a/Commands/Basic.pm b/Commands/Basic.pm index 1249f20..62aa717 100644 --- a/Commands/Basic.pm +++ b/Commands/Basic.pm @@ -80,5 +80,20 @@ command cmd => { } }; +command anon => { + help => q(syntax: .anon nick message), + type => q(anon), + acl => q(irc_anon), +}, class extends NDIRC::Command { + method execute($c,$msg) { + my ($target,$mess) = $msg =~ /^(\S+) (.*)$/ or die 'ARGS'; + + $c->message(privmsg => $target, "$mess (reply with /msg " + .$c->channel.")"); + $c->message(privmsg => $c->channel, "$target << $mess"); + } +}; + + 1; diff --git a/Commands/Def.pm b/Commands/Def.pm index d16de2d..5aec931 100644 --- a/Commands/Def.pm +++ b/Commands/Def.pm @@ -25,20 +25,6 @@ use feature ':5.10'; use MooseX::Declare; use NDIRC::Dispatcher; -command anon => { - help => q(syntax: .anon nick message), - type => q(def), - acl => q(irc_anondef), -}, class extends NDIRC::Command { - method execute($c,$msg) { - - my ($target,$mess) = $msg =~ /^(\S+) (.*)$/ or die 'ARGS'; - - $c->message(privmsg => $target, "$mess"); - $c->message(privmsg => $c->channel, "$target << $mess"); - } -}; - command defcall => { help => q(syntax: .defcall [callid] | if a call id is given, then shiptypes and eta will be fetched from the database and added to the message), type => q(def), diff --git a/Commands/Scans.pm b/Commands/Scans.pm index bc0f4c0..8ea51ff 100644 --- a/Commands/Scans.pm +++ b/Commands/Scans.pm @@ -198,20 +198,6 @@ SELECT ship,amount FROM fleet_ships WHERE fid = $1 ORDER BY num } }; -command anon => { - help => q(syntax: .anon nick message), - type => q(scan), - acl => q(irc_anonscan), -}, class extends NDIRC::Command { - method execute($c,$msg) { - my ($target,$mess) = $msg =~ /^(\S+) (.*)$/ or die 'ARGS'; - - $c->message(privmsg => $target, "$mess (reply with /msg " - .$c->channel.")"); - $c->message(privmsg => $c->channel, "$target << $mess"); - } -}; - command addscan => { help => q(syntax: .addscan list of scans), }, class extends NDIRC::Command { diff --git a/Delling.pm b/Delling.pm index 39c7cf9..dc4a0b0 100644 --- a/Delling.pm +++ b/Delling.pm @@ -36,6 +36,9 @@ has hal => ( lazy_build => 1, ); +my ($tick,$stattick) = (0,0); +my $last_announcement = 0; + after irc_public => sub { my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2]; my ($nick,$username,$address) = ( split /[!@]/, $who ); @@ -85,6 +88,7 @@ sub irc_join { my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1]; my ($nick,$username,$address) = ( split /[!@]/, $who ); my $irc = $sender->get_heap(); + my $disp = $self->disp; my $dbh = DB(); my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?}); @@ -108,13 +112,49 @@ WHERE u.hostmask = $1 AND channel = $2 AND flag IN ('o','v'); say "$mode - @who"; $irc->yield(mode => $channel, $mode, @who) if $mode; } + + if (lc $channel ~~ lc $disp->targets->{members}){ + if (time - $last_announcement < 1){ + $last_announcement = time; + return; + } + my $user = $dbh->selectrow_hashref(q{ +SELECT uid,pid,hostmask,password + ,(SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid) AS last_forum_visit +FROM users u WHERE hostmask = ? + }, undef, $address); + if ($user){ + if ($user->{password} eq ''){ + $irc->yield(privmsg => $disp->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points"); + } + if ($tick > 36 && not defined $user->{pid}){ + $irc->yield(privmsg => $disp->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords."); + } + + if (not defined $user->{last_forum_visit}){ + $irc->yield(privmsg => $disp->targets->{members}, "$nick: Go read the forum! https://nd.ruin.nu/forum"); + }else { + my $unread = $dbh->selectrow_hashref(q{SELECT * FROM unread_posts($1)},undef,$user->{uid}); + if ($unread && $unread->{new}){ + $irc->yield(notice => $nick, "$unread->{new} posts since your last forum visit ($unread->{unread} unread posts in total) https://nd.ruin.nu/forum/allUnread"); + } + } + } + if (time - $last_announcement < 2){ + $last_announcement = time; + return; + } + $last_announcement = time; + } } sub refresh { - my ($kernel,$heap) = @_[KERNEL,HEAP]; + my ($self,$kernel,$heap) = @_[OBJECT,KERNEL,HEAP]; $kernel->delay( refresh => 60 ); print 'Time: ' . time() . ' Lag: ' . $heap->{connector}->lag() . "\n"; + my $irc = $heap->{irc}; + my $disp = $self->disp; my $dbh = DB(); my $scans = $dbh->prepare(q{SELECT s.scan_id ,coords(x,y,z),type @@ -136,7 +176,48 @@ sub refresh { ." http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}"); $sentscan->execute($scan->{id}); } - return; + + my @row = $dbh->selectrow_array(q{SELECT tick(), max(tick) FROM planet_stats}); + if ($tick != $row[0]){ + $tick = $row[0]; + $irc->yield(privmsg => $disp->targets->{def}, "New tick: $tick"); + } + if (defined $row[1] && $stattick != $row[1]){ + $stattick = $row[1]; + $irc->yield(privmsg => $disp->targets->{members}, "New tick: $stattick"); + } + my $ircreqs = $dbh->prepare(q{SELECT id,username,message,channel FROM irc_requests NATURAL JOIN users WHERE not sent}); + my $upircreq = $dbh->prepare(q{UPDATE irc_requests SET sent = TRUE WHERE id = ?}); + $ircreqs->execute; + while (my $req = $ircreqs->fetchrow_hashref){ + if ($req->{channel} eq 'def'){ + $irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 ## $req->{username} via webbie ## >> $req->{message}"); + $self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$dbh); + }elsif(exists $disp->targets->{$req->{channel}}){ + $irc->yield(privmsg => $disp->targets->{$req->{channel}}, "<$req->{username} via webbie> $req->{message}"); + } + $upircreq->execute($req->{id}); + } + my $defmissions = $dbh->prepare(q{ +SELECT username,call,tick,dm.fleet,p.value + ,100 * SUM(fs.amount * (metal + crystal + eonium) / 100) / p.value AS value +FROM users u + JOIN current_planet_stats p USING (pid) + JOIN launch_confirmations USING (uid) + JOIN fleets f USING (fid) + JOIN fleet_ships fs USING (fid) + JOIN defense_missions dm ON f.fid = dm.fleet + JOIN ship_stats ss ON fs.ship = ss.name +WHERE NOT dm.announced +GROUP BY username,call,tick,dm.fleet,p.value + }); + my $updefmis = $dbh->prepare(q{UPDATE defense_missions SET announced = TRUE WHERE fleet = ?}); + $defmissions->execute(); + while (my $mission = $defmissions->fetchrow_hashref){ + $irc->yield(privmsg => $disp->targets->{def}, chr(3)."06 $mission->{username} sent def to call $mission->{call}, $mission->{value}% of value (tick $mission->{tick}) https://nd.ruin.nu/calls/edit/$mission->{call}"); + $updefmis->execute($mission->{fleet}); + } + } sub _build_hal { @@ -150,4 +231,8 @@ after sig_usr2 => sub { $self->hal->_cleanup; }; +after _start => sub { + ($tick,$stattick) = DB()->selectrow_array(q{SELECT tick(),max(tick) FROM planet_stats}); +}; + 1; diff --git a/Eos.pm b/Eos.pm deleted file mode 100644 index d397244..0000000 --- a/Eos.pm +++ /dev/null @@ -1,163 +0,0 @@ -#************************************************************************** -# Copyright (C) 2009 by Michael Andreen * -# * -# This program is free software; you can redistribute it and/or modify * -# it under the terms of the GNU General Public License as published by * -# the Free Software Foundation; either version 2 of the License, or * -# (at your option) any later version. * -# * -# This program is distributed in the hope that it will be useful, * -# but WITHOUT ANY WARRANTY; without even the implied warranty of * -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# GNU General Public License for more details. * -# * -# You should have received a copy of the GNU General Public License * -# along with this program; if not, write to the * -# Free Software Foundation, Inc., * -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * -#**************************************************************************/ -package NDIRC::Eos; - -use strict; -use warnings; -use feature ':5.10'; - -use Moose; -extends 'NDIRC::Bot'; - -use POE::Session; -use ND::DB; - -my ($tick,$stattick) = DB()->selectrow_array(q{SELECT tick(),max(tick) FROM planet_stats}); -my $last_announcement = 0; - -after irc_public => sub { - my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2]; - my ($nick,$username,$address) = ( split /[!@]/, $who ); - my $channel = $where->[0]; - - my $irc = $sender->get_heap(); - - if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){ - my $_ = $1; - my $text = $2; - unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){ - $msg = ".anon $_ $text"; - } - - } - if ($self->parseCommand($msg,$irc,$nick,$address,$channel,DB())){ - #Command parsed and run successfully - } -}; - - -after irc_msg => sub { - my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2]; - my ($nick,$username,$address) = ( split /[!@]/, $who ); - my $irc = $sender->get_heap(); - - if ($self->parseCommand($msg,$irc,$nick,$address,'pm',DB())){ - #Command parsed and run successfully - }else{ - my $disp = $self->disp; - $irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 $nick >> $msg"); - $self->parseCommand("~report_incs $msg",$irc,$nick,' BATCH ',$disp->targets->{def},DB()); - } -}; - -sub irc_join { - my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1]; - my ($nick,$username,$address) = ( split /[!@]/, $who ); - my $irc = $sender->get_heap(); - my $disp = $self->disp; - - my $dbh = DB(); - - if (lc $channel ~~ lc $disp->targets->{members}){ - if (time - $last_announcement < 1){ - $last_announcement = time; - return; - } - my $user = $dbh->selectrow_hashref(q{ -SELECT uid,pid,hostmask,password - ,(SELECT max(time) FROM forum_thread_visits WHERE uid = u.uid) AS last_forum_visit -FROM users u WHERE hostmask = ? - }, undef, $address); - if ($user){ - if ($user->{password} eq ''){ - $irc->yield(privmsg => $disp->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points"); - } - if ($tick > 36 && not defined $user->{pid}){ - $irc->yield(privmsg => $disp->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords."); - } - - if (not defined $user->{last_forum_visit}){ - $irc->yield(privmsg => $disp->targets->{members}, "$nick: Go read the forum! https://nd.ruin.nu/forum"); - }else { - my $unread = $dbh->selectrow_hashref(q{SELECT * FROM unread_posts($1)},undef,$user->{uid}); - if ($unread && $unread->{new}){ - $irc->yield(notice => $nick, "$unread->{new} posts since your last forum visit ($unread->{unread} unread posts in total) https://nd.ruin.nu/forum/allUnread"); - } - } - } - if (time - $last_announcement < 2){ - $last_announcement = time; - return; - } - $last_announcement = time; - } -} - -sub refresh { - my ($self,$kernel,$heap) = @_[OBJECT,KERNEL,HEAP]; - $kernel->delay( refresh => 60 ); - print 'Time: ' . time() . ' Lag: ' . $heap->{connector}->lag() . "\n"; - - my $irc = $heap->{irc}; - my $disp = $self->disp; - my $dbh = DB(); - - my @row = $dbh->selectrow_array(q{SELECT tick(), max(tick) FROM planet_stats}); - if ($tick != $row[0]){ - $tick = $row[0]; - $irc->yield(privmsg => $disp->targets->{def}, "New tick: $tick"); - } - if (defined $row[1] && $stattick != $row[1]){ - $stattick = $row[1]; - $irc->yield(privmsg => $disp->targets->{members}, "New tick: $stattick"); - } - my $ircreqs = $dbh->prepare(q{SELECT id,username,message,channel FROM irc_requests NATURAL JOIN users WHERE not sent}); - my $upircreq = $dbh->prepare(q{UPDATE irc_requests SET sent = TRUE WHERE id = ?}); - $ircreqs->execute; - while (my $req = $ircreqs->fetchrow_hashref){ - if ($req->{channel} eq 'def'){ - $irc->yield(privmsg => $disp->targets->{def}, chr(3)."04 ## $req->{username} via webbie ## >> $req->{message}"); - $self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$dbh); - }elsif(exists $disp->targets->{$req->{channel}}){ - $irc->yield(privmsg => $disp->targets->{$req->{channel}}, "<$req->{username} via webbie> $req->{message}"); - } - $upircreq->execute($req->{id}); - } - my $defmissions = $dbh->prepare(q{ -SELECT username,call,tick,dm.fleet,p.value - ,100 * SUM(fs.amount * (metal + crystal + eonium) / 100) / p.value AS value -FROM users u - JOIN current_planet_stats p USING (pid) - JOIN launch_confirmations USING (uid) - JOIN fleets f USING (fid) - JOIN fleet_ships fs USING (fid) - JOIN defense_missions dm ON f.fid = dm.fleet - JOIN ship_stats ss ON fs.ship = ss.name -WHERE NOT dm.announced -GROUP BY username,call,tick,dm.fleet,p.value - }); - my $updefmis = $dbh->prepare(q{UPDATE defense_missions SET announced = TRUE WHERE fleet = ?}); - $defmissions->execute(); - while (my $mission = $defmissions->fetchrow_hashref){ - $irc->yield(privmsg => $disp->targets->{def}, chr(3)."06 $mission->{username} sent def to call $mission->{call}, $mission->{value}% of value (tick $mission->{tick}) https://nd.ruin.nu/calls/edit/$mission->{call}"); - $updefmis->execute($mission->{fleet}); - } -} - -1; diff --git a/database/roles.sql b/database/roles.sql index 6809e92..657c969 100644 --- a/database/roles.sql +++ b/database/roles.sql @@ -5,7 +5,6 @@ INSERT INTO roles VALUES('irc_masterinvite'); INSERT INTO roles VALUES('irc_gs'); INSERT INTO roles VALUES('irc_scanreqs'); INSERT INTO roles VALUES('irc_scan'); -INSERT INTO roles VALUES('irc_anonscan'); INSERT INTO roles VALUES('irc_delquote'); INSERT INTO roles VALUES('irc_points_others'); INSERT INTO roles VALUES('irc_sms'); @@ -28,7 +27,6 @@ INSERT INTO roles VALUES('irc_sethostile'); INSERT INTO roles VALUES('irc_setnick'); INSERT INTO roles VALUES('irc_setally'); INSERT INTO roles VALUES('irc_setchannel'); -INSERT INTO roles VALUES('irc_anondef'); INSERT INTO roles VALUES('irc_defcall'); INSERT INTO roles VALUES('irc_settype'); INSERT INTO roles VALUES('irc_calltake'); @@ -45,13 +43,14 @@ INSERT INTO roles VALUES('irc_cmd'); INSERT INTO roles VALUES('irc_allycoords'); INSERT INTO roles VALUES('irc_allygals'); INSERT INTO roles VALUES('irc_g_intel'); +INSERT INTO roles VALUES('irc_anon'); INSERT INTO group_roles (gid,role) VALUES('T','irc_p_nick'); INSERT INTO group_roles (gid,role) VALUES('T','irc_p_intel'); INSERT INTO group_roles (gid,role) VALUES('T','irc_masterop'); INSERT INTO group_roles (gid,role) VALUES('T','irc_masterinvite'); INSERT INTO group_roles (gid,role) VALUES('T','irc_scanreqs'); -INSERT INTO group_roles (gid,role) VALUES('T','irc_anonscan'); +INSERT INTO group_roles (gid,role) VALUES('T','irc_anon'); INSERT INTO group_roles (gid,role) VALUES('T','irc_delquote'); INSERT INTO group_roles (gid,role) VALUES('T','irc_points_others'); INSERT INTO group_roles (gid,role) VALUES('T','irc_sms'); @@ -74,7 +73,6 @@ INSERT INTO group_roles (gid,role) VALUES('T','irc_sethostile'); INSERT INTO group_roles (gid,role) VALUES('T','irc_setnick'); INSERT INTO group_roles (gid,role) VALUES('T','irc_setally'); INSERT INTO group_roles (gid,role) VALUES('T','irc_setchannel'); -INSERT INTO group_roles (gid,role) VALUES('T','irc_anondef'); INSERT INTO group_roles (gid,role) VALUES('T','irc_defcall'); INSERT INTO group_roles (gid,role) VALUES('T','irc_settype'); INSERT INTO group_roles (gid,role) VALUES('T','irc_calltake'); @@ -99,7 +97,7 @@ INSERT INTO group_roles (gid,role) VALUES('H','irc_p_nick'); INSERT INTO group_roles (gid,role) VALUES('H','irc_masterop'); INSERT INTO group_roles (gid,role) VALUES('H','irc_masterinvite'); INSERT INTO group_roles (gid,role) VALUES('H','irc_scanreqs'); -INSERT INTO group_roles (gid,role) VALUES('H','irc_anonscan'); +INSERT INTO group_roles (gid,role) VALUES('H','irc_anon'); INSERT INTO group_roles (gid,role) VALUES('H','irc_delquote'); INSERT INTO group_roles (gid,role) VALUES('H','irc_points_others'); INSERT INTO group_roles (gid,role) VALUES('H','irc_sms'); @@ -122,7 +120,6 @@ INSERT INTO group_roles (gid,role) VALUES('H','irc_sethostile'); INSERT INTO group_roles (gid,role) VALUES('H','irc_setnick'); INSERT INTO group_roles (gid,role) VALUES('H','irc_setally'); INSERT INTO group_roles (gid,role) VALUES('H','irc_setchannel'); -INSERT INTO group_roles (gid,role) VALUES('H','irc_anondef'); INSERT INTO group_roles (gid,role) VALUES('H','irc_defcall'); INSERT INTO group_roles (gid,role) VALUES('H','irc_settype'); INSERT INTO group_roles (gid,role) VALUES('H','irc_calltake'); @@ -156,7 +153,7 @@ INSERT INTO group_roles (gid,role) VALUES('D','irc_getships'); INSERT INTO group_roles (gid,role) VALUES('D','irc_getfleet'); INSERT INTO group_roles (gid,role) VALUES('D','irc_d'); INSERT INTO group_roles (gid,role) VALUES('D','irc_sethostile'); -INSERT INTO group_roles (gid,role) VALUES('D','irc_anondef'); +INSERT INTO group_roles (gid,role) VALUES('D','irc_anon'); INSERT INTO group_roles (gid,role) VALUES('D','irc_defcall'); INSERT INTO group_roles (gid,role) VALUES('D','irc_settype'); INSERT INTO group_roles (gid,role) VALUES('D','irc_calltake'); @@ -166,7 +163,7 @@ INSERT INTO group_roles (gid,role) VALUES('D','irc_sendsms'); INSERT INTO group_roles (gid,role) VALUES('D','irc_smsstatus'); INSERT INTO group_roles (gid,role) VALUES('S','irc_scanreqs'); -INSERT INTO group_roles (gid,role) VALUES('S','irc_anonscan'); +INSERT INTO group_roles (gid,role) VALUES('S','irc_anon'); INSERT INTO group_roles (gid,role) VALUES('R','irc_p_nick'); INSERT INTO group_roles (gid,role) VALUES('R','irc_p_intel'); @@ -185,7 +182,7 @@ INSERT INTO group_roles (gid,role) VALUES('s','irc_getships'); INSERT INTO group_roles (gid,role) VALUES('s','irc_getfleet'); INSERT INTO group_roles (gid,role) VALUES('s','irc_d'); INSERT INTO group_roles (gid,role) VALUES('s','irc_sethostile'); -INSERT INTO group_roles (gid,role) VALUES('s','irc_anondef'); +INSERT INTO group_roles (gid,role) VALUES('s','irc_anon'); INSERT INTO group_roles (gid,role) VALUES('s','irc_defcall'); INSERT INTO group_roles (gid,role) VALUES('s','irc_settype'); INSERT INTO group_roles (gid,role) VALUES('s','irc_calltake'); -- 2.39.2