From cd65ac72902470ca0bdddfe7c2cdc9228c044488 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 11:46:15 -0800 Subject: [PATCH 01/69] Fixes incorrect tempalte path in threaded status page --- bookwyrm/templates/feed/thread.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/feed/thread.html b/bookwyrm/templates/feed/thread.html index 589702ce6..aa67d5bb5 100644 --- a/bookwyrm/templates/feed/thread.html +++ b/bookwyrm/templates/feed/thread.html @@ -4,7 +4,7 @@ {% with depth=depth|add:1 %} {% if depth <= max_depth and status.reply_parent and direction <= 0 %} {% with direction=-1 %} - {% include 'snippets/thread.html' with status=status|parent is_root=False %} + {% include 'feed/thread.html' with status=status|parent is_root=False %} {% endwith %} {% endif %} @@ -13,7 +13,7 @@ {% if depth <= max_depth and direction >= 0 %} {% for reply in status|replies %} {% with direction=1 %} - {% include 'snippets/thread.html' with status=reply is_root=False %} + {% include 'feed/thread.html' with status=reply is_root=False %} {% endwith %} {% endfor %} {% endif %} From ac4a178e8319e45388b9e1e0afefb67f5c8b749f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 12:03:50 -0800 Subject: [PATCH 02/69] Fixes shelf page template path bug --- bookwyrm/templates/{ => user}/shelf.html | 28 +++++++++++------------- bookwyrm/tests/views/test_shelf.py | 2 +- bookwyrm/views/shelf.py | 2 +- 3 files changed, 15 insertions(+), 17 deletions(-) rename bookwyrm/templates/{ => user}/shelf.html (89%) diff --git a/bookwyrm/templates/shelf.html b/bookwyrm/templates/user/shelf.html similarity index 89% rename from bookwyrm/templates/shelf.html rename to bookwyrm/templates/user/shelf.html index da599c7d2..c0083e176 100644 --- a/bookwyrm/templates/shelf.html +++ b/bookwyrm/templates/user/shelf.html @@ -1,21 +1,19 @@ -{% extends 'layout.html' %} +{% extends 'user/user_layout.html' %} {% load bookwyrm_tags %} -{% block content %} -
-
-

- {% if is_self %}Your - {% else %} - {% include 'snippets/username.html' with user=user possessive=True %} - {% endif %} - shelves -

-
-
- -{% include 'snippets/user_header.html' with user=user %} +{% block header %} +
+

+ {% if is_self %}Your + {% else %} + {% include 'snippets/username.html' with user=user possessive=True %} + {% endif %} + shelves +

