Merge branch 'main' into bookwyrm-groups

There are database migrations in main ahead of this branch so they need to be merged in to the branch before we can merge back into main.

bookwyrm/urls.py

@@ -342,6 +342,9 @@ urlpatterns = [
     re_path(
         rf"{STATUS_PATH}/replies(.json)?/?$", views.Replies.as_view(), name="replies"
     ),
+    re_path(
+        r"^edit/(?P<status_id>\d+)/?$", views.EditStatus.as_view(), name="edit-status"
+    ),
     re_path(
         r"^post/?$",
         views.CreateStatus.as_view(),
@@ -352,16 +355,16 @@ urlpatterns = [
         views.CreateStatus.as_view(),
         name="create-status",
     ),
+    re_path(
+        r"^post/(?P<status_type>\w+)/(?P<existing_status_id>\d+)/?$",
+        views.CreateStatus.as_view(),
+        name="create-status",
+    ),
     re_path(
         r"^delete-status/(?P<status_id>\d+)/?$",
         views.DeleteStatus.as_view(),
         name="delete-status",
     ),
-    re_path(
-        r"^redraft-status/(?P<status_id>\d+)/?$",
-        views.DeleteAndRedraft.as_view(),
-        name="redraft",
-    ),
     # interact
     re_path(r"^favorite/(?P<status_id>\d+)/?$", views.Favorite.as_view(), name="fav"),
     re_path(