X-Git-Url: https://ruin.nu/git/%3CTMPL_VAR%20NAME=PAGE%3E?a=blobdiff_plain;f=Delling.pm;h=feb1d80cec65ca7b90425c075fc79a74c5552142;hb=3db297141ed28670ac7bd7b4a21cd8eac917fbac;hp=c6df7f24b7c5f9d5fb64f786ae7260592b4e6e24;hpb=410507b62593ec8cc527567ce44b2be347352df7;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index c6df7f2..feb1d80 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -167,21 +167,24 @@ sub refresh {
 	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});
 	}
@@ -228,9 +231,16 @@ 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";
+	if ($channel eq 'dm')
+	{
+		say " - '$msg'";
+	}
 
 	my $c = NDIRC::DiscordContext->new({
 			discord_id => $author_name,