Universal scan parsing

[NDIRC.git] / Delling.pm

diff --git a/Delling.pm b/Delling.pm
index 96ff5ba9ebe4ae111ab4d93ae7a81a86ef357917..e04619015f4fdb8e8a5fafc39dfb79c75a5f7580 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -162,8 +162,9 @@ sub refresh {
                });
        $scans->execute;
        while (my $scan = $scans->fetchrow_hashref){
-               $heap->{irc}->yield(notice => $scan->{nick}, "($scan->{coords} $scan->{type})"
-                       ." http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}");
+               $self->message("($scan->{coords} $scan->{type})"
+                       ." http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}"
+                       , @{$scan->{nick}});
                $sentscan->execute($scan->{id});
        }
 
@@ -181,7 +182,7 @@ sub refresh {
        $ircreqs->execute;
        while (my $req = $ircreqs->fetchrow_hashref){
                if ($req->{channel} eq 'def'){
-                       $self->toTarget(def => chr(3)."04 ## $req->{username} via webbie ## >> $req->{message}");
+                       $self->toTarget(def => "<c04>## $req->{username} via webbie ## >></c> $req->{message}");
                        #$self->parseCommand("~report_incs $req->{message}",$irc,$req->{username},' BATCH ',$disp->targets->{def},$dbh);
                }else{
                        $self->toTarget($req->{channel} => "<$req->{username} via webbie> $req->{message}");
@@ -204,7 +205,7 @@ 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){
-               $self->toTarget(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}");
+               $self->toTarget(def => "<c06>$mission->{username} sent def</c> to call $mission->{call}, $mission->{value}% of value (tick $mission->{tick}) https://nd.ruin.nu/calls/edit/$mission->{call}");
                $updefmis->execute($mission->{fleet});
        }
 
@@ -236,23 +237,17 @@ after discord_message_create => sub {
 
        say localtime(time) . " - $channel_id $channel $author_name $author_id";
 
-       my ($p,$command,$args) = ($msg =~ /^([.!~])(\S+)(?: (.+))?/);
-
-
-       return 0 unless $self->disp->has_command($command,$channel);
-
-       say localtime(time) . " - $msg";
-
        my $c = NDIRC::DiscordContext->new({
                        discord_id => $author_name,
                        channel_id => $channel_id,
                        channel => $channel,
                        disp => $self->disp,
                        model => DB(),
+                       bot => $self,
                        discord => $self->discord,
                });
 
-       return $self->disp->run_command($c,$command,$args);
+       return $self->handleCommand($c,$msg);
 
 };