undo moves

also cleans up some templates

FEDERATION.md

@@ -13,14 +13,15 @@ User relationship interactions follow the standard ActivityPub spec.
 - `Block`: prevent users from seeing one another's statuses, and prevents the blocked user from viewing the actor's profile
 - `Update`: updates a user's profile and settings
 - `Delete`: deactivates a user
-- `Undo`: reverses a `Follow` or `Block`
+- `Undo`: reverses a `Block` or `Follow`
 
 ### Activities
 - `Create/Status`: saves a new status in the database.
 - `Delete/Status`: Removes a status
 - `Like/Status`: Creates a favorite on the status
 - `Announce/Status`: Boosts the status into the actor's timeline
-- `Undo/*`,: Reverses a `Like` or `Announce`
+- `Undo/*`,: Reverses an `Announce`, `Like`, or `Move`
+- `Move/User`: Moves a user from one ActivityPub id to another.
 
 ### Collections
 User's books and lists are represented by [`OrderedCollection`](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-orderedcollection)

bookwyrm/templates/feed/layout.html

@@ -1,9 +1,26 @@
 {% extends 'layout.html' %}
 {% load i18n %}
+{% load utilities %}
 
 {% block title %}{% trans "Updates" %}{% endblock %}
 
 {% block content %}
+{% if user.moved_to %}
+<div class="container my-6">
+    <div class="notification is-info has-text-centered">
+        <p>
+            {% trans "You have have moved to" %}
+            <a href="{{user.moved_to}}">{% id_to_username user.moved_to %}</a>
+        </p>
+        <p> {% trans "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." %}</p>
+        <form name="remove-alias" action="{% url 'prefs-unmove' %}" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="remote_id" id="remote_id" value="{{user.moved_to}}">
+            <button type="submit" class="button is-small">{% trans "Undo move" %}</button>
+        </form>
+    </div>
+</div>
+{% else %}
 <div class="columns">
     {% if user.is_authenticated %}
     <div class="column is-one-third">
@@ -27,6 +44,7 @@
         {% endif %}
     </div>
 </div>
+{% endif %}
 {% endblock %}
 
 

bookwyrm/templates/notifications/items/move_user.html

@@ -13,8 +13,12 @@
 {% endblock %}
 
 {% block description %}
-    {{ related_user }} {% trans "has moved to" %} <a href="{{ related_user_moved_to }}">{% id_to_username related_user_moved_to %}</a>
+    {% if related_user_moved_to %}
-    <div class="row shrink my-2">
+        {{ related_user }} {% trans "has moved to" %} <a href="{{ related_user_moved_to }}">{% id_to_username related_user_moved_to %}</a>
-        {% include 'snippets/move_user_buttons.html' with group=notification.related_group %}
+        <div class="row shrink my-2">
-    </div>
+            {% include 'snippets/move_user_buttons.html' with group=notification.related_group %}
+        </div>
+    {% else %}
+        {{ related_user }} {% trans "has undone their move" %}
+    {% endif %}
 {% endblock %}

bookwyrm/templates/preferences/alias_user.html

@@ -13,7 +13,10 @@
     <div class="box">
         <div class="notification is-info is-light">
             <p>
-                {% trans "Marking another account as an alias is required if you want to move that account to this one. This is a reversable action and will not change this account." %}
+                {% trans "Marking another account as an alias is required if you want to move that account to this one." %}
+            </p>
+            <p>
+                {% trans "This is a reversable action and will not change the functionality of this account." %}
             </p>
         </div>
         <form name="alias-user" action="{% url 'prefs-alias' %}" method="post">

bookwyrm/templates/preferences/layout.html

@@ -24,12 +24,12 @@
                 <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Two Factor Authentication" %}</a>
             </li>
             <li>
-                {% url 'prefs-move' as url %}
+                {% url 'prefs-alias' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Move  Account" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Aliases" %}</a>
             </li>
             <li>
-                {% url 'prefs-alias' as url %}
+                {% url 'prefs-move' as url %}
-                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Add alias" %}</a>
+                <a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Move  Account" %}</a>
             </li>
             <li>
                 {% url 'prefs-delete' as url %}

bookwyrm/templates/preferences/move_user.html

