Added alias description to banner info

ccorneli · Aug 10, 2021 · 55373af · 55373af
1 parent 5ab2eca
commit 55373af
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ Here are a few reasons I can think of:
 * Bring your own GPG/OpenPGP key to encrypt your forwarded emails (and the option to replace subjects)
 * No adverts
 * No analytics or trackers (just server access logs)
-* No third party content (excluding stripe.js on the subscription page)
+* No third party content
 * Open-source application code
 * No limitation on the number of aliases that can be created
 * Generous monthly bandwidth

diff --git a/app/Console/Commands/ReceiveEmail.php b/app/Console/Commands/ReceiveEmail.php
@@ -316,7 +316,7 @@ protected function handleBounce($returnPath)
             }
 
             // Try to find a user from the bounced email address
-            if ($recipient = Recipient::select(['id', 'email'])->get()->firstWhere('email', $bouncedEmailAddress)) {
+            if ($recipient = Recipient::select(['id', 'user_id', 'email', 'email_verified_at'])->get()->firstWhere('email', $bouncedEmailAddress)) {
                 if (!isset($user)) {
                     $user = $recipient->user;
                 }

diff --git a/app/CustomMailDriver/CustomSmtpTransport.php b/app/CustomMailDriver/CustomSmtpTransport.php
@@ -106,7 +106,7 @@ public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = nul
         $message->generateId(); //Make sure a new Message ID is used
 
         try {
-            // Get Postfix Queue ID and store in Redis for 6 hours?
+            // Get Postfix Queue ID and store in the database
             $id = str_replace("\r\n", "", Str::after($logger->dump(), 'Ok: queued as '));
 
             PostfixQueueId::create([

diff --git a/app/Mail/ForwardEmail.php b/app/Mail/ForwardEmail.php
@@ -205,6 +205,7 @@ public function build()
             'location' => $this->bannerLocation,
             'deactivateUrl' => $this->deactivateUrl,
             'aliasEmail' => $this->alias->email,
+            'aliasDescription' => $this->alias->description,
             'fromEmail' => $this->sender,
             'replacedSubject' => $this->replacedSubject,
             'shouldBlock' => $this->size === 0

diff --git a/resources/views/emails/forward/html.blade.php b/resources/views/emails/forward/html.blade.php
@@ -6,7 +6,7 @@
             @if($location === 'top')
             <tr>
                 <td style="padding:10px 20px;background-color:#fff;text-align:center;line-height:1.5;border-bottom:1px solid #cbd2d9;font-size:12px;width:100%;">
-                This email was sent to {{ $aliasEmail }} from {{ $fromEmail }}{{ $replacedSubject }} and has been forwarded by <a href="https://anonaddy.com" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">AnonAddy</a><br>Click <a href="{{ $deactivateUrl }}" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">here</a> to deactivate this alias
+                This email was sent to {{ $aliasEmail }}{{ $aliasDescription ? ' (' . $aliasDescription . ')' : '' }} from {{ $fromEmail }}{{ $replacedSubject }} and has been forwarded by <a href="https://anonaddy.com" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">AnonAddy</a><br>Click <a href="{{ $deactivateUrl }}" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">here</a> to deactivate this alias
                 </td>
             </tr>
             @endif
@@ -18,7 +18,7 @@
             @if($location === 'bottom')
             <tr>
                 <td style="padding:10px 20px;background-color:#fff;text-align:center;line-height:1.5;border-top:1px solid #cbd2d9;font-size:12px;width:100%;">
-                This email was sent to {{ $aliasEmail }} from {{ $fromEmail }}{{ $replacedSubject }} and has been forwarded by <a href="https://anonaddy.com" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">AnonAddy</a><br>Click <a href="{{ $deactivateUrl }}" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">here</a> to deactivate this alias
+                This email was sent to {{ $aliasEmail }}{{ $aliasDescription ? ' (' . $aliasDescription . ')' : '' }} from {{ $fromEmail }}{{ $replacedSubject }} and has been forwarded by <a href="https://anonaddy.com" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">AnonAddy</a><br>Click <a href="{{ $deactivateUrl }}" style="color:#2d3a8c;text-decoration:underline;" target="_blank" rel="noreferrer noopener nofollow">here</a> to deactivate this alias
                 </td>
             </tr>
             @endif

diff --git a/resources/views/emails/forward/text.blade.php b/resources/views/emails/forward/text.blade.php
@@ -1,5 +1,5 @@
 @if($location === 'top')
-This email was sent to {{ $aliasEmail }} from {{ $fromEmail }}{!! $replacedSubject !!} and has been forwarded by AnonAddy.
+This email was sent to {{ $aliasEmail }}{{ $aliasDescription ? ' (' . $aliasDescription . ')' : '' }} from {{ $fromEmail }}{!! $replacedSubject !!} and has been forwarded by AnonAddy.
 To deactivate this alias copy and paste the url below into your web browser.
 
 {{ $deactivateUrl }}
@@ -14,7 +14,7 @@
 
 -----
 
-This email was sent to {{ $aliasEmail }} from {{ $fromEmail }}{!! $replacedSubject !!} and has been forwarded by AnonAddy.
+This email was sent to {{ $aliasEmail }}{{ $aliasDescription ? ' (' . $aliasDescription . ')' : '' }} from {{ $fromEmail }}{!! $replacedSubject !!} and has been forwarded by AnonAddy.
 To deactivate this alias copy and paste the url below into your web browser.
 
 {{ $deactivateUrl }}