diff --git a/app/Console/Commands/ReceiveEmail.php b/app/Console/Commands/ReceiveEmail.php index 58653ac..82920bd 100644 --- a/app/Console/Commands/ReceiveEmail.php +++ b/app/Console/Commands/ReceiveEmail.php @@ -81,24 +81,26 @@ class ReceiveEmail extends Command }) ->first(); - $subdomain = substr($recipient['domain'], 0, strrpos($recipient['domain'], '.'.$parentDomain)); + if ($parentDomain) { + $subdomain = substr($recipient['domain'], 0, strrpos($recipient['domain'], '.'.$parentDomain)); - if ($subdomain === 'unsubscribe') { - $this->handleUnsubscribe($recipient); - continue; - } - - $user = User::where('username', $subdomain)->first(); - - if (is_null($user)) { - // Check if this is a custom domain. - if ($customDomain = Domain::where('domain', $recipient['domain'])->first()) { - $user = $customDomain->user; + if ($subdomain === 'unsubscribe') { + $this->handleUnsubscribe($recipient); + continue; } // Check if this is an additional username. if ($additionalUsername = AdditionalUsername::where('username', $subdomain)->first()) { $user = $additionalUsername->user; + } else { + $user = User::where('username', $subdomain)->first(); + } + } + + if (!isset($user)) { + // Check if this is a custom domain. + if ($customDomain = Domain::where('domain', $recipient['domain'])->first()) { + $user = $customDomain->user; } // Check if this is a uuid generated alias. diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 36c323e..5a24c60 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -40,7 +40,7 @@
diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php index 4ee9028..1373bde 100644 --- a/resources/views/auth/verify.blade.php +++ b/resources/views/auth/verify.blade.php @@ -20,7 +20,7 @@

- {{ __('Before proceeding, please check your email for a verification link.') }} + {{ __('Before proceeding, please check your email for a verification link.') }} This link will expire after 1 hour.