diff --git a/FEDERATION.md b/FEDERATION.md index dd0c917e2..d80e98bd3 100644 --- a/FEDERATION.md +++ b/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) diff --git a/bookwyrm/templates/feed/layout.html b/bookwyrm/templates/feed/layout.html index b70ed99ea..3a17e3e0b 100644 --- a/bookwyrm/templates/feed/layout.html +++ b/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 %} +
+
+

+ {% trans "You have have moved to" %} + {% id_to_username user.moved_to %} +

+

{% trans "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." %}

+
+ {% csrf_token %} + + +
+
+
+{% else %}
{% if user.is_authenticated %}
@@ -27,6 +44,7 @@ {% endif %}
+{% endif %} {% endblock %} diff --git a/bookwyrm/templates/notifications/items/move_user.html b/bookwyrm/templates/notifications/items/move_user.html index 39d3af83b..04163bc12 100644 --- a/bookwyrm/templates/notifications/items/move_user.html +++ b/bookwyrm/templates/notifications/items/move_user.html @@ -13,8 +13,12 @@ {% endblock %} {% block description %} - {{ related_user }} {% trans "has moved to" %} {% id_to_username related_user_moved_to %} -
- {% include 'snippets/move_user_buttons.html' with group=notification.related_group %} -
+ {% if related_user_moved_to %} + {{ related_user }} {% trans "has moved to" %} {% id_to_username related_user_moved_to %} +
+ {% include 'snippets/move_user_buttons.html' with group=notification.related_group %} +
+ {% else %} + {{ related_user }} {% trans "has undone their move" %} + {% endif %} {% endblock %} diff --git a/bookwyrm/templates/preferences/alias_user.html b/bookwyrm/templates/preferences/alias_user.html index 3cad65c35..e1e468208 100644 --- a/bookwyrm/templates/preferences/alias_user.html +++ b/bookwyrm/templates/preferences/alias_user.html @@ -13,7 +13,10 @@

- {% 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." %} +

+

+ {% trans "This is a reversable action and will not change the functionality of this account." %}

diff --git a/bookwyrm/templates/preferences/layout.html b/bookwyrm/templates/preferences/layout.html index 2ef09a245..fb0b6fba6 100644 --- a/bookwyrm/templates/preferences/layout.html +++ b/bookwyrm/templates/preferences/layout.html @@ -24,12 +24,12 @@ {% trans "Two Factor Authentication" %}
  • - {% url 'prefs-move' as url %} - {% trans "Move Account" %} + {% url 'prefs-alias' as url %} + {% trans "Aliases" %}
  • - {% url 'prefs-alias' as url %} - {% trans "Add alias" %} + {% url 'prefs-move' as url %} + {% trans "Move Account" %}
  • {% url 'prefs-delete' as url %} diff --git a/bookwyrm/templates/preferences/move_user.html b/bookwyrm/templates/preferences/move_user.html index 444e5aa5e..aa1b9f12d 100644 --- a/bookwyrm/templates/preferences/move_user.html +++ b/bookwyrm/templates/preferences/move_user.html @@ -13,10 +13,10 @@

    - {% 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." %}

    - {{ user.username }} {% trans "will be marked as moved and will not be discoverable." %} + {{ user.username }} {% trans "will be marked as moved and will not be discoverable or usable unless you undo the move." %}

    diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html index 7d0035ed3..a2410ef95 100644 --- a/bookwyrm/templates/shelf/shelf.html +++ b/bookwyrm/templates/shelf/shelf.html @@ -18,7 +18,22 @@ {% include 'user/books_header.html' %} - +{% if user.moved_to %} +
    +
    +

    + {% trans "You have have moved to" %} + {% id_to_username user.moved_to %} +

    +

    {% trans "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." %}

    + + {% csrf_token %} + + + +
    +
    +{% else %}