fix: Fixed Orbital Discord Notification (#101)

* fix: Fixed if Orbital attacker is missing alliance the Discord payload becomes invalid. * fix: Fixed StructureUnderAttack if missing Alliance
eveseat · Sep 5, 2024 · 4d032d7 · 4d032d7
1 parent 96ffce2
commit 4d032d7
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/src/Notifications/Structures/Discord/OrbitalAttacked.php b/src/Notifications/Structures/Discord/OrbitalAttacked.php
@@ -69,13 +69,12 @@ public function populateMessage(DiscordMessage $message, $notifiable): void
                                     ->name
                             )
                         );
-                })
-                    ->field(function (DiscordEmbedField $field) {
-                        if (! array_key_exists('aggressorAllianceID', $this->notification->text) || is_null(
-                                $this->notification->text['aggressorAllianceID']
-                            )) {
-                            return;
-                        }
+                });
+
+                if (array_key_exists('aggressorAllianceID', $this->notification->text) && ! is_null(
+                    $this->notification->text['aggressorAllianceID']
+                    )) {
+                    $embed->field(function (DiscordEmbedField $field) {
 
                         $field->name('Alliance')
                             ->value(
@@ -90,6 +89,7 @@ public function populateMessage(DiscordMessage $message, $notifiable): void
                                 )
                             );
                     });
+                }
             })
             ->embed(function (DiscordEmbed $embed) {
                 $embed->field(function (DiscordEmbedField $field) {

diff --git a/src/Notifications/Structures/Discord/StructureUnderAttack.php b/src/Notifications/Structures/Discord/StructureUnderAttack.php
@@ -66,14 +66,12 @@ public function populateMessage(DiscordMessage $message, $notifiable): void
                                 $this->notification->text['corpName']
                             )
                         );
-                })
-                    ->field(function (DiscordEmbedField $field) {
-                        if (! array_key_exists('allianceID', $this->notification->text) || is_null(
-                                $this->notification->text['allianceID']
-                            )) {
-                            return;
-                        }
+                });
 
+                if (array_key_exists('aggressorAllianceID', $this->notification->text) && ! is_null(
+                    $this->notification->text['aggressorAllianceID']
+                    )) {
+                    $embed->field(function (DiscordEmbedField $field) {
                         $field->name('Alliance')
                             ->value(
                                 $this->zKillBoardToDiscordLink(
@@ -82,33 +80,35 @@ public function populateMessage(DiscordMessage $message, $notifiable): void
                                     $this->notification->text['allianceName']
                                 )
                             );
-                    })
-                    ->field(function (DiscordEmbedField $field) {
-                        $system = MapDenormalize::find($this->notification->text['solarsystemID']);
+                    });
+                }
 
-                        $field->name('System')
-                            ->value(
-                                $this->zKillBoardToDiscordLink(
-                                    'system',
-                                    $system->itemID,
-                                    $system->itemName . ' (' . number_format($system->security, 2) . ')'
-                                )
-                            );
-                    })
-                    ->field(function (DiscordEmbedField $field) {
-                        $structure = UniverseStructure::find($this->notification->text['structureID']);
+                $embed->field(function (DiscordEmbedField $field) {
+                    $system = MapDenormalize::find($this->notification->text['solarsystemID']);
 
-                        $type = InvType::find($this->notification->text['structureShowInfoData'][1]);
+                    $field->name('System')
+                        ->value(
+                            $this->zKillBoardToDiscordLink(
+                                'system',
+                                $system->itemID,
+                                $system->itemName . ' (' . number_format($system->security, 2) . ')'
+                            )
+                        );
+                })
+                ->field(function (DiscordEmbedField $field) {
+                    $structure = UniverseStructure::find($this->notification->text['structureID']);
 
-                        $title = 'Structure';
+                    $type = InvType::find($this->notification->text['structureShowInfoData'][1]);
 
-                        if (! is_null($structure)) {
-                            $title = $structure->name;
-                        }
+                    $title = 'Structure';
 
-                        $field->name($title)
-                            ->value($type->typeName);
-                    });
+                    if (! is_null($structure)) {
+                        $title = $structure->name;
+                    }
+
+                    $field->name($title)
+                        ->value($type->typeName);
+                });
             })
             ->embed(function (DiscordEmbed $embed) {
                 $embed->field(function (DiscordEmbedField $field) {