From d9d2405a8a34f4fdf0b70996377bdd3ae046df08 Mon Sep 17 00:00:00 2001
From: mein Name <ich@example.com>
Date: Sun, 9 Feb 2025 12:51:49 -0500
Subject: [PATCH] change moving account links to account page

---
 common/templates/404.html              |  3 ++-
 neodb-takahe                           |  2 +-
 users/templates/users/account.html     | 21 +++++++++++++++++++++
 users/templates/users/preferences.html |  7 -------
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/common/templates/404.html b/common/templates/404.html
index 684f36d1..c19126f1 100644
--- a/common/templates/404.html
+++ b/common/templates/404.html
@@ -22,7 +22,8 @@
         {% blocktrans %}You may have visited an incorrect URL, or the content you are looking for has been deleted by the author.{% endblocktrans %}
         <br>
         {% blocktrans %}If you believe this is our mistake, please contact us through the link at the bottom of the page.{% endblocktrans %}
-        <a href="{% url 'common:home' %}" class="button">{trans "Go to Home"}</a>
+        <br>
+        <a href="{% url 'common:home' %}" class="button">{% trans "Go to Home" %}</a>
       </article>
     </main>
     {% include "_footer.html" %}
diff --git a/neodb-takahe b/neodb-takahe
index 21fd348a..8b1fe6d2 160000
--- a/neodb-takahe
+++ b/neodb-takahe
@@ -1 +1 @@
-Subproject commit 21fd348a2c54f8769adb7f4d6d8782ebdd3a25bc
+Subproject commit 8b1fe6d2556c6201f77de05b0a58fe7e2e5105d2
diff --git a/users/templates/users/account.html b/users/templates/users/account.html
index dab5c971..b0d25761 100644
--- a/users/templates/users/account.html
+++ b/users/templates/users/account.html
@@ -298,6 +298,27 @@
           </details>
         </article>
         {% if allow_any_site %}
+          <article>
+            <details>
+              <summary>{% trans 'Migrate Account' %}</summary>
+              <p>
+                {% if not user.email_account %}
+                  <i class="fa-solid fa-triangle-exclamation"></i>
+                  {% trans "Linking an email to your account is highly recommended before migrating from another Fediverse instance." %}
+                {% endif %}
+                <div>
+                  <form action="/@{{ request.user.identity.handle }}/settings/migrate_in/">
+                    <button>{% trans "Migrate from anther instance to here" %}</button>
+                  </form>
+                </p>
+                <p>
+                  <form action="/@{{ request.user.identity.handle }}/settings/migrate_out/">
+                    <button>{% trans "Migrate to another instance" %}</button>
+                  </form>
+                </div>
+              </p>
+            </details>
+          </article>
           <article>
             <details>
               <summary>{% trans 'Delete Account' %}</summary>
diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html
index a279da04..883bb1f5 100644
--- a/users/templates/users/preferences.html
+++ b/users/templates/users/preferences.html
@@ -249,13 +249,6 @@
             <p>
               <a href="/@{{ request.user.identity.handle }}/settings/tokens/">{% trans "View authorized applications" %}</a>
             </p>
-            <p>
-              {% if user.email_account %}
-                <a href="/@{{ request.user.identity.handle }}/settings/migrate_in/">{% trans "Migrate account" %}</a>
-              {% else %}
-                <a href="{% url 'users:info' %}">{% trans "Link an email so that you can migrate followers from other Fediverse instances." %}</a>
-              {% endif %}
-            </p>
           </details>
         </article>
       </div>