Merge branch 'main' into groups-merge-test

Big merge of a couple of weeks' work from the main project back into this branch. :ohno:

bookwyrm/views/__init__.py

@@ -1,4 +1,5 @@
 """ make sure all our nice views are available """
+# site admin
 from .admin.announcements import Announcements, Announcement, delete_announcement
 from .admin.dashboard import Dashboard
 from .admin.federation import Federation, FederatedServer
@@ -19,14 +20,22 @@ from .admin.reports import (
 )
 from .admin.site import Site
 from .admin.user_admin import UserAdmin, UserAdminList
+
+# user preferences
+from .preferences.change_password import ChangePassword
+from .preferences.edit_user import EditUser
+from .preferences.delete_user import DeleteUser
+from .preferences.block import Block, unblock
+
+# books
+from .books.books import Book, upload_cover, add_description, resolve_book
+from .books.edit_book import EditBook, ConfirmEditBook
+from .books.editions import Editions, switch_edition
+
+# misc views
 from .author import Author, EditAuthor
-from .block import Block, unblock
-from .books import Book, EditBook, ConfirmEditBook
-from .books import upload_cover, add_description, resolve_book
 from .directory import Directory
 from .discover import Discover
-from .edit_user import EditUser, DeleteUser
-from .editions import Editions, switch_edition
 from .feed import DirectMessage, Feed, Replies, Status
 from .follow import follow, unfollow
 from .follow import accept_follow_request, delete_follow_request
@@ -43,17 +52,17 @@ from .list import save_list, unsave_list, delete_list
 from .login import Login, Logout
 from .notifications import Notifications
 from .outbox import Outbox
-from .reading import edit_readthrough, create_readthrough
-from .reading import delete_readthrough, delete_progressupdate
+from .reading import create_readthrough, delete_readthrough, delete_progressupdate
 from .reading import ReadingStatus
 from .register import Register, ConfirmEmail, ConfirmEmailCode, resend_link
 from .rss_feed import RssFeed
-from .password import PasswordResetRequest, PasswordReset, ChangePassword
+from .password import PasswordResetRequest, PasswordReset
 from .search import Search
 from .shelf import Shelf
 from .shelf import create_shelf, delete_shelf
 from .shelf import shelve, unshelve
-from .status import CreateStatus, DeleteStatus, DeleteAndRedraft
+from .status import CreateStatus, DeleteStatus, DeleteAndRedraft, update_progress
+from .status import edit_readthrough
 from .updates import get_notification_count, get_unread_status_count
 from .user import User, Followers, Following, hide_suggestions
 from .wellknown import *