+
+{% endblock %} +{% block panel %}
diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py index 35e07953e..95150fe9d 100644 --- a/bookwyrm/tests/views/test_shelf.py +++ b/bookwyrm/tests/views/test_shelf.py @@ -41,7 +41,7 @@ class ShelfViews(TestCase): is_api.return_value = False result = view(request, self.local_user.username, shelf.identifier) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'shelf.html') + self.assertEqual(result.template_name, 'user/shelf.html') self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.shelf.is_api_request') as is_api: diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index ae8a494ba..e4c492615 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -62,7 +62,7 @@ class Shelf(View): 'books': [b.book for b in books], } - return TemplateResponse(request, 'shelf.html', data) + return TemplateResponse(request, 'user/shelf.html', data) @method_decorator(login_required, name='dispatch') # pylint: disable=unused-argument From b3bd6822b20423ed018a1d3b9d675d348e08132d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 12:16:57 -0800 Subject: [PATCH 03/69] Make sure templates render rather than checking template paths --- bookwyrm/tests/views/test_authentication.py | 10 +++++----- bookwyrm/tests/views/test_author.py | 10 +++++++--- bookwyrm/tests/views/test_block.py | 3 ++- bookwyrm/tests/views/test_book.py | 7 ++++--- bookwyrm/tests/views/test_federation.py | 3 ++- bookwyrm/tests/views/test_feed.py | 9 +++++---- bookwyrm/tests/views/test_import.py | 5 +++-- bookwyrm/tests/views/test_invite.py | 5 +++-- bookwyrm/tests/views/test_landing.py | 9 ++++----- bookwyrm/tests/views/test_notifications.py | 3 ++- bookwyrm/tests/views/test_password.py | 13 +++++++------ bookwyrm/tests/views/test_search.py | 5 +++-- bookwyrm/tests/views/test_shelf.py | 3 ++- bookwyrm/tests/views/test_tag.py | 3 ++- bookwyrm/tests/views/test_user.py | 9 +++++---- 15 files changed, 56 insertions(+), 41 deletions(-) diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py index 655772084..dc52719c9 100644 --- a/bookwyrm/tests/views/test_authentication.py +++ b/bookwyrm/tests/views/test_authentication.py @@ -33,7 +33,7 @@ class AuthenticationViews(TestCase): result = login(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'login.html') + result.render() self.assertEqual(result.status_code, 200) request.user = self.local_user @@ -94,7 +94,7 @@ class AuthenticationViews(TestCase): }) response = view(request) self.assertEqual(models.User.objects.count(), 1) - self.assertEqual(response.template_name, 'login.html') + response.render() def test_register_invalid_username(self): ''' gotta have an email ''' @@ -109,7 +109,7 @@ class AuthenticationViews(TestCase): }) response = view(request) self.assertEqual(models.User.objects.count(), 1) - self.assertEqual(response.template_name, 'login.html') + response.render() request = self.factory.post( 'register/', @@ -120,7 +120,7 @@ class AuthenticationViews(TestCase): }) response = view(request) self.assertEqual(models.User.objects.count(), 1) - self.assertEqual(response.template_name, 'login.html') + response.render() request = self.factory.post( 'register/', @@ -131,7 +131,7 @@ class AuthenticationViews(TestCase): }) response = view(request) self.assertEqual(models.User.objects.count(), 1) - self.assertEqual(response.template_name, 'login.html') + response.render() def test_register_closed_instance(self): diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index c00972f39..c92c47501 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -34,6 +34,7 @@ class AuthorViews(TestCase): remote_id='https://example.com/book/1', parent_work=self.work ) + models.SiteSettings.objects.create() def test_author_page(self): @@ -45,7 +46,8 @@ class AuthorViews(TestCase): is_api.return_value = False result = view(request, author.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'author.html') + result.render() + self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200) request = self.factory.get('') @@ -66,7 +68,8 @@ class AuthorViews(TestCase): result = view(request, author.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'edit_author.html') + result.render() + self.assertEqual(result.status_code, 200) self.assertEqual(result.status_code, 200) @@ -116,4 +119,5 @@ class AuthorViews(TestCase): resp = view(request, author.id) author.refresh_from_db() self.assertEqual(author.name, 'Test Author') - self.assertEqual(resp.template_name, 'edit_author.html') + resp.render() + self.assertEqual(resp.status_code, 200) diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index f3a0c2f8b..6f85f2822 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -23,6 +23,7 @@ class BlockViews(TestCase): inbox='https://example.com/users/rat/inbox', outbox='https://example.com/users/rat/outbox', ) + models.SiteSettings.objects.create() def test_block_get(self): @@ -32,7 +33,7 @@ class BlockViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'preferences/blocks.html') + result.render() self.assertEqual(result.status_code, 200) def test_block_post(self): diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 8306b8037..32a407d60 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -33,6 +33,7 @@ class BookViews(TestCase): remote_id='https://example.com/book/1', parent_work=self.work ) + models.SiteSettings.objects.create() def test_book_page(self): @@ -44,7 +45,7 @@ class BookViews(TestCase): is_api.return_value = False result = view(request, self.book.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'book.html') + result.render() self.assertEqual(result.status_code, 200) request = self.factory.get('') @@ -63,7 +64,7 @@ class BookViews(TestCase): request.user.is_superuser = True result = view(request, self.book.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'edit_book.html') + result.render() self.assertEqual(result.status_code, 200) @@ -116,7 +117,7 @@ class BookViews(TestCase): is_api.return_value = False result = view(request, self.work.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'editions.html') + result.render() self.assertEqual(result.status_code, 200) request = self.factory.get('') diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index 2a182a21d..70cf41f6e 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -15,6 +15,7 @@ class FederationViews(TestCase): self.local_user = models.User.objects.create_user( 'mouse@local.com', 'mouse@mouse.mouse', 'password', local=True, localname='mouse') + models.SiteSettings.objects.create() def test_federation_page(self): @@ -25,5 +26,5 @@ class FederationViews(TestCase): request.user.is_superuser = True result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'settings/federation.html') + result.render() self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index da597a7cf..879dd2b69 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -21,6 +21,7 @@ class FeedMessageViews(TestCase): title='Example Edition', remote_id='https://example.com/book/1', ) + models.SiteSettings.objects.create() def test_feed(self): @@ -30,7 +31,7 @@ class FeedMessageViews(TestCase): request.user = self.local_user result = view(request, 'local') self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'feed/feed.html') + result.render() self.assertEqual(result.status_code, 200) @@ -45,7 +46,7 @@ class FeedMessageViews(TestCase): is_api.return_value = False result = view(request, 'mouse', status.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'feed/status.html') + result.render() self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.feed.is_api_request') as is_api: @@ -66,7 +67,7 @@ class FeedMessageViews(TestCase): is_api.return_value = False result = view(request, 'mouse', status.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'feed/status.html') + result.render() self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.feed.is_api_request') as is_api: @@ -83,7 +84,7 @@ class FeedMessageViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'feed/direct_messages.html') + result.render() self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py index 14209f24b..ba8f2457b 100644 --- a/bookwyrm/tests/views/test_import.py +++ b/bookwyrm/tests/views/test_import.py @@ -16,6 +16,7 @@ class ImportViews(TestCase): self.local_user = models.User.objects.create_user( 'mouse@local.com', 'mouse@mouse.mouse', 'password', local=True, localname='mouse') + models.SiteSettings.objects.create() def test_import_page(self): @@ -25,7 +26,7 @@ class ImportViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'import.html') + result.render() self.assertEqual(result.status_code, 200) @@ -39,5 +40,5 @@ class ImportViews(TestCase): async_result.return_value = [] result = view(request, import_job.id) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'import_status.html') + result.render() self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py index 857416881..e93e7209b 100644 --- a/bookwyrm/tests/views/test_invite.py +++ b/bookwyrm/tests/views/test_invite.py @@ -18,6 +18,7 @@ class InviteViews(TestCase): self.local_user = models.User.objects.create_user( 'mouse@local.com', 'mouse@mouse.mouse', 'password', local=True, localname='mouse') + models.SiteSettings.objects.create() def test_invite_page(self): @@ -32,7 +33,7 @@ class InviteViews(TestCase): invite.return_value = True result = view(request, 'hi') self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'invite.html') + result.render() self.assertEqual(result.status_code, 200) @@ -44,5 +45,5 @@ class InviteViews(TestCase): request.user.is_superuser = True result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'settings/manage_invites.html') + result.render() self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py index 8576af496..5e0e50cff 100644 --- a/bookwyrm/tests/views/test_landing.py +++ b/bookwyrm/tests/views/test_landing.py @@ -18,6 +18,7 @@ class LandingViews(TestCase): local=True, localname='mouse') self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False + models.SiteSettings.objects.create() def test_home_page(self): @@ -27,13 +28,13 @@ class LandingViews(TestCase): request.user = self.local_user result = view(request) self.assertEqual(result.status_code, 200) - self.assertEqual(result.template_name, 'feed/feed.html') + result.render() request.user = self.anonymous_user result = view(request) self.assertIsInstance(result, TemplateResponse) self.assertEqual(result.status_code, 200) - self.assertEqual(result.template_name, 'discover.html') + result.render() def test_about_page(self): @@ -43,7 +44,7 @@ class LandingViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'about.html') + result.render() self.assertEqual(result.status_code, 200) @@ -53,5 +54,3 @@ class LandingViews(TestCase): request = self.factory.get('') result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'discover.html') - self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 683424d5a..24fbde1e6 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -15,6 +15,7 @@ class NotificationViews(TestCase): self.local_user = models.User.objects.create_user( 'mouse@local.com', 'mouse@mouse.mouse', 'password', local=True, localname='mouse') + models.SiteSettings.objects.create() def test_notifications_page(self): ''' there are so many views, this just makes sure it LOADS ''' @@ -23,7 +24,7 @@ class NotificationViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'notifications.html') + result.render() self.assertEqual(result.status_code, 200) def test_clear_notifications(self): diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py index 8cac2b13c..9fc37fdb9 100644 --- a/bookwyrm/tests/views/test_password.py +++ b/bookwyrm/tests/views/test_password.py @@ -19,6 +19,7 @@ class PasswordViews(TestCase): local=True, localname='mouse') self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False + models.SiteSettings.objects.create(id=1) def test_password_reset_request(self): @@ -29,7 +30,7 @@ class PasswordViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'password_reset_request.html') + result.render() self.assertEqual(result.status_code, 200) @@ -43,7 +44,7 @@ class PasswordViews(TestCase): request = self.factory.post('', {'email': 'mouse@mouse.com'}) with patch('bookwyrm.emailing.send_email.delay'): resp = view(request) - self.assertEqual(resp.template_name, 'password_reset_request.html') + resp.render() self.assertEqual( models.PasswordReset.objects.get().user, self.local_user) @@ -56,7 +57,7 @@ class PasswordViews(TestCase): request.user = self.anonymous_user result = view(request, code.code) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'password_reset.html') + result.render() self.assertEqual(result.status_code, 200) @@ -82,7 +83,7 @@ class PasswordViews(TestCase): 'confirm-password': 'hi' }) resp = view(request, 'jhgdkfjgdf') - self.assertEqual(resp.template_name, 'password_reset.html') + resp.render() self.assertTrue(models.PasswordReset.objects.exists()) def test_password_reset_mismatch(self): @@ -94,7 +95,7 @@ class PasswordViews(TestCase): 'confirm-password': 'hihi' }) resp = view(request, code.code) - self.assertEqual(resp.template_name, 'password_reset.html') + resp.render() self.assertTrue(models.PasswordReset.objects.exists()) @@ -106,7 +107,7 @@ class PasswordViews(TestCase): result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'preferences/change_password.html') + result.render() self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 3f1d78503..e5cba99c9 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -33,6 +33,7 @@ class ShelfViews(TestCase): connector_file='self_connector', local=True ) + models.SiteSettings.objects.create() def test_search_json_response(self): @@ -89,7 +90,7 @@ class ShelfViews(TestCase): manager.return_value = [search_result] response = view(request) self.assertIsInstance(response, TemplateResponse) - self.assertEqual(response.template_name, 'search_results.html') + response.render() self.assertEqual( response.context_data['book_results'][0].title, 'Gideon the Ninth') @@ -103,6 +104,6 @@ class ShelfViews(TestCase): with patch('bookwyrm.connectors.connector_manager.search'): response = view(request) self.assertIsInstance(response, TemplateResponse) - self.assertEqual(response.template_name, 'search_results.html') + response.render() self.assertEqual( response.context_data['user_results'][0], self.local_user) diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py index 95150fe9d..f67bbc562 100644 --- a/bookwyrm/tests/views/test_shelf.py +++ b/bookwyrm/tests/views/test_shelf.py @@ -29,6 +29,7 @@ class ShelfViews(TestCase): identifier='test-shelf', user=self.local_user ) + models.SiteSettings.objects.create() def test_shelf_page(self): @@ -41,7 +42,7 @@ class ShelfViews(TestCase): is_api.return_value = False result = view(request, self.local_user.username, shelf.identifier) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'user/shelf.html') + result.render() self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.shelf.is_api_request') as is_api: diff --git a/bookwyrm/tests/views/test_tag.py b/bookwyrm/tests/views/test_tag.py index 1556139ca..3dfef9a11 100644 --- a/bookwyrm/tests/views/test_tag.py +++ b/bookwyrm/tests/views/test_tag.py @@ -33,6 +33,7 @@ class TagViews(TestCase): remote_id='https://example.com/book/1', parent_work=self.work ) + models.SiteSettings.objects.create() def test_tag_page(self): @@ -46,7 +47,7 @@ class TagViews(TestCase): is_api.return_value = False result = view(request, tag.identifier) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'tag.html') + result.render() self.assertEqual(result.status_code, 200) request = self.factory.get('') diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 61fcdb641..616a6575f 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -23,6 +23,7 @@ class UserViews(TestCase): self.rat = models.User.objects.create_user( 'rat@local.com', 'rat@rat.rat', 'password', local=True, localname='rat') + models.SiteSettings.objects.create() def test_user_page(self): @@ -34,7 +35,7 @@ class UserViews(TestCase): is_api.return_value = False result = view(request, 'mouse') self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'user/user.html') + result.render() self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.user.is_api_request') as is_api: @@ -65,7 +66,7 @@ class UserViews(TestCase): is_api.return_value = False result = view(request, 'mouse') self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'user/followers.html') + result.render() self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.user.is_api_request') as is_api: @@ -96,7 +97,7 @@ class UserViews(TestCase): is_api.return_value = False result = view(request, 'mouse') self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'user/following.html') + result.render() self.assertEqual(result.status_code, 200) with patch('bookwyrm.views.user.is_api_request') as is_api: @@ -125,7 +126,7 @@ class UserViews(TestCase): request.user = self.local_user result = view(request) self.assertIsInstance(result, TemplateResponse) - self.assertEqual(result.template_name, 'preferences/edit_user.html') + result.render() self.assertEqual(result.status_code, 200) From 661d49d9cc69915003ed14d3f4f4d4b797d5d4a6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 17:19:01 -0800 Subject: [PATCH 04/69] Ignore openlibrary editions with little to no metadata Also fixes the isbn problem --- bookwyrm/connectors/openlibrary.py | 31 +++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 55355131c..cd196d274 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -27,9 +27,9 @@ class Connector(AbstractConnector): Mapping('series', formatter=get_first), Mapping('seriesNumber', remote_field='series_number'), Mapping('subjects'), - Mapping('subjectPlaces'), - Mapping('isbn13', formatter=get_first), - Mapping('isbn10', formatter=get_first), + Mapping('subjectPlaces', remote_field='subject_places'), + Mapping('isbn13', remote_field='isbn_13', formatter=get_first), + Mapping('isbn10', remote_field='isbn_10', formatter=get_first), Mapping('lccn', formatter=get_first), Mapping( 'oclcNumber', remote_field='oclc_numbers', @@ -144,9 +144,34 @@ class Connector(AbstractConnector): # we can mass download edition data from OL to avoid repeatedly querying edition_options = self.load_edition_data(work.openlibrary_key) for edition_data in edition_options.get('entries'): + # does this edition have ANY interesting data? + if ignore_edition(edition_data): + continue self.create_edition_from_data(work, edition_data) +def ignore_edition(edition_data): + ''' don't load a million editions that have no metadata ''' + # an isbn, we love to see it + if edition_data.get('isbn_13') or edition_data.get('isbn_10'): + print(edition_data.get('isbn_10')) + return False + # grudgingly, oclc can stay + if edition_data.get('oclc_numbers'): + print(edition_data.get('oclc_numbers')) + return False + # if it has a cover it can stay + if edition_data.get('covers'): + print(edition_data.get('covers')) + return False + # keep non-english editions + if edition_data.get('languages') and \ + 'languages/eng' not in str(edition_data.get('languages')): + print(edition_data.get('languages')) + return False + return True + + def get_description(description_blob): ''' descriptions can be a string or a dict ''' if isinstance(description_blob, dict): From 9833f5a03da6ae2b4a8d298c99506316ccac0fb5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 17:36:24 -0800 Subject: [PATCH 05/69] Tests creating editions --- .../connectors/test_openlibrary_connector.py | 16 ++++++++++++++++ bookwyrm/tests/data/ol_edition.json | 1 + 2 files changed, 17 insertions(+) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index dc4c5f5b1..c277ba045 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -190,3 +190,19 @@ class Openlibrary(TestCase): ''' detect if the loaded json is an edition ''' edition = pick_default_edition(self.edition_list_data['entries']) self.assertEqual(edition['key'], '/books/OL9788823M') + + + def test_create_edition_from_data(self): + ''' okay but can it actually create an edition with proper metadata ''' + work = models.Work.objects.create(title='Hello') + result = self.connector.create_edition_from_data( + work, self.edition_data) + self.assertEqual(result.parent_work, work) + self.assertEqual(result.title, 'Sabriel') + self.assertEqual(result.isbn_10, '0060273224') + self.assertIsNotNone(result.description) + self.assertEqual(result.languages[0], 'English') + self.assertEqual(result.publishers[0], 'Harper Trophy') + self.assertEqual(result.pages, 491) + self.assertEqual(result.subjects[0], 'Fantasy.') + self.assertEqual(result.physical_format, 'Hardcover') diff --git a/bookwyrm/tests/data/ol_edition.json b/bookwyrm/tests/data/ol_edition.json index 459e9dff4..2423364b1 100644 --- a/bookwyrm/tests/data/ol_edition.json +++ b/bookwyrm/tests/data/ol_edition.json @@ -9,6 +9,7 @@ "518848" ] }, + "physical_format": "Hardcover", "lc_classifications": [ "PZ7.N647 Sab 1995" ], From 45ac13a7fffe00337127b5b82d6a569cc2703ed3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 18:30:07 -0800 Subject: [PATCH 06/69] Clear unused editions with poor metadata --- .../management/commands/remove_editions.py | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 bookwyrm/management/commands/remove_editions.py diff --git a/bookwyrm/management/commands/remove_editions.py b/bookwyrm/management/commands/remove_editions.py new file mode 100644 index 000000000..c5153f44b --- /dev/null +++ b/bookwyrm/management/commands/remove_editions.py @@ -0,0 +1,34 @@ +''' PROCEED WITH CAUTION: this permanently deletes book data ''' +from django.core.management.base import BaseCommand +from django.db.models import Count, Q +from bookwyrm import models + + +def remove_editions(): + ''' combine duplicate editions and update related models ''' + # not in use + filters = {'%s__isnull' % r.name: True \ + for r in models.Edition._meta.related_objects} + # no cover, no identifying fields + filters['cover'] = '' + null_fields = {'%s__isnull' % f: True for f in \ + ['isbn_10', 'isbn_13', 'oclc_number']} + + editions = models.Edition.objects.filter( + Q(languages=[]) | Q(languages__contains=['English']), + **filters, **null_fields + ).annotate(Count('parent_work__editions')).filter( + # mustn't be the only edition for the work + parent_work__editions__count__gt=1 + ) + print(editions.count()) + editions.delete() + + +class Command(BaseCommand): + ''' dedplucate allllll the book data models ''' + help = 'merges duplicate book data' + # pylint: disable=no-self-use,unused-argument + def handle(self, *args, **options): + ''' run deudplications ''' + remove_editions() From fe088f21fb495b27beee8b1ca178ddc7176f9830 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 21:00:36 -0800 Subject: [PATCH 07/69] Model and migration for lists --- .../migrations/0041_auto_20210131_0500.py | 65 +++++++++++++++ bookwyrm/models/__init__.py | 1 + bookwyrm/models/list.py | 83 +++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 bookwyrm/migrations/0041_auto_20210131_0500.py create mode 100644 bookwyrm/models/list.py diff --git a/bookwyrm/migrations/0041_auto_20210131_0500.py b/bookwyrm/migrations/0041_auto_20210131_0500.py new file mode 100644 index 000000000..eb00e3f37 --- /dev/null +++ b/bookwyrm/migrations/0041_auto_20210131_0500.py @@ -0,0 +1,65 @@ +# Generated by Django 3.0.7 on 2021-01-31 05:00 + +import bookwyrm.models.base_model +import bookwyrm.models.fields +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0040_auto_20210122_0057'), + ] + + operations = [ + migrations.CreateModel( + name='List', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])), + ('name', bookwyrm.models.fields.CharField(max_length=100)), + ('description', bookwyrm.models.fields.TextField(blank=True, null=True)), + ('privacy', bookwyrm.models.fields.CharField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255)), + ('curation', bookwyrm.models.fields.CharField(choices=[('closed', 'Closed'), ('open', 'Open'), ('moderated', 'Moderated')], default='closed', max_length=255)), + ], + options={ + 'abstract': False, + }, + bases=(bookwyrm.models.base_model.OrderedCollectionMixin, models.Model), + ), + migrations.CreateModel( + name='ListItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_date', models.DateTimeField(auto_now_add=True)), + ('updated_date', models.DateTimeField(auto_now=True)), + ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])), + ('notes', bookwyrm.models.fields.TextField(blank=True, null=True)), + ('approved', models.BooleanField(default=True)), + ('order', bookwyrm.models.fields.IntegerField(blank=True, null=True)), + ('added_by', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), + ('book', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.Edition')), + ('book_list', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.List')), + ('endorsement', models.ManyToManyField(related_name='endorsers', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ('-created_date',), + 'unique_together': {('book', 'book_list')}, + }, + bases=(bookwyrm.models.base_model.ActivitypubMixin, models.Model), + ), + migrations.AddField( + model_name='list', + name='books', + field=models.ManyToManyField(through='bookwyrm.ListItem', to='bookwyrm.Edition'), + ), + migrations.AddField( + model_name='list', + name='user', + field=bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py index b232e98fa..0aef63850 100644 --- a/bookwyrm/models/__init__.py +++ b/bookwyrm/models/__init__.py @@ -7,6 +7,7 @@ from .author import Author from .connector import Connector from .shelf import Shelf, ShelfBook +from .list import List, ListItem from .status import Status, GeneratedNote, Review, Comment, Quotation from .status import Boost diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py new file mode 100644 index 000000000..2bc49261a --- /dev/null +++ b/bookwyrm/models/list.py @@ -0,0 +1,83 @@ +''' make a list of books!! ''' +from django.db import models + +from bookwyrm import activitypub +from .base_model import ActivitypubMixin, BookWyrmModel +from .base_model import OrderedCollectionMixin +from . import fields + + +CurationType = models.TextChoices('Curation', [ + 'closed', + 'open', + 'moderated', +]) + +class List(OrderedCollectionMixin, BookWyrmModel): + ''' a list of books ''' + name = fields.CharField(max_length=100) + user = fields.ForeignKey( + 'User', on_delete=models.PROTECT, activitypub_field='owner') + description = fields.TextField(blank=True, null=True) + privacy = fields.CharField( + max_length=255, + default='public', + choices=fields.PrivacyLevels.choices + ) + curation = fields.CharField( + max_length=255, + default='closed', + choices=CurationType.choices + ) + books = models.ManyToManyField( + 'Edition', + symmetrical=False, + through='ListItem', + through_fields=('book_list', 'book'), + ) + @property + def collection_queryset(self): + ''' list of books for this shelf, overrides OrderedCollectionMixin ''' + return self.books.all().order_by('listitem') + + +class ListItem(ActivitypubMixin, BookWyrmModel): + ''' ok ''' + book = fields.ForeignKey( + 'Edition', on_delete=models.PROTECT, activitypub_field='object') + book_list = fields.ForeignKey( + 'List', on_delete=models.CASCADE, activitypub_field='target') + added_by = fields.ForeignKey( + 'User', + on_delete=models.PROTECT, + activitypub_field='actor' + ) + notes = fields.TextField(blank=True, null=True) + approved = models.BooleanField(default=True) + order = fields.IntegerField(blank=True, null=True) + endorsement = models.ManyToManyField('User', related_name='endorsers') + + activity_serializer = activitypub.AddBook + + def to_add_activity(self, user): + ''' AP for shelving a book''' + return activitypub.Add( + id='%s#add' % self.remote_id, + actor=user.remote_id, + object=self.book.to_activity(), + target=self.book_list.remote_id, + ).serialize() + + def to_remove_activity(self, user): + ''' AP for un-shelving a book''' + return activitypub.Remove( + id='%s#remove' % self.remote_id, + actor=user.remote_id, + object=self.book.to_activity(), + target=self.book_list.to_activity() + ).serialize() + + class Meta: + ''' an opinionated constraint! you can't put a book on a list twice ''' + unique_together = ('book', 'book_list') + ordering = ('-created_date',) From af65509527dfa4d46b63267bfb49e6d642f4efbd Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 21:03:50 -0800 Subject: [PATCH 08/69] stub test for list model --- bookwyrm/tests/models/test_list.py | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 bookwyrm/tests/models/test_list.py diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py new file mode 100644 index 000000000..bca63e169 --- /dev/null +++ b/bookwyrm/tests/models/test_list.py @@ -0,0 +1,32 @@ +''' testing models ''' +from django.test import TestCase + +from bookwyrm import models, settings + + +class List(TestCase): + ''' some activitypub oddness ahead ''' + def setUp(self): + ''' look, a list ''' + self.user = models.User.objects.create_user( + 'mouse', 'mouse@mouse.mouse', 'mouseword', + local=True, localname='mouse') + self.list = models.List.objects.create( + name='Test List', user=self.user) + + def test_remote_id(self): + ''' shelves use custom remote ids ''' + expected_id = 'https://%s/user/mouse/list/%d' % \ + (settings.DOMAIN, self.list.id) + self.assertEqual(self.list.get_remote_id(), expected_id) + + + def test_to_activity(self): + ''' jsonify it ''' + activity_json = self.list.to_activity() + self.assertIsInstance(activity_json, dict) + self.assertEqual(activity_json['id'], self.list.remote_id) + self.assertEqual(activity_json['totalItems'], 0) + self.assertEqual(activity_json['type'], 'OrderedCollection') + self.assertEqual(activity_json['name'], 'Test List') + self.assertEqual(activity_json['owner'], self.user.remote_id) From 0815b36ec9af2b44f0c4eeab19dcfa188f4603c3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 Jan 2021 21:33:41 -0800 Subject: [PATCH 09/69] Adds basic view and template files --- bookwyrm/templates/layout.html | 5 ++- bookwyrm/templates/lists/list.html | 7 ++++ bookwyrm/templates/lists/lists.html | 16 +++++++++ bookwyrm/urls.py | 9 +++-- bookwyrm/views/__init__.py | 1 + bookwyrm/views/list.py | 53 +++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/templates/lists/list.html create mode 100644 bookwyrm/templates/lists/lists.html create mode 100644 bookwyrm/views/list.py diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 817829706..1a6c065ea 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -53,13 +53,16 @@ From 1e9189d43c952d4529d274268f84a33d92922664 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 10:56:40 -0800 Subject: [PATCH 17/69] Suggest recently edited books if we're out of user books --- bookwyrm/templates/lists/list.html | 6 +++--- bookwyrm/templates/snippets/privacy-icons.html | 16 ++++++++-------- bookwyrm/views/list.py | 10 +++++++++- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 8f171bb45..38be3edf8 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -5,7 +5,7 @@