@@ -13,10 +13,10 @@
     <div class="box">
         <div class="notification is-danger is-light">
             <p>
-                {% trans "Moving your account will notify all your followers and redirect them to the new account." %}
+                {% trans "Moving your account will notify all your followers and direct them to follow the new account." %}
             </p>
             <p>
-                <strong>{{ user.username }}</strong> {% trans "will be marked as moved and will not be discoverable." %}
+                <strong>{{ user.username }}</strong> {% trans "will be marked as moved and will not be discoverable or usable unless you undo the move." %}
             </p>
         </div>
         <div class="notification is-info is-light">

bookwyrm/templates/shelf/shelf.html

@@ -18,7 +18,22 @@
         {% include 'user/books_header.html' %}
     </h1>
 </header>
-
+{% if user.moved_to %}
+<div class="container my-6">
+    <div class="notification is-info has-text-centered">
+        <p>
+            {% trans "You have have moved to" %}
+            <a href="{{user.moved_to}}">{% id_to_username user.moved_to %}</a>
+        </p>
+        <p> {% trans "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." %}</p>
+        <form name="remove-alias" action="{% url 'prefs-unmove' %}" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="remote_id" id="remote_id" value="{{user.moved_to}}">
+            <button type="submit" class="button is-small">{% trans "Undo move" %}</button>
+        </form>
+    </div>
+</div>
+{% else %}
 <nav class="breadcrumb subtitle" aria-label="breadcrumbs">
     <ul>
         <li><a href="{% url 'user-feed' user|username %}">{% trans "User profile" %}</a></li>
@@ -215,6 +230,7 @@
 <div>
     {% include 'snippets/pagination.html' with page=books path=request.path %}
 </div>
+{% endif %}
 {% endblock %}
 
 {% block scripts %}

bookwyrm/templatetags/utilities.py

@@ -117,8 +117,11 @@ def get_isni(existing, author, autoescape=True):
 @register.simple_tag(takes_context=False)
 def id_to_username(user_id):
     """given an arbitrary user id, return the username"""
-    url = urlparse(user_id)
+    if user_id:
-    domain = url.netloc
+        url = urlparse(user_id)
-    parts = url.path.split("/")
+        domain = url.netloc
-    name = parts[-1]
+        parts = url.path.split("/")
-    return f"{name}@{domain}"
+        name = parts[-1]
+        return f"{name}@{domain}"
+    else:
+        return None

bookwyrm/urls.py

@@ -598,6 +598,7 @@ urlpatterns = [
     re_path(
         r"^preferences/remove-alias/?$", views.remove_alias, name="prefs-remove-alias"
     ),
+    re_path(r"^preferences/unmove/?$", views.unmove, name="prefs-unmove"),
     re_path(r"^preferences/delete/?$", views.DeleteUser.as_view(), name="prefs-delete"),
     re_path(
         r"^preferences/deactivate/?$",

bookwyrm/views/__init__.py

@@ -37,7 +37,7 @@ from .admin.user_admin import UserAdmin, UserAdminList, ActivateUserAdmin
 from .preferences.change_password import ChangePassword
 from .preferences.edit_user import EditUser
 from .preferences.export import Export
-from .preferences.move_user import MoveUser, AliasUser, remove_alias
+from .preferences.move_user import MoveUser, AliasUser, remove_alias, unmove
 from .preferences.delete_user import DeleteUser, DeactivateUser, ReactivateUser
 from .preferences.block import Block, unblock
 from .preferences.two_factor_auth import (

bookwyrm/views/preferences/move_user.py

@@ -2,7 +2,7 @@
 
 from django.core.exceptions import PermissionDenied
 from django.contrib.auth.decorators import login_required
-from django.shortcuts import redirect
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -96,3 +96,16 @@ def remove_alias(request):
 
     request.user.also_known_as.remove(request.POST["alias"])
     return redirect("prefs-alias")
+
+
+@require_POST
+@login_required
+def unmove(request):
+    """undo a user move"""
+    target = get_object_or_404(models.User, remote_id=request.POST["remote_id"])
+    move = get_object_or_404(models.MoveUser, target=target, user=request.user)
+    move.delete()
+
+    request.user.moved_to = None
+    request.user.save(update_fields=["moved_to"], broadcast=True)
+    return redirect("prefs-alias")