X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Delling.pm;h=2b5eff81cdc556e1631857b46ccb3f67a1004d6c;hb=5e3d1d34e92582e05cc242356b60aeef5bc76a34;hp=c6d06fa1ac500ccaf92e14c5efed3476c99bb5b1;hpb=d43083661d814e3ef6d92a29fb2501515e429d71;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index c6d06fa..2b5eff8 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -149,31 +149,42 @@ sub refresh {
 		SET sent = TRUE WHERE id = ANY($1)
 		});
 	$scans->execute;
+	my @scanreqs;
 	while (my $scan = $scans->fetchrow_hashref){
 		$self->message("($scan->{coords} $scan->{type})"
 			." http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}"
 			, @{$scan->{nick}});
 		$sentscan->execute($scan->{id});
+		push @scanreqs, @{$scan->{id}};
+	}
+
+	if (scalar @scanreqs > 0)
+	{
+		my $scanreqs =  join(', ', @scanreqs);
+		$self->toTarget(scan => "Handled the following requests: $scanreqs");
 	}
 
 	my @row = $dbh->selectrow_array(q{SELECT tick(), max(tick) FROM planet_stats});
 	if ($tick != $row[0]){
 		$tick = $row[0];
-		$self->toTarget(def => "New tick: $tick");
 	}
 	if (defined $row[1] && $stattick != $row[1]){
 		$stattick = $row[1];
 		$self->toTarget(spam => "New tick: $stattick");
+		my $raids = $dbh->prepare(q{UPDATE raids SET open = true WHERE NOT open AND NOT removed AND open_tick <= $1 RETURNING id});
+		$raids->execute($stattick);
+		while (my $raid = $raids->fetchrow_hashref) {
+			$self->toTarget(members => "\@everyone Raid is now open: https://nd.ruin.nu/raids/view/$raid->{id}");
+		}
 	}
 	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'){
-			$self->toTarget(def => "<c04>## $req->{username} via webbie ## >></c> $req->{message}");
-			$self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ','#def-ndawn',$dbh);
+			$self->toTarget(def => "> __**## $req->{username} via webbie ##**__ >> $req->{message}");
 		}else{
-			$self->toTarget($req->{channel} => "<$req->{username} via webbie> $req->{message}");
+			$self->toTarget($req->{channel} => "> <$req->{username} via webbie> $req->{message}");
 		}
 		$upircreq->execute($req->{id});
 	}
@@ -220,6 +231,9 @@ after discord_message_create => sub {
 	my $channel = "D-".$channel_id;
 	if (exists $self->discord_channels->{$channel_id}) {
 		$channel = 'dm' if ($self->discord_channels->{$channel_id}->{type} == 1);
+	} else
+	{
+		$channel = 'dm';
 	}
 
 	say localtime(time) . " - $channel_id $channel $author_name $author_id";