{{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

-

Created by {% include 'snippets/username.html' with user=list.user %}

+

Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}

{% include 'snippets/trimmed_text.html' with full=list.description %}
{% if request.user == list.user %} @@ -64,7 +64,7 @@ {% if not list.curation == 'closed' or request.user == list.user %}
-

Add Books

+

{% if list.curation == 'open' or request.user == list.user %}Add{% else %}Suggest{% endif %} Books

{% for book in suggested_books %}
@@ -75,7 +75,7 @@
{% csrf_token %} - +
diff --git a/bookwyrm/templates/snippets/privacy-icons.html b/bookwyrm/templates/snippets/privacy-icons.html index 793fbc8b2..c917f553b 100644 --- a/bookwyrm/templates/snippets/privacy-icons.html +++ b/bookwyrm/templates/snippets/privacy-icons.html @@ -1,18 +1,18 @@ {% if item.privacy == 'public' %} - - Public post + + Public {% elif item.privacy == 'unlisted' %} - - Unlisted post + + Unlisted {% elif item.privacy == 'followers' %} - - Followers-only post + + Followers-only {% else %} - - Private post + + Private {% endif %} diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 63f99c4aa..c126102d0 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -55,11 +55,19 @@ class List(View): suggestions = request.user.shelfbook_set.filter( ~Q(book__in=book_list.books.all()) ) + suggestions = [s.book for s in suggestions[:5]] + if len(suggestions) < 5: + suggestions += [s.default_edition for s in \ + models.Work.objects.filter( + ~Q(editions__in=book_list.books.all()), + ).order_by('-updated_date') + ][:5 - len(suggestions)] + data = { 'title': '%s | Lists' % book_list.name, 'list': book_list, - 'suggested_books': [s.book for s in suggestions[:5]], + 'suggested_books': suggestions, 'list_form': forms.ListForm(instance=book_list), } return TemplateResponse(request, 'lists/list.html', data) From 6a68fe9475cf2eb9fdaecc4683e7096a2d9efbd6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 11:11:26 -0800 Subject: [PATCH 18/69] Search for books to add to lists --- bookwyrm/connectors/connector_manager.py | 4 ++-- bookwyrm/connectors/self_connector.py | 11 +++++++--- bookwyrm/templates/layout.html | 2 +- bookwyrm/templates/lists/list.html | 17 ++++++++++++++ bookwyrm/views/list.py | 28 +++++++++++++++--------- 5 files changed, 46 insertions(+), 16 deletions(-) diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index d3b01f7ae..a63a788eb 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -35,10 +35,10 @@ def search(query, min_confidence=0.1): return results -def local_search(query, min_confidence=0.1): +def local_search(query, min_confidence=0.1, raw=False): ''' only look at local search results ''' connector = load_connector(models.Connector.objects.get(local=True)) - return connector.search(query, min_confidence=min_confidence) + return connector.search(query, min_confidence=min_confidence, raw=raw) def first_search_result(query, min_confidence=0.1): diff --git a/bookwyrm/connectors/self_connector.py b/bookwyrm/connectors/self_connector.py index c5d58a595..f57fbc1cc 100644 --- a/bookwyrm/connectors/self_connector.py +++ b/bookwyrm/connectors/self_connector.py @@ -11,7 +11,8 @@ from .abstract_connector import AbstractConnector, SearchResult class Connector(AbstractConnector): ''' instantiate a connector ''' - def search(self, query, min_confidence=0.1): + # pylint: disable=arguments-differ + def search(self, query, min_confidence=0.1, raw=False): ''' search your local database ''' if not query: return [] @@ -22,10 +23,14 @@ class Connector(AbstractConnector): results = search_title_author(query, min_confidence) search_results = [] for result in results: - search_results.append(self.format_search_result(result)) + if raw: + search_results.append(result) + else: + search_results.append(self.format_search_result(result)) if len(search_results) >= 10: break - search_results.sort(key=lambda r: r.confidence, reverse=True) + if not raw: + search_results.sort(key=lambda r: r.confidence, reverse=True) return search_results diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 1a6c065ea..fe8a75094 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -59,10 +59,10 @@ Feed - {% endif %} Lists + {% endif %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 38be3edf8..04fd5e116 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -65,6 +65,23 @@ {% if not list.curation == 'closed' or request.user == list.user %}

{% if list.curation == 'open' or request.user == list.user %}Add{% else %}Suggest{% endif %} Books

+
+
+
+ +
+
+ +
+
+ {% if query %} +

Clear search

+ {% endif %} +
{% for book in suggested_books %}
diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index c126102d0..ff2a2f21e 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -10,6 +10,7 @@ from django.views.decorators.http import require_POST from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.connectors import connector_manager from .helpers import is_api_request, object_visible_to_user, privacy_filter @@ -52,16 +53,22 @@ class List(View): if is_api_request(request): return ActivitypubResponse(book_list.to_activity()) - suggestions = request.user.shelfbook_set.filter( - ~Q(book__in=book_list.books.all()) - ) - suggestions = [s.book for s in suggestions[:5]] - if len(suggestions) < 5: - suggestions += [s.default_edition for s in \ - models.Work.objects.filter( - ~Q(editions__in=book_list.books.all()), - ).order_by('-updated_date') - ][:5 - len(suggestions)] + query = request.GET.get('q') + if query: + # search for books + suggestions = connector_manager.local_search(query, raw=True) + else: + # just suggest whatever books are nearby + suggestions = request.user.shelfbook_set.filter( + ~Q(book__in=book_list.books.all()) + ) + suggestions = [s.book for s in suggestions[:5]] + if len(suggestions) < 5: + suggestions += [s.default_edition for s in \ + models.Work.objects.filter( + ~Q(editions__in=book_list.books.all()), + ).order_by('-updated_date') + ][:5 - len(suggestions)] data = { @@ -69,6 +76,7 @@ class List(View): 'list': book_list, 'suggested_books': suggestions, 'list_form': forms.ListForm(instance=book_list), + 'query': query or '' } return TemplateResponse(request, 'lists/list.html', data) From f15626b2cbc50057dc64b8096406bdb34b955b58 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 11:13:05 -0800 Subject: [PATCH 19/69] Null state for search results --- bookwyrm/templates/lists/list.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 04fd5e116..ee9d5f999 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -82,6 +82,9 @@

Clear search

{% endif %} + {% if not suggested_books %} +

No books found{% if query %} matching the query "{{ query }}"{% endif %}

+ {% endif %} {% for book in suggested_books %}
From a2e69d783def5e440ee5d161904b0e341248af5e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 11:13:50 -0800 Subject: [PATCH 20/69] suggest button wording --- bookwyrm/templates/lists/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index ee9d5f999..200f5770f 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -95,7 +95,7 @@
{% csrf_token %} - +
From 846489e88e22f837ae48a2a4e19608626e9629b2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 11:21:50 -0800 Subject: [PATCH 21/69] Only show approved list items --- bookwyrm/templates/lists/list.html | 4 ++-- bookwyrm/views/list.py | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 200f5770f..b9b9ce86f 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -23,11 +23,11 @@
- {% if not list.books.exists %} + {% if not items.exists %}

This list is currently empty

{% else %}
    - {% for item in list.listitem_set.all %} + {% for item in items %}
  1. diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index ff2a2f21e..8d3e50eec 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -64,16 +64,18 @@ class List(View): ) suggestions = [s.book for s in suggestions[:5]] if len(suggestions) < 5: - suggestions += [s.default_edition for s in \ - models.Work.objects.filter( - ~Q(editions__in=book_list.books.all()), - ).order_by('-updated_date') + suggestions += [ + s.default_edition for s in \ + models.Work.objects.filter( + ~Q(editions__in=book_list.books.all()), + ).order_by('-updated_date') ][:5 - len(suggestions)] data = { 'title': '%s | Lists' % book_list.name, 'list': book_list, + 'items': book_list.listitem_set.filter(approved=True), 'suggested_books': suggestions, 'list_form': forms.ListForm(instance=book_list), 'query': query or '' From a6c5341ad115039abbbc46c130f77b527f66ed6e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 11:45:16 -0800 Subject: [PATCH 22/69] curation ui --- bookwyrm/templates/lists/list.html | 45 ++++++++++++++++++++++++++++++ bookwyrm/views/list.py | 1 + 2 files changed, 46 insertions(+) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index b9b9ce86f..6210c2bc0 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -20,6 +20,51 @@ {% include 'lists/form.html' %} +{% if pending.exists %} +
    +
    +

    {{ pending.count }} book{{pending.count | pluralize }} awaiting your approval

    + {% include 'snippets/toggle/open_button.html' with text="Curate suggestions" controls_text="pending-books" class="is-small" %} +
    + +
    +{% endif %}
    diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 8d3e50eec..a885c5533 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -76,6 +76,7 @@ class List(View): 'title': '%s | Lists' % book_list.name, 'list': book_list, 'items': book_list.listitem_set.filter(approved=True), + 'pending': book_list.listitem_set.filter(approved=False), 'suggested_books': suggestions, 'list_form': forms.ListForm(instance=book_list), 'query': query or '' From 13b38d40bb2b91b6c1799b323f970c555b21785f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 12:07:54 -0800 Subject: [PATCH 23/69] Curation view --- bookwyrm/templates/lists/curate.html | 49 ++++++++++++++++ bookwyrm/templates/lists/list.html | 68 ++--------------------- bookwyrm/templates/lists/list_layout.html | 25 +++++++++ bookwyrm/urls.py | 2 + bookwyrm/views/__init__.py | 2 +- bookwyrm/views/list.py | 38 ++++++++++++- 6 files changed, 120 insertions(+), 64 deletions(-) create mode 100644 bookwyrm/templates/lists/curate.html create mode 100644 bookwyrm/templates/lists/list_layout.html diff --git a/bookwyrm/templates/lists/curate.html b/bookwyrm/templates/lists/curate.html new file mode 100644 index 000000000..20c8175dd --- /dev/null +++ b/bookwyrm/templates/lists/curate.html @@ -0,0 +1,49 @@ +{% extends 'lists/list_layout.html' %} +{% block panel %} + +
    +

    Pending Books

    +

    Go to list

    + {% if not pending.exists %} +

    You're all set!

    + {% else %} + + + + + + + + {% for item in pending %} + + + + + + + {% endfor %} +
    BookSuggested by
    + {% include 'snippets/book_cover.html' with book=item.book size="small" %} + + {% include 'snippets/book_titleby.html' with book=item.book %} + + {% include 'snippets/username.html' with user=item.added_by %} + +
    +
    + {% csrf_token %} + + + +
    +
    + {% csrf_token %} + + + +
    + +
    + {% endif %} +
    +{% endblock %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 6210c2bc0..76c12aca3 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -1,68 +1,12 @@ -{% extends 'layout.html' %} +{% extends 'lists/list_layout.html' %} {% load bookwyrm_tags %} -{% block content %} +{% block panel %} -
    -
    -

    {{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

    -

    Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}

    - {% include 'snippets/trimmed_text.html' with full=list.description %} -
    - {% if request.user == list.user %} -
    - {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="create-list" %} -
    - {% endif %} -
    - - - -{% if pending.exists %} +{% if request.user == list.user and pending_count %}
    -
    -

    {{ pending.count }} book{{pending.count | pluralize }} awaiting your approval

    - {% include 'snippets/toggle/open_button.html' with text="Curate suggestions" controls_text="pending-books" class="is-small" %} -
    - +

    + {{ pending_count }} book{{ pending_count | pluralize }} awaiting your approval +

    {% endif %} diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html new file mode 100644 index 000000000..135655ee7 --- /dev/null +++ b/bookwyrm/templates/lists/list_layout.html @@ -0,0 +1,25 @@ +{% extends 'layout.html' %} +{% load bookwyrm_tags %} +{% block content %} + +
    +
    +

    {{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

    +

    Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}

    + {% include 'snippets/trimmed_text.html' with full=list.description %} +
    + {% if request.user == list.user %} +
    + {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="create-list" %} +
    + {% endif %} +
    + + + +{% block panel %}{% endblock %} + +{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 7b0975c0b..89cc5c419 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -92,6 +92,8 @@ urlpatterns = [ views.List.as_view(), name='list'), re_path(r'^list/(?P\d+)/add/?$', views.list.add_book, name='list-add-book'), + re_path(r'^list/(?P\d+)/curate/?$', + views.Curate.as_view(), name='list-curate'), # preferences re_path(r'^preferences/profile/?$', views.EditUser.as_view()), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 5302d6c76..422931e3d 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -14,7 +14,7 @@ from .import_data import Import, ImportStatus from .interaction import Favorite, Unfavorite, Boost, Unboost from .invite import ManageInvites, Invite from .landing import About, Home, Discover -from .list import Lists, List +from .list import Lists, List, Curate from .notifications import Notifications from .outbox import Outbox from .reading import edit_readthrough, create_readthrough, delete_readthrough diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index a885c5533..9e76e12cc 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -76,7 +76,8 @@ class List(View): 'title': '%s | Lists' % book_list.name, 'list': book_list, 'items': book_list.listitem_set.filter(approved=True), - 'pending': book_list.listitem_set.filter(approved=False), + 'pending_count': book_list.listitem_set.filter( + approved=False).count(), 'suggested_books': suggestions, 'list_form': forms.ListForm(instance=book_list), 'query': query or '' @@ -96,6 +97,41 @@ class List(View): return redirect(book_list.local_path) +class Curate(View): + ''' approve or discard list suggestsions ''' + @method_decorator(login_required, name='dispatch') + def get(self, request, list_id): + ''' display a pending list ''' + book_list = get_object_or_404(models.List, id=list_id) + if not book_list.user == request.user: + # only the creater can curate the list + return HttpResponseNotFound() + + data = { + 'title': 'Curate "%s" | Lists' % book_list.name, + 'list': book_list, + 'pending': book_list.listitem_set.filter(approved=False), + 'list_form': forms.ListForm(instance=book_list), + } + return TemplateResponse(request, 'lists/curate.html', data) + + + @method_decorator(login_required, name='dispatch') + # pylint: disable=unused-argument + def post(self, request, list_id): + ''' edit a book_list ''' + book_list = get_object_or_404(models.List, id=list_id) + suggestion = get_object_or_404( + models.ListItem, id=request.POST.get('item')) + approved = request.POST.get('approved') == 'true' + if approved: + suggestion.approved = True + suggestion.save() + else: + suggestion.delete() + return redirect('list-curate', book_list.id) + + @require_POST def add_book(request, list_id): ''' put a book on a list ''' From 47097c6b32faf86c5881680f923a467180c6cd74 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 12:10:10 -0800 Subject: [PATCH 24/69] updates user rating tag --- bookwyrm/tests/test_templatetags.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index d315144f6..98e401ee2 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -33,18 +33,18 @@ class TemplateTags(TestCase): bookwyrm_tags.dict_key(test_dict, 'c'), 0) - def test_get_rating(self): + def test_get_user_rating(self): ''' get a user's most recent rating of a book ''' models.Review.objects.create( user=self.user, book=self.book, rating=3) self.assertEqual( - bookwyrm_tags.get_rating(self.book, self.user), 3) + bookwyrm_tags.get_user_rating(self.book, self.user), 3) - def test_get_rating_doesnt_exist(self): + def test_get_user_rating_doesnt_exist(self): ''' there is no rating available ''' self.assertEqual( - bookwyrm_tags.get_rating(self.book, self.user), 0) + bookwyrm_tags.get_user_rating(self.book, self.user), 0) def test_get_user_identifer_local(self): From b17761cfc3062dc152e086a6a5aaeddb719b2e0b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 12:15:38 -0800 Subject: [PATCH 25/69] remove items from list --- bookwyrm/templates/lists/list.html | 4 ++-- bookwyrm/urls.py | 2 ++ bookwyrm/views/list.py | 13 +++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 76c12aca3..8764d61b4 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -37,9 +37,9 @@

    Added by {% include 'snippets/username.html' with user=item.added_by %}

    {% if list.user == request.user or list.curation == 'open' and item.added_by == request.user %} -
    + {% csrf_token %} - +
    {% endif %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 89cc5c419..ae0f25f38 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -92,6 +92,8 @@ urlpatterns = [ views.List.as_view(), name='list'), re_path(r'^list/(?P\d+)/add/?$', views.list.add_book, name='list-add-book'), + re_path(r'^list/(?P\d+)/remove/?$', + views.list.remove_book, name='list-remove-book'), re_path(r'^list/(?P\d+)/curate/?$', views.Curate.as_view(), name='list-curate'), diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 9e76e12cc..2e9afe336 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -161,3 +161,16 @@ def add_book(request, list_id): return HttpResponseBadRequest() return redirect('list', list_id) + + +@require_POST +def remove_book(request, list_id): + ''' put a book on a list ''' + book_list = get_object_or_404(models.List, id=list_id) + item = get_object_or_404(models.ListItem, id=request.POST.get('item')) + + if not book_list.user == request.user and not item.user == request.user: + return HttpResponseNotFound() + + item.delete() + return redirect('list', list_id) From 6824bdd5ed3bf67833a0b42fca0f5e556084541e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 12:30:33 -0800 Subject: [PATCH 26/69] Fixes shelve menu display --- bookwyrm/templates/lists/list.html | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 8764d61b4..569b17471 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -3,35 +3,32 @@ {% block panel %} {% if request.user == list.user and pending_count %} -
    +

    {{ pending_count }} book{{ pending_count | pluralize }} awaiting your approval

    {% endif %} -
    +
    {% if not items.exists %}

    This list is currently empty

    {% else %}
      {% for item in items %} -
    1. +
    2. -
      - {% include 'snippets/book_cover.html' with book=item.book size="medium" %} -
      +
      +
      + {% include 'snippets/book_cover.html' with book=item.book size="medium" %} +
      +
      {% include 'snippets/book_titleby.html' with book=item.book %} {% include 'snippets/stars.html' with rating=item.book|rating:request.user %} {% include 'snippets/shelve_button.html' with book=item.book %}
      -
      - {% if item.note %} -
      - {% include 'snippets/trimmed_text.html' with full=item.note %}
      - {% endif %}

      Added by {% include 'snippets/username.html' with user=item.added_by %}

      From 697bcb0edb786dd78686dabb741150414b6ce817 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 12:31:39 -0800 Subject: [PATCH 27/69] sidebar css class --- bookwyrm/templates/lists/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 569b17471..ab689b1d4 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -49,7 +49,7 @@
    {% if not list.curation == 'closed' or request.user == list.user %} -
    +

    {% if list.curation == 'open' or request.user == list.user %}Add{% else %}Suggest{% endif %} Books

    From 944503dde5f5ba252e48f247d60d26bebfa45633 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 12:36:53 -0800 Subject: [PATCH 28/69] Use close button instead of cancel button on edit form --- bookwyrm/templates/lists/form.html | 3 +-- bookwyrm/templates/lists/list_layout.html | 11 ++++++++--- bookwyrm/templates/lists/lists.html | 7 ++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/bookwyrm/templates/lists/form.html b/bookwyrm/templates/lists/form.html index af0b8abf6..ec265cc1c 100644 --- a/bookwyrm/templates/lists/form.html +++ b/bookwyrm/templates/lists/form.html @@ -28,7 +28,7 @@
    @@ -39,7 +39,6 @@
    - {% include 'snippets/toggle/close_button.html' with controls_text='create-list' text="Cancel" %}
    diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html index 135655ee7..5e8d2c12c 100644 --- a/bookwyrm/templates/lists/list_layout.html +++ b/bookwyrm/templates/lists/list_layout.html @@ -10,13 +10,18 @@
    {% if request.user == list.user %}
    - {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="create-list" %} + {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" %}
    {% endif %}
    - -

    Edit list

    + +
    +

    Edit list

    +
    + {% include 'snippets/toggle/toggle_button.html' with controls_text="edit-list" label="close" class="delete" nonbutton=True %} +
    +
    {% include 'lists/form.html' %} diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html index 1f230b783..97b156419 100644 --- a/bookwyrm/templates/lists/lists.html +++ b/bookwyrm/templates/lists/lists.html @@ -17,7 +17,12 @@ From 19b56c26f79da4deeef8c8636812853ace4d657c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 13:12:56 -0800 Subject: [PATCH 29/69] list views tests --- bookwyrm/tests/views/test_list.py | 209 +++++++++++++++++++++++++++++- 1 file changed, 207 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index 76c7f74cd..790533d7c 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -20,11 +20,14 @@ class ListViews(TestCase): local=True, localname='mouse', remote_id='https://example.com/users/mouse', ) - self.work = models.Work.objects.create(title='Test Work') + self.rat = models.User.objects.create_user( + 'rat@local.com', 'rat@rat.com', 'ratword', + local=True, localname='rat', + remote_id='https://example.com/users/rat', + ) self.book = models.Edition.objects.create( title='Example Edition', remote_id='https://example.com/book/1', - parent_work=self.work ) self.list = models.List.objects.create( name='Test List', user=self.local_user) @@ -55,6 +58,25 @@ class ListViews(TestCase): self.assertEqual(result.status_code, 200) + def test_lists_create(self): + ''' create list view ''' + view = views.Lists.as_view() + request = self.factory.post('', { + 'name': 'A list', + 'description': 'wow', + 'privacy': 'unlisted', + 'curation': 'open', + 'user': self.local_user.id, + }) + request.user = self.local_user + result = view(request) + self.assertEqual(result.status_code, 302) + new_list = models.List.objects.filter(name='A list').get() + self.assertEqual(new_list.description, 'wow') + self.assertEqual(new_list.privacy, 'unlisted') + self.assertEqual(new_list.curation, 'open') + + def test_list_page(self): ''' there are so many views, this just makes sure it LOADS ''' view = views.List.as_view() @@ -81,3 +103,186 @@ class ListViews(TestCase): result = view(request, self.list.id) self.assertIsInstance(result, ActivitypubResponse) self.assertEqual(result.status_code, 200) + + + def test_list_edit(self): + ''' edit a list ''' + view = views.List.as_view() + request = self.factory.post('', { + 'name': 'New Name', + 'description': 'wow', + 'privacy': 'direct', + 'curation': 'curated', + 'user': self.local_user.id, + }) + request.user = self.local_user + + result = view(request, self.list.id) + self.assertEqual(result.status_code, 302) + + self.list.refresh_from_db() + self.assertEqual(self.list.name, 'New Name') + self.assertEqual(self.list.description, 'wow') + self.assertEqual(self.list.privacy, 'direct') + self.assertEqual(self.list.curation, 'curated') + + + def test_curate_page(self): + ''' there are so many views, this just makes sure it LOADS ''' + view = views.Curate.as_view() + models.List.objects.create(name='Public list', user=self.local_user) + models.List.objects.create( + name='Private list', privacy='private', user=self.local_user) + request = self.factory.get('') + request.user = self.local_user + + result = view(request, self.list.id) + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + + request.user = self.anonymous_user + result = view(request, self.list.id) + self.assertEqual(result.status_code, 302) + + + def test_curate_approve(self): + ''' approve a pending item ''' + view = views.Curate.as_view() + pending = models.ListItem.objects.create( + book_list=self.list, + added_by=self.local_user, + book=self.book, + approved=False + ) + + request = self.factory.post('', { + 'item': pending.id, + 'approved': 'true', + }) + request.user = self.local_user + + view(request, self.list.id) + pending.refresh_from_db() + self.assertEqual(self.list.books.count(), 1) + self.assertEqual(self.list.listitem_set.first(), pending) + self.assertTrue(pending.approved) + + + def test_curate_reject(self): + ''' approve a pending item ''' + view = views.Curate.as_view() + pending = models.ListItem.objects.create( + book_list=self.list, + added_by=self.local_user, + book=self.book, + approved=False + ) + + request = self.factory.post('', { + 'item': pending.id, + 'approved': 'false', + }) + request.user = self.local_user + + view(request, self.list.id) + self.assertFalse(self.list.books.exists()) + self.assertFalse(models.ListItem.objects.exists()) + + + def test_add_book(self): + ''' put a book on a list ''' + request = self.factory.post('', { + 'book': self.book.id, + }) + request.user = self.local_user + + views.list.add_book(request, self.list.id) + item = self.list.listitem_set.get() + self.assertEqual(item.book, self.book) + self.assertEqual(item.added_by, self.local_user) + self.assertTrue(item.approved) + + + def test_add_book_outsider(self): + ''' put a book on a list ''' + self.list.curation = 'open' + self.list.save() + request = self.factory.post('', { + 'book': self.book.id, + }) + request.user = self.rat + + views.list.add_book(request, self.list.id) + item = self.list.listitem_set.get() + self.assertEqual(item.book, self.book) + self.assertEqual(item.added_by, self.rat) + self.assertTrue(item.approved) + + + def test_add_book_pending(self): + ''' put a book on a list ''' + self.list.curation = 'curated' + self.list.save() + request = self.factory.post('', { + 'book': self.book.id, + }) + request.user = self.rat + + views.list.add_book(request, self.list.id) + item = self.list.listitem_set.get() + self.assertEqual(item.book, self.book) + self.assertEqual(item.added_by, self.rat) + self.assertFalse(item.approved) + + + def test_add_book_self_curated(self): + ''' put a book on a list ''' + self.list.curation = 'curated' + self.list.save() + request = self.factory.post('', { + 'book': self.book.id, + }) + request.user = self.local_user + + views.list.add_book(request, self.list.id) + item = self.list.listitem_set.get() + self.assertEqual(item.book, self.book) + self.assertEqual(item.added_by, self.local_user) + self.assertTrue(item.approved) + + + def test_remove_book(self): + ''' take an item off a list ''' + item = models.ListItem.objects.create( + book_list=self.list, + added_by=self.local_user, + book=self.book, + ) + self.assertTrue(self.list.listitem_set.exists()) + request = self.factory.post('', { + 'item': item.id, + }) + request.user = self.local_user + + views.list.remove_book(request, self.list.id) + + self.assertFalse(self.list.listitem_set.exists()) + + + def test_remove_book_unauthorized(self): + ''' take an item off a list ''' + item = models.ListItem.objects.create( + book_list=self.list, + added_by=self.local_user, + book=self.book, + ) + self.assertTrue(self.list.listitem_set.exists()) + request = self.factory.post('', { + 'item': item.id, + }) + request.user = self.rat + + views.list.remove_book(request, self.list.id) + + self.assertTrue(self.list.listitem_set.exists()) From b9b56941654de5101f78121934a9a17a35122b41 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 13:14:52 -0800 Subject: [PATCH 30/69] Fixes bug in removing list item --- bookwyrm/views/list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 2e9afe336..4b7a4de4c 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -169,7 +169,7 @@ def remove_book(request, list_id): book_list = get_object_or_404(models.List, id=list_id) item = get_object_or_404(models.ListItem, id=request.POST.get('item')) - if not book_list.user == request.user and not item.user == request.user: + if not book_list.user == request.user and not item.added_by == request.user: return HttpResponseNotFound() item.delete() From 5939a72c811aa0ab259903ba5844d3cbb7849fe6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 13:31:49 -0800 Subject: [PATCH 31/69] More list models tests --- bookwyrm/models/list.py | 2 +- bookwyrm/tests/models/test_list.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 28ee7a2a4..96bf0b7a7 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -80,7 +80,7 @@ class ListItem(ActivitypubMixin, BookWyrmModel): id='%s#remove' % self.remote_id, actor=user.remote_id, object=self.book.to_activity(), - target=self.book_list.to_activity() + target=self.book_list.remote_id ).serialize() class Meta: diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index ba90d961c..ce7b18676 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -30,3 +30,25 @@ class List(TestCase): self.assertEqual(activity_json['type'], 'OrderedCollection') self.assertEqual(activity_json['name'], 'Test List') self.assertEqual(activity_json['owner'], self.user.remote_id) + + def test_list_item(self): + ''' a list entry ''' + work = models.Work.objects.create(title='hello') + book = models.Edition.objects.create(title='hi', parent_work=work) + item = models.ListItem.objects.create( + book_list=self.list, + book=book, + added_by=self.user, + ) + + self.assertTrue(item.approved) + + add_activity = item.to_add_activity(self.user) + self.assertEqual(add_activity['actor'], self.user.remote_id) + self.assertEqual(add_activity['object']['id'], book.remote_id) + self.assertEqual(add_activity['target'], self.list.remote_id) + + remove_activity = item.to_remove_activity(self.user) + self.assertEqual(remove_activity['actor'], self.user.remote_id) + self.assertEqual(remove_activity['object']['id'], book.remote_id) + self.assertEqual(remove_activity['target'], self.list.remote_id) From fd9b98d443f2ba5b52d4036ba0e01fadd38a0fe7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 13:38:26 -0800 Subject: [PATCH 32/69] Fixes logged out list view --- bookwyrm/templates/lists/list.html | 2 +- bookwyrm/tests/views/test_list.py | 8 ++++++++ bookwyrm/views/list.py | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index ab689b1d4..213f9dca6 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -48,7 +48,7 @@ {% endif %}
- {% if not list.curation == 'closed' or request.user == list.user %} + {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}

{% if list.curation == 'open' or request.user == list.user %}Add{% else %}Suggest{% endif %} Books

diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index 790533d7c..c3e76745b 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -90,6 +90,14 @@ class ListViews(TestCase): result.render() self.assertEqual(result.status_code, 200) + request.user = self.anonymous_user + with patch('bookwyrm.views.list.is_api_request') as is_api: + is_api.return_value = False + result = view(request, self.list.id) + self.assertIsInstance(result, TemplateResponse) + result.render() + self.assertEqual(result.status_code, 200) + with patch('bookwyrm.views.list.is_api_request') as is_api: is_api.return_value = True result = view(request, self.list.id) diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 4b7a4de4c..9ef2ae3be 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -54,10 +54,11 @@ class List(View): return ActivitypubResponse(book_list.to_activity()) query = request.GET.get('q') - if query: + suggestions = None + if query and request.user.is_authenticated: # search for books suggestions = connector_manager.local_search(query, raw=True) - else: + elif request.user.is_authenticated: # just suggest whatever books are nearby suggestions = request.user.shelfbook_set.filter( ~Q(book__in=book_list.books.all()) From 6e0d258c97b2cd6a5ebdde029902d22987c179db Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 14:03:38 -0800 Subject: [PATCH 33/69] Cards on list page --- bookwyrm/templates/lists/list-item.html | 2 -- bookwyrm/templates/lists/list_items.html | 23 +++++++++++++++++++++++ bookwyrm/templates/lists/lists.html | 18 ++++-------------- 3 files changed, 27 insertions(+), 16 deletions(-) delete mode 100644 bookwyrm/templates/lists/list-item.html create mode 100644 bookwyrm/templates/lists/list_items.html diff --git a/bookwyrm/templates/lists/list-item.html b/bookwyrm/templates/lists/list-item.html deleted file mode 100644 index 9018c0eff..000000000 --- a/bookwyrm/templates/lists/list-item.html +++ /dev/null @@ -1,2 +0,0 @@ -

{{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

-{% include 'snippets/trimmed_text.html' with full=list.description %} diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html new file mode 100644 index 000000000..4560147f1 --- /dev/null +++ b/bookwyrm/templates/lists/list_items.html @@ -0,0 +1,23 @@ +{% load bookwyrm_tags %} +
+ {% for list in lists %} +
+
+
+

+ {{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %} +

+
+
+ {% for book in list.books.all|slice:5 %} + {% include 'snippets/book_cover.html' with book=book size="small" %} + {% endfor %} +
+
+ {% if list.description %}{{ list.description | to_markdown | safe | truncatewords_html:20 }}{% endif %} +

Created {% if list.curation != 'open' %} and curated{% endif %} by {% include 'snippets/username.html' with user=list.user %}

+
+
+
+ {% endfor %} +
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html index 97b156419..b016b9f15 100644 --- a/bookwyrm/templates/lists/lists.html +++ b/bookwyrm/templates/lists/lists.html @@ -27,13 +27,7 @@ {% if request.user.list_set.exists %} -
    - {% for list in request.user.list_set.all %} -
  • - {% include 'lists/list-item.html' with list=list %} -
    • - {% endfor %} -
+ {% include 'lists/list_items.html' with lists=request.user.list_set.all %} {% endif %}
{% endif %} @@ -41,13 +35,9 @@ {% if lists.exists %}

Recent Lists

-
    - {% for list in lists %} -
  • - {% include 'lists/list-item.html' with list=list %} -
    • - {% endfor %} -
+ {% if request.user.list_set.exists %} + {% include 'lists/list_items.html' with lists=lists %} + {% endif %}
{% endif %} From d7c32cc3143362cb8d3ff1d7e0ad190c55e0c9ca Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 31 Jan 2021 17:34:06 -0800 Subject: [PATCH 34/69] Paginates lists view --- bookwyrm/models/list.py | 4 ++++ bookwyrm/templates/lists/lists.html | 15 +++++++++++---- bookwyrm/views/list.py | 13 +++++++++++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 96bf0b7a7..6ade16ded 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -46,6 +46,10 @@ class List(OrderedCollectionMixin, BookWyrmModel): ''' list of books for this shelf, overrides OrderedCollectionMixin ''' return self.books.all().order_by('listitem') + class Meta: + ''' default sorting ''' + ordering = ('-updated_date',) + class ListItem(ActivitypubMixin, BookWyrmModel): ''' ok ''' diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html index b016b9f15..36250331b 100644 --- a/bookwyrm/templates/lists/lists.html +++ b/bookwyrm/templates/lists/lists.html @@ -4,8 +4,7 @@

Lists

- -{% if request.user.is_authenticated %} +{% if request.user.is_authenticated and not lists.has_previous %}
@@ -27,18 +26,26 @@ {% if request.user.list_set.exists %} - {% include 'lists/list_items.html' with lists=request.user.list_set.all %} + {% include 'lists/list_items.html' with lists=request.user.list_set.all|slice:4 %} + {% endif %} + + {% if request.user.list_set.count > 4 %} + See all {{ request.user.list_set.count}} lists {% endif %}
{% endif %} -{% if lists.exists %} + +{% if lists %}

Recent Lists

{% if request.user.list_set.exists %} {% include 'lists/list_items.html' with lists=lists %} {% endif %}
+
+ {% include 'snippets/pagination.html' with page=lists path=path %} +
{% endif %} {% endblock %} diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 9ef2ae3be..01af2d191 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -1,5 +1,6 @@ ''' book list views''' from django.contrib.auth.decorators import login_required +from django.core.paginator import Paginator from django.db.models import Q from django.http import HttpResponseNotFound, HttpResponseBadRequest from django.shortcuts import get_object_or_404, redirect @@ -19,15 +20,23 @@ class Lists(View): ''' book list page ''' def get(self, request): ''' display a book list ''' + try: + page = int(request.GET.get('page', 1)) + except ValueError: + page = 1 + user = request.user if request.user.is_authenticated else None lists = models.List.objects.filter( ~Q(user=user), ).all() lists = privacy_filter(request.user, lists, ['public', 'followers']) + + paginated = Paginator(lists, 12) data = { 'title': 'Lists', - 'lists': lists, - 'list_form': forms.ListForm() + 'lists': paginated.page(page), + 'list_form': forms.ListForm(), + 'path': '/list', } return TemplateResponse(request, 'lists/lists.html', data) From ec7a9f68c2df503071a7e7f0131075ad5f170670 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 1 Feb 2021 11:34:08 -0800 Subject: [PATCH 35/69] Adds tabs to user profile page --- bookwyrm/templates/goal.html | 25 ++++++++++++------ bookwyrm/templates/lists/lists.html | 2 +- bookwyrm/templates/preferences/edit_user.html | 2 +- bookwyrm/templates/user/shelf.html | 6 ++--- bookwyrm/templates/user/user_layout.html | 25 ++++++++++++++++++ bookwyrm/urls.py | 23 +++++++++------- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/goal.py | 1 + bookwyrm/views/list.py | 26 ++++++++++++++++++- 9 files changed, 88 insertions(+), 24 deletions(-) diff --git a/bookwyrm/templates/goal.html b/bookwyrm/templates/goal.html index ac6c65d25..dfdc02aad 100644 --- a/bookwyrm/templates/goal.html +++ b/bookwyrm/templates/goal.html @@ -1,13 +1,22 @@ -{% extends 'layout.html' %} -{% block content %} +{% extends 'user/user_layout.html' %} +{% block header %} +
+
+

{{ year }} Reading Progress

+
+ {% if is_self and goal %} +
+ {% include 'snippets/toggle/open_button.html' with text="Edit goal" icon="pencil" controls_text="show-edit-goal" focus="edit-form-header" %} +
+ {% endif %} +
+{% endblock %} + +{% block panel %}
-

{{ year }} Reading Progress

{% if user == request.user %}
- {% if goal %} - {% include 'snippets/toggle/open_button.html' with text="Edit goal" controls_text="show-edit-goal" focus="edit-form-header" %} - {% endif %} {% now 'Y' as year %}
@@ -34,8 +43,8 @@
{% if goal.books %} -
-

{% if goal.user == request.user %}Your{% else %}{{ goal.user.display_name }}'s{% endif %} {{ year }} Books

+
+

{% if goal.user == request.user %}Your{% else %}{{ goal.user.display_name }}'s{% endif %} {{ year }} Books

{% for book in goal.books %}
diff --git a/bookwyrm/templates/lists/lists.html b/bookwyrm/templates/lists/lists.html index 36250331b..0e25bb237 100644 --- a/bookwyrm/templates/lists/lists.html +++ b/bookwyrm/templates/lists/lists.html @@ -30,7 +30,7 @@ {% endif %} {% if request.user.list_set.count > 4 %} - See all {{ request.user.list_set.count}} lists + See all {{ request.user.list_set.count}} lists {% endif %}
{% endif %} diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html index 8b384276f..798d2fcba 100644 --- a/bookwyrm/templates/preferences/edit_user.html +++ b/bookwyrm/templates/preferences/edit_user.html @@ -7,7 +7,7 @@ Edit Profile {% if form.non_field_errors %}

{{ form.non_field_errors }}

{% endif %} -
+ {% csrf_token %}
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html index c0083e176..add5e5db1 100644 --- a/bookwyrm/templates/user/shelf.html +++ b/bookwyrm/templates/user/shelf.html @@ -18,11 +18,11 @@
    - {% for shelf_tab in shelves %} -
  • + {% for shelf_tab in shelves %} +
  • {{ shelf_tab.name }}
    • - {% endfor %} + {% endfor %}
diff --git a/bookwyrm/templates/user/user_layout.html b/bookwyrm/templates/user/user_layout.html index 1ab51ce32..ec8f71890 100644 --- a/bookwyrm/templates/user/user_layout.html +++ b/bookwyrm/templates/user/user_layout.html @@ -67,6 +67,31 @@
{% endif %}
+{% with user|username as username %} +{% if 'user/'|add:username|add:'/shelf' not in request.path and 'user/'|add:username|add:'/shelves' not in request.path %} + +{% endif %} +{% endwith %} {% block panel %}{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index ae0f25f38..68aaedd76 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -78,13 +78,20 @@ urlpatterns = [ re_path(r'^import/(\d+)/?$', views.ImportStatus.as_view()), # users - re_path(r'%s/?$' % user_path, views.User.as_view()), + re_path(r'%s/?$' % user_path, views.User.as_view(), name='user-feed'), re_path(r'%s\.json$' % user_path, views.User.as_view()), - re_path(r'%s/rss' % user_path, views.rss_feed.RssFeed()), - re_path(r'%s/followers(.json)?/?$' % user_path, views.Followers.as_view()), - re_path(r'%s/following(.json)?/?$' % user_path, views.Following.as_view()), + re_path(r'%s/rss' % user_path, views.rss_feed.RssFeed(), name='user-rss'), + re_path(r'%s/followers(.json)?/?$' % user_path, + views.Followers.as_view(), name='user-followers'), + re_path(r'%s/following(.json)?/?$' % user_path, + views.Following.as_view(), name='user-following'), re_path(r'%s/shelves/?$' % user_path, views.user_shelves_page, name='user-shelves'), + re_path(r'%s/lists/?$' % user_path, + views.UserLists.as_view(), name='user-lists'), + re_path(r'%s/goal/(?P\d{4})/?$' % user_path, + views.Goal.as_view(), name='user-goal'), + # lists re_path(r'^list/?$', views.Lists.as_view(), name='lists'), @@ -98,15 +105,13 @@ urlpatterns = [ views.Curate.as_view(), name='list-curate'), # preferences - re_path(r'^preferences/profile/?$', views.EditUser.as_view()), + re_path(r'^preferences/profile/?$', + views.EditUser.as_view(), name='prefs-profile'), re_path(r'^preferences/password/?$', views.ChangePassword.as_view()), re_path(r'^preferences/block/?$', views.Block.as_view()), re_path(r'^block/(?P\d+)/?$', views.Block.as_view()), re_path(r'^unblock/(?P\d+)/?$', views.unblock), - # reading goals - re_path(r'%s/goal/(?P\d{4})/?$' % user_path, views.Goal.as_view()), - # statuses re_path(r'%s(.json)?/?$' % status_path, views.Status.as_view()), re_path(r'%s/activity/?$' % status_path, views.Status.as_view()), @@ -142,7 +147,7 @@ urlpatterns = [ # shelf re_path(r'^%s/shelf/(?P[\w-]+)(.json)?/?$' % \ - user_path, views.Shelf.as_view()), + user_path, views.Shelf.as_view(), name='shelf'), re_path(r'^%s/shelf/(?P[\w-]+)(.json)?/?$' % \ local_user_path, views.Shelf.as_view()), re_path(r'^create-shelf/?$', views.create_shelf), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 422931e3d..196e84c0a 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -14,7 +14,7 @@ from .import_data import Import, ImportStatus from .interaction import Favorite, Unfavorite, Boost, Unboost from .invite import ManageInvites, Invite from .landing import About, Home, Discover -from .list import Lists, List, Curate +from .list import Lists, List, Curate, UserLists from .notifications import Notifications from .outbox import Outbox from .reading import edit_readthrough, create_readthrough, delete_readthrough diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index f1954672f..ac7a1702f 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -35,6 +35,7 @@ class Goal(View): 'goal': goal, 'user': user, 'year': year, + 'is_self': request.user == user, } return TemplateResponse(request, 'goal.html', data) diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 01af2d191..50cab1fd0 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -13,7 +13,7 @@ from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.connectors import connector_manager from .helpers import is_api_request, object_visible_to_user, privacy_filter - +from .helpers import get_user_from_username # pylint: disable=no-self-use class Lists(View): @@ -50,6 +50,30 @@ class Lists(View): book_list = form.save() return redirect(book_list.local_path) +class UserLists(View): + ''' a user's book list page ''' + def get(self, request, username): + ''' display a book list ''' + try: + page = int(request.GET.get('page', 1)) + except ValueError: + page = 1 + user = get_user_from_username(username) + lists = models.List.objects.filter(user=user).all() + lists = privacy_filter( + request.user, lists, ['public', 'followers', 'unlisted']) + paginated = Paginator(lists, 12) + + data = { + 'title': '%s: Lists' % user.name, + 'user': user, + 'is_self': request.user.id == user.id, + 'lists': paginated.page(page), + 'list_form': forms.ListForm(), + 'path': user.local_path + '/lists', + } + return TemplateResponse(request, 'user/lists.html', data) + class List(View): ''' book list page ''' From e86553014271d54d48361c7fcd26f2eddcb46b28 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 1 Feb 2021 11:50:47 -0800 Subject: [PATCH 36/69] Search lists --- bookwyrm/templates/search_results.html | 41 +++++++++++++++++++------- bookwyrm/views/search.py | 17 +++++++++-- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/bookwyrm/templates/search_results.html b/bookwyrm/templates/search_results.html index a35504a17..be1da8318 100644 --- a/bookwyrm/templates/search_results.html +++ b/bookwyrm/templates/search_results.html @@ -63,17 +63,36 @@
-

Matching Users

- {% if not user_results %} -

No users found for "{{ query }}"

- {% endif %} - {% for result in user_results %} -
- {% include 'snippets/avatar.html' with user=result %} - {% include 'snippets/username.html' with user=result show_full=True %} - {% include 'snippets/follow_button.html' with user=result %} -
- {% endfor %} +
+

Matching Users

+ {% if not user_results %} +

No users found for "{{ query }}"

+ {% endif %} +
    + {% for result in user_results %} +
  • + {% include 'snippets/avatar.html' with user=result %} + {% include 'snippets/username.html' with user=result show_full=True %} + {% include 'snippets/follow_button.html' with user=result %} +
    • + {% endfor %} +
+
+
+

Lists

+ {% if not list_results %} +

No lists found for "{{ query }}"

+ {% endif %} + {% for result in list_results %} +
+ +
+ {% endfor %} +
{% endwith %} diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 8066777a0..a4cd73374 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -10,7 +10,7 @@ from django.views import View from bookwyrm import models from bookwyrm.connectors import connector_manager from bookwyrm.utils import regex -from .helpers import is_api_request +from .helpers import is_api_request, privacy_filter from .helpers import handle_remote_webfinger @@ -32,7 +32,7 @@ class Search(View): if re.match(r'\B%s' % regex.full_username, query): handle_remote_webfinger(query) - # do a local user search + # do a user search user_results = models.User.objects.annotate( similarity=Greatest( TrigramSimilarity('username', query), @@ -42,12 +42,25 @@ class Search(View): similarity__gt=0.5, ).order_by('-similarity')[:10] + # any relevent lists? + list_results = privacy_filter( + request.user, models.List.objects, ['public', 'followers'] + ).annotate( + similarity=Greatest( + TrigramSimilarity('name', query), + TrigramSimilarity('description', query), + ) + ).filter( + similarity__gt=0.1, + ).order_by('-similarity')[:10] + book_results = connector_manager.search( query, min_confidence=min_confidence) data = { 'title': 'Search Results', 'book_results': book_results, 'user_results': user_results, + 'list_results': list_results, 'query': query, } return TemplateResponse(request, 'search_results.html', data) From 3e3b21c46aced1ba1a8fe3c0c696115eb85fae24 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 1 Feb 2021 12:03:11 -0800 Subject: [PATCH 37/69] Fixes ap serialization of list lists --- bookwyrm/views/list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 50cab1fd0..b7a8dad08 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -84,7 +84,7 @@ class List(View): return HttpResponseNotFound() if is_api_request(request): - return ActivitypubResponse(book_list.to_activity()) + return ActivitypubResponse(book_list.to_activity(**request.GET)) query = request.GET.get('q') suggestions = None From c7914d1394c1459b2a65dadc3d45476f7f49230a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 1 Feb 2021 13:06:06 -0800 Subject: [PATCH 38/69] Fixes search tests --- bookwyrm/tests/views/test_search.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index e5cba99c9..655b4563a 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -83,6 +83,7 @@ class ShelfViews(TestCase): ) request = self.factory.get('', {'q': 'Test Book'}) + request.user = self.local_user with patch('bookwyrm.views.search.is_api_request') as is_api: is_api.return_value = False with patch( @@ -99,6 +100,7 @@ class ShelfViews(TestCase): ''' searches remote connectors ''' view = views.Search.as_view() request = self.factory.get('', {'q': 'mouse'}) + request.user = self.local_user with patch('bookwyrm.views.search.is_api_request') as is_api: is_api.return_value = False with patch('bookwyrm.connectors.connector_manager.search'): From e53b4e57fa65f8394a90a09485fd7a24c4255f0c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Feb 2021 09:37:46 -0800 Subject: [PATCH 39/69] Federating lists and shelves --- bookwyrm/activitypub/ordered_collection.py | 11 +++--- bookwyrm/activitypub/verbs.py | 2 +- bookwyrm/models/base_model.py | 18 +++++----- bookwyrm/models/list.py | 9 ++--- bookwyrm/models/shelf.py | 6 +--- bookwyrm/views/goal.py | 7 +++- bookwyrm/views/list.py | 40 +++++++++++++++++++++- bookwyrm/views/shelf.py | 10 ++++-- 8 files changed, 74 insertions(+), 29 deletions(-) diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 9aeaf6641..335723f44 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -1,5 +1,5 @@ ''' defines activitypub collections (lists) ''' -from dataclasses import dataclass +from dataclasses import dataclass, field from typing import List from .base_activity import ActivityObject @@ -10,9 +10,12 @@ class OrderedCollection(ActivityObject): ''' structure of an ordered collection activity ''' totalItems: int first: str - last: str = '' - name: str = '' - owner: str = '' + last: str = None + name: str = None + summary: str = None + owner: str = None + to: List[str] = field(default_factory=lambda: []) + cc: List[str] = field(default_factory=lambda: []) type: str = 'OrderedCollection' diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index 6977ee8e8..5502ced01 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -18,7 +18,7 @@ class Create(Verb): ''' Create activity ''' to: List cc: List - signature: Signature + signature: Signature = None type: str = 'Create' diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 3f1ed66d8..889eb5f41 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -161,16 +161,18 @@ class ActivitypubMixin: ''' returns the object wrapped in a Create activity ''' activity_object = self.to_activity(**kwargs) - signer = pkcs1_15.new(RSA.import_key(user.key_pair.private_key)) - content = activity_object['content'] - signed_message = signer.sign(SHA256.new(content.encode('utf8'))) + signature = None create_id = self.remote_id + '/activity' + if 'content' in activity_object: + signer = pkcs1_15.new(RSA.import_key(user.key_pair.private_key)) + content = activity_object['content'] + signed_message = signer.sign(SHA256.new(content.encode('utf8'))) - signature = activitypub.Signature( - creator='%s#main-key' % user.remote_id, - created=activity_object['published'], - signatureValue=b64encode(signed_message).decode('utf8') - ) + signature = activitypub.Signature( + creator='%s#main-key' % user.remote_id, + created=activity_object['published'], + signatureValue=b64encode(signed_message).decode('utf8') + ) return activitypub.Create( id=create_id, diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 6ade16ded..801a3f2ae 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -19,12 +19,9 @@ class List(OrderedCollectionMixin, BookWyrmModel): name = fields.CharField(max_length=100) user = fields.ForeignKey( 'User', on_delete=models.PROTECT, activitypub_field='owner') - description = fields.TextField(blank=True, null=True) - privacy = fields.CharField( - max_length=255, - default='public', - choices=fields.PrivacyLevels.choices - ) + description = fields.TextField( + blank=True, null=True, activitypub_field='summary') + privacy = fields.PrivacyField() curation = fields.CharField( max_length=255, default='closed', diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py index 845751372..87200f380 100644 --- a/bookwyrm/models/shelf.py +++ b/bookwyrm/models/shelf.py @@ -15,11 +15,7 @@ class Shelf(OrderedCollectionMixin, BookWyrmModel): user = fields.ForeignKey( 'User', on_delete=models.PROTECT, activitypub_field='owner') editable = models.BooleanField(default=True) - privacy = fields.CharField( - max_length=255, - default='public', - choices=fields.PrivacyLevels.choices - ) + privacy = fields.PrivacyField() books = models.ManyToManyField( 'Edition', symmetrical=False, diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index ac7a1702f..0496848ff 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -71,10 +71,15 @@ class Goal(View): broadcast( request.user, status.to_create_activity(request.user), + privacy=status.privacy, software='bookwyrm') # re-format the activity for non-bookwyrm servers remote_activity = status.to_create_activity(request.user, pure=True) - broadcast(request.user, remote_activity, software='other') + broadcast( + request.user, + remote_activity, + privacy=status.privacy, + software='other') return redirect(request.headers.get('Referer', '/')) diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index b7a8dad08..ce0cedb42 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -11,6 +11,7 @@ from django.views.decorators.http import require_POST from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.broadcast import broadcast from bookwyrm.connectors import connector_manager from .helpers import is_api_request, object_visible_to_user, privacy_filter from .helpers import get_user_from_username @@ -48,6 +49,14 @@ class Lists(View): if not form.is_valid(): return redirect('lists') book_list = form.save() + + # let the world know + broadcast( + request.user, + book_list.to_create_activity(request.user), + privacy=book_list.privacy, + software='bookwyrm' + ) return redirect(book_list.local_path) class UserLists(View): @@ -128,6 +137,13 @@ class List(View): if not form.is_valid(): return redirect('list', book_list.id) book_list = form.save() + # let the world know + broadcast( + request.user, + book_list.to_update_activity(request.user), + privacy=book_list.privacy, + software='bookwyrm' + ) return redirect(book_list.local_path) @@ -161,6 +177,13 @@ class Curate(View): if approved: suggestion.approved = True suggestion.save() + # let the world know + broadcast( + request.user, + suggestion.to_add_activity(request.user), + privacy=book_list.privacy, + software='bookwyrm' + ) else: suggestion.delete() return redirect('list-curate', book_list.id) @@ -177,11 +200,18 @@ def add_book(request, list_id): # do you have permission to add to the list? if request.user == book_list.user or book_list.curation == 'open': # go ahead and add it - models.ListItem.objects.create( + item = models.ListItem.objects.create( book=book, book_list=book_list, added_by=request.user, ) + # let the world know + broadcast( + request.user, + item.to_add_activity(request.user), + privacy=book_list.privacy, + software='bookwyrm' + ) elif book_list.curation == 'curated': # make a pending entry models.ListItem.objects.create( @@ -206,5 +236,13 @@ def remove_book(request, list_id): if not book_list.user == request.user and not item.added_by == request.user: return HttpResponseNotFound() + activity = item.to_remove_activity(request.user) item.delete() + # let the world know + broadcast( + request.user, + activity, + privacy=book_list.privacy, + software='bookwyrm' + ) return redirect('list', list_id) diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index e4c492615..ebeb6b52b 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -138,7 +138,12 @@ def shelve(request): pass shelfbook = models.ShelfBook.objects.create( book=book, shelf=desired_shelf, added_by=request.user) - broadcast(request.user, shelfbook.to_add_activity(request.user)) + broadcast( + request.user, + shelfbook.to_add_activity(request.user), + privacy=shelfbook.shelf.privacy, + software='bookwyrm' + ) # post about "want to read" shelves if desired_shelf.identifier == 'to-read': @@ -146,7 +151,6 @@ def shelve(request): request.user, desired_shelf, book, - privacy=desired_shelf.privacy ) return redirect('/') @@ -169,4 +173,4 @@ def handle_unshelve(user, book, shelf): activity = row.to_remove_activity(user) row.delete() - broadcast(user, activity) + broadcast(user, activity, privacy=shelf.privacy, software='bookwyrm') From 23ce639e5c54404c73852810613ebb5b8ac9a303 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Feb 2021 09:41:24 -0800 Subject: [PATCH 40/69] migration to change privacy field type --- .../migrations/0042_auto_20210201_2108.py | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 bookwyrm/migrations/0042_auto_20210201_2108.py diff --git a/bookwyrm/migrations/0042_auto_20210201_2108.py b/bookwyrm/migrations/0042_auto_20210201_2108.py new file mode 100644 index 000000000..95a144de2 --- /dev/null +++ b/bookwyrm/migrations/0042_auto_20210201_2108.py @@ -0,0 +1,28 @@ +# Generated by Django 3.0.7 on 2021-02-01 21:08 + +import bookwyrm.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0041_auto_20210131_1614'), + ] + + operations = [ + migrations.AlterModelOptions( + name='list', + options={'ordering': ('-updated_date',)}, + ), + migrations.AlterField( + model_name='list', + name='privacy', + field=bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255), + ), + migrations.AlterField( + model_name='shelf', + name='privacy', + field=bookwyrm.models.fields.PrivacyField(choices=[('public', 'Public'), ('unlisted', 'Unlisted'), ('followers', 'Followers'), ('direct', 'Direct')], default='public', max_length=255), + ), + ] From d2fc3febb0b063e0bcac6f3585bcbaa1a09c014f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Feb 2021 09:44:29 -0800 Subject: [PATCH 41/69] Show reading activity panel when no readthroughs exist --- bookwyrm/templates/book.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index 4a95237cf..51811d17f 100644 --- a/bookwyrm/templates/book.html +++ b/bookwyrm/templates/book.html @@ -147,7 +147,7 @@ {% endfor %}
- {% if readthroughs.exists %} + {% if request.user.is_authenticated %}

Your reading activity

@@ -155,6 +155,9 @@ {% include 'snippets/toggle/open_button.html' with text="Add read dates" icon="plus" class="is-small" controls_text="add-readthrough" %}
+ {% if not readthroughs.exists %} +

You don't have any reading activity for this book.

+ {% endif %}
{% if request.user == list.user %}
- {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" %} + {% include 'snippets/toggle/open_button.html' with text="Edit list" icon="pencil" controls_text="edit-list" focus="edit-list-header" %}
{% endif %}