diff --git a/app/Mail/SpaceInvitationMail.php b/app/Mail/SpaceInvitationMail.php index 50fab075..a93d3893 100644 --- a/app/Mail/SpaceInvitationMail.php +++ b/app/Mail/SpaceInvitationMail.php @@ -3,6 +3,7 @@ namespace App\Mail; use App\Models\SpaceInvitation; +use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; @@ -30,7 +31,7 @@ class SpaceInvitationMail extends Mailable implements ShouldQueue { return new Envelope( subject: __(':inviter invited you to :space on Whisper Money', [ - 'inviter' => $this->invitation->invitedBy?->name ?? __('Someone'), + 'inviter' => User::query()->whereKey($this->invitation->invited_by_id)->value('name') ?? __('Someone'), 'space' => $this->invitation->space->name, ]), ); @@ -41,9 +42,8 @@ class SpaceInvitationMail extends Mailable implements ShouldQueue return new Content( markdown: 'mail.space-invitation', with: [ - 'invitation' => $this->invitation, 'spaceName' => $this->invitation->space->name, - 'inviterName' => $this->invitation->invitedBy?->name ?? __('A Whisper Money user'), + 'inviterName' => User::query()->whereKey($this->invitation->invited_by_id)->value('name') ?? __('A Whisper Money user'), 'acceptUrl' => route('spaces.invitations.accept', $this->invitation->token), ], ); diff --git a/app/Models/SpaceInvitation.php b/app/Models/SpaceInvitation.php index 71b41027..402b53e1 100644 --- a/app/Models/SpaceInvitation.php +++ b/app/Models/SpaceInvitation.php @@ -16,6 +16,8 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; * @property string $token * @property ?Carbon $expires_at * @property ?Carbon $accepted_at + * @property-read Space $space + * @property-read ?User $invitedBy */ class SpaceInvitation extends Model {