X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Delling.pm;h=bf9bb9d665d8e17cb0a5ca44710a308e0c767de4;hb=48c2e7d852234548bdce239b4441b7a98de408a2;hp=33141596b3f6d82c29ceebe6ec6e4d1be398dbcd;hpb=05629ec258dcfc359decc3cbc44c3345dd0eb62e;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index 3314159..bf9bb9d 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -26,11 +26,13 @@ use Moose;
 extends 'NDIRC::Bot';
 
 use POE::Session;
-use NDIRC::Misc;
 use ND::DB;
 
-sub irc_public {
-	my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+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 );
 	my $channel = $where->[0];
 
@@ -41,22 +43,21 @@ sub irc_public {
 	my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
 	$seen->execute($address);
 
-	if ($msg =~ /^(\S+): (.+)$/ && $heap->{disp}->has_command('anon',$channel)){
-		my $_ = $1;
+	my $nickname = $irc->nick_name;
+	if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
+		local $_ = $1;
 		my $text = $2;
 		unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
 			$msg = ".anon $_ $text";
+			$self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh);
 		}
-
-	}
-	if (parseCommand($msg,$irc,$nick,$address,$channel,$heap->{disp},$dbh)){
+	}elsif ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
 		#Command parsed and run successfully
 	}
-}
-
+};
 
-sub irc_msg {
-	my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+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();
 
@@ -64,23 +65,24 @@ sub irc_msg {
 	my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
 	$seen->execute($address);
 
-	if (parseCommand($msg,$irc,$nick,$address,'pm',$heap->{disp},$dbh)){
+	if ($self->parseCommand($msg,$irc,$nick,$address,'pm',$dbh)){
 		#Command parsed and run successfully
 	}else{
 		$irc->yield(notice => $nick, "unknown command");
 	}
-}
+};
 
 sub irc_join {
-	my ($sender, $heap, $who, $channel) = @_[SENDER, HEAP, ARG0 .. ARG1];
+	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 = ?});
 	$seen->execute($address);
 
-	if($heap->{disp}->has_command('voice',$channel)){
+	if($self->disp->has_command('voice',$channel)){
 		my $flags = $dbh->prepare_cached(q{
 SELECT DISTINCT flag
 FROM users u
@@ -98,32 +100,120 @@ 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){
+			unless ($user->{password}) {
+				$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 > 12 && 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
 			,array_agg(sr.nick) AS nick
 			,array_agg(sr.id) AS id
 		FROM scan_requests sr
 			JOIN scans s USING (pid,type)
+			JOIN current_planet_stats USING (pid)
 		WHERE sr.time > NOW() - '30 min'::INTERVAL
 			AND s.tick >= sr.tick AND NOT sr.sent
-		GROUP BY scan_id
+		GROUP BY scan_id,x,y,z,type
 		});
 	my $sentscan = $dbh->prepare(q{UPDATE scan_requests
 		SET sent = TRUE WHERE id = ANY($1)
 		});
 	$scans->execute;
 	while (my $scan = $scans->fetchrow_hashref){
-		$heap->{irc}->yield(notice => $scan->{nick}, "http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
+		$heap->{irc}->yield(notice => $scan->{nick}, "($scan->{coords} $scan->{type})"
+			." 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 USING (ship)
+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});
+	}
+
 }
 
+after sig_usr2 => sub {
+	my $self = shift;
+};
+
+after _start => sub {
+ ($tick,$stattick) = DB()->selectrow_array(q{SELECT tick(),max(tick) FROM planet_stats});
+};
+
 1;