Also listen to MESSAGE_UPDATE

[NDIRC.git] / Delling.pm

diff --git a/Delling.pm b/Delling.pm
index 545df2fdc8aeaab7b886ac415422ad42ff4882da..c6df7f24b7c5f9d5fb64f786ae7260592b4e6e24 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -117,18 +117,6 @@ FROM users u WHERE hostmask = ?
                        unless ($user->{password}) {
                                $irc->yield(privmsg => $channel, "$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 => $channel, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
-                       }
-
-                       if (not defined $user->{last_forum_visit}){
-                               $irc->yield(privmsg => $channel, "$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;
@@ -161,11 +149,19 @@ 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});
@@ -220,8 +216,7 @@ after _start => sub {
 };
 
 after discord_message_create => sub {
-       my $self = shift;
-       my $hash = shift;
+       my ($self, $gw, $hash) = @_;
 
        my $author = $hash->{author};
        my $msg = $hash->{content};
@@ -240,6 +235,7 @@ after discord_message_create => sub {
        my $c = NDIRC::DiscordContext->new({
                        discord_id => $author_name,
                        channel_id => $channel_id,
+                       author_id => $author_id,
                        channel => $channel,
                        disp => $self->disp,
                        model => DB(),