Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix discord messages again #98

Merged
merged 4 commits into from
Mar 20, 2024
Merged

Fix discord messages again #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b70be0
update corp leave message to allow corp or char info if either is kno…
justindh Sep 7, 2023
ce8a7c9
Fix colors for moon mining discord notifications.
zenobio93 Feb 4, 2024
63136d5
SolarSystem issue while not used MapDenormalize
zenobio93 Feb 4, 2024
5638679
Merge branch 'eveseat:master' into bugfix/discord-notifications
zenobio93 Mar 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Notifications/Sovereignties/Discord/EntosisCaptureStarted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

use Seat\Eveapi\Models\Character\CharacterNotification;
use Seat\Eveapi\Models\Sde\InvType;
use Seat\Eveapi\Models\Sde\SolarSystem;
use Seat\Eveapi\Models\Sde\MapDenormalize;
use Seat\Notifications\Notifications\AbstractDiscordNotification;
use Seat\Notifications\Services\Discord\Messages\DiscordEmbed;
use Seat\Notifications\Services\Discord\Messages\DiscordEmbedField;
Expand Down Expand Up @@ -68,7 +68,7 @@ public function populateMessage(DiscordMessage $message, $notifiable)
$embed->author('SeAT Sovereignty Health', asset('web/img/favico/apple-icon-180x180.png'));

$embed->field(function (DiscordEmbedField $field) {
$system = SolarSystem::find($this->notification->text['solarSystemID']);
$system = MapDenormalize::find($this->notification->text['solarSystemID']);

$field->name('System')
->value($this->zKillBoardToDiscordLink(
Expand Down
4 changes: 2 additions & 2 deletions src/Notifications/Sovereignties/Discord/SovCommandNodeEventStarted.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
namespace Seat\Notifications\Notifications\Sovereignties\Discord;

use Seat\Eveapi\Models\Character\CharacterNotification;
use Seat\Eveapi\Models\Sde\SolarSystem;
use Seat\Eveapi\Models\Sde\MapDenormalize;
use Seat\Notifications\Notifications\AbstractDiscordNotification;
use Seat\Notifications\Services\Discord\Messages\DiscordEmbed;
use Seat\Notifications\Services\Discord\Messages\DiscordEmbedField;
Expand Down Expand Up @@ -67,7 +67,7 @@ public function populateMessage(DiscordMessage $message, $notifiable)
$embed->author('SeAT Sovereignty Health', asset('web/img/favico/apple-icon-180x180.png'));

$embed->field(function (DiscordEmbedField $field) {
$system = SolarSystem::find($this->notification->text['solarSystemID']);
$system = MapDenormalize::find($this->notification->text['solarSystemID']);

$field->name('System')
->value($this->zKillBoardToDiscordLink(
Expand Down
12 changes: 6 additions & 6 deletions src/Notifications/Structures/Traits/MoonMiningNotificationTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ trait MoonMiningNotificationTrait

const R64_MARKET_GROUP_ID = 2401;

const ORE_COLOR = '#d2d6de';
const ORE_COLOR = 12370112;

const GAZ_COLOR = '#00a65a';
const GAZ_COLOR = 5763719;

const R8_COLOR = '#3c8dbc';
const R8_COLOR = 9936031;

const R16_COLOR = '#00c0ef';
const R16_COLOR = 10038562;

const R32_COLOR = '#f39c12';
const R32_COLOR = 11027200;

const R64_COLOR = '#dd4b39';
const R64_COLOR = 15844367;

/**
* @return array<string, array<int|string, mixed>>
Expand Down