Bot message sending restructure

[NDIRC.git] / Delling.pm

diff --git a/Delling.pm b/Delling.pm
index 96ff5ba9ebe4ae111ab4d93ae7a81a86ef357917..01097f2b318e54b9e2472bf34311e4efca472464 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -181,7 +181,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 +204,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});
        }
 
@@ -249,6 +249,7 @@ after discord_message_create => sub {
                        channel => $channel,
                        disp => $self->disp,
                        model => DB(),
+                       bot => $self,
                        discord => $self->discord,
                });