Updated self-hosting instructions

.husky/pre-commit

@@ -1,2 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
+
+npm run pre-commit

README.md

@@ -11,7 +11,7 @@ This is the source code for self-hosting AnonAddy.
 - [What is a shared domain alias?](#what-is-a-shared-domain-alias)
 - [What is a standard alias?](#what-is-a-standard-alias)
 - [Can I use my own domain?](#can-i-use-my-own-domain)
-- [Can I add a domain and also use it as a recipient?](#can-i-add-a-domain-and-also-use-it-as-a-recipients)
+- [Can I add a domain and also use it as a recipient?](#can-i-add-a-domain-and-also-use-it-as-a-recipient)
 - [Why should I use this instead of a similar service?](#why-should-i-use-this-instead-of-a-similar-service)
 - [Is there a browser extension?](#is-there-a-browser-extension)
 - [Is there an Android app?](#is-there-an-android-app)
@@ -26,6 +26,7 @@ This is the source code for self-hosting AnonAddy.
 - [What happens when I delete my account?](#what-happens-when-i-delete-my-account)
 - [Does this work with any email provider?](#does-this-work-with-any-email-provider)
 - [How do I reply to a forwarded email?](#how-do-i-reply-to-a-forwarded-email)
+- [I'm trying to reply/send from an alias but the email keeps coming back to me, what's wrong?](#im-trying-to-reply-send-from-an-alias-but-the-email-keeps-coming-back-to-me-whats-wrong)
 - [Does AnonAddy strip out the banner information when I reply to an email?](#does-anonaddy-strip-out-the-banner-information-when-i-reply-to-an-email)
 - [How do I send email from an alias?](#how-do-i-send-email-from-an-alias)
 - [Will people see my real email if I reply to a forwarded one?](#will-people-see-my-real-email-if-i-reply-to-a-forwarded-one)
@@ -202,6 +203,14 @@ To check if a reply has worked properly check in your dashboard if the reply cou
 
 For further details please see this help article - [Replying to email using an alias](https://anonaddy.com/help/replying-to-email-using-an-alias/).
 
+## I'm trying to reply/send from an alias but the email keeps coming back to me, what's wrong?
+
+If you are tying to reply or send from an alias but the email keeps coming back to yourself then it is most likely because you are not sending the message from an email address that **is not listed as a verified recipient** on your AnonAddy account.
+
+If you try to reply or send from an alias using an unverified email address then the message will simply be forwarded to you as it would be if it was sent by any other sender.
+
+Please double check that you are indeed sending from a verified recipient email address by inspecting your sent items to see which address it was actually sent from.
+
 ## Does AnonAddy strip out the banner information when I reply to an email?
 
 At the moment the site does not automatically strip out the "This email was sent to..." text from forwarded emails when you reply to them. You need to either remove this from the quoted text manually or set the banner information to "off" in your account settings.

app/Http/Controllers/Api/AliasRecipientController.php

@@ -14,6 +14,6 @@ class AliasRecipientController extends Controller
 
         $alias->recipients()->sync($request->recipient_ids);
 
-        return new AliasResource($alias);
+        return new AliasResource($alias->refresh()->load('recipients'));
     }
 }

app/Http/Controllers/Api/DomainController.php

@@ -33,7 +33,7 @@ class DomainController extends Controller
         $domain->domain = $request->domain;
 
         if (! $domain->checkVerification()) {
-            return response('Verification record not found, please add the following TXT record to your domain: aa-verify=' . sha1(config('anonaddy.secret') . user()->id), 404);
+            return response('Verification record not found, please add the following TXT record to your domain: aa-verify=' . sha1(config('anonaddy.secret') . user()->id . user()->domains->count()), 404);
         }
 
         user()->domains()->save($domain);

composer.json

@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.3|^8.0",
         "asbiin/laravel-webauthn": "^1.0.0",
         "bacon/bacon-qr-code": "^2.0",
         "doctrine/dbal": "^2.9",
@@ -29,8 +29,8 @@
     "require-dev": {
         "beyondcode/laravel-dump-server": "^1.0",
         "facade/ignition": "^2.3.6",
+        "fakerphp/faker": "^1.9.1",
         "friendsofphp/php-cs-fixer": "^2.14",
-        "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.0",
         "phpunit/phpunit": "^9.3"

config/version.yml

@@ -5,9 +5,9 @@ current:
   major: 0
   minor: 7
   patch: 2
-  prerelease: ''
+  prerelease: 5-g7798465
   buildmetadata: ''
-  commit: '834971'
+  commit: '779846'
   timestamp:
     year: 2020
     month: 10

package.json

@@ -9,7 +9,8 @@
         "prod": "npm run production",
         "production": "mix --production",
         "format": "prettier --write 'resources/**/*.{css,js,vue}'",
-        "prepare": "husky install"
+        "prepare": "husky install",
+        "pre-commit": "lint-staged"
     },
     "dependencies": {
         "autoprefixer": "^10.2.4",
@@ -34,15 +35,10 @@
         "vuedraggable": "^2.24.2"
     },
     "devDependencies": {
-        "husky": "^5.1.3",
+        "husky": "^6.0.0",
         "lint-staged": "^10.5.3",
         "prettier": "2.2.1"
     },
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
     "lint-staged": {
         "*.{css,js,vue}": [
             "prettier --write"

resources/views/settings/show.blade.php

@@ -248,7 +248,7 @@
 
                     <p class="mt-6">This will determine if forwarded emails use the From header or the Reply-To header for sending replies. Some users may find it easier to set up inbox filters having the From: header set as just the alias.
                     </p>
-                    <p class="mt-4">If enabled, then the <b>From:</b> header will bet set as the alias email e.g. <b>alias{{ '@'.$user->username }}.{{ config('anonaddy.domain') }}</b> instead of the default <b>alias+sender=example.com{{ '@'.$user->username }}.{{ config('anonaddy.domain') }}</b> (this will be set as the Reply-To header instead)</p>
+                    <p class="mt-4">If enabled, then the <b>From:</b> header will be set as the alias email e.g. <b>alias{{ '@'.$user->username }}.{{ config('anonaddy.domain') }}</b> instead of the default <b>alias+sender=example.com{{ '@'.$user->username }}.{{ config('anonaddy.domain') }}</b> (this will be set as the Reply-To header instead)</p>
 
                     <div class="mt-6 flex flex-wrap mb-4">
                         <label for="use_reply_to" class="block text-grey-700 text-sm mb-2">
@@ -779,4 +779,4 @@
         </div>
 
     </div>
-@endsection
+@endsection