From daa7746f47be7244379c3a731bfbddcaf3016639 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 29 Apr 2021 21:40:54 +0200 Subject: [PATCH 001/196] Stretch List card in list of lists --- bookwyrm/templates/lists/list_items.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html index 3e3e8bf49..e1b9cd7a5 100644 --- a/bookwyrm/templates/lists/list_items.html +++ b/bookwyrm/templates/lists/list_items.html @@ -2,7 +2,7 @@
{% for list in lists %}
-
+

{{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %} From b59b3e294f28a7e36848af99051a619d69a31555 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 29 Apr 2021 21:41:31 +0200 Subject: [PATCH 002/196] Arrange Sort List form fields --- bookwyrm/templates/lists/list.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 641038d0a..e61caf9c3 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -79,15 +79,19 @@

{% trans "Sort List" %}

- -
- {{ sort_form.sort_by }} +
+ +
+ {{ sort_form.sort_by }} +
- -
- {{ sort_form.direction }} +
+ +
+ {{ sort_form.direction }} +
-
+
From 0a71fb094fb8fbf994103f800ee84b4cd3b8bda3 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 29 Apr 2021 21:41:43 +0200 Subject: [PATCH 003/196] Move counter in Ordered List --- bookwyrm/static/css/bookwyrm.css | 34 ++++++++++++++++++++++++++++++ bookwyrm/templates/lists/list.html | 8 ++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 9e74d69f1..0d9cbe3a4 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -346,3 +346,37 @@ body { display: none; } } + +/* Book list + ******************************************************************************/ + +ol.ordered-list { + list-style: none; + counter-reset: books; +} + +ol.ordered-list li { + counter-increment: books +} + +ol.ordered-list li::before { + content: counter(books); + position: absolute; + left: -20px; + width: 20px; + height: 24px; + + border: 1px solid #dbdbdb; + border-right: 0; + border-top-left-radius: 2px; + border-top-right-radius: 2px; + + display: flex; + align-items: center; + justify-content: center; + align-items: center; + + color: #888; + font-size: 0.8em; + font-weight: bold; +} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index e61caf9c3..cfecfd4b0 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -26,7 +26,7 @@ {% if not items.object_list.exists %}

{% trans "This list is currently empty" %}

{% else %} -
    +
      {% for item in items %}
    1. @@ -40,7 +40,7 @@ {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
-
+

{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by {{ username }}{% endblocktrans %}

@@ -50,6 +50,9 @@
+
+ +
{% csrf_token %}
@@ -58,7 +61,6 @@
-
From fa17386a6eb3553b09b92aba79b21df4f4002e2f Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 29 Apr 2021 21:45:48 +0200 Subject: [PATCH 004/196] Fix --- bookwyrm/static/css/bookwyrm.css | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 0d9cbe3a4..85b9e0c2e 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -356,27 +356,27 @@ ol.ordered-list { } ol.ordered-list li { - counter-increment: books + counter-increment: books } ol.ordered-list li::before { - content: counter(books); - position: absolute; - left: -20px; - width: 20px; - height: 24px; + content: counter(books); + position: absolute; + left: -20px; + width: 20px; + height: 24px; - border: 1px solid #dbdbdb; - border-right: 0; - border-top-left-radius: 2px; - border-top-right-radius: 2px; + border: 1px solid #dbdbdb; + border-right: 0; + border-top-left-radius: 2px; + border-top-right-radius: 2px; - display: flex; - align-items: center; - justify-content: center; - align-items: center; + display: flex; + align-items: center; + justify-content: center; + align-items: center; - color: #888; - font-size: 0.8em; - font-weight: bold; + color: #888; + font-size: 0.8em; + font-weight: bold; } From d4dffe48a7d2bf786a0099ab8b5b2756b8b5c982 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 29 Apr 2021 21:48:35 +0200 Subject: [PATCH 005/196] Update bookwyrm.css --- bookwyrm/static/css/bookwyrm.css | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 85b9e0c2e..c11a07970 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -356,7 +356,7 @@ ol.ordered-list { } ol.ordered-list li { - counter-increment: books + counter-increment: books; } ol.ordered-list li::before { @@ -365,17 +365,14 @@ ol.ordered-list li::before { left: -20px; width: 20px; height: 24px; - border: 1px solid #dbdbdb; border-right: 0; border-top-left-radius: 2px; border-top-right-radius: 2px; - display: flex; align-items: center; justify-content: center; align-items: center; - color: #888; font-size: 0.8em; font-weight: bold; From bbac0ad7ab444f7eb5d3c069c699fe6b81687ca4 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 29 Apr 2021 21:51:42 +0200 Subject: [PATCH 006/196] Update bookwyrm.css --- bookwyrm/static/css/bookwyrm.css | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index c11a07970..f2c6a0280 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -370,7 +370,6 @@ ol.ordered-list li::before { border-top-left-radius: 2px; border-top-right-radius: 2px; display: flex; - align-items: center; justify-content: center; align-items: center; color: #888; From 4c021e63572dc8707ed44200419a87d952489d2d Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 2 May 2021 21:34:43 +0200 Subject: [PATCH 007/196] Add Mobile styles --- bookwyrm/static/css/bookwyrm.css | 27 ++++++++++++++++++++++++--- bookwyrm/templates/lists/list.html | 2 +- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index f2c6a0280..2fa909131 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -47,6 +47,14 @@ body { .m-0-mobile { margin: 0 !important; } + + .card-footer.is-stacked-mobile { + flex-direction: column; + } + .card-footer.is-stacked-mobile .card-footer-item:not(:last-child) { + border-bottom: 1px solid #ededed; + border-right: 0; + } } .button.is-transparent { @@ -352,19 +360,20 @@ body { ol.ordered-list { list-style: none; - counter-reset: books; + counter-reset: list-counter; } ol.ordered-list li { - counter-increment: books; + counter-increment: list-counter; } ol.ordered-list li::before { - content: counter(books); + content: counter(list-counter); position: absolute; left: -20px; width: 20px; height: 24px; + background-color: #fff; border: 1px solid #dbdbdb; border-right: 0; border-top-left-radius: 2px; @@ -376,3 +385,15 @@ ol.ordered-list li::before { font-size: 0.8em; font-weight: bold; } + +@media only screen and (max-width: 768px) { + ol.ordered-list li::before { + left: 0; + z-index: 1; + border: 0; + border-right: 1px solid #dbdbdb; + border-bottom: 1px solid #dbdbdb; + border-radius: 0; + border-bottom-right-radius: 2px; + } +} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index cfecfd4b0..da092656a 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -40,7 +40,7 @@ {% include 'snippets/shelve_button/shelve_button.html' with book=item.book %}
-
+

{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by {{ username }}{% endblocktrans %}

From 6abe9274c0af2615ccbd75fcda3b101b6f02face Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 10 May 2021 15:55:42 -0700 Subject: [PATCH 008/196] Switches out links in the top bar and dropdown --- bookwyrm/templates/layout.html | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index bc6544012..1cf6d4db9 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -55,15 +55,15 @@ From a70c713c29ffcc3b8e877237f28b608edbd7e822 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 20 May 2021 20:21:04 -0700 Subject: [PATCH 010/196] Fixes default values in edit announcement form --- bookwyrm/templates/settings/announcement_form.html | 10 +++++++--- bookwyrm/views/announcements.py | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/settings/announcement_form.html b/bookwyrm/templates/settings/announcement_form.html index 4e2e8f32d..8eb6acd52 100644 --- a/bookwyrm/templates/settings/announcement_form.html +++ b/bookwyrm/templates/settings/announcement_form.html @@ -2,7 +2,11 @@ {% load i18n %} {% block header %} +{% if announcement %} +{% trans "Edit Announcement" %} +{% else %} {% trans "Create Announcement" %} +{% endif %} {% endblock %} {% block form %} @@ -24,7 +28,7 @@

- + {% for error in form.event_date.errors %}

{{ error | escape }}

{% endfor %} @@ -34,7 +38,7 @@

- + {% for error in form.start_date.errors %}

{{ error | escape }}

{% endfor %} @@ -43,7 +47,7 @@

- + {% for error in form.end_date.errors %}

{{ error | escape }}

{% endfor %} diff --git a/bookwyrm/views/announcements.py b/bookwyrm/views/announcements.py index 6cd6ecd8f..e522fc7f6 100644 --- a/bookwyrm/views/announcements.py +++ b/bookwyrm/views/announcements.py @@ -81,6 +81,7 @@ class Announcement(View): form = forms.AnnouncementForm(request.POST, instance=announcement) if form.is_valid(): announcement = form.save() + form = forms.AnnouncementForm(instance=announcement) data = { "announcement": announcement, "form": form, From 8772f26b911cbc605aa598587ee90b05b23f95b2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 20 May 2021 20:35:12 -0700 Subject: [PATCH 011/196] Don't error when task for import no longer exists --- bookwyrm/views/import_data.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/views/import_data.py b/bookwyrm/views/import_data.py index 910283c42..62dcce73b 100644 --- a/bookwyrm/views/import_data.py +++ b/bookwyrm/views/import_data.py @@ -81,7 +81,10 @@ class ImportStatus(View): job = models.ImportJob.objects.get(id=job_id) if job.user != request.user: raise PermissionDenied - task = app.AsyncResult(job.task_id) + try: + task = app.AsyncResult(job.task_id) + except ValueError: + task = None items = job.items.order_by("index").all() failed_items = [i for i in items if i.fail_reason] items = [i for i in items if not i.fail_reason] From 00eba98e9f6f6c5847b1cff71560543ac9aaf026 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 21 May 2021 09:50:23 -0700 Subject: [PATCH 012/196] Fixes display of announcement show/hide button on mobile --- bookwyrm/templates/snippets/announcement.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/announcement.html b/bookwyrm/templates/snippets/announcement.html index a6a7c65b3..74dfdb54b 100644 --- a/bookwyrm/templates/snippets/announcement.html +++ b/bookwyrm/templates/snippets/announcement.html @@ -4,7 +4,7 @@ class="notification mb-1 p-3{% if not admin_mode %} is-hidden{% endif %} transition-y" {% if not admin_mode %}data-hide="hide-announcement-{{ announcement.id }}"{% endif %} > -
+
{% if announcement.event_date %} {{ announcement.event_date|naturalday|title }}: From d33b55e0250f8adebfc74aeb7759f2939d34cca4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 21 May 2021 09:52:40 -0700 Subject: [PATCH 013/196] Hide delete button text on mobile --- bookwyrm/templates/settings/announcement.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/settings/announcement.html b/bookwyrm/templates/settings/announcement.html index d276d17ce..627c360cd 100644 --- a/bookwyrm/templates/settings/announcement.html +++ b/bookwyrm/templates/settings/announcement.html @@ -16,8 +16,8 @@ {% csrf_token %}
From 368d2cd71614cc471432b5bfeae13a2de06d34b6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 22 May 2021 17:33:10 -0700 Subject: [PATCH 014/196] Reduces feed page queries for goals 9 fewer queries --- bookwyrm/models/user.py | 13 ++++++------- bookwyrm/templates/snippets/goal_progress.html | 15 +++++++++------ bookwyrm/views/feed.py | 9 +++++---- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 7d821c5ba..d9f3eba99 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -381,17 +381,16 @@ class AnnualGoal(BookWyrmModel): return {r.book.id: r.rating for r in reviews} @property - def progress_percent(self): - """how close to your goal, in percent form""" - return int(float(self.book_count / self.goal) * 100) - - @property - def book_count(self): + def progress(self): """how many books you've read this year""" - return self.user.readthrough_set.filter( + count = self.user.readthrough_set.filter( finish_date__year__gte=self.year, finish_date__year__lt=self.year + 1, ).count() + return { + "count": count, + "percent": int(float(count / self.goal) * 100), + } @app.task diff --git a/bookwyrm/templates/snippets/goal_progress.html b/bookwyrm/templates/snippets/goal_progress.html index 2d46181ef..d0229b689 100644 --- a/bookwyrm/templates/snippets/goal_progress.html +++ b/bookwyrm/templates/snippets/goal_progress.html @@ -1,16 +1,19 @@ {% load i18n %} {% load humanize %} + +{% with goal.progress as progress %}

- {% if goal.progress_percent >= 100 %} + {% if progress.percent >= 100 %} {% trans "Success!" %} - {% elif goal.progress_percent %} - {% blocktrans with percent=goal.progress_percent %}{{ percent }}% complete!{% endblocktrans %} + {% elif progress.percent %} + {% blocktrans with percent=progress.percent %}{{ percent }}% complete!{% endblocktrans %} {% endif %} {% if goal.user == request.user %} - {% blocktrans with read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}You've read {{ read_count }} of {{ goal_count}} books.{% endblocktrans %} + {% blocktrans with read_count=progress.count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}You've read {{ read_count }} of {{ goal_count}} books.{% endblocktrans %} {% else %} - {% blocktrans with username=goal.user.display_name read_count=goal.book_count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read {{ read_count }} of {{ goal_count}} books.{% endblocktrans %} + {% blocktrans with username=goal.user.display_name read_count=progress.count|intcomma goal_count=goal.goal|intcomma path=goal.local_path %}{{ username }} has read {{ read_count }} of {{ goal_count}} books.{% endblocktrans %} {% endif %}

- + +{% endwith %} diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index a03d6b4cc..9a85dbb16 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -162,14 +162,15 @@ def get_suggested_books(user, max_books=5): else max_books - book_count ) shelf = user.shelf_set.get(identifier=preset) - - shelf_books = shelf.shelfbook_set.order_by("-updated_date")[:limit] - if not shelf_books: + if not shelf.books.exists(): continue + shelf_preview = { "name": shelf.name, "identifier": shelf.identifier, - "books": [s.book for s in shelf_books], + "books": shelf.books.order_by("shelfbook").prefetch_related("authors")[ + :limit + ], } suggested_books.append(shelf_preview) book_count += len(shelf_preview["books"]) From 3d3ab6433e9fca5edd0ddc019b87af1076e1de16 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 22 May 2021 17:58:08 -0700 Subject: [PATCH 015/196] Improves query efficiency for shelve buttons About 50 fewer queries (yikes) --- bookwyrm/templates/get_started/book_preview.html | 2 +- bookwyrm/templates/layout.html | 3 +++ bookwyrm/templates/snippets/shelf_selector.html | 2 +- bookwyrm/templates/snippets/shelve_button/shelve_button.html | 4 ++-- .../snippets/shelve_button/shelve_button_dropdown.html | 2 +- bookwyrm/templatetags/bookwyrm_tags.py | 4 +--- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/get_started/book_preview.html b/bookwyrm/templates/get_started/book_preview.html index 578fef708..d8941ad50 100644 --- a/bookwyrm/templates/get_started/book_preview.html +++ b/bookwyrm/templates/get_started/book_preview.html @@ -5,7 +5,7 @@
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index bad1cb6e5..d5a2087e5 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -193,8 +193,11 @@
+ {# almost every view needs to know the user shelves #} + {% with request.user.shelf_set.all as user_shelves %} {% block content %} {% endblock %} + {% endwith %}
diff --git a/bookwyrm/templates/snippets/shelf_selector.html b/bookwyrm/templates/snippets/shelf_selector.html index 0036a4e90..ca5a39f6e 100644 --- a/bookwyrm/templates/snippets/shelf_selector.html +++ b/bookwyrm/templates/snippets/shelf_selector.html @@ -6,7 +6,7 @@ {% endblock %} {% block dropdown-list %} -{% for shelf in request.user.shelf_set.all %} +{% for shelf in user_shelves %}
{% else %}
- {% include 'snippets/shelve_button/shelve_button_options.html' with class="shelf-option is-small" shelves=request.user.shelf_set.all active_shelf=active_shelf button_uuid=uuid %} + {% include 'snippets/shelve_button/shelve_button_options.html' with class="shelf-option is-small" shelves=user_shelves active_shelf=active_shelf button_uuid=uuid %}
{% include 'snippets/shelve_button/shelve_button_dropdown.html' with class="is-small" button_uuid=uuid%} {% endif %} @@ -25,7 +25,7 @@ {% include 'snippets/shelve_button/finish_reading_modal.html' with book=active_shelf.book controls_text="finish-reading" controls_uid=uuid readthrough=readthrough %} -{% include 'snippets/shelve_button/progress_update_modal.html' with book=shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %} +{% include 'snippets/shelve_button/progress_update_modal.html' with book=active_shelf_book.book controls_text="progress-update" controls_uid=uuid readthrough=readthrough %} {% endwith %} {% endif %} diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html index 4439bfc28..353a37a1c 100644 --- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html +++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html @@ -7,5 +7,5 @@ {% endblock %} {% block dropdown-list %} -{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=request.user.shelf_set.all dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %} +{% include 'snippets/shelve_button/shelve_button_options.html' with active_shelf=active_shelf shelves=user_shelves dropdown=True class="shelf-option is-fullwidth is-small is-radiusless is-white" %} {% endblock %} diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 70228799f..072ff6634 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -3,8 +3,6 @@ from django import template from django.db.models import Avg from bookwyrm import models, views -from bookwyrm.views.status import to_markdown -from bookwyrm.templatetags.utilities import get_user_identifier register = template.Library() @@ -73,7 +71,7 @@ def active_shelf(context, book): """check what shelf a user has a book on, if any""" shelf = models.ShelfBook.objects.filter( shelf__user=context["request"].user, book__in=book.parent_work.editions.all() - ).first() + ).select_related("book", "shelf").first() return shelf if shelf else {"book": book} From e5ff4ac36d314b0f9047ea7cdbc790383bb197ff Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 22 May 2021 18:02:14 -0700 Subject: [PATCH 016/196] Python formatting --- bookwyrm/templatetags/bookwyrm_tags.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 072ff6634..3f33643bf 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -69,9 +69,14 @@ def related_status(notification): @register.simple_tag(takes_context=True) def active_shelf(context, book): """check what shelf a user has a book on, if any""" - shelf = models.ShelfBook.objects.filter( - shelf__user=context["request"].user, book__in=book.parent_work.editions.all() - ).select_related("book", "shelf").first() + shelf = ( + models.ShelfBook.objects.filter( + shelf__user=context["request"].user, + book__in=book.parent_work.editions.all(), + ) + .select_related("book", "shelf") + .first() + ) return shelf if shelf else {"book": book} From 7a4c4248df14e703a21477492b9612ca1a84d892 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 22 May 2021 18:34:34 -0700 Subject: [PATCH 017/196] Improves status template performance Reduces queries about about 65 --- bookwyrm/activitystreams.py | 2 ++ bookwyrm/templates/layout.html | 6 +++-- bookwyrm/templates/snippets/boost_button.html | 24 ++++++++++++++++--- bookwyrm/templates/snippets/fav_button.html | 6 +++-- .../templates/snippets/status/layout.html | 2 +- .../snippets/status/status_options.html | 4 ++-- bookwyrm/templatetags/interaction.py | 8 ++----- bookwyrm/templatetags/status_display.py | 7 +++++- 8 files changed, 42 insertions(+), 17 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 86321cd83..ff3c55fbd 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -55,6 +55,8 @@ class ActivityStream(RedisStore): return ( models.Status.objects.select_subclasses() .filter(id__in=statuses) + .select_related("user", "reply_parent") + .prefetch_related("mention_books", "mention_users") .order_by("-published_date") ) diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index d5a2087e5..1158d82db 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -134,12 +134,14 @@ {% trans "Notifications" %} + {% with request.user.unread_notification_count as notification_count %} - {{ request.user.unread_notification_count }} + {{ notification_count }} + {% endwith %}
{% else %} diff --git a/bookwyrm/templates/snippets/boost_button.html b/bookwyrm/templates/snippets/boost_button.html index 5b84ea44e..0f9274068 100644 --- a/bookwyrm/templates/snippets/boost_button.html +++ b/bookwyrm/templates/snippets/boost_button.html @@ -3,14 +3,31 @@ {% load i18n %} {% with status.id|uuid as uuid %} - +{% with request.user|boosted:status as boosted %} + {% csrf_token %} - -
+ {% csrf_token %}
{% endwith %} +{% endwith %} diff --git a/bookwyrm/templates/snippets/fav_button.html b/bookwyrm/templates/snippets/fav_button.html index 40fa2d25f..6c4cfe9aa 100644 --- a/bookwyrm/templates/snippets/fav_button.html +++ b/bookwyrm/templates/snippets/fav_button.html @@ -3,7 +3,8 @@ {% load i18n %} {% with status.id|uuid as uuid %} -
+{% with request.user|liked:status as liked %} + {% csrf_token %}
-
+ {% csrf_token %}
{% endwith %} +{% endwith %} diff --git a/bookwyrm/templates/snippets/status/layout.html b/bookwyrm/templates/snippets/status/layout.html index 6fd7ebde6..b1d361fe0 100644 --- a/bookwyrm/templates/snippets/status/layout.html +++ b/bookwyrm/templates/snippets/status/layout.html @@ -15,7 +15,7 @@
{# moderation options #} -
+ {% csrf_token %} diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html index 495bc3e98..0cbe6b8cd 100644 --- a/bookwyrm/templates/snippets/follow_button.html +++ b/bookwyrm/templates/snippets/follow_button.html @@ -1,7 +1,7 @@ {% load i18n %} {% if request.user == user or not request.user.is_authenticated %} {% elif user in request.user.blocks.all %} -{% include 'snippets/block_button.html' %} +{% include 'snippets/block_button.html' with blocks=True %} {% else %}
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html index c33aeda2c..7eb613d3b 100644 --- a/bookwyrm/templates/snippets/status/status_options.html +++ b/bookwyrm/templates/snippets/status/status_options.html @@ -39,7 +39,7 @@ {% include 'snippets/report_button.html' with user=status.user status=status %} {% endif %} {% endblock %} diff --git a/bookwyrm/templates/snippets/user_options.html b/bookwyrm/templates/snippets/user_options.html index 01cc09bf5..3db3c2b17 100644 --- a/bookwyrm/templates/snippets/user_options.html +++ b/bookwyrm/templates/snippets/user_options.html @@ -16,6 +16,6 @@ {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %}
  • - {% include 'snippets/block_button.html' with user=user class="is-fullwidth" %} + {% include 'snippets/block_button.html' with user=user class="is-fullwidth" blocks=False %}
    • {% endblock %} diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index ffc352d88..d186fe97f 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -59,10 +59,15 @@ class User(View): break # user's posts - activities = privacy_filter( - request.user, - user.status_set.select_subclasses(), + activities = ( + privacy_filter( + request.user, + user.status_set.select_subclasses(), + ) + .select_related("reply_parent") + .prefetch_related("mention_books", "mention_users") ) + paginated = Paginator(activities, PAGE_LENGTH) goal = models.AnnualGoal.objects.filter( user=user, year=timezone.now().year From f987a352c6f6bbf0831aacbc0937dcba0b82ec69 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 22 May 2021 21:33:56 -0700 Subject: [PATCH 021/196] Fixes username helper --- bookwyrm/views/helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 3dc02e0d2..95a1cbbe3 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -13,7 +13,7 @@ from bookwyrm.utils import regex def get_user_from_username(viewer, username): """helper function to resolve a localname or a username to a user""" - if viewer.localname == username: + if viewer.is_authenticated and viewer.localname == username: # that's yourself, fool return viewer From e138a585d18f31a9673bad5f30d6168edbde7892 Mon Sep 17 00:00:00 2001 From: Jason Kelly Date: Sun, 23 May 2021 14:07:45 +0800 Subject: [PATCH 022/196] Setting `client_max_body_size` to 10m. - Removed commented-out nginx config for clarity. --- nginx/development | 2 ++ nginx/production | 59 +-------------------------------------------- nginx/server_config | 1 + 3 files changed, 4 insertions(+), 58 deletions(-) create mode 100644 nginx/server_config diff --git a/nginx/development b/nginx/development index d38982870..cdc90df1f 100644 --- a/nginx/development +++ b/nginx/development @@ -5,6 +5,8 @@ upstream web { server { listen 80; + include /etc/nginx/conf.d/server_config; + location / { proxy_pass http://web; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/production b/nginx/production index c5d83cbf6..95225c26b 100644 --- a/nginx/production +++ b/nginx/production @@ -6,67 +6,10 @@ server { listen [::]:80; listen 80; - server_name your-domain.com www.your-domain.com; + include /etc/nginx/conf.d/server_config; location ~ /.well-known/acme-challenge { allow all; root /var/www/certbot; } - -# # redirect http to https -# return 301 https://your-domain.com$request_uri; -# } -# -# server { -# listen [::]:443 ssl http2; -# listen 443 ssl http2; -# -# server_name your-domain.com; -# -# # SSL code -# ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem; -# ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem; -# -# location ~ /.well-known/acme-challenge { -# allow all; -# root /var/www/certbot; -# } -# -# location / { -# proxy_pass http://web; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header Host $host; -# proxy_redirect off; -# } -# -# location /images/ { -# alias /app/images/; -# } -# -# location /static/ { -# alias /app/static/; -# } } - -# Reverse-Proxy server -# server { -# listen [::]:8001; -# listen 8001; - -# server_name your-domain.com www.your-domain.com; - -# location / { -# proxy_pass http://web; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header Host $host; -# proxy_redirect off; -# } - -# location /images/ { -# alias /app/images/; -# } - -# location /static/ { -# alias /app/static/; -# } -# } diff --git a/nginx/server_config b/nginx/server_config new file mode 100644 index 000000000..c9aad8e4a --- /dev/null +++ b/nginx/server_config @@ -0,0 +1 @@ +client_max_body_size 10m; From c9617c4bd372c26f4ed8b015ae70e64673752bdb Mon Sep 17 00:00:00 2001 From: Jason Kelly Date: Sun, 23 May 2021 14:09:13 +0800 Subject: [PATCH 023/196] Added `EMAIL_BACKEND` to env settings to be able to use console backend in local dev. --- bookwyrm/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index d694e33fd..b689a6a2a 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -21,6 +21,7 @@ CELERY_TASK_SERIALIZER = "json" CELERY_RESULT_SERIALIZER = "json" # email +EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend") EMAIL_HOST = env("EMAIL_HOST") EMAIL_PORT = env("EMAIL_PORT", 587) EMAIL_HOST_USER = env("EMAIL_HOST_USER") From 6e655cb0e0fdf0d52681d12ee96e14d11d21fcc8 Mon Sep 17 00:00:00 2001 From: Jason Kelly Date: Sun, 23 May 2021 14:12:00 +0800 Subject: [PATCH 024/196] Added new widget to alert if a file is set at larger than 10 MB. - Updated default widget to use template that adds a notification box. - Added JS to add onchange & load events to look at the value in the input and trigger the notification & disable the form submits. --- bookwyrm/models/fields.py | 15 ++++++++ bookwyrm/static/js/bookwyrm.js | 35 +++++++++++++++++++ .../clearable_file_input_with_warning.html | 3 ++ 3 files changed, 53 insertions(+) create mode 100644 bookwyrm/templates/widgets/clearable_file_input_with_warning.html diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 123b3efa4..d4d94aa24 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -9,6 +9,7 @@ from django.contrib.postgres.fields import ArrayField as DjangoArrayField from django.core.exceptions import ValidationError from django.core.files.base import ContentFile from django.db import models +from django.forms import ClearableFileInput, ImageField from django.utils import timezone from django.utils.translation import gettext_lazy as _ from bookwyrm import activitypub @@ -332,6 +333,14 @@ class TagField(ManyToManyField): return items +class ClearableFileInputWithWarning(ClearableFileInput): + template_name = 'widgets/clearable_file_input_with_warning.html' + + +class CustomImageField(ImageField): + widget = ClearableFileInputWithWarning + + def image_serializer(value, alt): """helper for serializing images""" if value and hasattr(value, "url"): @@ -395,6 +404,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): image_content = ContentFile(response.content) return [image_name, image_content] + def formfield(self, **kwargs): + return super().formfield(**{ + 'form_class': CustomImageField, + **kwargs, + }) + class DateTimeField(ActivitypubFieldMixin, models.DateTimeField): """activitypub-aware datetime field""" diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 3659a20e4..2c43d7384 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -3,6 +3,7 @@ let BookWyrm = new class { constructor() { + this.MAX_FILE_SIZE = 10000000 this.initOnDOMLoaded(); this.initReccuringTasks(); this.initEventListeners(); @@ -32,15 +33,26 @@ let BookWyrm = new class { 'click', this.back) ); + + document.querySelectorAll('input[type="file"]') + .forEach(node => node.addEventListener( + 'change', + this.disableIfTooLarge.bind(this) + )); } /** * Execute code once the DOM is loaded. */ initOnDOMLoaded() { + const bookwyrm = this + window.addEventListener('DOMContentLoaded', function() { document.querySelectorAll('.tab-group') .forEach(tabs => new TabGroup(tabs)); + document.querySelectorAll('input[type="file"]').forEach( + bookwyrm.disableIfTooLarge.bind(bookwyrm) + ) }); } @@ -284,4 +296,27 @@ let BookWyrm = new class { node.classList.remove(classname); } } + + disableIfTooLarge(eventOrElement) { + const { addRemoveClass, MAX_FILE_SIZE } = this + const element = eventOrElement.currentTarget || eventOrElement + + const submits = element.form.querySelectorAll('[type="submit"]') + const warns = element.parentElement.querySelectorAll('.file-too-big') + const isTooBig = element.files && + element.files[0] && + element.files[0].size > MAX_FILE_SIZE + + if (isTooBig) { + submits.forEach(submitter => submitter.disabled = true) + warns.forEach( + sib => addRemoveClass(sib, 'is-hidden', false) + ) + } else { + submits.forEach(submitter => submitter.disabled = false) + warns.forEach( + sib => addRemoveClass(sib, 'is-hidden', true) + ) + } + } } diff --git a/bookwyrm/templates/widgets/clearable_file_input_with_warning.html b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html new file mode 100644 index 000000000..700e22f9b --- /dev/null +++ b/bookwyrm/templates/widgets/clearable_file_input_with_warning.html @@ -0,0 +1,3 @@ +{% load i18n %} +{% include "django/forms/widgets/clearable_file_input.html" %} + From 318e0bf508ac9ccc2c0076763d6eb28bc0a5ab0b Mon Sep 17 00:00:00 2001 From: Jason Kelly Date: Sun, 23 May 2021 14:27:02 +0800 Subject: [PATCH 025/196] Fixing nginx-config misunderstanding. --- nginx/development | 4 ++-- nginx/production | 61 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/nginx/development b/nginx/development index cdc90df1f..05b27c2b1 100644 --- a/nginx/development +++ b/nginx/development @@ -1,3 +1,5 @@ +include /etc/nginx/conf.d/server_config; + upstream web { server web:8000; } @@ -5,8 +7,6 @@ upstream web { server { listen 80; - include /etc/nginx/conf.d/server_config; - location / { proxy_pass http://web; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/nginx/production b/nginx/production index 95225c26b..54c84af45 100644 --- a/nginx/production +++ b/nginx/production @@ -1,3 +1,5 @@ +include /etc/nginx/conf.d/server_config; + upstream web { server web:8000; } @@ -6,10 +8,67 @@ server { listen [::]:80; listen 80; - include /etc/nginx/conf.d/server_config; + server_name your-domain.com www.your-domain.com; location ~ /.well-known/acme-challenge { allow all; root /var/www/certbot; } + +# # redirect http to https +# return 301 https://your-domain.com$request_uri; +# } +# +# server { +# listen [::]:443 ssl http2; +# listen 443 ssl http2; +# +# server_name your-domain.com; +# +# # SSL code +# ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem; +# ssl_certificate_key /etc/nginx/ssl/live/your-domain.com/privkey.pem; +# +# location ~ /.well-known/acme-challenge { +# allow all; +# root /var/www/certbot; +# } +# +# location / { +# proxy_pass http://web; +# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +# proxy_set_header Host $host; +# proxy_redirect off; +# } +# +# location /images/ { +# alias /app/images/; +# } +# +# location /static/ { +# alias /app/static/; +# } } + +# Reverse-Proxy server +# server { +# listen [::]:8001; +# listen 8001; + +# server_name your-domain.com www.your-domain.com; + +# location / { +# proxy_pass http://web; +# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +# proxy_set_header Host $host; +# proxy_redirect off; +# } + +# location /images/ { +# alias /app/images/; +# } + +# location /static/ { +# alias /app/static/; +# } +# } From 7eb5f3b026cd11e2a981db294ae31770a36cc192 Mon Sep 17 00:00:00 2001 From: Jason Kelly Date: Sun, 23 May 2021 14:31:22 +0800 Subject: [PATCH 026/196] Making magic number more readable --- bookwyrm/static/js/bookwyrm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 2c43d7384..598dd93ac 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -3,7 +3,7 @@ let BookWyrm = new class { constructor() { - this.MAX_FILE_SIZE = 10000000 + this.MAX_FILE_SIZE_BYTES = 10 * 1000000 this.initOnDOMLoaded(); this.initReccuringTasks(); this.initEventListeners(); @@ -298,14 +298,14 @@ let BookWyrm = new class { } disableIfTooLarge(eventOrElement) { - const { addRemoveClass, MAX_FILE_SIZE } = this + const { addRemoveClass, MAX_FILE_SIZE_BYTES } = this const element = eventOrElement.currentTarget || eventOrElement const submits = element.form.querySelectorAll('[type="submit"]') const warns = element.parentElement.querySelectorAll('.file-too-big') const isTooBig = element.files && element.files[0] && - element.files[0].size > MAX_FILE_SIZE + element.files[0].size > MAX_FILE_SIZE_BYTES if (isTooBig) { submits.forEach(submitter => submitter.disabled = true) From 0708d64bf1965d68a343f3bc1b097ea7b65a65fa Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 12:10:57 +0200 Subject: [PATCH 027/196] Update bookwyrm.css --- bookwyrm/static/css/bookwyrm.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/css/bookwyrm.css b/bookwyrm/static/css/bookwyrm.css index 6ff745d37..a695c18b5 100644 --- a/bookwyrm/static/css/bookwyrm.css +++ b/bookwyrm/static/css/bookwyrm.css @@ -51,6 +51,7 @@ body { .card-footer.is-stacked-mobile { flex-direction: column; } + .card-footer.is-stacked-mobile .card-footer-item:not(:last-child) { border-bottom: 1px solid #ededed; border-right: 0; @@ -384,7 +385,7 @@ ol.ordered-list li::before { border-bottom-right-radius: 2px; } } - + /* Dimensions * @todo These could be in rem. ******************************************************************************/ From 179560a009b94ab6873062e82735e866d2121e10 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 14:56:47 +0200 Subject: [PATCH 028/196] French translation update This PR replaces #935 --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 40772 -> 45420 bytes locale/fr_FR/LC_MESSAGES/django.po | 438 +++++++++++------------------ 2 files changed, 164 insertions(+), 274 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 8d377f42069c249539b29f61221b14d4910a80a7..5297cd7c71b91d2b03dd89fbba6c605cee474c7d 100644 GIT binary patch delta 17007 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 P$6Fc=8LtDXIYEu52u zHJ#rIJH_(6JVN%V@&~d#ox1u}(DT$S%(do4{cqQ5-*}b>qr8=)zUB7n|I#e{-`kz{ zs%J{$&7A(X?M?Il=-;``TiEgJ7ow^n64X<4-bce!g`GdWAJpb85%onXzgf7XR?{gg z!yEM!pDN$!Eh?(IC#+aFb4%LQS`^PkOP;M84e&7XL5YT(OkW#kvM;;YL_Q`8LRp!= zsv`c9x@|PXhYtJyh4jYL0>rR z4Md!8muyR^y4BK2RaM za)5tOg5xc1Qh$m!-dj<8FI7fL?F3$db|C7!6=<8}KE7n<^6^{zefXk=RaY04*hMPxk&3RYoEBM@kQskm z!d8wR9lO*md7=Ry4}oqupWf0k-A6qOzHsH&(eDzPL<6=PMvbQT7tfRP&Wf!6>xs&w zm7av5EI9rF))jvCVfAj{gXew=iNx5y-_=? zUYX=R++kf?b0 zarE+ej6W(-Zay3N+~@Jknqh<3aV72~?bW^FZ;3K(BKIvvN4zz?OL!W{7IU@Vx13Hg zonC97ZDXo=(&DwAQg0w?`~C4aJ72CXO0)x&6W8rZsFlyxq}ciFl2vuiPRZGNiN{$O zyE|)~uc(BZ?-^Y%i$^N{N!6#6FHcnkH{NGWw@bYt?q2v@F1`brl#i|D4s~I9r1klc zp30ZW?^_u1hE~N}zFPiGQhs!y-^Wuh*_Y`&b!prB+mABB@+sEvA`8=`Z?s>C9UZ2Ho=dmC*A&Z}>tV-`Ets=q@ z))caY!Q+1CL)@nbkH5QL%=WbiK*Y-}h+pWA>a4r&(=>WE&r!7crB%H3^?!e)W(Bz{ z%%(i=hd}Rbol?vXfp|y?w#`hiEAQRbs)qCU_PPb}ElW(!?oHm6?rU2=2K2sbXU)

    1^H6F460$d}zn>i84rs}XL%%6JIN;%SV-uP_F0 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

    Td=b_rzZ@&#GpI9i2(|R5O#TPd3jH;m^{-AM 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 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 577614544..325d7fbfa 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 14:40-0700\n" +"POT-Creation-Date: 2021-05-23 10:45+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -49,13 +49,11 @@ msgstr "Sans limite" #: bookwyrm/forms.py:299 msgid "List Order" -msgstr "" +msgstr "Ordre de la liste" #: bookwyrm/forms.py:300 -#, fuzzy -#| msgid "Title" msgid "Book Title" -msgstr "Titre" +msgstr "Titre du livre" #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 #: bookwyrm/templates/user/shelf/shelf.html:84 @@ -65,19 +63,15 @@ msgstr "Note" #: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101 msgid "Sort By" -msgstr "" +msgstr "Trier par" #: bookwyrm/forms.py:307 -#, fuzzy -#| msgid "Sorted ascending" msgid "Ascending" -msgstr "Trié par ordre croissant" +msgstr "Ordre croissant" #: bookwyrm/forms.py:308 -#, fuzzy -#| msgid "Sorted ascending" msgid "Descending" -msgstr "Trié par ordre croissant" +msgstr "Ordre décroissant" #: bookwyrm/models/fields.py:24 #, python-format @@ -89,7 +83,7 @@ msgstr "%(value)s n’est pas une remote_id valide." msgid "%(value)s is not a valid username" msgstr "%(value)s n’est pas un nom de compte valide." -#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155 +#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157 msgid "username" msgstr "nom du compte :" @@ -145,15 +139,15 @@ msgstr "Modifier l’auteur ou autrice" #: bookwyrm/templates/author/author.html:32 #: bookwyrm/templates/author/edit_author.html:38 msgid "Aliases:" -msgstr "" +msgstr "Pseudonymes :" #: bookwyrm/templates/author/author.html:38 msgid "Born:" -msgstr "" +msgstr "Naissance :" #: bookwyrm/templates/author/author.html:44 msgid "Died:" -msgstr "" +msgstr "Décès :" #: bookwyrm/templates/author/author.html:51 msgid "Wikipedia" @@ -166,10 +160,8 @@ msgstr "Voir sur OpenLibrary" #: bookwyrm/templates/author/author.html:60 #: bookwyrm/templates/book/book.html:81 -#, fuzzy -#| msgid "View on OpenLibrary" msgid "View on Inventaire" -msgstr "Voir sur OpenLibrary" +msgstr "Voir sur Inventaire" #: bookwyrm/templates/author/author.html:74 #, python-format @@ -211,10 +203,8 @@ msgstr "Nom :" #: bookwyrm/templates/book/edit_book.html:132 #: bookwyrm/templates/book/edit_book.html:141 #: bookwyrm/templates/book/edit_book.html:178 -#, fuzzy -#| msgid "Separate multiple publishers with commas." msgid "Separate multiple values with commas." -msgstr "Séparez plusieurs éditeurs par une virgule." +msgstr "Séparez plusieurs valeurs par une virgule." #: bookwyrm/templates/author/edit_author.html:46 msgid "Bio:" @@ -242,10 +232,8 @@ msgstr "Clé Openlibrary :" #: bookwyrm/templates/author/edit_author.html:79 #: bookwyrm/templates/book/edit_book.html:243 -#, fuzzy -#| msgid "View on OpenLibrary" msgid "Inventaire ID:" -msgstr "Voir sur OpenLibrary" +msgstr "Identifiant Inventaire :" #: bookwyrm/templates/author/edit_author.html:84 msgid "Librarything key:" @@ -260,7 +248,7 @@ msgstr "Clé Goodreads :" #: bookwyrm/templates/book/edit_book.html:263 #: bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 -#: bookwyrm/templates/settings/announcement_form.html:65 +#: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:97 @@ -356,28 +344,20 @@ msgid "You don't have any reading activity for this book." msgstr "Vous n’avez aucune activité de lecture pour ce livre" #: bookwyrm/templates/book/book.html:200 -#, fuzzy -#| msgid "Review" msgid "Reviews" -msgstr "Critique" +msgstr "Critiques" #: bookwyrm/templates/book/book.html:205 -#, fuzzy -#| msgid "Your shelves" msgid "Your reviews" -msgstr "Vos étagères" +msgstr "Vos critiques" #: bookwyrm/templates/book/book.html:211 -#, fuzzy -#| msgid "Your Account" msgid "Your comments" -msgstr "Votre compte" +msgstr "Vos commentaires" #: bookwyrm/templates/book/book.html:217 -#, fuzzy -#| msgid "Your books" msgid "Your quotes" -msgstr "Vos livres" +msgstr "Vos citations" #: bookwyrm/templates/book/book.html:253 msgid "Subjects" @@ -498,10 +478,8 @@ msgid "Series number:" msgstr "Numéro dans la série :" #: bookwyrm/templates/book/edit_book.html:130 -#, fuzzy -#| msgid "Language:" msgid "Languages:" -msgstr "Langue :" +msgstr "Langues :" #: bookwyrm/templates/book/edit_book.html:139 msgid "Publisher:" @@ -563,10 +541,8 @@ msgid "ISBN 10:" msgstr "ISBN 10 :" #: bookwyrm/templates/book/edit_book.html:238 -#, fuzzy -#| msgid "Openlibrary key:" msgid "Openlibrary ID:" -msgstr "Clé Openlibrary :" +msgstr "Identifiant Openlibrary :" #: bookwyrm/templates/book/editions.html:4 #, python-format @@ -605,7 +581,7 @@ msgstr "%(pages)s pages" #: bookwyrm/templates/book/publisher_info.html:38 #, python-format msgid "%(languages)s language" -msgstr "%(languages)s langues" +msgstr "Langue : %(languages)s" #: bookwyrm/templates/book/publisher_info.html:64 #, python-format @@ -688,8 +664,8 @@ msgstr "Actif récemment" #: bookwyrm/templates/directory/user_card.html:33 msgid "follower you follow" msgid_plural "followers you follow" -msgstr[0] "compte auquel vous êtes abonné(e)" -msgstr[1] "comptes auxquels vous êtes abonné(e)" +msgstr[0] "compte que vous suivez" +msgstr[1] "comptes que vous suivez" #: bookwyrm/templates/directory/user_card.html:40 msgid "book on your shelves" @@ -946,8 +922,8 @@ msgstr "Défi lecture pour %(year)s" #, python-format msgid "%(mutuals)s follower you follow" msgid_plural "%(mutuals)s followers you follow" -msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)" -msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)" +msgstr[0] "%(mutuals)s abonné(e) que vous suivez" +msgstr[1] "%(mutuals)s abonné(e)s que vous suivez" #: bookwyrm/templates/feed/suggested_users.html:19 #, python-format @@ -1014,7 +990,7 @@ msgstr "Enregistrer & continuer" #: bookwyrm/templates/get_started/layout.html:14 #, python-format msgid "Welcome to %(site_name)s!" -msgstr "Bienvenu(e) sur %(site_name)s !" +msgstr "Bienvenue sur %(site_name)s !" #: bookwyrm/templates/get_started/layout.html:16 msgid "These are some first steps to get you started." @@ -1278,49 +1254,47 @@ msgstr "Se déconnecter" msgid "Notifications" msgstr "Notifications" -#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158 +#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160 #: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nom du compte :" -#: bookwyrm/templates/layout.html:159 +#: bookwyrm/templates/layout.html:161 msgid "password" msgstr "Mot de passe" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36 msgid "Forgot your password?" msgstr "Mot de passe oublié ?" -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10 #: bookwyrm/templates/login.html:33 msgid "Log in" msgstr "Se connecter" -#: bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/layout.html:173 msgid "Join" msgstr "Rejoindre" -#: bookwyrm/templates/layout.html:206 +#: bookwyrm/templates/layout.html:211 msgid "About this server" msgstr "À propos de ce serveur" -#: bookwyrm/templates/layout.html:210 +#: bookwyrm/templates/layout.html:215 msgid "Contact site admin" msgstr "Contacter l’administrateur du site" -#: bookwyrm/templates/layout.html:214 -#, fuzzy -#| msgid "List curation:" +#: bookwyrm/templates/layout.html:219 msgid "Documentation" -msgstr "Modération de la liste :" +msgstr "Documentation" -#: bookwyrm/templates/layout.html:221 +#: bookwyrm/templates/layout.html:226 #, python-format msgid "Support %(site_name)s on %(support_title)s" msgstr "Soutenez %(site_name)s avec %(support_title)s" -#: bookwyrm/templates/layout.html:225 +#: bookwyrm/templates/layout.html:230 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via GitHub." @@ -1378,7 +1352,7 @@ msgstr "Fermée" #: bookwyrm/templates/lists/form.html:22 msgid "Only you can add and remove books to this list" -msgstr "Vous seul(e) pouvez ajouter ou retirer des livres dans cette liste" +msgstr "Vous seulement pouvez ajouter ou retirer des livres dans cette liste" #: bookwyrm/templates/lists/form.html:26 msgid "Curated" @@ -1401,34 +1375,28 @@ msgstr "N’importe qui peut suggérer des livres" #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" -msgstr "" +msgstr "Vous avez suggéré un livre à cette liste !" #: bookwyrm/templates/lists/list.html:22 -#, fuzzy -#| msgid "Anyone can add books to this list" msgid "You successfully added a book to this list!" -msgstr "N’importe qui peut suggérer des livres" +msgstr "Vous avez ajouté un livre à cette liste !" #: bookwyrm/templates/lists/list.html:28 msgid "This list is currently empty" -msgstr "Cette liste est vide actuellement" +msgstr "Cette liste est actuellement vide" #: bookwyrm/templates/lists/list.html:65 #, python-format msgid "Added by %(username)s" -msgstr "Ajoutée par %(username)s" +msgstr "Ajouté par %(username)s" #: bookwyrm/templates/lists/list.html:77 -#, fuzzy -#| msgid "Sent" msgid "Set" -msgstr "Envoyé(e)s" +msgstr "Régler" #: bookwyrm/templates/lists/list.html:80 -#, fuzzy -#| msgid "List curation:" msgid "List position" -msgstr "Modération de la liste :" +msgstr "Position" #: bookwyrm/templates/lists/list.html:86 #: bookwyrm/templates/snippets/shelf_selector.html:26 @@ -1436,16 +1404,12 @@ msgid "Remove" msgstr "Supprimer" #: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111 -#, fuzzy -#| msgid "Your Lists" msgid "Sort List" -msgstr "Vos listes" +msgstr "Ordonner de la liste" #: bookwyrm/templates/lists/list.html:105 -#, fuzzy -#| msgid "Directory" msgid "Direction" -msgstr "Répertoire" +msgstr "Direction" #: bookwyrm/templates/lists/list.html:116 msgid "Add Books" @@ -1457,7 +1421,7 @@ msgstr "Suggérer des livres" #: bookwyrm/templates/lists/list.html:125 msgid "search" -msgstr "Chercher" +msgstr "chercher" #: bookwyrm/templates/lists/list.html:131 msgid "Clear search" @@ -1523,10 +1487,8 @@ msgid "No statuses reported" msgstr "Aucun statut signalé" #: bookwyrm/templates/moderation/report.html:53 -#, fuzzy -#| msgid "Statuses has been deleted" msgid "Status has been deleted" -msgstr "Les statuts ont été supprimés" +msgstr "Le statut a été supprimé" #: bookwyrm/templates/moderation/report_modal.html:6 #, python-format @@ -1589,13 +1551,11 @@ msgstr "Supprimer les notifications" #: bookwyrm/templates/notifications.html:25 msgid "All" -msgstr "" +msgstr "Tout" #: bookwyrm/templates/notifications.html:29 -#, fuzzy -#| msgid "More options" msgid "Mentions" -msgstr "Plus d’options" +msgstr "Mentions" #: bookwyrm/templates/notifications.html:70 #, python-format @@ -1659,7 +1619,7 @@ msgstr "a répondu à votre %(book_title)s t msgstr " a suggégré l’ajout de %(book_title)s à votre liste « %(list_name)s »" #: bookwyrm/templates/notifications.html:128 -#, fuzzy, python-format -#| msgid "Your import completed." +#, python-format msgid "Your import completed." -msgstr "Votre importation est terminée." +msgstr "Votre importation est terminée." #: bookwyrm/templates/notifications.html:131 #, python-format @@ -1774,31 +1733,45 @@ msgstr "Profil" msgid "Relationships" msgstr "Relations" +#: bookwyrm/templates/rss/title.html:5 +#: bookwyrm/templates/snippets/status/status_header.html:35 +msgid "rated" +msgstr "a noté" + +#: bookwyrm/templates/rss/title.html:7 +#: bookwyrm/templates/snippets/status/status_header.html:37 +msgid "reviewed" +msgstr "a écrit une critique de" + +#: bookwyrm/templates/rss/title.html:9 +#: bookwyrm/templates/snippets/status/status_header.html:39 +msgid "commented on" +msgstr "a commenté" + +#: bookwyrm/templates/rss/title.html:11 +#: bookwyrm/templates/snippets/status/status_header.html:41 +msgid "quoted" +msgstr "a cité" + #: bookwyrm/templates/search/book.html:64 -#, fuzzy -#| msgid "Show results from other catalogues" msgid "Load results from other catalogues" -msgstr "Montrer les résultats d’autres catalogues" +msgstr "Charger les résultats d’autres catalogues" #: bookwyrm/templates/search/book.html:68 msgid "Manually add book" -msgstr "" +msgstr "Ajouter un livre manuellement" #: bookwyrm/templates/search/book.html:73 msgid "Log in to import or add books." -msgstr "" +msgstr "Authentifiez-vous pour importer ou ajouter des livres." #: bookwyrm/templates/search/layout.html:16 -#, fuzzy -#| msgid "Search for a user" msgid "Search query" -msgstr "Chercher un compte" +msgstr "Requête" #: bookwyrm/templates/search/layout.html:19 -#, fuzzy -#| msgid "Search" msgid "Search type" -msgstr "Chercher" +msgstr "Type de recherche" #: bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 @@ -1815,10 +1788,9 @@ msgid "Users" msgstr "Comptes" #: bookwyrm/templates/search/layout.html:58 -#, fuzzy, python-format -#| msgid "No lists found for \"%(query)s\"" +#, python-format msgid "No results found for \"%(query)s\"" -msgstr "Aucune liste trouvée pour « %(query)s »" +msgstr "Aucun résultat pour « %(query)s »" #: bookwyrm/templates/settings/admin_layout.html:4 msgid "Administration" @@ -1872,23 +1844,18 @@ msgstr "Enregistrement" #: bookwyrm/templates/settings/announcement.html:3 #: bookwyrm/templates/settings/announcement.html:6 -#, fuzzy -#| msgid "Announcements" msgid "Announcement" -msgstr "Annonces" +msgstr "Annonce" #: bookwyrm/templates/settings/announcement.html:7 #: bookwyrm/templates/settings/federated_server.html:13 -#, fuzzy -#| msgid "Back to server list" msgid "Back to list" -msgstr "Retour à la liste des serveurs" +msgstr "Retour à la liste" #: bookwyrm/templates/settings/announcement.html:11 -#, fuzzy -#| msgid "Announcements" +#: bookwyrm/templates/settings/announcement_form.html:6 msgid "Edit Announcement" -msgstr "Annonces" +msgstr "Modifier l’annonce" #: bookwyrm/templates/settings/announcement.html:20 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 @@ -1898,64 +1865,48 @@ msgstr "Supprimer" #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" -msgstr "" +msgstr "Visible :" #: bookwyrm/templates/settings/announcement.html:38 msgid "True" -msgstr "" +msgstr "Vrai" #: bookwyrm/templates/settings/announcement.html:40 msgid "False" -msgstr "" +msgstr "Faux" #: bookwyrm/templates/settings/announcement.html:47 -#, fuzzy -#| msgid "Birth date:" msgid "Start date:" -msgstr "Date de naissance :" +msgstr "Date de début :" #: bookwyrm/templates/settings/announcement.html:54 -#, fuzzy -#| msgid "Birth date:" msgid "End date:" -msgstr "Date de naissance :" +msgstr "Date de fin :" #: bookwyrm/templates/settings/announcement.html:60 -#, fuzzy -#| msgid "Active" msgid "Active:" -msgstr "Actif" +msgstr "Actif :" -#: bookwyrm/templates/settings/announcement_form.html:5 +#: bookwyrm/templates/settings/announcement_form.html:8 #: bookwyrm/templates/settings/announcements.html:8 -#, fuzzy -#| msgid "Announcements" msgid "Create Announcement" -msgstr "Annonces" +msgstr "Créer une annonce" #: bookwyrm/templates/settings/announcements.html:22 -#, fuzzy -#| msgid "Date Added" msgid "Date added" msgstr "Date d’ajout" #: bookwyrm/templates/settings/announcements.html:26 -#, fuzzy -#| msgid "reviewed" msgid "Preview" -msgstr "a écrit une critique de" +msgstr "Prévisualisation" #: bookwyrm/templates/settings/announcements.html:30 -#, fuzzy -#| msgid "Started" msgid "Start date" -msgstr "Commencé" +msgstr "Date de début" #: bookwyrm/templates/settings/announcements.html:34 -#, fuzzy -#| msgid "Edit read dates" msgid "End date" -msgstr "Modifier les date de lecture" +msgstr "Date de fin" #: bookwyrm/templates/settings/announcements.html:38 #: bookwyrm/templates/settings/federation.html:30 @@ -1966,16 +1917,12 @@ msgid "Status" msgstr "Statut" #: bookwyrm/templates/settings/announcements.html:48 -#, fuzzy -#| msgid "Inactive" msgid "active" -msgstr "Inactif" +msgstr "active" #: bookwyrm/templates/settings/announcements.html:48 -#, fuzzy -#| msgid "Inactive" msgid "inactive" -msgstr "Inactif" +msgstr "inactive" #: bookwyrm/templates/settings/edit_server.html:3 #: bookwyrm/templates/settings/edit_server.html:6 @@ -1984,10 +1931,8 @@ msgstr "Inactif" #: bookwyrm/templates/settings/federation.html:10 #: bookwyrm/templates/settings/server_blocklist.html:3 #: bookwyrm/templates/settings/server_blocklist.html:20 -#, fuzzy -#| msgid "Add cover" msgid "Add server" -msgstr "Ajouter une couverture" +msgstr "Ajouter un serveur" #: bookwyrm/templates/settings/edit_server.html:7 #: bookwyrm/templates/settings/server_blocklist.html:7 @@ -1996,16 +1941,12 @@ msgstr "Retour à la liste des serveurs" #: bookwyrm/templates/settings/edit_server.html:16 #: bookwyrm/templates/settings/server_blocklist.html:16 -#, fuzzy -#| msgid "Import book" msgid "Import block list" -msgstr "Importer le livre" +msgstr "Importer une liste de blocage" #: bookwyrm/templates/settings/edit_server.html:30 -#, fuzzy -#| msgid "Instance Name:" msgid "Instance:" -msgstr "Nom de l’instance :" +msgstr "Instance :" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 @@ -2015,10 +1956,8 @@ msgstr "Statut :" #: bookwyrm/templates/settings/edit_server.html:41 #: bookwyrm/templates/settings/federated_server.html:10 -#, fuzzy -#| msgid "Block" msgid "Blocked" -msgstr "Bloquer" +msgstr "Bloqué" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 @@ -2034,7 +1973,7 @@ msgstr "Description :" #: bookwyrm/templates/settings/edit_server.html:64 msgid "Notes:" -msgstr "" +msgstr "Remarques :" #: bookwyrm/templates/settings/federated_server.html:19 msgid "Details" @@ -2073,13 +2012,11 @@ msgstr "Bloqués par nous :" #: bookwyrm/templates/settings/federated_server.html:82 #: bookwyrm/templates/user_admin/user_info.html:39 msgid "Notes" -msgstr "" +msgstr "Remarques" #: bookwyrm/templates/settings/federated_server.html:85 -#, fuzzy -#| msgid "Edit Book" msgid "Edit" -msgstr "Modifier le livre" +msgstr "Modifier" #: bookwyrm/templates/settings/federated_server.html:105 #: bookwyrm/templates/user_admin/user_moderation_actions.html:3 @@ -2093,7 +2030,7 @@ msgstr "Bloquer" #: bookwyrm/templates/settings/federated_server.html:110 msgid "All users from this instance will be deactivated." -msgstr "" +msgstr "Tous les comptes de cette instance seront désactivés." #: bookwyrm/templates/settings/federated_server.html:115 #: bookwyrm/templates/snippets/block_button.html:10 @@ -2102,7 +2039,7 @@ msgstr "Débloquer" #: bookwyrm/templates/settings/federated_server.html:116 msgid "All users from this instance will be re-activated." -msgstr "" +msgstr "Tous les comptes de cette instance seront réactivés." #: bookwyrm/templates/settings/federation.html:19 #: bookwyrm/templates/user_admin/server_filter.html:5 @@ -2224,25 +2161,21 @@ msgid "No active invites" msgstr "Aucune invitation active" #: bookwyrm/templates/settings/server_blocklist.html:6 -#, fuzzy -#| msgid "Import Books" msgid "Import Blocklist" -msgstr "Importer des livres" +msgstr "Importer une liste de blocage" #: bookwyrm/templates/settings/server_blocklist.html:26 -#: bookwyrm/templates/snippets/goal_progress.html:5 +#: bookwyrm/templates/snippets/goal_progress.html:7 msgid "Success!" msgstr "Bravo !" #: bookwyrm/templates/settings/server_blocklist.html:30 -#, fuzzy -#| msgid "Successfully imported" msgid "Successfully blocked:" -msgstr "Importation réussie" +msgstr "Blocage réussi :" #: bookwyrm/templates/settings/server_blocklist.html:32 msgid "Failed:" -msgstr "" +msgstr "Échec :" #: bookwyrm/templates/settings/site.html:15 msgid "Instance Name:" @@ -2290,7 +2223,7 @@ msgstr "Email de l’administrateur :" #: bookwyrm/templates/settings/site.html:73 msgid "Additional info:" -msgstr "" +msgstr "Infos supplémentaires :" #: bookwyrm/templates/settings/site.html:83 msgid "Allow registration:" @@ -2305,33 +2238,28 @@ msgid "Registration closed text:" msgstr "Texte affiché lorsque les enregistrements sont clos :" #: bookwyrm/templates/snippets/announcement.html:31 -#, fuzzy, python-format -#| msgid "Added by %(username)s" +#, python-format msgid "Posted by %(username)s" -msgstr "Ajoutée par %(username)s" +msgstr "Publié par %(username)s" #: bookwyrm/templates/snippets/book_cover.html:31 msgid "No cover" -msgstr "Aucune couverture" +msgstr "Pas de couverture" #: bookwyrm/templates/snippets/book_titleby.html:4 #, python-format msgid "%(title)s by " msgstr "%(title)s par " -#: bookwyrm/templates/snippets/boost_button.html:9 -#: bookwyrm/templates/snippets/boost_button.html:10 -#, fuzzy -#| msgid "boosted" +#: bookwyrm/templates/snippets/boost_button.html:20 +#: bookwyrm/templates/snippets/boost_button.html:21 msgid "Boost" -msgstr "partagé" +msgstr "Partager" -#: bookwyrm/templates/snippets/boost_button.html:16 -#: bookwyrm/templates/snippets/boost_button.html:17 -#, fuzzy -#| msgid "Un-boost status" +#: bookwyrm/templates/snippets/boost_button.html:33 +#: bookwyrm/templates/snippets/boost_button.html:34 msgid "Un-boost" -msgstr "Annuler le partage du statut" +msgstr "Annuler le partage" #: bookwyrm/templates/snippets/content_warning_field.html:3 msgid "Spoiler alert:" @@ -2369,10 +2297,8 @@ msgid "Reply" msgstr "Répondre" #: bookwyrm/templates/snippets/create_status_form.html:56 -#, fuzzy -#| msgid "Footer Content" msgid "Content" -msgstr "Contenu du pied de page" +msgstr "Contenu" #: bookwyrm/templates/snippets/create_status_form.html:80 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 @@ -2421,17 +2347,15 @@ msgstr "Supprimer ces dates de lecture ?" msgid "You are deleting this readthrough and its %(count)s associated progress updates." msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées." -#: bookwyrm/templates/snippets/fav_button.html:9 -#: bookwyrm/templates/snippets/fav_button.html:11 +#: bookwyrm/templates/snippets/fav_button.html:10 +#: bookwyrm/templates/snippets/fav_button.html:12 msgid "Like" -msgstr "" +msgstr "Ajouter aux favoris" -#: bookwyrm/templates/snippets/fav_button.html:17 #: bookwyrm/templates/snippets/fav_button.html:18 -#, fuzzy -#| msgid "Un-like status" +#: bookwyrm/templates/snippets/fav_button.html:19 msgid "Un-like" -msgstr "Retirer le statut des favoris" +msgstr "Retirer des favoris" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7 msgid "Show filters" @@ -2470,6 +2394,14 @@ msgstr "Accepter" msgid "No rating" msgstr "Aucune note" +#: bookwyrm/templates/snippets/form_rate_stars.html:44 +#: bookwyrm/templates/snippets/stars.html:7 +#, python-format +msgid "%(rating)s star" +msgid_plural "%(rating)s stars" +msgstr[0] "%(rating)s étoile" +msgstr[1] "%(rating)s étoiles" + #: bookwyrm/templates/snippets/generated_status/goal.html:1 #, python-format msgid "set a goal to read %(counter)s book in %(year)s" @@ -2524,17 +2456,17 @@ msgstr "Publier sur le fil d’actualité" msgid "Set goal" msgstr "Valider ce défi" -#: bookwyrm/templates/snippets/goal_progress.html:7 +#: bookwyrm/templates/snippets/goal_progress.html:9 #, python-format msgid "%(percent)s%% complete!" msgstr "%(percent)s%% terminé !" -#: bookwyrm/templates/snippets/goal_progress.html:10 +#: bookwyrm/templates/snippets/goal_progress.html:12 #, python-format msgid "You've read %(read_count)s of %(goal_count)s books." msgstr "Vous avez lu %(read_count)s sur %(goal_count)s livres." -#: bookwyrm/templates/snippets/goal_progress.html:12 +#: bookwyrm/templates/snippets/goal_progress.html:14 #, python-format msgid "%(username)s has read %(read_count)s of %(goal_count)s books." msgstr "%(username)s a lu %(read_count)s sur %(goal_count)s livres." @@ -2581,7 +2513,7 @@ msgstr "Confidentialité du statut" #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" -msgstr "Abonnements" +msgstr "Abonné(e)s" #: bookwyrm/templates/snippets/rate_action.html:4 msgid "Leave a rating" @@ -2643,26 +2575,6 @@ msgstr "S’enregistrer" msgid "Report" msgstr "Signaler" -#: bookwyrm/templates/snippets/rss_title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 -msgid "rated" -msgstr "a noté" - -#: bookwyrm/templates/snippets/rss_title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 -msgid "reviewed" -msgstr "a écrit une critique de" - -#: bookwyrm/templates/snippets/rss_title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 -msgid "commented on" -msgstr "a commenté" - -#: bookwyrm/templates/snippets/rss_title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 -msgid "quoted" -msgstr "a cité" - #: bookwyrm/templates/snippets/search_result_text.html:36 msgid "Import book" msgstr "Importer le livre" @@ -2744,7 +2656,7 @@ msgstr "Ajouter le statut aux favoris" #: bookwyrm/templates/snippets/status/status.html:10 msgid "boosted" -msgstr "partagé" +msgstr "a partagé" #: bookwyrm/templates/snippets/status/status_header.html:45 #, python-format @@ -2807,12 +2719,12 @@ msgstr "%(username)s n’a pas d’abonné(e)" #: bookwyrm/templates/user/relationships/following.html:6 #: bookwyrm/templates/user/relationships/layout.html:15 msgid "Following" -msgstr "Abonné(e) à" +msgstr "Comptes suivis" #: bookwyrm/templates/user/relationships/following.html:12 #, python-format msgid "%(username)s isn't following any users" -msgstr "%(username)s n’est abonné(e) à personne" +msgstr "%(username)s ne suit personne" #: bookwyrm/templates/user/shelf/books_header.html:5 #, python-format @@ -2832,7 +2744,7 @@ msgstr "Modifier l’étagère" msgid "Update shelf" msgstr "Mettre l’étagère à jour" -#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51 +#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "Tous les livres" @@ -2895,14 +2807,14 @@ msgstr "Aucune activité pour l’instant !" #: bookwyrm/templates/user/user_preview.html:15 #, python-format msgid "Joined %(date)s" -msgstr "Enregistré(e) %(date)s" +msgstr "A rejoint ce serveur %(date)s" #: bookwyrm/templates/user/user_preview.html:19 #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" -msgstr[0] "%(counter)s abonnement" -msgstr[1] "%(counter)s abonnements" +msgstr[0] "%(counter)s abonné(e)" +msgstr[1] "%(counter)s abonné(e)s" #: bookwyrm/templates/user/user_preview.html:20 #, python-format @@ -2910,19 +2822,15 @@ msgid "%(counter)s following" msgstr "%(counter)s abonnements" #: bookwyrm/templates/user/user_preview.html:26 -#, fuzzy, python-format -#| msgid "%(mutuals)s follower you follow" -#| msgid_plural "%(mutuals)s followers you follow" +#, python-format msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" -msgstr[0] "%(mutuals)s abonnement auxquel vous êtes abonné(e)" -msgstr[1] "%(mutuals)s abonnements auxquels vous êtes abonné(e)" +msgstr[0] "%(mutuals_display)s abonné(e) que vous suivez" +msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez" #: bookwyrm/templates/user_admin/user.html:9 -#, fuzzy -#| msgid "Back to reports" msgid "Back to users" -msgstr "Retour aux signalements" +msgstr "Retour aux comptes" #: bookwyrm/templates/user_admin/user_admin.html:7 #, python-format @@ -2960,42 +2868,36 @@ msgid "Not set" msgstr "Non défini" #: bookwyrm/templates/user_admin/user_info.html:5 -#, fuzzy -#| msgid "Details" msgid "User details" -msgstr "Détails" +msgstr "Détails du compte" #: bookwyrm/templates/user_admin/user_info.html:14 msgid "View user profile" msgstr "Voir le profil" #: bookwyrm/templates/user_admin/user_info.html:20 -#, fuzzy -#| msgid "Instance Settings" msgid "Instance details" -msgstr "Paramètres de l’instance" +msgstr "Détails de l’instance" #: bookwyrm/templates/user_admin/user_info.html:46 msgid "View instance" -msgstr "" +msgstr "Voir l’instance" #: bookwyrm/templates/user_admin/user_moderation_actions.html:11 msgid "Suspend user" -msgstr "" +msgstr "Suspendre le compte" #: bookwyrm/templates/user_admin/user_moderation_actions.html:13 msgid "Un-suspend user" -msgstr "" +msgstr "Rétablir le compte" #: bookwyrm/templates/user_admin/user_moderation_actions.html:21 msgid "Access level:" -msgstr "" +msgstr "Niveau d’accès :" #: bookwyrm/views/import_data.py:67 -#, fuzzy -#| msgid "Email address:" msgid "Not a valid csv file" -msgstr "Adresse email :" +msgstr "Fichier CSV invalide" #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." @@ -3056,12 +2958,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Enter a number." #~ msgstr "Numéro dans la série :" -#, fuzzy, python-format +#, fuzzy #~| msgid "A user with this email already exists." #~ msgid "%(model_name)s with this %(field_labels)s already exists." #~ msgstr "Cet email est déjà associé à un compte." -#, fuzzy, python-format +#, fuzzy #~| msgid "%(value)s is not a valid remote_id" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "%(value)s n’est pas une remote_id valide." @@ -3071,7 +2973,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "This field cannot be null." #~ msgstr "Cette étagère est vide" -#, fuzzy, python-format +#, fuzzy #~| msgid "A user with this email already exists." #~ msgid "%(model_name)s with this %(field_label)s already exists." #~ msgstr "Cet email est déjà associé à un compte." @@ -3121,7 +3023,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Positive small integer" #~ msgstr "Aucune invitation active" -#, fuzzy, python-format +#, fuzzy #~| msgid "%(value)s is not a valid username" #~ msgid "“%(value)s” is not a valid UUID." #~ msgstr "%(value)s n’est pas un nom de compte valide." @@ -3136,12 +3038,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "One-to-one relationship" #~ msgstr "Relations" -#, fuzzy, python-format +#, fuzzy #~| msgid "Relationships" #~ msgid "%(from)s-%(to)s relationship" #~ msgstr "Relations" -#, fuzzy, python-format +#, fuzzy #~| msgid "Relationships" #~ msgid "%(from)s-%(to)s relationships" #~ msgstr "Relations" @@ -3201,7 +3103,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Order" #~ msgstr "Trier par" -#, fuzzy, python-format +#, fuzzy #~| msgid "%(value)s is not a valid username" #~ msgid "“%(pk)s” is not a valid value." #~ msgstr "%(value)s n’est pas un nom de compte valide." @@ -3265,7 +3167,7 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "This is not a valid IPv6 address." #~ msgstr "Adresse email :" -#, fuzzy, python-format +#, fuzzy #~| msgid "No books found matching the query \"%(query)s\"" #~ msgid "No %(verbose_name)s found matching the query" #~ msgstr "Aucun livre trouvé pour la requête « %(query)s »" @@ -3284,11 +3186,9 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Matching Users" #~ msgstr "Comptes correspondants" -#, python-format #~ msgid "Set a reading goal for %(year)s" #~ msgstr "Définir un défi lecture pour %(year)s" -#, python-format #~ msgid "by %(author)s" #~ msgstr "par %(author)s" @@ -3298,21 +3198,12 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Reactivate user" #~ msgstr "Réactiver le compte" -#, python-format -#~ msgid "%(rating)s star" -#~ msgid_plural "%(rating)s stars" -#~ msgstr[0] "%(rating)s étoile" -#~ msgstr[1] "%(rating)s étoiles" - -#, python-format #~ msgid "replied to %(username)s's review" #~ msgstr "a répondu à la critique de %(username)s" -#, python-format #~ msgid "replied to %(username)s's comment" #~ msgstr "a répondu au commentaire de %(username)s" -#, python-format #~ msgid "replied to %(username)s's quote" #~ msgstr "a répondu à la citation de %(username)s" @@ -3322,7 +3213,6 @@ msgstr "Un lien de réinitialisation a été envoyé à %s." #~ msgid "Add tag" #~ msgstr "Ajouter un tag" -#, python-format #~ msgid "Books tagged \"%(tag.name)s\"" #~ msgstr "Livres tagués « %(tag.name)s »" From a31bbfd95ed8590230bf087687ecae1216d38f21 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 15:13:17 +0200 Subject: [PATCH 029/196] Update translations --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45420 -> 45420 bytes locale/fr_FR/LC_MESSAGES/django.po | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 5297cd7c71b91d2b03dd89fbba6c605cee474c7d..6c9e3eb5f2bd1eb69a76ddcf0fed5656fb3aeac9 100644 GIT binary patch delta 355 zcmXZWKTASk6vy$y)zFL3AOCcTq(QoKI0}O3V2v#ff(;=qiUpBNsLv2it!};ox8M#! zb4~@mfE?mFxZEvYK;MJU^f~7|&vSlH6gpApynlNpBO=YANDljWjIWr*sqN?14?F)t zefNuH+~E}#Mz!?qCMqJYJ&`!JF@i&k;kT_P)}`&Q@tXNB z7V#gm_}CYzVjY7xLESgUB(5-ld%VJ9UySGhp24{hLk+&ObsjaSYU>*6;ubz&7jJNk z8n8h9zr|a0F@qi>lE!<~yfTLI#gs$>Jl<)9u!DN>Cl>GvHSovIw|GgtLtW%L!PHa3 WSNT{?owwfT!vEZCHM`EA8Rbs1Ej+dW diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 325d7fbfa..5514b43e9 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -647,7 +647,7 @@ msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment dep #: bookwyrm/templates/snippets/announcement.html:34 #: bookwyrm/templates/snippets/goal_card.html:22 msgid "Dismiss message" -msgstr "Rejeter le message" +msgstr "Fermer le message" #: bookwyrm/templates/directory/sort_filter.html:5 msgid "Order by" @@ -1890,7 +1890,7 @@ msgstr "Actif :" #: bookwyrm/templates/settings/announcement_form.html:8 #: bookwyrm/templates/settings/announcements.html:8 msgid "Create Announcement" -msgstr "Créer une annonce" +msgstr "Ajouter une annonce" #: bookwyrm/templates/settings/announcements.html:22 msgid "Date added" From 6024fae766d8906049f9cbaeef3e0e4a5ef35fe0 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 15:23:35 +0200 Subject: [PATCH 030/196] Update translation --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45420 -> 45418 bytes locale/fr_FR/LC_MESSAGES/django.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 6c9e3eb5f2bd1eb69a76ddcf0fed5656fb3aeac9..00b7885c9bfe359515daf9c787ddc9d9fdf6f3ab 100644 GIT binary patch delta 1829 zcmXZcc}&l79LMnwsZ{cl9Q`UO%q>@bGUrfkCagBrw29^1Opc77`Su6Q5#R3@Eg}i$TR*3yr^_ zF@lc%bY!3s??fdo#AGaSaV;JrevN~0Ymr^>25R0T48vNC!8+7BX0J^cg4%cjYU62p z{l>)6m_tWP+=vZ{-49A!e-(Nezm0A16)I6ZsxpoC8551YFcimPYn+D7F$Y!Ym6(g` zP?h@Or=f*{_uJA&VteAA*a|12CT5{FmV;AqDJt=8^x#)i1zIw0($X2#$p|6fkp>yg+fskXouQB66%Dr-S`sJIvY^y7NII}1cUGr z#^5!iQhxKy4ZK60^b@Ky-%$$$7TXhfPz!fN^(VV{q>IyCoQ2_xFGrnt6VAfj*a1Id zCyY3xb-8~Z4ee+=D#2XT9j-=|Y736WYD~eOn1;hj>_@vBClTMlXpB5;%uq~3C0vLJ zxC>`u6-HtB5hTCqOd}A7qfVBBs>Bp*g6XIY%|d;o^H6u5hkC9%oQE)h_&n-Lo}j+1 zx2XAFFb;oVEP9Vpe=X#rp^~MdPB0y{z!Fq~wWzz>gWAA8H+~v5uLkv;?x8mR92*j2 zcj7OoJkh20fZb8QPb#JUDtRg$x`LT*UMn2Vy=saoG_+0@qCQO z{n!<2PG%hA&>0oha@0ore`o~INIGpxn~d4SqcIClIh&oauV67Y zrN0_O@Cqj4UDscay1KtO0b8E6>tv#y;dN)bbHU|ROFoTb%Q I^UuZp2bXpxb^rhX delta 1831 zcmXZccWll<9LMp~;_2o=(e}|{#HLnNg&_8dSzFK$Qk4>7wRsSmNE)TB)~MPw^B6%Y zVw42IKO&74q7p$6Q4zuW)4RW3_q}`Wdw1Xa-ShEn(5JUS=Y5I(P-D#Hd}G?B%G zQT=~01Vi>1(-FPc9Q$E1rlS|PU<4LnLp+9wcm+G*b8Lq7_S)aIK*b&Q8h>qL5FI_} zn2uU_7i!@`OvO?cSK(3Oci0EF71)HgQS+W)I96dCR-^I+71{;EQ5$cC+W4eGzcKMN z7SPcMH(~9p6kndreaxB@qzD)q}x zLy1E7+0sU10&y2?f@4t=Gf*4L#PPTswQwai!0)IE1QpvWjBqBR=JiBfQ9sm`jKp5( zUr9p~&!85(f-(3IeOQf35L{v_6oINh0%`*(s1wd}<4aL_Hlp$tp(;^^_3I0S#=1RQYCezd!B4DmgT#ppwn8Iw^9F2N+s!xLpyQ4a^APBsixiSbw$r=d198}*ScLfv@|>bdT89>OHzi>NDkhWfVNqvn6Z zc>IGtj5|#Il_-^lN;VvIf^<}ZrKkngq3$jpwSi(ceik*a0`;68pf>&zYZt~2#NSZs z_{!`7JE4A`Qbzq%^5Jyo3TC;1)u@GcpvDiPHgpk{_%?RK$Ed`0j@ZOrOdyU!&FhQW z@HjV~f!c5uj=;4?sQ*M7cj?H*82(*WV*&O??=fRK;|Q$8l`igooVQNA7!$Ds+hGOj z?yGSzwmxCMjXcz=d5tOf6ZLU+_MfzOlZO14m?5|xU%CD{r|fIUMD08Wbw%4w z2e3O{bMa>kBmRL?@E_`+Q_8L7sEzpl(FmrIa@v+Q4d)XN#kqLe8Fj|Kf@}<-{}P7c z4eWyVU4ISg>daYVMnMx)o;j#zc*~h^ju)i&pF=|vDlihCVq1KTdKI4Ywp5X*g=1aZ z3O&Th&QuI19)PoPH0qg^qvqYg_V@^=Vhx6B#<&aiYn&d4X}dqmGjT Date: Sun, 23 May 2021 16:01:01 +0200 Subject: [PATCH 031/196] Update shelf translations --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45418 -> 45409 bytes locale/fr_FR/LC_MESSAGES/django.po | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 00b7885c9bfe359515daf9c787ddc9d9fdf6f3ab..349ef43a8322a5be7b4efa8c969d8185f70d36b7 100644 GIT binary patch delta 3927 zcmXZdc~F-{9LMoTL{33eR8TNL@j|@sBg3O|G;b6wP1GNm86-lJqxhg9;ekQkCW=?y zC*z%#7o%g7T25waCSG~WSV>-^Q}2(vf4%m*&-3i=_q)5l-@P)g>t$X$n})en9mgrj za-3Rt5^LgB490S-h83rqxF&`Y$J)3PRwwRl=q4P~-1My?+kt;?3!f z>%`Eg=sHdWHb70-1FPUr^urVk#54@Ssn`+cp(ZS~&(EPR@fB2JH&O3D#vt^~HsjVn zjT@WIgJ>Gf=ul<@P%HCb1I$4Uw8eVZdKR_N>!^yA+c=QREEE!GQWq)QSVQ~rdWVl z*kM!x?gbiQH142E;(YEnO~4=ZVH;Hc+o%c+#Ar-GO_Yb)+l8o%wxR|;VxON!jeiw& zrXHi-uaxtu-*qBsD1&yW6(^ud)CV=uKvX3rqb8V&k(iH~XbZN%BdEQ8gj%@wEc0C$ zD&r{Bg4I$5HeAfHj%lxj;jQro}#g+X}8 zdKy*Ii>QqLwEl$}=PC9??*fxyZ`6B(Fb+qc7MzRB=Q?X>Xrg`AqZmSb2BYu_Dub7( zdtANHoP{Q+fm)y@=!>er5LAX~sNaP`)HN-|s`v+1#(ywO_y0c{x^`h-nUb_c9mcWN z38>5_VHM1>=G*5*s0FXXdbkI*kV~k;T#lNs@&Z$la8w+lnE9RNG<3QFHSrp1qQ|IH?X}G8c{2j7YKvN- zwxk=jMRy_%eYgfS;Z_XCqo`YP88yIDRD~+6FckRxCg0}>zua_uAnl#fhx^?)BrC~8Tk~Mfor4so7=dfjr-X+33WR@MrAw|-@`nN z!CR<5Ex(l-m;H~Yp%o>dRz4E7hv}$NWubo2He)Y*h=Z{0DsyP_@EziBu{H)2J5E=O zMNK#sb$xU3UEGLa=)D@5--)E5``-?gSr=3#-bDQl^g}IZFsj6(PP-p8m)c3csF8+-X7_x@?YoK@KE8 zevGP|&pLB^LQvneKrOfz>Uk1s!DFyDezK1G52kUDjw}r3*JTRM!}jR&jrmV_9ZQKP z+PL)w4j^$dMqwc~!riF7zl;+xe4{xVxv1Zb3)l|tqYh_`yUFZLbL6+g>4Y=zXWO5+ z+1!TFsFhDbZINr^<>*7a5nJI78<$}K@m(B-<)}paZZQ_47UGuEs7NDjt0`@B^bmK( zWL#~nxXs)G5Bkx+8U3*Yo8e*G{{Xdh|6(8X-)_c9L|wyu*3cb}^M>yKBpUi)HwIxT zHpC04Tk!%bqt{L|aTQb?hQ1hUjmJRZwm1qCP}i&&wcrET7>{8RK0tqc(QB7Ejr~i) z8_rDh&P?@0Em$?JwQ2k^?P}G&p0OF3>7L0^p46zZX_@JhOO9s^hzRbPoZ*QYSC+jj Pc|uxdMoHZAZngdg@3>le delta 3936 zcmXZdd2o+M9LMoT5V?rNk%ZuvxCx4gt3{kCZJe2;WsIoM5K)>GaXg5dHjcXENTVvD zb)=5E28pALV@5|!9j&WX?a(4E9Y^0EyMMj*yU+9N?)SU9zu(PUUiWW#?TiX_D?5%; zG|h2Bumr2)HLQe>F&Mq3o46WQC9Y@V_E?2D&c;K~mv{`;$4sn=>rmtGL%n|iYvb+d zj_X9y@Nyj|9P6Vd?23VyfIgUl{+Nzha2B@5MW_i+*yk6p0`XN0!rQ3#OR*w)&oJXw zMU7i;1`i@=G^0bA^+m001UA5I)If#SL)P=Ch5mx7*kc>}%`}PBLiKk*RiHn{;#e$? zJ5b~9acNYeaSD~;byViRqcVAhepqIf*@6I632UNC+yeDH0n6bq)Ho@q%8W<7KLw*O z2eq(6s07?gG(u_oiYmz~Y=S=7=EK&g{$8jG^}`5EK}|FdwYSSr8Er!ieAqs}h#LPI z>P(fQ-Y+-%b-(L`(@+L&P%G|&Dp7CLMEy{en1Grf3v1zG)I^0CjfYWt{RowD**WIB z5LCu>Pz#Q+c10h~pA%2xLmnieCOV4RlGEsoH&7M0i<lFh#Ghz2H+B`f$LG3?YEX- zAL5JH62s@4@8eMwPDfR461o~-5e;Rq1&3n^YD*d}Fax(jW!wpMI|g8X9FO&|7*+av zsLDMRq#7hBDb&uK1JQC);UxQ-2@sMC>wRZb8NgBRl=QE5f4~T zqe^-imC#qL;kiODby^jX8jbM?R>6Cy z7oVd}srL%AcY&zW+Y#TuL8t}HL1nZGHSuQj;2w;^%cx3}U1{E{iHaMor2cAjp`$e> zp(b98ns_B@F7 ziNiMNX424y+fWnk!7x07x)pa&1C+@%74kz>pcZNY(WnfE+2`X>wsjl0@7(ZcY2ZP2*ve+&(+s5feYk*GbKf-2Qq)Gt~Q_Q0n&06T3ohjuBxOMC)rV3kc=VQh|? zFb#Emb8s;3!ceT3hs^IZprQNU8I@TNR3-YNeg_g!3mSqtq@z%Ko`t%u3#}V4f_OJ- zOMXC|t=p*YA7X9%55qC+3+k_dVrZyjJy979LJcquHNkY$-Yr8dV2ypg9rfKo)OGqE zweYL>dSYxs{17!yjeL_}6V&_B`P5$}?@5QYV6c5K5jF7w)bsVI1?@%+d<bv%+1;?YFC!-cT2H(cXo2mam8pU)>!w`O5CgTchi-B9re?l)jNt|ip zH^1VKhj=u4a4j~%gQ&f~gJ~GK)trqS)UCOWG57>^IGef!W^dXdza>sLoQciMZH}NiPh5K#%2l^2|!bE(5N;F}cu>iFY_XUlzG@`eg(ze4C;_jG? zh1P(t%`HerANq^X7Y|``JZbw&QCs&C`(W@lW}Km@Yk1UJYX?93y8l@;^ua-_h!?OS zUPs-E@;gnb{81B!+BgC$5I48Rpg(aZ9E!bB*Q@~b-EnM;XE6y&(N|x@?=q(`sVJ=B ztb}rDw`QzazHw@6)3`kKdgUJJo{R~}sp*~(DW0^{2`NP-)B1&n#*QABnNeKeDc Date: Sun, 23 May 2021 17:17:02 +0200 Subject: [PATCH 032/196] Fix display bug --- bookwyrm/templates/lists/list.html | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 83df6521b..72f3210b0 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -57,7 +57,6 @@ {% include 'snippets/shelve_button/shelve_button.html' %}

    -
    {% endwith %}
    From cf7cbfdf8f61f502b8dc6c8f32e7d10c1fba8941 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 17:17:30 +0200 Subject: [PATCH 033/196] Fix title styles --- bookwyrm/templates/lists/list.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 72f3210b0..84c6edb0c 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -98,7 +98,9 @@
    -

    {% trans "Sort List" %}

    +

    + {% trans "Sort List" %} +

    @@ -119,7 +121,13 @@
    {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %} -

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

    +

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

    From 1aa319d6eeec6d49cb373b2754fa28a0c2b055d7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 17:17:46 +0200 Subject: [PATCH 034/196] Move description text below header --- bookwyrm/templates/lists/list_layout.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/list_layout.html b/bookwyrm/templates/lists/list_layout.html index 993587ca2..1bbc98b47 100644 --- a/bookwyrm/templates/lists/list_layout.html +++ b/bookwyrm/templates/lists/list_layout.html @@ -10,7 +10,6 @@

    {% include 'lists/created_text.html' with list=list %}

    - {% include 'snippets/trimmed_text.html' with full=list.description %}
    {% if request.user == list.user %}
    @@ -20,6 +19,10 @@ {% endif %}

    +
    + {% include 'snippets/trimmed_text.html' with full=list.description %} +
    +
    {% include 'lists/edit_form.html' with controls_text="edit-list" %}
    From 354b5110893177f69476e9290885aa4bc46e9f1c Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 17:18:16 +0200 Subject: [PATCH 035/196] Fix flex styles --- bookwyrm/templates/lists/list.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 84c6edb0c..4dc9660a3 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -35,16 +35,17 @@
    -
    +
    -
    +

    {% include 'snippets/book_titleby.html' %}

    @@ -59,7 +60,7 @@
    {% endwith %} -
    +

    {% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by {{ username }}{% endblocktrans %}

    From ca8067769c76a030e779e72817525b80bf4fa338 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 May 2021 08:48:00 -0700 Subject: [PATCH 036/196] Don't show deleted ratings in stars --- bookwyrm/templatetags/bookwyrm_tags.py | 1 + bookwyrm/views/shelf.py | 1 + 2 files changed, 2 insertions(+) diff --git a/bookwyrm/templatetags/bookwyrm_tags.py b/bookwyrm/templatetags/bookwyrm_tags.py index 3f33643bf..5cba5455f 100644 --- a/bookwyrm/templatetags/bookwyrm_tags.py +++ b/bookwyrm/templatetags/bookwyrm_tags.py @@ -25,6 +25,7 @@ def get_user_rating(book, user): user=user, book=book, rating__isnull=False, + deleted=False, ) .order_by("-published_date") .first() diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py index 99e22fa95..538a8e343 100644 --- a/bookwyrm/views/shelf.py +++ b/bookwyrm/views/shelf.py @@ -62,6 +62,7 @@ class Shelf(View): user=user, rating__isnull=False, book__id=OuterRef("id"), + deleted=False, ).order_by("-published_date") if not is_self: From 6e9c9e839c04549f261f7c1524ee788070019564 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 20:25:42 +0200 Subject: [PATCH 037/196] Fix date of death display --- bookwyrm/templates/author/author.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 67f8792c9..aa99cbe27 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -39,7 +39,7 @@
    {{ author.born|naturalday }}
    {% endif %} - {% if author.aliases %} + {% if author.died %}
    {% trans "Died:" %}
    {{ author.died|naturalday }}
    From 55a3a28d49f187d3de0391ea3beaba0e75620dac Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 23 May 2021 21:17:14 +0200 Subject: [PATCH 038/196] Add microformats to author page --- bookwyrm/templates/author/author.html | 33 ++++++++++++++++++++------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index aa99cbe27..496012a82 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -22,42 +22,59 @@
    -
    - {% if author.aliases or author.born or author.died or author.wikipedia_link %} +
    + + + {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
    {% if author.aliases %}
    {% trans "Aliases:" %}
    -
    {{ author.aliases|join:', ' }}
    +
    + {% for alias in author.aliases %} + {{alias}}{% if not forloop.last %},{% endif %} + {% endfor %} +
    {% endif %} {% if author.born %}
    {% trans "Born:" %}
    -
    {{ author.born|naturalday }}
    +
    {{ author.born|naturalday }}
    {% endif %} {% if author.died %}
    {% trans "Died:" %}
    -
    {{ author.died|naturalday }}
    +
    {{ author.died|naturalday }}
    {% endif %}
    {% if author.wikipedia_link %} -

    {% trans "Wikipedia" %}

    +

    + + + {% trans "Wikipedia" %} + +

    {% endif %} {% if author.openlibrary_key %}

    - {% trans "View on OpenLibrary" %} + + + {% trans "View on OpenLibrary" %} +

    {% endif %} {% if author.inventaire_id %}

    - {% trans "View on Inventaire" %} + + + {% trans "View on Inventaire" %} +

    {% endif %}
    From b362b72c57531d3d85e272f9892758e57a89edf2 Mon Sep 17 00:00:00 2001 From: Jason Kelly Date: Mon, 24 May 2021 09:35:21 +0800 Subject: [PATCH 039/196] Python linting --- bookwyrm/models/fields.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index d4d94aa24..caa22fcd3 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -334,7 +334,7 @@ class TagField(ManyToManyField): class ClearableFileInputWithWarning(ClearableFileInput): - template_name = 'widgets/clearable_file_input_with_warning.html' + template_name = "widgets/clearable_file_input_with_warning.html" class CustomImageField(ImageField): @@ -405,10 +405,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): return [image_name, image_content] def formfield(self, **kwargs): - return super().formfield(**{ - 'form_class': CustomImageField, - **kwargs, - }) + return super().formfield( + **{ + "form_class": CustomImageField, + **kwargs, + } + ) class DateTimeField(ActivitypubFieldMixin, models.DateTimeField): From 31deb36c853536c4ddd9537304d63476ff534fb5 Mon Sep 17 00:00:00 2001 From: bcj Date: Sun, 23 May 2021 23:49:12 -0500 Subject: [PATCH 040/196] URL-Encode password in broker_url Needed to prevent connection errors if the password contains non-urlsafe characters. Dockerfile change because all the services using it are mirroring ./ in /app now anyway. Flower needs because it needs bookwyrm in order to read the celerywyrm config (because flower only allows overwriting broker_url from the command line and we want to do it in Python so we have access to a urlencode function). --- .env.dev.example | 4 +--- .env.prod.example | 2 -- Dockerfile | 2 -- bookwyrm/settings.py | 8 ++++++-- celerywyrm/settings.py | 4 ++-- docker-compose.yml | 6 +++--- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.env.dev.example b/.env.dev.example index 2f24378c6..03e6ef258 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -34,10 +34,8 @@ REDIS_ACTIVITY_PORT=6379 #REDIS_ACTIVITY_PASSWORD=redispassword345 # Redis as celery broker -#REDIS_BROKER_PORT=6379 +REDIS_BROKER_PORT=6379 #REDIS_BROKER_PASSWORD=redispassword123 -CELERY_BROKER=redis://redis_broker:6379/0 -CELERY_RESULT_BACKEND=redis://redis_broker:6379/0 FLOWER_PORT=8888 #FLOWER_USER=mouse diff --git a/.env.prod.example b/.env.prod.example index a82499a32..dd15fbb79 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -36,8 +36,6 @@ REDIS_ACTIVITY_PASSWORD=redispassword345 # Redis as celery broker REDIS_BROKER_PORT=6379 REDIS_BROKER_PASSWORD=redispassword123 -CELERY_BROKER=redis://:${REDIS_BROKER_PASSWORD}@redis_broker:${REDIS_BROKER_PORT}/0 -CELERY_RESULT_BACKEND=redis://:${REDIS_BROKER_PASSWORD}@redis_broker:${REDIS_BROKER_PORT}/0 FLOWER_PORT=8888 FLOWER_USER=mouse diff --git a/Dockerfile b/Dockerfile index 0f10015c6..1892ae234 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,5 +9,3 @@ WORKDIR /app COPY requirements.txt /app/ RUN pip install -r requirements.txt --no-cache-dir RUN apt-get update && apt-get install -y gettext libgettextpo-dev && apt-get clean - -COPY ./bookwyrm ./celerywyrm /app/ diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index d694e33fd..19d84c7f1 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -14,8 +14,12 @@ PAGE_LENGTH = env("PAGE_LENGTH", 15) DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English") # celery -CELERY_BROKER = env("CELERY_BROKER") -CELERY_RESULT_BACKEND = env("CELERY_RESULT_BACKEND") +CELERY_BROKER = "redis://:{}@redis_broker:{}/0".format( + requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT") +) +CELERY_RESULT_BACKEND = "redis://:{}@redis_broker:{}/0".format( + requests.utils.quote(env("REDIS_BROKER_PASSWORD", "")), env("REDIS_BROKER_PORT") +) CELERY_ACCEPT_CONTENT = ["application/json"] CELERY_TASK_SERIALIZER = "json" CELERY_RESULT_SERIALIZER = "json" diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py index e4fa73ca2..63a6e9409 100644 --- a/celerywyrm/settings.py +++ b/celerywyrm/settings.py @@ -1,10 +1,10 @@ """ bookwyrm settings and configuration """ from bookwyrm.settings import * -CELERY_BROKER_URL = env("CELERY_BROKER") +CELERY_BROKER_URL = CELERY_BROKER CELERY_ACCEPT_CONTENT = ["json"] CELERY_TASK_SERIALIZER = "json" -CELERY_RESULT_BACKEND = "redis" +FLOWER_PORT = env("FLOWER_PORT") INSTALLED_APPS = INSTALLED_APPS + [ "celerywyrm", diff --git a/docker-compose.yml b/docker-compose.yml index 18f836502..49d02e706 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -74,10 +74,10 @@ services: restart: on-failure flower: build: . - command: flower --port=${FLOWER_PORT} + command: flower -A celerywyrm env_file: .env - environment: - - CELERY_BROKER_URL=${CELERY_BROKER} + volumes: + - .:/app networks: - main depends_on: From 58c07d16779d3d1f7a5f8c43518c41efad6e891b Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 24 May 2021 12:36:48 +0200 Subject: [PATCH 041/196] Apply review suggestions --- bookwyrm/templates/author/author.html | 29 +++++++++++++-------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 496012a82..de7d230f9 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -22,7 +22,7 @@
    -
    +
    {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %} @@ -32,11 +32,11 @@ {% if author.aliases %}
    {% trans "Aliases:" %}
    -
    - {% for alias in author.aliases %} - {{alias}}{% if not forloop.last %},{% endif %} - {% endfor %} -
    + {% for alias in author.aliases %} +
    + {{alias}}{% if not forloop.last %},{% endif %} +
    + {% endfor %}
    {% endif %} {% if author.born %} @@ -54,25 +54,24 @@ {% if author.wikipedia_link %} -

    - - +

    + {% trans "Wikipedia" %}

    {% endif %} + {% if author.openlibrary_key %} -

    - - +

    + {% trans "View on OpenLibrary" %}

    {% endif %} + {% if author.inventaire_id %} -

    - - +

    + {% trans "View on Inventaire" %}

    From 594f7b370875e6f469c2c84fc075c0ee8ff87347 Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 24 May 2021 12:51:18 +0200 Subject: [PATCH 042/196] Style fixes --- bookwyrm/templates/author/author.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index de7d230f9..1d317492f 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -26,43 +26,43 @@ {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %} -
    +
    {% if author.aliases %} -
    -
    {% trans "Aliases:" %}
    +
    +
    {% trans "Aliases:" %}
    {% for alias in author.aliases %}
    - {{alias}}{% if not forloop.last %},{% endif %} + {{alias}}{% if not forloop.last %}, {% endif %}
    {% endfor %}
    {% endif %} {% if author.born %} -
    -
    {% trans "Born:" %}
    +
    +
    {% trans "Born:" %}
    {{ author.born|naturalday }}
    {% endif %} {% if author.died %} -
    -
    {% trans "Died:" %}
    +
    +
    {% trans "Died:" %}
    {{ author.died|naturalday }}
    {% endif %}
    {% if author.wikipedia_link %} -

    +

    {% trans "Wikipedia" %}

    {% endif %} - + {% if author.openlibrary_key %} -

    +

    {% trans "View on OpenLibrary" %} @@ -70,7 +70,7 @@ {% endif %} {% if author.inventaire_id %} -

    +

    {% trans "View on Inventaire" %} From 25858ed3aa5da7e9f41281d9590faff31fe8e29a Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 24 May 2021 12:51:41 +0200 Subject: [PATCH 043/196] Added LibraryThing and Goodreads links --- bookwyrm/templates/author/author.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 1d317492f..9b3c637e3 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -76,6 +76,22 @@

    {% endif %} + + {% if author.librarything_key %} +

    + + {% trans "View on LibraryThing" %} + +

    + {% endif %} + + {% if author.goodreads_key %} +

    + + {% trans "View on Goodreads" %} + +

    + {% endif %}
    {% endif %} From f058aa8f1d4ca28b86d08d539232ab609770ed4f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 24 May 2021 06:54:43 -0700 Subject: [PATCH 044/196] Uses correct filter for book title --- bookwyrm/templates/book/book.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index df76d8e11..af2230200 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,7 +1,7 @@ {% extends 'layout.html' %} {% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %} -{% block title %}{{ book|title }}{% endblock %} +{% block title %}{{ book|book_title }}{% endblock %} {% block content %} {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %} From b72580daf61ff0dd22dd05ad8ecbabe92301b3b4 Mon Sep 17 00:00:00 2001 From: Joachim Date: Mon, 24 May 2021 17:17:12 +0200 Subject: [PATCH 045/196] Update author.html --- bookwyrm/templates/author/author.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 9b3c637e3..f4f308f2d 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -27,10 +27,10 @@ {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id %}
    -
    +
    {% if author.aliases %} -
    +
    {% trans "Aliases:" %}
    {% for alias in author.aliases %}
    @@ -39,14 +39,16 @@ {% endfor %}
    {% endif %} + {% if author.born %} -
    +
    {% trans "Born:" %}
    {{ author.born|naturalday }}
    {% endif %} + {% if author.died %} -
    +
    {% trans "Died:" %}
    {{ author.died|naturalday }}
    @@ -54,7 +56,7 @@
    {% if author.wikipedia_link %} -

    +

    {% trans "Wikipedia" %} @@ -62,7 +64,7 @@ {% endif %} {% if author.openlibrary_key %} -

    +

    {% trans "View on OpenLibrary" %} @@ -70,7 +72,7 @@ {% endif %} {% if author.inventaire_id %} -

    +

    {% trans "View on Inventaire" %} @@ -78,7 +80,7 @@ {% endif %} {% if author.librarything_key %} -

    +

    {% trans "View on LibraryThing" %} @@ -86,7 +88,7 @@ {% endif %} {% if author.goodreads_key %} -

    +

    {% trans "View on Goodreads" %} From d1737b44bdad3ad435721c6363dca18ac3e4f94b Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 00:41:53 +0200 Subject: [PATCH 046/196] First functioning commit TODO - [ ] Delay task (Celery?) - [ ] Store the image in a subfolder unique to the edition, to make cleaning up the image easy - [ ] Clean up the image before replacing it - [ ] Ensure that the image will be cleaned when the edition is deleted ?? - [ ] Use instance custom colors? - [ ] Use book cover color base? --- .gitignore | 3 + .../migrations/0076_book_preview_image.py | 21 +++ bookwyrm/models/book.py | 12 ++ bookwyrm/preview_images.py | 133 ++++++++++++++++++ bookwyrm/settings.py | 5 + bookwyrm/static/fonts/public_sans/OFL.txt | 93 ++++++++++++ .../fonts/public_sans/PublicSans-Bold.ttf | Bin 0 -> 56580 bytes .../fonts/public_sans/PublicSans-Light.ttf | Bin 0 -> 56452 bytes .../fonts/public_sans/PublicSans-Regular.ttf | Bin 0 -> 56424 bytes celerywyrm/celery.py | 1 + 10 files changed, 268 insertions(+) create mode 100644 bookwyrm/migrations/0076_book_preview_image.py create mode 100644 bookwyrm/preview_images.py create mode 100644 bookwyrm/static/fonts/public_sans/OFL.txt create mode 100644 bookwyrm/static/fonts/public_sans/PublicSans-Bold.ttf create mode 100644 bookwyrm/static/fonts/public_sans/PublicSans-Light.ttf create mode 100644 bookwyrm/static/fonts/public_sans/PublicSans-Regular.ttf diff --git a/.gitignore b/.gitignore index cf88e9878..624ce100c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ #nginx nginx/default.conf + +#macOS +**/.DS_Store diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py new file mode 100644 index 000000000..070be663f --- /dev/null +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2 on 2021-05-24 18:03 + +import bookwyrm.models.fields +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0075_announcement"), + ] + + operations = [ + migrations.AddField( + model_name="edition", + name="preview_image", + field=bookwyrm.models.fields.ImageField( + blank=True, null=True, upload_to="previews/" + ), + ), + ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 869ff04d2..72f0547bf 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -2,10 +2,13 @@ import re from django.db import models +from django.dispatch import receiver from model_utils.managers import InheritanceManager from bookwyrm import activitypub +from bookwyrm.preview_images import generate_preview_image_task from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE +from bookwyrm.tasks import app from .activitypub_mixin import OrderedCollectionPageMixin, ObjectMixin from .base_model import BookWyrmModel @@ -204,6 +207,9 @@ class Edition(Book): activitypub_field="work", ) edition_rank = fields.IntegerField(default=0) + preview_image = fields.ImageField( + upload_to="previews/", blank=True, null=True, alt_field="alt_text" + ) activity_serializer = activitypub.Edition name_field = "title" @@ -293,3 +299,9 @@ def isbn_13_to_10(isbn_13): if checkdigit == 10: checkdigit = "X" return converted + str(checkdigit) + + +@receiver(models.signals.post_save, sender=Edition) +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): + generate_preview_image_task(instance, *args, **kwargs) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py new file mode 100644 index 000000000..b659f678b --- /dev/null +++ b/bookwyrm/preview_images.py @@ -0,0 +1,133 @@ +import math +import textwrap + +from io import BytesIO +from PIL import Image, ImageDraw, ImageFont, ImageOps +from pathlib import Path +from uuid import uuid4 + +from django.core.files.base import ContentFile +from django.core.files.uploadedfile import InMemoryUploadedFile + +from bookwyrm import models, settings +from bookwyrm.tasks import app + +# dev +import logging + +IMG_WIDTH = settings.PREVIEW_IMG_WIDTH +IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT +BG_COLOR = (182, 186, 177) +TRANSPARENT_COLOR = (0, 0, 0, 0) +TEXT_COLOR = (16, 16, 16) + +margin = math.ceil(IMG_HEIGHT / 10) +gutter = math.ceil(margin / 2) +cover_img_limits = math.ceil(IMG_HEIGHT * 0.8) +path = Path(__file__).parent.absolute() +font_path = path.joinpath("static/fonts/public_sans") + + +def generate_texts_layer(edition, text_x): + try: + font_title = ImageFont.truetype("%s/PublicSans-Bold.ttf" % font_path, 48) + font_authors = ImageFont.truetype("%s/PublicSans-Regular.ttf" % font_path, 40) + except OSError: + font_title = ImageFont.load_default() + font_authors = ImageFont.load_default() + + text_layer = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=TRANSPARENT_COLOR) + text_layer_draw = ImageDraw.Draw(text_layer) + + text_y = 0 + + text_y = text_y + 6 + + # title + title = textwrap.fill(edition.title, width=28) + text_layer_draw.multiline_text((0, text_y), title, font=font_title, fill=TEXT_COLOR) + + text_y = text_y + font_title.getsize_multiline(title)[1] + 16 + + # subtitle + authors_text = ", ".join(a.name for a in edition.authors.all()) + authors = textwrap.fill(authors_text, width=36) + text_layer_draw.multiline_text( + (0, text_y), authors, font=font_authors, fill=TEXT_COLOR + ) + + imageBox = text_layer.getbbox() + return text_layer.crop(imageBox) + + +def generate_site_layer(text_x): + try: + font_instance = ImageFont.truetype("%s/PublicSans-Light.ttf" % font_path, 28) + except OSError: + font_instance = ImageFont.load_default() + + site = models.SiteSettings.objects.get() + + if site.logo_small: + logo_img = Image.open(site.logo_small) + else: + static_path = path.joinpath("static/images/logo-small.png") + logo_img = Image.open(static_path) + + site_layer = Image.new("RGBA", (IMG_WIDTH - text_x - margin, 50), color=BG_COLOR) + + logo_img.thumbnail((50, 50), Image.ANTIALIAS) + + site_layer.paste(logo_img, (0, 0)) + + site_layer_draw = ImageDraw.Draw(site_layer) + site_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) + + return site_layer + + +def generate_preview_image(edition): + img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=BG_COLOR) + + cover_img_layer = Image.open(edition.cover) + cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + + text_x = margin + cover_img_layer.width + gutter + + texts_layer = generate_texts_layer(edition, text_x) + text_y = IMG_HEIGHT - margin - texts_layer.height + + site_layer = generate_site_layer(text_x) + + # Composite all layers + img.paste(cover_img_layer, (margin, margin)) + img.alpha_composite(texts_layer, (text_x, text_y)) + img.alpha_composite(site_layer, (text_x, margin)) + + file_name = "%s.png" % str(uuid4()) + + image_buffer = BytesIO() + try: + img.save(image_buffer, format="png") + edition.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/png", + image_buffer.tell(), + None, + ) + + edition.save(update_fields=["preview_image"]) + finally: + image_buffer.close() + + +@app.task +def generate_preview_image_task(instance, *args, **kwargs): + """generate preview_image after save""" + updated_fields = kwargs["update_fields"] + + if not updated_fields or "preview_image" not in updated_fields: + logging.warn("image name to delete", instance.preview_image.name) + generate_preview_image(edition=instance) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index d694e33fd..cee07e913 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -37,6 +37,11 @@ LOCALE_PATHS = [ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" +# preview image + +PREVIEW_IMG_WIDTH = 1200 +PREVIEW_IMG_HEIGHT = 630 + # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ diff --git a/bookwyrm/static/fonts/public_sans/OFL.txt b/bookwyrm/static/fonts/public_sans/OFL.txt new file mode 100644 index 000000000..ac793eaaa --- /dev/null +++ b/bookwyrm/static/fonts/public_sans/OFL.txt @@ -0,0 +1,93 @@ +Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/bookwyrm/static/fonts/public_sans/PublicSans-Bold.ttf b/bookwyrm/static/fonts/public_sans/PublicSans-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3eb5ac24e2b78297531f6ac6c31255a306af980d GIT binary patch literal 56580 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�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 literal 0 HcmV?d00001 diff --git a/bookwyrm/static/fonts/public_sans/PublicSans-Light.ttf b/bookwyrm/static/fonts/public_sans/PublicSans-Light.ttf new file mode 100644 index 0000000000000000000000000000000000000000..13fd7edbceff6e379e28d7ca78b17822b1753d0c GIT binary patch literal 56452 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 literal 0 HcmV?d00001 diff --git a/bookwyrm/static/fonts/public_sans/PublicSans-Regular.ttf b/bookwyrm/static/fonts/public_sans/PublicSans-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..25c1646a40bfcbf8d0ebc8f8a20406fec29da05e GIT binary patch literal 56424 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 literal 0 HcmV?d00001 diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py index 4af8e281d..1dad55888 100644 --- a/celerywyrm/celery.py +++ b/celerywyrm/celery.py @@ -24,5 +24,6 @@ app.autodiscover_tasks(["bookwyrm"], related_name="broadcast") app.autodiscover_tasks(["bookwyrm"], related_name="connectors.abstract_connector") app.autodiscover_tasks(["bookwyrm"], related_name="emailing") app.autodiscover_tasks(["bookwyrm"], related_name="goodreads_import") +app.autodiscover_tasks(["bookwyrm"], related_name="preview_images") app.autodiscover_tasks(["bookwyrm"], related_name="models.user") app.autodiscover_tasks(["bookwyrm"], related_name="views.inbox") From da63606c0ea471d571a847553ed39aa6fe2b6c8b Mon Sep 17 00:00:00 2001 From: reese Date: Mon, 24 May 2021 21:00:58 -0500 Subject: [PATCH 047/196] translated new translations --- locale/es/LC_MESSAGES/django.mo | Bin 40665 -> 43765 bytes locale/es/LC_MESSAGES/django.po | 457 +++++++++++--------------------- 2 files changed, 151 insertions(+), 306 deletions(-) diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index 1377b50921ff631bb3fced41caf49a3579a7d17f..0e5df226ff94914032c35b735f32bebe7ae3630e 100644 GIT binary patch delta 15520 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 Fe*gqXKI#Af delta 12870 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\n" "Language-Team: LANGUAGE \n" @@ -56,12 +56,12 @@ msgid "Book Title" msgstr "Título" #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34 -#: bookwyrm/templates/user/shelf/shelf.html:84 -#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:85 +#: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "Calificación" -#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101 +#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Ordenar por" @@ -83,7 +83,7 @@ msgstr "%(value)s no es un remote_id válido" msgid "%(value)s is not a valid username" msgstr "%(value)s no es un usuario válido" -#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155 +#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152 msgid "username" msgstr "nombre de usuario" @@ -139,15 +139,15 @@ msgstr "Editar Autor/Autora" #: bookwyrm/templates/author/author.html:32 #: bookwyrm/templates/author/edit_author.html:38 msgid "Aliases:" -msgstr "" +msgstr "Aliases:" #: bookwyrm/templates/author/author.html:38 msgid "Born:" -msgstr "" +msgstr "Nacido:" #: bookwyrm/templates/author/author.html:44 msgid "Died:" -msgstr "" +msgstr "Muerto:" #: bookwyrm/templates/author/author.html:51 msgid "Wikipedia" @@ -160,10 +160,8 @@ msgstr "Ver en OpenLibrary" #: bookwyrm/templates/author/author.html:60 #: bookwyrm/templates/book/book.html:81 -#, fuzzy -#| msgid "View on OpenLibrary" msgid "View on Inventaire" -msgstr "Ver en OpenLibrary" +msgstr "Ver en Inventaire" #: bookwyrm/templates/author/author.html:74 #, python-format @@ -205,10 +203,8 @@ msgstr "Nombre:" #: bookwyrm/templates/book/edit_book.html:132 #: bookwyrm/templates/book/edit_book.html:141 #: bookwyrm/templates/book/edit_book.html:178 -#, fuzzy -#| msgid "Separate multiple publishers with commas." msgid "Separate multiple values with commas." -msgstr "Separar varios editores con comas." +msgstr "Separar varios valores con comas." #: bookwyrm/templates/author/edit_author.html:46 msgid "Bio:" @@ -236,10 +232,8 @@ msgstr "Clave OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:79 #: bookwyrm/templates/book/edit_book.html:243 -#, fuzzy -#| msgid "View on OpenLibrary" msgid "Inventaire ID:" -msgstr "Ver en OpenLibrary" +msgstr "ID Inventaire:" #: bookwyrm/templates/author/edit_author.html:84 msgid "Librarything key:" @@ -254,7 +248,7 @@ msgstr "Clave Goodreads:" #: bookwyrm/templates/book/edit_book.html:263 #: bookwyrm/templates/lists/form.html:42 #: bookwyrm/templates/preferences/edit_user.html:70 -#: bookwyrm/templates/settings/announcement_form.html:65 +#: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:97 @@ -350,28 +344,20 @@ msgid "You don't have any reading activity for this book." msgstr "No tienes ninguna actividad de lectura para este libro." #: bookwyrm/templates/book/book.html:200 -#, fuzzy -#| msgid "Review" msgid "Reviews" -msgstr "Reseña" +msgstr "Reseñas" #: bookwyrm/templates/book/book.html:205 -#, fuzzy -#| msgid "Your shelves" msgid "Your reviews" -msgstr "Tus estantes" +msgstr "Tus reseñas" #: bookwyrm/templates/book/book.html:211 -#, fuzzy -#| msgid "Your Account" msgid "Your comments" -msgstr "Tu cuenta" +msgstr "Tus comentarios" #: bookwyrm/templates/book/book.html:217 -#, fuzzy -#| msgid "Your books" msgid "Your quotes" -msgstr "Tus libros" +msgstr "Tus citas" #: bookwyrm/templates/book/book.html:253 msgid "Subjects" @@ -381,7 +367,7 @@ msgstr "Sujetos" msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -395,7 +381,7 @@ msgstr "Agregar a lista" #: bookwyrm/templates/book/book.html:297 #: bookwyrm/templates/book/cover_modal.html:31 -#: bookwyrm/templates/lists/list.html:164 +#: bookwyrm/templates/lists/list.html:179 msgid "Add" msgstr "Agregar" @@ -492,10 +478,8 @@ msgid "Series number:" msgstr "Número de serie:" #: bookwyrm/templates/book/edit_book.html:130 -#, fuzzy -#| msgid "Language:" msgid "Languages:" -msgstr "Idioma:" +msgstr "Idiomas:" #: bookwyrm/templates/book/edit_book.html:139 msgid "Publisher:" @@ -527,7 +511,7 @@ msgid "John Doe, Jane Smith" msgstr "Juan Nadie, Natalia Natalia" #: bookwyrm/templates/book/edit_book.html:183 -#: bookwyrm/templates/user/shelf/shelf.html:77 +#: bookwyrm/templates/user/shelf/shelf.html:78 msgid "Cover" msgstr "Portada:" @@ -557,10 +541,8 @@ msgid "ISBN 10:" msgstr "ISBN 10:" #: bookwyrm/templates/book/edit_book.html:238 -#, fuzzy -#| msgid "Openlibrary key:" msgid "Openlibrary ID:" -msgstr "Clave OpenLibrary:" +msgstr "ID OpenLibrary:" #: bookwyrm/templates/book/editions.html:4 #, python-format @@ -648,7 +630,7 @@ msgstr "Comunidad federalizada" #: bookwyrm/templates/directory/directory.html:4 #: bookwyrm/templates/directory/directory.html:9 -#: bookwyrm/templates/layout.html:92 +#: bookwyrm/templates/layout.html:64 msgid "Directory" msgstr "Directorio" @@ -849,7 +831,7 @@ msgid "Direct Messages with %(username)s" msgstr "Mensajes directos con %(username)s" #: bookwyrm/templates/feed/direct_messages.html:10 -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:92 msgid "Direct Messages" msgstr "Mensajes directos" @@ -905,7 +887,6 @@ msgid "Updates" msgstr "Actualizaciones" #: bookwyrm/templates/feed/feed_layout.html:10 -#: bookwyrm/templates/layout.html:58 #: bookwyrm/templates/user/shelf/books_header.html:3 msgid "Your books" msgstr "Tus libros" @@ -960,7 +941,7 @@ msgid "What are you reading?" msgstr "¿Qué estás leyendo?" #: bookwyrm/templates/get_started/books.html:9 -#: bookwyrm/templates/lists/list.html:120 +#: bookwyrm/templates/lists/list.html:135 msgid "Search for a book" msgstr "Buscar libros" @@ -980,7 +961,7 @@ msgstr "Puedes agregar libros cuando comiences a usar %(site_name)s." #: bookwyrm/templates/get_started/users.html:18 #: bookwyrm/templates/get_started/users.html:19 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38 -#: bookwyrm/templates/lists/list.html:124 +#: bookwyrm/templates/lists/list.html:139 #: bookwyrm/templates/search/layout.html:4 #: bookwyrm/templates/search/layout.html:9 msgid "Search" @@ -996,7 +977,7 @@ msgid "Popular on %(site_name)s" msgstr "Popular en %(site_name)s" #: bookwyrm/templates/get_started/books.html:58 -#: bookwyrm/templates/lists/list.html:137 +#: bookwyrm/templates/lists/list.html:152 msgid "No books found" msgstr "No se encontró ningún libro" @@ -1108,7 +1089,7 @@ msgid "%(username)s's %(year)s Books" msgstr "Los libros de %(username)s para %(year)s" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/layout.html:97 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Import Books" msgstr "Importar libros" @@ -1193,14 +1174,14 @@ msgstr "Libro" #: bookwyrm/templates/import_status.html:114 #: bookwyrm/templates/snippets/create_status_form.html:13 -#: bookwyrm/templates/user/shelf/shelf.html:78 -#: bookwyrm/templates/user/shelf/shelf.html:98 +#: bookwyrm/templates/user/shelf/shelf.html:79 +#: bookwyrm/templates/user/shelf/shelf.html:99 msgid "Title" msgstr "Título" #: bookwyrm/templates/import_status.html:117 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:101 +#: bookwyrm/templates/user/shelf/shelf.html:80 +#: bookwyrm/templates/user/shelf/shelf.html:102 msgid "Author" msgstr "Autor/Autora" @@ -1242,15 +1223,19 @@ msgstr "Buscar un libro o un usuario" msgid "Main navigation menu" msgstr "Menú de navigación central" -#: bookwyrm/templates/layout.html:61 +#: bookwyrm/templates/layout.html:58 msgid "Feed" msgstr "Actividad" -#: bookwyrm/templates/layout.html:102 +#: bookwyrm/templates/layout.html:87 +msgid "Your Books" +msgstr "Tus libros" + +#: bookwyrm/templates/layout.html:97 msgid "Settings" msgstr "Configuración" -#: bookwyrm/templates/layout.html:111 +#: bookwyrm/templates/layout.html:106 #: bookwyrm/templates/settings/admin_layout.html:31 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 @@ -1258,40 +1243,40 @@ msgstr "Configuración" msgid "Invites" msgstr "Invitaciones" -#: bookwyrm/templates/layout.html:118 +#: bookwyrm/templates/layout.html:113 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/layout.html:125 +#: bookwyrm/templates/layout.html:120 msgid "Log out" msgstr "Cerrar sesión" -#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134 +#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/notifications.html:6 #: bookwyrm/templates/notifications.html:11 msgid "Notifications" msgstr "Notificaciones" -#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158 +#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155 #: bookwyrm/templates/login.html:17 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nombre de usuario:" -#: bookwyrm/templates/layout.html:159 +#: bookwyrm/templates/layout.html:156 msgid "password" msgstr "contraseña" -#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36 +#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10 +#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10 #: bookwyrm/templates/login.html:33 msgid "Log in" msgstr "Iniciar sesión" -#: bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/layout.html:168 msgid "Join" msgstr "Unirse" @@ -1304,8 +1289,6 @@ msgid "Contact site admin" msgstr "Contactarse con administradores del sitio" #: bookwyrm/templates/layout.html:214 -#, fuzzy -#| msgid "Django Documentation" msgid "Documentation" msgstr "Documentación de Django" @@ -1358,7 +1341,7 @@ msgid "Discard" msgstr "Desechar" #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:17 +#: bookwyrm/templates/lists/list_layout.html:16 msgid "Edit List" msgstr "Editar lista" @@ -1395,66 +1378,65 @@ msgstr "Cualquer usuario puede agregar libros a esta lista" #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" -msgstr "" +msgstr "¡Has sugerido un libro para esta lista exitosamente!" #: bookwyrm/templates/lists/list.html:22 -#, fuzzy -#| msgid "Anyone can add books to this list" msgid "You successfully added a book to this list!" -msgstr "Cualquer usuario puede agregar libros a esta lista" +msgstr "¡Has agregado un libro a esta lista exitosamente!" #: bookwyrm/templates/lists/list.html:28 msgid "This list is currently empty" msgstr "Esta lista está vacia" -#: bookwyrm/templates/lists/list.html:65 +#: bookwyrm/templates/lists/list.html:66 #, python-format msgid "Added by %(username)s" msgstr "Agregado por %(username)s" -#: bookwyrm/templates/lists/list.html:77 -msgid "Set" -msgstr "Establecido" - -#: bookwyrm/templates/lists/list.html:80 +#: bookwyrm/templates/lists/list.html:74 msgid "List position" msgstr "Posición" -#: bookwyrm/templates/lists/list.html:86 +#: bookwyrm/templates/lists/list.html:81 +msgid "Set" +msgstr "Establecido" + +#: bookwyrm/templates/lists/list.html:89 #: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Quitar" -#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111 +#: bookwyrm/templates/lists/list.html:103 +#: bookwyrm/templates/lists/list.html:120 msgid "Sort List" msgstr "Ordena la lista" -#: bookwyrm/templates/lists/list.html:105 +#: bookwyrm/templates/lists/list.html:113 msgid "Direction" msgstr "Dirección" -#: bookwyrm/templates/lists/list.html:116 +#: bookwyrm/templates/lists/list.html:127 msgid "Add Books" msgstr "Agregar libros" -#: bookwyrm/templates/lists/list.html:116 +#: bookwyrm/templates/lists/list.html:129 msgid "Suggest Books" msgstr "Sugerir libros" -#: bookwyrm/templates/lists/list.html:125 +#: bookwyrm/templates/lists/list.html:140 msgid "search" msgstr "buscar" -#: bookwyrm/templates/lists/list.html:131 +#: bookwyrm/templates/lists/list.html:146 msgid "Clear search" msgstr "Borrar búsqueda" -#: bookwyrm/templates/lists/list.html:136 +#: bookwyrm/templates/lists/list.html:151 #, python-format msgid "No books found matching the query \"%(query)s\"" msgstr "No se encontró ningún libro correspondiente a la búsqueda: \"%(query)s\"" -#: bookwyrm/templates/lists/list.html:164 +#: bookwyrm/templates/lists/list.html:179 msgid "Suggest" msgstr "Sugerir" @@ -1573,13 +1555,11 @@ msgstr "Borrar notificaciones" #: bookwyrm/templates/notifications.html:25 msgid "All" -msgstr "" +msgstr "Todas" #: bookwyrm/templates/notifications.html:29 -#, fuzzy -#| msgid "More options" msgid "Mentions" -msgstr "Más opciones" +msgstr "Menciones" #: bookwyrm/templates/notifications.html:70 #, python-format @@ -1680,10 +1660,8 @@ msgid " suggested adding %(book_title)s t msgstr " sugirió agregar %(book_title)s a tu lista \"%(list_name)s\"" #: bookwyrm/templates/notifications.html:128 -#, fuzzy, python-format -#| msgid "Your import completed." msgid "Your import completed." -msgstr "Tu importación ha terminado." +msgstr "Tu importación ha terminado." #: bookwyrm/templates/notifications.html:131 #, python-format @@ -1758,31 +1736,45 @@ msgstr "Perfil" msgid "Relationships" msgstr "Relaciones" +#: bookwyrm/templates/rss/title.html:5 +#: bookwyrm/templates/snippets/status/status_header.html:35 +msgid "rated" +msgstr "calificó" + +#: bookwyrm/templates/rss/title.html:7 +#: bookwyrm/templates/snippets/status/status_header.html:37 +msgid "reviewed" +msgstr "reseñó" + +#: bookwyrm/templates/rss/title.html:9 +#: bookwyrm/templates/snippets/status/status_header.html:39 +msgid "commented on" +msgstr "comentó en" + +#: bookwyrm/templates/rss/title.html:11 +#: bookwyrm/templates/snippets/status/status_header.html:41 +msgid "quoted" +msgstr "citó" + #: bookwyrm/templates/search/book.html:64 -#, fuzzy -#| msgid "Show results from other catalogues" msgid "Load results from other catalogues" -msgstr "Mostrar resultados de otros catálogos" +msgstr "Cargar resultados de otros catálogos" #: bookwyrm/templates/search/book.html:68 msgid "Manually add book" -msgstr "" +msgstr "Agregar libro a mano" #: bookwyrm/templates/search/book.html:73 msgid "Log in to import or add books." -msgstr "" +msgstr "Iniciar una sesión para importar o agregar libros" #: bookwyrm/templates/search/layout.html:16 -#, fuzzy -#| msgid "Search for a user" msgid "Search query" -msgstr "Buscar un usuario" +msgstr "Búsqueda" #: bookwyrm/templates/search/layout.html:19 -#, fuzzy -#| msgid "Search" msgid "Search type" -msgstr "Buscar" +msgstr "Tipo de búsqueda" #: bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 @@ -1799,10 +1791,8 @@ msgid "Users" msgstr "Usuarios" #: bookwyrm/templates/search/layout.html:58 -#, fuzzy, python-format -#| msgid "No lists found for \"%(query)s\"" msgid "No results found for \"%(query)s\"" -msgstr "No se encontró ningúna lista correspondiente a \"%(query)s\"" +msgstr "No se encontró ningún resultado correspondiente a \"%(query)s\"" #: bookwyrm/templates/settings/admin_layout.html:4 msgid "Administration" @@ -1856,23 +1846,18 @@ msgstr "Registración" #: bookwyrm/templates/settings/announcement.html:3 #: bookwyrm/templates/settings/announcement.html:6 -#, fuzzy -#| msgid "Announcements" msgid "Announcement" -msgstr "Anuncios" +msgstr "Anuncio" #: bookwyrm/templates/settings/announcement.html:7 #: bookwyrm/templates/settings/federated_server.html:13 -#, fuzzy -#| msgid "Back to server list" msgid "Back to list" msgstr "Volver a la lista de servidores" #: bookwyrm/templates/settings/announcement.html:11 -#, fuzzy -#| msgid "Announcements" +#: bookwyrm/templates/settings/announcement_form.html:6 msgid "Edit Announcement" -msgstr "Anuncios" +msgstr "Editar anuncio" #: bookwyrm/templates/settings/announcement.html:20 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 @@ -1882,64 +1867,48 @@ msgstr "Eliminar" #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" -msgstr "" +msgstr "Visible:" #: bookwyrm/templates/settings/announcement.html:38 msgid "True" -msgstr "" +msgstr "Verdadero" #: bookwyrm/templates/settings/announcement.html:40 msgid "False" -msgstr "" +msgstr "Falso" #: bookwyrm/templates/settings/announcement.html:47 -#, fuzzy -#| msgid "Birth date:" msgid "Start date:" -msgstr "Fecha de nacimiento:" +msgstr "Fecha de inicio:" #: bookwyrm/templates/settings/announcement.html:54 -#, fuzzy -#| msgid "Birth date:" msgid "End date:" -msgstr "Fecha de nacimiento:" +msgstr "Fecha final:" #: bookwyrm/templates/settings/announcement.html:60 -#, fuzzy -#| msgid "Active" msgid "Active:" -msgstr "Activ@" +msgstr "Activ@:" -#: bookwyrm/templates/settings/announcement_form.html:5 +#: bookwyrm/templates/settings/announcement_form.html:8 #: bookwyrm/templates/settings/announcements.html:8 -#, fuzzy -#| msgid "Announcements" msgid "Create Announcement" -msgstr "Anuncios" +msgstr "Crear anuncio" #: bookwyrm/templates/settings/announcements.html:22 -#, fuzzy -#| msgid "Date Added" msgid "Date added" msgstr "Fecha agregada" #: bookwyrm/templates/settings/announcements.html:26 -#, fuzzy -#| msgid "reviewed" msgid "Preview" -msgstr "reseñó" +msgstr "Vista preliminar" #: bookwyrm/templates/settings/announcements.html:30 -#, fuzzy -#| msgid "Started" msgid "Start date" -msgstr "Empezado" +msgstr "Fecha de inicio" #: bookwyrm/templates/settings/announcements.html:34 -#, fuzzy -#| msgid "Edit read dates" msgid "End date" -msgstr "Editar fechas de lectura" +msgstr "Fecha final" #: bookwyrm/templates/settings/announcements.html:38 #: bookwyrm/templates/settings/federation.html:30 @@ -1950,16 +1919,12 @@ msgid "Status" msgstr "Status" #: bookwyrm/templates/settings/announcements.html:48 -#, fuzzy -#| msgid "Inactive" msgid "active" -msgstr "Inactiv@" +msgstr "activo" #: bookwyrm/templates/settings/announcements.html:48 -#, fuzzy -#| msgid "Inactive" msgid "inactive" -msgstr "Inactiv@" +msgstr "inactivo" #: bookwyrm/templates/settings/edit_server.html:3 #: bookwyrm/templates/settings/edit_server.html:6 @@ -2202,7 +2167,7 @@ msgid "Import Blocklist" msgstr "Importar lista de bloqueo" #: bookwyrm/templates/settings/server_blocklist.html:26 -#: bookwyrm/templates/snippets/goal_progress.html:5 +#: bookwyrm/templates/snippets/goal_progress.html:7 msgid "Success!" msgstr "¡Meta logrado!" @@ -2260,7 +2225,7 @@ msgstr "Correo electrónico de administradorx:" #: bookwyrm/templates/settings/site.html:73 msgid "Additional info:" -msgstr "" +msgstr "Más informacion:" #: bookwyrm/templates/settings/site.html:83 msgid "Allow registration:" @@ -2275,10 +2240,8 @@ msgid "Registration closed text:" msgstr "Texto de registración cerrada:" #: bookwyrm/templates/snippets/announcement.html:31 -#, fuzzy, python-format -#| msgid "Added by %(username)s" msgid "Posted by %(username)s" -msgstr "Agregado por %(username)s" +msgstr "Publicado por %(username)s" #: bookwyrm/templates/snippets/book_cover.html:31 msgid "No cover" @@ -2289,19 +2252,15 @@ msgstr "Sin portada" msgid "%(title)s by " msgstr "%(title)s por " -#: bookwyrm/templates/snippets/boost_button.html:9 -#: bookwyrm/templates/snippets/boost_button.html:10 -#, fuzzy -#| msgid "boosted" +#: bookwyrm/templates/snippets/boost_button.html:20 +#: bookwyrm/templates/snippets/boost_button.html:21 msgid "Boost" -msgstr "respaldó" +msgstr "Respaldar" -#: bookwyrm/templates/snippets/boost_button.html:16 -#: bookwyrm/templates/snippets/boost_button.html:17 -#, fuzzy -#| msgid "Un-boost status" +#: bookwyrm/templates/snippets/boost_button.html:33 +#: bookwyrm/templates/snippets/boost_button.html:34 msgid "Un-boost" -msgstr "Status de des-respaldo" +msgstr "Des-respaldar" #: bookwyrm/templates/snippets/content_warning_field.html:3 msgid "Spoiler alert:" @@ -2339,10 +2298,8 @@ msgid "Reply" msgstr "Respuesta" #: bookwyrm/templates/snippets/create_status_form.html:56 -#, fuzzy -#| msgid "Footer Content" msgid "Content" -msgstr "Contenido del pie de página" +msgstr "Contenido" #: bookwyrm/templates/snippets/create_status_form.html:80 #: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 @@ -2391,17 +2348,15 @@ msgstr "¿Eliminar estas fechas de lectura?" msgid "You are deleting this readthrough and its %(count)s associated progress updates." msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados." -#: bookwyrm/templates/snippets/fav_button.html:9 -#: bookwyrm/templates/snippets/fav_button.html:11 +#: bookwyrm/templates/snippets/fav_button.html:10 +#: bookwyrm/templates/snippets/fav_button.html:12 msgid "Like" -msgstr "" +msgstr "Me gusta" -#: bookwyrm/templates/snippets/fav_button.html:17 #: bookwyrm/templates/snippets/fav_button.html:18 -#, fuzzy -#| msgid "Un-like status" +#: bookwyrm/templates/snippets/fav_button.html:19 msgid "Un-like" -msgstr "Quitar me gusta de status" +msgstr "Quitar me gusta" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:7 msgid "Show filters" @@ -2440,6 +2395,14 @@ msgstr "Aceptar" msgid "No rating" msgstr "No calificación" +#: bookwyrm/templates/snippets/form_rate_stars.html:44 +#: bookwyrm/templates/snippets/stars.html:7 +#, python-format +msgid "%(rating)s star" +msgid_plural "%(rating)s stars" +msgstr[0] "%(rating)s estrella" +msgstr[1] "%(rating)s estrellas" + #: bookwyrm/templates/snippets/generated_status/goal.html:1 #, python-format msgid "set a goal to read %(counter)s book in %(year)s" @@ -2494,17 +2457,17 @@ msgstr "Compartir con tu feed" msgid "Set goal" msgstr "Establecer meta" -#: bookwyrm/templates/snippets/goal_progress.html:7 +#: bookwyrm/templates/snippets/goal_progress.html:9 #, python-format msgid "%(percent)s%% complete!" msgstr "%(percent)s%% terminado!" -#: bookwyrm/templates/snippets/goal_progress.html:10 +#: bookwyrm/templates/snippets/goal_progress.html:12 #, python-format msgid "You've read %(read_count)s of %(goal_count)s books." msgstr "Has leído %(read_count)s de %(goal_count)s libros." -#: bookwyrm/templates/snippets/goal_progress.html:12 +#: bookwyrm/templates/snippets/goal_progress.html:14 #, python-format msgid "%(username)s has read %(read_count)s of %(goal_count)s books." msgstr "%(username)s ha leído %(read_count)s de %(goal_count)s libros." @@ -2515,8 +2478,6 @@ msgid "page %(page)s of %(total_pages)s" msgstr "página %(page)s de %(total_pages)s" #: bookwyrm/templates/snippets/page_text.html:6 -#, fuzzy, python-format -#| msgid "page %(page)s" msgid "page %(page)s" msgstr "página %(pages)s" @@ -2614,26 +2575,6 @@ msgstr "Inscribirse" msgid "Report" msgstr "Reportar" -#: bookwyrm/templates/snippets/rss_title.html:5 -#: bookwyrm/templates/snippets/status/status_header.html:35 -msgid "rated" -msgstr "calificó" - -#: bookwyrm/templates/snippets/rss_title.html:7 -#: bookwyrm/templates/snippets/status/status_header.html:37 -msgid "reviewed" -msgstr "reseñó" - -#: bookwyrm/templates/snippets/rss_title.html:9 -#: bookwyrm/templates/snippets/status/status_header.html:39 -msgid "commented on" -msgstr "comentó en" - -#: bookwyrm/templates/snippets/rss_title.html:11 -#: bookwyrm/templates/snippets/status/status_header.html:41 -msgid "quoted" -msgstr "citó" - #: bookwyrm/templates/snippets/search_result_text.html:36 msgid "Import book" msgstr "Importar libro" @@ -2706,7 +2647,7 @@ msgstr "Eliminar status" #: bookwyrm/templates/snippets/status/layout.html:51 #: bookwyrm/templates/snippets/status/layout.html:52 msgid "Boost status" -msgstr "Status de respaldo" +msgstr "Respaldar status" #: bookwyrm/templates/snippets/status/layout.html:55 #: bookwyrm/templates/snippets/status/layout.html:56 @@ -2803,7 +2744,7 @@ msgstr "Editar estante" msgid "Update shelf" msgstr "Actualizar estante" -#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51 +#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "Todos los libros" @@ -2811,30 +2752,30 @@ msgstr "Todos los libros" msgid "Create shelf" msgstr "Crear estante" -#: bookwyrm/templates/user/shelf/shelf.html:61 +#: bookwyrm/templates/user/shelf/shelf.html:62 msgid "Edit shelf" msgstr "Editar estante" -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:104 +#: bookwyrm/templates/user/shelf/shelf.html:81 +#: bookwyrm/templates/user/shelf/shelf.html:105 msgid "Shelved" msgstr "Archivado" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:108 +#: bookwyrm/templates/user/shelf/shelf.html:82 +#: bookwyrm/templates/user/shelf/shelf.html:109 msgid "Started" msgstr "Empezado" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:83 +#: bookwyrm/templates/user/shelf/shelf.html:112 msgid "Finished" msgstr "Terminado" -#: bookwyrm/templates/user/shelf/shelf.html:137 +#: bookwyrm/templates/user/shelf/shelf.html:138 msgid "This shelf is empty." msgstr "Este estante está vacio." -#: bookwyrm/templates/user/shelf/shelf.html:143 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Delete shelf" msgstr "Eliminar estante" @@ -2881,13 +2822,10 @@ msgid "%(counter)s following" msgstr "%(counter)s siguiendo" #: bookwyrm/templates/user/user_preview.html:26 -#, fuzzy, python-format -#| msgid "%(mutuals)s follower you follow" -#| msgid_plural "%(mutuals)s followers you follow" msgid "%(mutuals_display)s follower you follow" msgid_plural "%(mutuals_display)s followers you follow" -msgstr[0] "%(mutuals)s seguidor que sigues" -msgstr[1] "%(mutuals)s seguidores que sigues" +msgstr[0] "%(mutuals_display)s seguidor que sigues" +msgstr[1] "%(mutuals_display)s seguidores que sigues" #: bookwyrm/templates/user_admin/user.html:9 msgid "Back to users" @@ -2957,10 +2895,8 @@ msgid "Access level:" msgstr "Nivel de acceso:" #: bookwyrm/views/import_data.py:67 -#, fuzzy -#| msgid "Enter a valid value." msgid "Not a valid csv file" -msgstr "Ingrese un valor válido." +msgstr "No un archivo csv válido" #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." @@ -2981,7 +2917,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Show" #~ msgstr "Mostrar más" -#, python-format #~ msgid "ambiguous option: %(option)s could match %(matches)s" #~ msgstr "opción ambiguo: %(option)s pudiera coincidir con %(matches)s" @@ -3033,25 +2968,20 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Enter only digits separated by commas." #~ msgstr "Ingrese solo digitos separados por comas." -#, python-format #~ msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." #~ msgstr "Asegura que este valor es %(limit_value)s (es %(show_value)s)." -#, python-format #~ msgid "Ensure this value is less than or equal to %(limit_value)s." #~ msgstr "Asegura que este valor es menor que o iguala a %(limit_value)s." -#, python-format #~ msgid "Ensure this value is greater than or equal to %(limit_value)s." #~ msgstr "Asegura que este valor es más que o que iguala a %(limit_value)s." -#, python-format #~ msgid "Ensure this value has at least %(limit_value)d character (it has %(show_value)d)." #~ msgid_plural "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)." #~ msgstr[0] "Verifica que este valor tiene por lo menos %(limit_value)d carácter. (Tiene %(show_value)d).)" #~ msgstr[1] "Verifica que este valor tiene por lo menos %(limit_value)d caracteres. (Tiene %(show_value)d).)" -#, python-format #~ msgid "Ensure this value has at most %(limit_value)d character (it has %(show_value)d)." #~ msgid_plural "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)." #~ msgstr[0] "Verifica que este valor tiene a lo sumo %(limit_value)d carácter. (Tiene %(show_value)d).)" @@ -3060,26 +2990,22 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Enter a number." #~ msgstr "Ingrese un número." -#, python-format #~ msgid "Ensure that there are no more than %(max)s digit in total." #~ msgid_plural "Ensure that there are no more than %(max)s digits in total." #~ msgstr[0] "Verifica que no hay más que %(max)s digito en total." #~ msgstr[1] "Verifica que no hay más que %(max)s digitos en total." # is -#, python-format #~ msgid "Ensure that there are no more than %(max)s decimal place." #~ msgid_plural "Ensure that there are no more than %(max)s decimal places." #~ msgstr[0] "Verifica que no hay más que %(max)s cifra decimal." #~ msgstr[1] "Verifica que no hay más que %(max)s cifras decimales." -#, python-format #~ msgid "Ensure that there are no more than %(max)s digit before the decimal point." #~ msgid_plural "Ensure that there are no more than %(max)s digits before the decimal point." #~ msgstr[0] "Verifica que no hay más que %(max)s digito antes de la coma decimal." #~ msgstr[1] "Verifica que no hay más que %(max)s digitos antes de la coma decimal." -#, python-format #~ msgid "File extension “%(extension)s” is not allowed. Allowed extensions are: %(allowed_extensions)s." #~ msgstr "No se permite la extensión de archivo “%(extension)s”. Extensiones permitidas son: %(allowed_extensions)s." @@ -3089,11 +3015,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "and" #~ msgstr "y" -#, python-format #~ msgid "%(model_name)s with this %(field_labels)s already exists." #~ msgstr "Ya existe %(model_name)s con este %(field_labels)s." -#, python-format #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "El valor %(value)s no es una opción válida." @@ -3103,67 +3027,56 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "This field cannot be blank." #~ msgstr "Este campo no puede ser vacio." -#, fuzzy, python-format +#, fuzzy #~| msgid "%(model_name)s with this %(field_label)s already exists." #~ msgid "%(model_name)s with this %(field_label)s already exists." #~ msgstr "Ya existe %(model_name)s con este %(field_labels)s." -#, python-format #~ msgid "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." #~ msgstr "%(field_label)s deben ser unicos por %(date_field_label)s %(lookup_type)s." -#, python-format #~ msgid "Field of type: %(field_type)s" #~ msgstr "Campo de tipo: %(field_type)s" -#, python-format #~ msgid "“%(value)s” value must be either True or False." #~ msgstr "“%(value)s” valor debe ser o verdadero o falso." -#, python-format #~ msgid "“%(value)s” value must be either True, False, or None." #~ msgstr "%(value)s” valor debe ser o True, False, o None." #~ msgid "Boolean (Either True or False)" #~ msgstr "Booleano (O True O False)" -#, python-format #~ msgid "String (up to %(max_length)s)" #~ msgstr "Cadena (máximo de %(max_length)s caracteres)" #~ msgid "Comma-separated integers" #~ msgstr "Enteros separados por comas" -#, python-format #~ msgid "“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD format." #~ msgstr "“%(value)s” valor tiene un formato de fecha inválido. Hay que estar de formato YYYY-MM-DD." -#, python-format #~ msgid "“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid date." #~ msgstr "“%(value)s” valor tiene el formato correcto (YYYY-MM-DD) pero la fecha es invalida." #~ msgid "Date (without time)" #~ msgstr "Fecha (sin la hora)" -#, python-format #~ msgid "“%(value)s” value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] format." #~ msgstr "“%(value)s” valor tiene un formato invalido. Debe estar en formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]." -#, python-format #~ msgid "“%(value)s” value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but it is an invalid date/time." #~ msgstr "“%(value)s” valor tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) pero es una fecha/hora invalida." #~ msgid "Date (with time)" #~ msgstr "Fecha (con la hora)" -#, python-format #~ msgid "“%(value)s” value must be a decimal number." #~ msgstr "El valor de “%(value)s” debe ser un número decimal." #~ msgid "Decimal number" #~ msgstr "Número decimal" -#, python-format #~ msgid "“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[.uuuuuu] format." #~ msgstr "“%(value)s” valor tiene un formato invalido. Debe estar en formato [DD] [[HH:]MM:]ss[.uuuuuu]." @@ -3176,14 +3089,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "File path" #~ msgstr "Ruta de archivo" -#, python-format #~ msgid "“%(value)s” value must be a float." #~ msgstr "%(value)s no es un usuario válido" #~ msgid "Floating point number" #~ msgstr "Número de coma flotante" -#, python-format #~ msgid "“%(value)s” value must be an integer." #~ msgstr "“%(value)s” valor debe ser un entero." @@ -3199,7 +3110,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "IP address" #~ msgstr "Dirección IP" -#, python-format #~ msgid "“%(value)s” value must be either None, True or False." #~ msgstr "Valor “%(value)s” debe ser o None, True, o False." @@ -3212,7 +3122,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Positive small integer" #~ msgstr "Entero positivo pequeño " -#, python-format #~ msgid "Slug (up to %(max_length)s)" #~ msgstr "Slug (máximo de %(max_length)s)" @@ -3222,11 +3131,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Text" #~ msgstr "Texto" -#, python-format #~ msgid "“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." #~ msgstr "“%(value)s” valor tiene un formato invalido. Debe estar en formato HH:MM[:ss[.uuuuuu]]." -#, python-format #~ msgid "“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid time." #~ msgstr "“%(value)s” valor tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una hora invalida." @@ -3239,7 +3146,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Raw binary data" #~ msgstr "Datos binarios sin procesar" -#, python-format #~ msgid "“%(value)s” is not a valid UUID." #~ msgstr "%(value)s no es una UUID válida." @@ -3252,7 +3158,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Image" #~ msgstr "Imágen" -#, python-format #~ msgid "%(model)s instance with %(field)s %(value)r does not exist." #~ msgstr "%(model)s instancia con %(field)s %(value)r no existe." @@ -3262,11 +3167,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "One-to-one relationship" #~ msgstr "Relación uno-a-uno" -#, python-format #~ msgid "%(from)s-%(to)s relationship" #~ msgstr "relación %(from)s-%(to)s" -#, python-format #~ msgid "%(from)s-%(to)s relationships" #~ msgstr "relaciones %(from)s-%(to)s" @@ -3291,7 +3194,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Enter a valid duration." #~ msgstr "Ingrese una duración válida." -#, python-brace-format #~ msgid "The number of days must be between {min_days} and {max_days}." #~ msgstr "El número de dias debe ser entre {min_days} y {max_days}." @@ -3304,7 +3206,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "The submitted file is empty." #~ msgstr "El archivo enviado está vacio." -#, python-format #~ msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." #~ msgid_plural "Ensure this filename has at most %(max)d characters (it has %(length)d)." #~ msgstr[0] "Verifica que este nombre de archivo no tiene más que %(max)d carácter. (Tiene %(length)d)." @@ -3316,7 +3217,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." #~ msgstr "Subir una imagen válida. El archivo que subiste o no fue imagen o fue corrupto." -#, python-format #~ msgid "Select a valid choice. %(value)s is not one of the available choices." #~ msgstr "Selecciona una opción válida. %(value)s no es una de las opciones disponibles." @@ -3332,20 +3232,17 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid ":" #~ msgstr ":" -#, python-format #~ msgid "(Hidden field %(name)s) %(error)s" #~ msgstr "(Campo oculto %(name)s) %(error)s" #~ msgid "ManagementForm data is missing or has been tampered with" #~ msgstr "Datos de ManagementForm está ausento o ha sido corrompido" -#, python-format #~ msgid "Please submit %d or fewer forms." #~ msgid_plural "Please submit %d or fewer forms." #~ msgstr[0] "Por favor, enviar %d o menos formularios." #~ msgstr[1] "Por favor, enviar %d o menos formularios." -#, python-format #~ msgid "Please submit %d or more forms." #~ msgid_plural "Please submit %d or more forms." #~ msgstr[0] "Por favor, enviar %d o más formularios." @@ -3358,15 +3255,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" # if verb # msgstr "Pedido" # if noun -#, python-format #~ msgid "Please correct the duplicate data for %(field)s." #~ msgstr "Por favor corrige los datos duplicados en %(field)s." -#, python-format #~ msgid "Please correct the duplicate data for %(field)s, which must be unique." #~ msgstr "Por favor corrige los datos duplicados en %(field)s, los cuales deben ser unicos." -#, python-format #~ msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s." #~ msgstr "Por favor corrige los datos duplicados en %(field_name)s los cuales deben ser unicos por el %(lookup)s en %(date_field)s." @@ -3379,11 +3273,9 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Select a valid choice. That choice is not one of the available choices." #~ msgstr "Selecciona una opción válida. Esa opción no es una de las opciones disponibles." -#, python-format #~ msgid "“%(pk)s” is not a valid value." #~ msgstr "“%(pk)s” no es un valor válido." -#, python-format #~ msgid "%(datetime)s couldn’t be interpreted in time zone %(current_timezone)s; it may be ambiguous or it may not exist." #~ msgstr "%(datetime)s no se pudo interpretar en la zona horaria %(current_timezone)s; puede ser ambiguo o puede que no exista." @@ -3408,29 +3300,23 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "yes,no,maybe" #~ msgstr "sí,no,quizás" -#, python-format #~ msgid "%(size)d byte" #~ msgid_plural "%(size)d bytes" #~ msgstr[0] "%(size)d byte" #~ msgstr[1] "%(size)d bytes" -#, python-format #~ msgid "%s KB" #~ msgstr "%s KB" -#, python-format #~ msgid "%s MB" #~ msgstr "%s MB" -#, python-format #~ msgid "%s GB" #~ msgstr "%s GB" -#, python-format #~ msgid "%s TB" #~ msgstr "%s TB" -#, python-format #~ msgid "%s PB" #~ msgstr "%s PB" @@ -3665,7 +3551,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "This is not a valid IPv6 address." #~ msgstr "Esta no es una dirección IPv6 válida." -#, python-format #~ msgctxt "String to return when truncating text" #~ msgid "%(truncated_text)s…" #~ msgstr "%(truncated_text)s…" @@ -3676,37 +3561,31 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid ", " #~ msgstr ", " -#, python-format #~ msgid "%d year" #~ msgid_plural "%d years" #~ msgstr[0] "%d año" #~ msgstr[1] "%d años" -#, python-format #~ msgid "%d month" #~ msgid_plural "%d months" #~ msgstr[0] "%d mes" #~ msgstr[1] "%d meses" -#, python-format #~ msgid "%d week" #~ msgid_plural "%d weeks" #~ msgstr[0] "%d semana" #~ msgstr[1] "%d semanas" -#, python-format #~ msgid "%d day" #~ msgid_plural "%d days" #~ msgstr[0] "%d día" #~ msgstr[1] "%d días" -#, python-format #~ msgid "%d hour" #~ msgid_plural "%d hours" #~ msgstr[0] "%d hora" #~ msgstr[1] "%d horas" -#, python-format #~ msgid "%d minute" #~ msgid_plural "%d minutes" #~ msgstr[0] "%d minuto" @@ -3757,55 +3636,45 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "No week specified" #~ msgstr "Ninguna semana fue especificado" -#, python-format #~ msgid "No %(verbose_name_plural)s available" #~ msgstr "No %(verbose_name_plural)s disponible" -#, python-format #~ msgid "Future %(verbose_name_plural)s not available because %(class_name)s.allow_future is False." #~ msgstr "%(verbose_name_plural)s del futuro no está disponible porque %(class_name)s.allow_future es False." -#, python-format #~ msgid "Invalid date string “%(datestr)s” given format “%(format)s”" #~ msgstr "Cadena de fecha invalida “%(datestr)s” dado el formato “%(format)s”" -#, python-format #~ msgid "No %(verbose_name)s found matching the query" #~ msgstr "No se encontró ningún %(verbose_name)s correspondiente a la búsqueda" #~ msgid "Page is not “last”, nor can it be converted to an int." #~ msgstr "Página no es “last”, ni puede ser convertido en un int." -#, python-format #~ msgid "Invalid page (%(page_number)s): %(message)s" #~ msgstr "Página invalida (%(page_number)s): %(message)s" -#, python-format #~ msgid "Empty list and “%(class_name)s.allow_empty” is False." #~ msgstr "Lista vacia y “%(class_name)s.allow_empty” es False." #~ msgid "Directory indexes are not allowed here." #~ msgstr "Indices directorios no se permiten aquí." -#, python-format #~ msgid "“%(path)s” does not exist" #~ msgstr "“%(path)s” no existe" -#, python-format #~ msgid "Index of %(directory)s" #~ msgstr "Indice de %(directory)s" #~ msgid "Django: the Web framework for perfectionists with deadlines." #~ msgstr "Django: el estructura Web para perfeccionistas con fechas límites." -#, python-format #~ msgid "View release notes for Django %(version)s" #~ msgstr "Ver notas de lanzamiento por Django %(version)s" #~ msgid "The install worked successfully! Congratulations!" #~ msgstr "¡La instalación fue exitoso! ¡Felicidades!" -#, python-format #~ msgid "You are seeing this page because DEBUG=True is in your settings file and you have not configured any URLs." #~ msgstr "Estás viendo esta pagina porque DEBUG=True está en tu archivo de configuración y no has configurado ningún URL." @@ -3827,15 +3696,12 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Connect, get help, or contribute" #~ msgstr "Conectarse, encontrar ayuda, o contribuir" -#, python-format #~ msgid "Attempting to connect to qpid with SASL mechanism %s" #~ msgstr "Intentando conectar con qpid con mecanismo SASL %s" -#, python-format #~ msgid "Connected to qpid with SASL mechanism %s" #~ msgstr "Conectado con qpid con mecanismo SASL %s" -#, python-format #~ msgid "Unable to connect to qpid with SASL mechanism %s" #~ msgstr "No se pudo conectar con qpid con mecanismo SASL %s" @@ -3848,7 +3714,6 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "1 hour ago" #~ msgstr "Hace 1 hora" -#, python-format #~ msgid "%(time)s" #~ msgstr "%(time)s" @@ -3857,45 +3722,36 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock # a working clock is broken twice a day! -#, python-format #~ msgid "yesterday at %(time)s" #~ msgstr "ayer a las %(time)s" -#, python-format #~ msgid "%(weekday)s" #~ msgstr "%(weekday)s" # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock # a working clock is broken twice a day! -#, python-format #~ msgid "%(weekday)s at %(time)s" #~ msgstr "%(weekday)s a las %(time)s" -#, python-format #~ msgid "%(month_name)s %(day)s" #~ msgstr "%(day)s %(month_name)s" # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock # a working clock is broken twice a day! -#, python-format #~ msgid "%(month_name)s %(day)s at %(time)s" #~ msgstr "%(day)s %(month_name)s a las %(time)s" -#, python-format #~ msgid "%(month_name)s %(day)s, %(year)s" #~ msgstr "%(day)s %(month_name)s, %(year)s" # TODO cc @mouse this could be grammatically incorrect if the time said 1 o'clock # a working clock is broken twice a day! -#, python-format #~ msgid "%(month_name)s %(day)s, %(year)s at %(time)s" #~ msgstr "%(day)s %(month_name)s, %(year)s a las %(time)s" -#, python-format #~ msgid "%(weekday)s, %(month_name)s %(day)s" #~ msgstr "%(weekday)s, %(day)s %(month_name)s" -#, python-format #~ msgid "%(commas)s and %(last)s" #~ msgstr "%(commas)s y %(last)s" @@ -3924,29 +3780,18 @@ msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" #~ msgid "Matching Users" #~ msgstr "Usuarios correspondientes" -#, python-format #~ msgid "Set a reading goal for %(year)s" #~ msgstr "Establecer una meta de lectura para %(year)s" -#, python-format #~ msgid "by %(author)s" #~ msgstr "por %(author)s" -#, python-format -#~ msgid "%(rating)s star" -#~ msgid_plural "%(rating)s stars" -#~ msgstr[0] "%(rating)s estrella" -#~ msgstr[1] "%(rating)s estrellas" - -#, python-format #~ msgid "replied to %(username)s's review" #~ msgstr "respondió a la reseña de %(username)s " -#, python-format #~ msgid "replied to %(username)s's comment" #~ msgstr "respondió al comentario de %(username)s " -#, python-format #~ msgid "replied to %(username)s's quote" #~ msgstr "respondió a la cita de %(username)s " From fa7334826c2df4dec35419ee9c596898f3b40998 Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 23:04:28 +0200 Subject: [PATCH 048/196] Update --- bookwyrm/activitypub/book.py | 1 + .../migrations/0076_book_preview_image.py | 8 +- bookwyrm/models/book.py | 15 +- bookwyrm/preview_images.py | 225 ++++++++++++++---- bookwyrm/settings.py | 6 +- bookwyrm/static/images/icons/star-empty.png | Bin 0 -> 1200 bytes bookwyrm/static/images/icons/star-full.png | Bin 0 -> 923 bytes bookwyrm/static/images/icons/star-half.png | Bin 0 -> 1153 bytes requirements.txt | 1 + 9 files changed, 195 insertions(+), 61 deletions(-) create mode 100755 bookwyrm/static/images/icons/star-empty.png create mode 100755 bookwyrm/static/images/icons/star-full.png create mode 100755 bookwyrm/static/images/icons/star-half.png diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 1599b408a..ccb4c0ea3 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -37,6 +37,7 @@ class Book(BookData): publishedDate: str = "" cover: Document = None + preview_image: Document = None type: str = "Book" diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index 070be663f..c068e2e27 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -12,10 +12,8 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( - model_name="edition", - name="preview_image", - field=bookwyrm.models.fields.ImageField( - blank=True, null=True, upload_to="previews/" - ), + model_name='book', + name='preview_image', + field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='cover_previews/'), ), ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 72f0547bf..af3005606 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -6,7 +6,7 @@ from django.dispatch import receiver from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.preview_images import generate_preview_image_task +from bookwyrm.preview_images import generate_preview_image_from_edition_task from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE from bookwyrm.tasks import app @@ -85,6 +85,9 @@ class Book(BookDataModel): cover = fields.ImageField( upload_to="covers/", blank=True, null=True, alt_field="alt_text" ) + preview_image = fields.ImageField( + upload_to="cover_previews/", blank=True, null=True, alt_field="alt_text" + ) first_published_date = fields.DateTimeField(blank=True, null=True) published_date = fields.DateTimeField(blank=True, null=True) @@ -207,9 +210,6 @@ class Edition(Book): activitypub_field="work", ) edition_rank = fields.IntegerField(default=0) - preview_image = fields.ImageField( - upload_to="previews/", blank=True, null=True, alt_field="alt_text" - ) activity_serializer = activitypub.Edition name_field = "title" @@ -302,6 +302,7 @@ def isbn_13_to_10(isbn_13): @receiver(models.signals.post_save, sender=Edition) -# pylint: disable=unused-argument -def preview_image(instance, *args, **kwargs): - generate_preview_image_task(instance, *args, **kwargs) +def preview_image(instance, **kwargs): + updated_fields = kwargs["update_fields"] + + generate_preview_image_from_edition_task.delay(instance.id, updated_fields) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index b659f678b..d0da30839 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -1,13 +1,17 @@ +import colorsys import math +import os import textwrap +from colorthief import ColorThief from io import BytesIO -from PIL import Image, ImageDraw, ImageFont, ImageOps +from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor from pathlib import Path from uuid import uuid4 from django.core.files.base import ContentFile from django.core.files.uploadedfile import InMemoryUploadedFile +from django.db.models import Avg from bookwyrm import models, settings from bookwyrm.tasks import app @@ -17,54 +21,64 @@ import logging IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT -BG_COLOR = (182, 186, 177) +BG_COLOR = settings.PREVIEW_BG_COLOR +TEXT_COLOR = settings.PREVIEW_TEXT_COLOR +DEFAULT_COVER_COLOR = settings.PREVIEW_DEFAULT_COVER_COLOR TRANSPARENT_COLOR = (0, 0, 0, 0) -TEXT_COLOR = (16, 16, 16) -margin = math.ceil(IMG_HEIGHT / 10) -gutter = math.ceil(margin / 2) -cover_img_limits = math.ceil(IMG_HEIGHT * 0.8) +margin = math.floor(IMG_HEIGHT / 10) +gutter = math.floor(margin / 2) +cover_img_limits = math.floor(IMG_HEIGHT * 0.8) path = Path(__file__).parent.absolute() -font_path = path.joinpath("static/fonts/public_sans") +font_dir = path.joinpath("static/fonts/public_sans") +icon_font_dir = path.joinpath("static/css/fonts") +def get_font(font_name, size=28): + if font_name == "light": + font_path = "%s/PublicSans-Light.ttf" % font_dir + if font_name == "regular": + font_path = "%s/PublicSans-Regular.ttf" % font_dir + elif font_name == "bold": + font_path = "%s/PublicSans-Bold.ttf" % font_dir + elif font_name == "icomoon": + font_path = "%s/icomoon.ttf" % icon_font_dir -def generate_texts_layer(edition, text_x): try: - font_title = ImageFont.truetype("%s/PublicSans-Bold.ttf" % font_path, 48) - font_authors = ImageFont.truetype("%s/PublicSans-Regular.ttf" % font_path, 40) + font = ImageFont.truetype(font_path, size) except OSError: - font_title = ImageFont.load_default() - font_authors = ImageFont.load_default() + font = ImageFont.load_default() - text_layer = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=TRANSPARENT_COLOR) + return font + + +def generate_texts_layer(book, content_width): + font_title = get_font("bold", size=48) + font_authors = get_font("regular", size=40) + + text_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) text_layer_draw = ImageDraw.Draw(text_layer) text_y = 0 - text_y = text_y + 6 - # title - title = textwrap.fill(edition.title, width=28) + title = textwrap.fill(book.title, width=28) text_layer_draw.multiline_text((0, text_y), title, font=font_title, fill=TEXT_COLOR) text_y = text_y + font_title.getsize_multiline(title)[1] + 16 # subtitle - authors_text = ", ".join(a.name for a in edition.authors.all()) + authors_text = book.author_text authors = textwrap.fill(authors_text, width=36) text_layer_draw.multiline_text( (0, text_y), authors, font=font_authors, fill=TEXT_COLOR ) - imageBox = text_layer.getbbox() - return text_layer.crop(imageBox) + text_layer_box = text_layer.getbbox() + return text_layer.crop(text_layer_box) -def generate_site_layer(text_x): - try: - font_instance = ImageFont.truetype("%s/PublicSans-Light.ttf" % font_path, 28) - except OSError: - font_instance = ImageFont.load_default() +def generate_instance_layer(content_width): + font_instance = get_font("light", size=28) site = models.SiteSettings.objects.get() @@ -74,42 +88,157 @@ def generate_site_layer(text_x): static_path = path.joinpath("static/images/logo-small.png") logo_img = Image.open(static_path) - site_layer = Image.new("RGBA", (IMG_WIDTH - text_x - margin, 50), color=BG_COLOR) + instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) logo_img.thumbnail((50, 50), Image.ANTIALIAS) - site_layer.paste(logo_img, (0, 0)) + instance_layer.paste(logo_img, (0, 0)) - site_layer_draw = ImageDraw.Draw(site_layer) - site_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) + instance_layer_draw = ImageDraw.Draw(instance_layer) + instance_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) - return site_layer + line_width = 50 + 10 + font_instance.getsize(site.name)[0] + + line_layer = Image.new("RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50)) + instance_layer.alpha_composite(line_layer, (0, 60)) + + return instance_layer -def generate_preview_image(edition): - img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=BG_COLOR) +def generate_rating_layer(rating, content_width): + font_icons = get_font("icomoon", size=60) - cover_img_layer = Image.open(edition.cover) - cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + icon_star_full = Image.open(path.joinpath("static/images/icons/star-full.png")) + icon_star_empty = Image.open(path.joinpath("static/images/icons/star-empty.png")) + icon_star_half = Image.open(path.joinpath("static/images/icons/star-half.png")) - text_x = margin + cover_img_layer.width + gutter + icon_size = 64 + icon_margin = 10 - texts_layer = generate_texts_layer(edition, text_x) - text_y = IMG_HEIGHT - margin - texts_layer.height + rating_layer_base = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) + rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) + rating_layer_mask = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) - site_layer = generate_site_layer(text_x) + position_x = 0 - # Composite all layers - img.paste(cover_img_layer, (margin, margin)) - img.alpha_composite(texts_layer, (text_x, text_y)) - img.alpha_composite(site_layer, (text_x, margin)) + for r in range(math.floor(rating)): + rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + + if math.floor(rating) != math.ceil(rating): + rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + + for r in range(5 - math.ceil(rating)): + rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) + position_x = position_x + icon_size + icon_margin + + rating_layer_mask = rating_layer_mask.getchannel("A") + rating_layer_mask = ImageOps.invert(rating_layer_mask) + + rating_layer_composite = Image.composite(rating_layer_base, rating_layer_color, rating_layer_mask) + + return rating_layer_composite + + +def generate_default_cover(): + font_cover = get_font("light", size=28) + + cover_width = math.floor(cover_img_limits * .7) + default_cover = Image.new("RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR) + default_cover_draw = ImageDraw.Draw(default_cover) + + text = "no cover :(" + text_dimensions = font_cover.getsize(text) + text_coords = (math.floor((cover_width - text_dimensions[0]) / 2), + math.floor((cover_img_limits - text_dimensions[1]) / 2)) + default_cover_draw.text(text_coords, text, font=font_cover, fill='white') + + return default_cover + + +def generate_preview_image(book_id, rating=None): + book = models.Book.objects.select_subclasses().get(id=book_id) + + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] + + # Cover + try: + cover_img_layer = Image.open(book.cover) + cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + color_thief = ColorThief(book.cover) + dominant_color = color_thief.get_color(quality=1) + except: + cover_img_layer = generate_default_cover() + dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) + + # Color + if BG_COLOR == 'use_dominant_color': + image_bg_color = "rgb(%s, %s, %s)" % dominant_color + # Lighten color + image_bg_color_rgb = [x/255.0 for x in ImageColor.getrgb(image_bg_color)] + image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) + image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[1]) + image_bg_color = tuple([math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)]) + else: + image_bg_color = BG_COLOR + + # Background (using the color) + img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) + + # Contents + content_x = margin + cover_img_layer.width + gutter + content_width = IMG_WIDTH - content_x - margin + + instance_layer = generate_instance_layer(content_width) + texts_layer = generate_texts_layer(book, content_width) + + contents_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) + contents_composite_y = 0 + contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + instance_layer.height + gutter + contents_layer.alpha_composite(texts_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + texts_layer.height + 30 + + if rating: + # Add some more margin + contents_composite_y = contents_composite_y + 30 + rating_layer = generate_rating_layer(rating, content_width) + contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + rating_layer.height + 30 + + contents_layer_box = contents_layer.getbbox() + contents_layer_height = contents_layer_box[3] - contents_layer_box[1] + + contents_y = math.floor((IMG_HEIGHT - contents_layer_height) / 2) + # Remove Instance Layer from centering calculations + contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) + + if contents_y < margin: + contents_y = margin + + cover_y = math.floor((IMG_HEIGHT - cover_img_layer.height) / 2) + + # Composite layers + img.paste(cover_img_layer, (margin, cover_y)) + img.alpha_composite(contents_layer, (content_x, contents_y)) file_name = "%s.png" % str(uuid4()) image_buffer = BytesIO() try: + try: + old_path = book.preview_image.path + except ValueError: + old_path = '' + + # Save img.save(image_buffer, format="png") - edition.preview_image = InMemoryUploadedFile( + book.preview_image = InMemoryUploadedFile( ContentFile(image_buffer.getvalue()), "preview_image", file_name, @@ -117,17 +246,17 @@ def generate_preview_image(edition): image_buffer.tell(), None, ) + book.save(update_fields=["preview_image"]) - edition.save(update_fields=["preview_image"]) + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) finally: image_buffer.close() @app.task -def generate_preview_image_task(instance, *args, **kwargs): +def generate_preview_image_from_edition_task(book_id, updated_fields=None): """generate preview_image after save""" - updated_fields = kwargs["update_fields"] - if not updated_fields or "preview_image" not in updated_fields: - logging.warn("image name to delete", instance.preview_image.name) - generate_preview_image(edition=instance) + generate_preview_image(book_id=book_id) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index cee07e913..cef11630e 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -37,10 +37,14 @@ LOCALE_PATHS = [ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" -# preview image +# Preview image +# Specify RGB tuple or RGB hex strings, or 'use_dominant_color' +PREVIEW_BG_COLOR = 'use_dominant_color' PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 +PREVIEW_TEXT_COLOR = '#363636' +PREVIEW_DEFAULT_COVER_COLOR = '#002549' # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ diff --git a/bookwyrm/static/images/icons/star-empty.png b/bookwyrm/static/images/icons/star-empty.png new file mode 100755 index 0000000000000000000000000000000000000000..896417ef69cb053e349720a11b12d7900154011b GIT binary patch literal 1200 zcmV;h1W)^kP)P5Yc6Q#r zdy|~+{O8_1k^g+0ESCRzSpWB`eXIuXG6=4}r*l{d0PTMd65ke)C04K!09t<$0K5{B zC04KsfNDRE0XL@Gzlf{?@JvKr8-Y(nT8ipOtpfU08-i~|1-26m~I6#0i?9AnEf>|iXXU{@m!=#et-ecPhL1%01)P85Dp;`wj^XuIkno~iUqZbS2#cc4v>BZV3+0q zzgcl%247$Uo zW@4A-bq=ou=>0(WWi~`CV51{O>dg{ft!Xm*cw@Z)h{Ruvq%=*$h!F!Hr^$)Oy_TS7 zH`NOu<&#|+DNsvUTvy=j1z-;^X*c!FuMrl&oS1vuu6vH#4twhbfT?q)sN-`;MWcjg z-d)%11z?~2jLZNE)ny6fK~%yH_NNpa84`M7imPc9*vP5sNyi;T&5txGcU1Z ztGEFYPpx#gGeHl4+Gt!OxP@E-QM-20rFsBR0>_$6X#pSK(s*fufS}gEBI04|53X~) zZSDn7s>pbz$0oO20+-P^fd9uPZNXsj%=aODv0DY|1(1ux2vH+A*VtF%5sJUpfB;@k z208%t0!ZazPGM+{a)V8$1h?1MfJm+7>O#E$Qhj+&aQXwTZ~2!PTnxzk*vE9abzD`b z7l4hzsZFWi2=DFJTR^z_5HA3m0W1JALXY5fJ_TW4r;V?3WdaWXBD?;(o82f;8dI;S z=1M6r^*w7df9}nZ=CcS7fK&z;Ex3h|1JT?QcmTvj2!2PPsy>JJsD0xevJS4MXA;dN zu?K*@{|AUsXMe4nuu643+hlFdqU!Bei$v^Nic-c4Sq`~Lx3cQx;1#*kzH O0000gjN7J_HSike*j=E2yHC@JOS`-LS=Xq zv;Z*Xed7@x1pm=wPR z;0O?A#g_osGlWI)r2zH_p-6lUfIUGd7GDcs4-mNM;UuSc$*e4gxme<4=}u=erEh7H zQ+3ir0YKfoL6F2NLtyCiULeTgy#Oo{el;EnJX%u~_CtHsAz=65Z1GED0QYK=UT&)w zKo9!}uJZ(50K=nhtpdSy#Lf$V<&b-dE!*c*{v;c`0M>Z&BN;yEKU#sL;4d8iFJpUQaVI=^p|1D{JQ$&_{!AbyF{aFI=LPVB$ z!72dR`eh8b7ViHdvI@Wx5qYT;J{6I-(GXSvVC~;f%6=CSVnOIw0pO8{yxGt)+zVC! zs98Vr2={_$0DIQY5JJ5m8bHnZzeVIqu_QvhAQHfq^{D}JJrM2%kpQ;VKKUQ3FY$sX z0DEg68Oo|K)C-~j>_vWLpdwu21rY#Rkw43@#0w$->{%ao&oV6Wf};VntX~4)@8Mo> zG=P@%HGpt0I1)gQ^)-NSFE|3g?Ud7LZFR?2>w&ZkTV4QAs>Uxf+eI&ctmM6v!uU7J z_9(37ugOr01?6+3On!jDR@z4|oIL<2b6rGG4y&N7SIIr2)nur7L9gL69H0OPNIw#= zOYdOvyGltWN9m}sWdxSc!^uLF9&-kV$$Nv%idzHNI)=E+w==#4{p z`ISo&Z}q}C+jl4@XN|vCUD-k4FTA!Fz@98MI5~#t=g1@vQsBI_D-2zNN7DlF5AgfJ6;N%=hhT#JG*3xHYq7Jw)SGXS`h z?*R}2VHAK{`Cb4=Ll^-tq`U>dkr2E9hLyJhI0}LXz*gl-(?gNd-7>j{AHbFf*k z$WS|3!lyNp+n4fMCa>v9B>o%-fJTNUryO@IL2onw>E~zcBUp@3^SGh&1eVEbhHh|aos9IEfZMZaW0no!Q^&2B6sL}=@z!XS;ttiXVfym{k+H5^MYAva7G3wWwC(J zp6AX4BOXwz%B%*^_Y>iH@9Rc!gSYV2Di3!i7y&RN18f0nftZ#FMgUL(=hNP!mfr(G zt$|0BL)RYwbDcK#0+`VQ(7O{y7_9%&r8N*-9;M%<3$^&;>Iu96YLU3t3s4+o^wD^f z;{SU<@D81UT$#WNpq7hU0Jap@&-H*{$47s`ewqSkOO6ZIy#Op3fX`9fZ~2uNmKc!v z>HSPcoZx=b@B-+`09kRA_x9@+5U!rU3!s$&$jc*&Yb$0D`cQRwpDPo10Pxv4|GJwN zlqij>_m;ILcTI;Sc>mVP5pyQ+0H|evqZQYnFhUK4ITLsQltl>Zj=E+_8OD+!p-0!G0-X-+TO=j6V07ixUr=I@{g Date: Tue, 25 May 2021 23:05:38 +0200 Subject: [PATCH 049/196] Thank you Black --- .../migrations/0076_book_preview_image.py | 8 ++- bookwyrm/preview_images.py | 59 ++++++++++++------- bookwyrm/settings.py | 6 +- 3 files changed, 46 insertions(+), 27 deletions(-) diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index c068e2e27..bc756f898 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -12,8 +12,10 @@ class Migration(migrations.Migration): operations = [ migrations.AddField( - model_name='book', - name='preview_image', - field=bookwyrm.models.fields.ImageField(blank=True, null=True, upload_to='cover_previews/'), + model_name="book", + name="preview_image", + field=bookwyrm.models.fields.ImageField( + blank=True, null=True, upload_to="cover_previews/" + ), ), ] diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index d0da30839..960762701 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -33,6 +33,7 @@ path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") icon_font_dir = path.joinpath("static/css/fonts") + def get_font(font_name, size=28): if font_name == "light": font_path = "%s/PublicSans-Light.ttf" % font_dir @@ -99,7 +100,9 @@ def generate_instance_layer(content_width): line_width = 50 + 10 + font_instance.getsize(site.name)[0] - line_layer = Image.new("RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50)) + line_layer = Image.new( + "RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50) + ) instance_layer.alpha_composite(line_layer, (0, 60)) return instance_layer @@ -115,9 +118,13 @@ def generate_rating_layer(rating, content_width): icon_size = 64 icon_margin = 10 - rating_layer_base = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) + rating_layer_base = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) - rating_layer_mask = Image.new("RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR) + rating_layer_mask = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) position_x = 0 @@ -136,7 +143,9 @@ def generate_rating_layer(rating, content_width): rating_layer_mask = rating_layer_mask.getchannel("A") rating_layer_mask = ImageOps.invert(rating_layer_mask) - rating_layer_composite = Image.composite(rating_layer_base, rating_layer_color, rating_layer_mask) + rating_layer_composite = Image.composite( + rating_layer_base, rating_layer_color, rating_layer_mask + ) return rating_layer_composite @@ -144,15 +153,19 @@ def generate_rating_layer(rating, content_width): def generate_default_cover(): font_cover = get_font("light", size=28) - cover_width = math.floor(cover_img_limits * .7) - default_cover = Image.new("RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR) + cover_width = math.floor(cover_img_limits * 0.7) + default_cover = Image.new( + "RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR + ) default_cover_draw = ImageDraw.Draw(default_cover) text = "no cover :(" text_dimensions = font_cover.getsize(text) - text_coords = (math.floor((cover_width - text_dimensions[0]) / 2), - math.floor((cover_img_limits - text_dimensions[1]) / 2)) - default_cover_draw.text(text_coords, text, font=font_cover, fill='white') + text_coords = ( + math.floor((cover_width - text_dimensions[0]) / 2), + math.floor((cover_img_limits - text_dimensions[1]) / 2), + ) + default_cover_draw.text(text_coords, text, font=font_cover, fill="white") return default_cover @@ -168,22 +181,24 @@ def generate_preview_image(book_id, rating=None): # Cover try: - cover_img_layer = Image.open(book.cover) - cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) - color_thief = ColorThief(book.cover) - dominant_color = color_thief.get_color(quality=1) + cover_img_layer = Image.open(book.cover) + cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + color_thief = ColorThief(book.cover) + dominant_color = color_thief.get_color(quality=1) except: - cover_img_layer = generate_default_cover() - dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) + cover_img_layer = generate_default_cover() + dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) # Color - if BG_COLOR == 'use_dominant_color': + if BG_COLOR == "use_dominant_color": image_bg_color = "rgb(%s, %s, %s)" % dominant_color # Lighten color - image_bg_color_rgb = [x/255.0 for x in ImageColor.getrgb(image_bg_color)] + image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[1]) - image_bg_color = tuple([math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)]) + image_bg_color = tuple( + [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] + ) else: image_bg_color = BG_COLOR @@ -197,7 +212,9 @@ def generate_preview_image(book_id, rating=None): instance_layer = generate_instance_layer(content_width) texts_layer = generate_texts_layer(book, content_width) - contents_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) + contents_layer = Image.new( + "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR + ) contents_composite_y = 0 contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) contents_composite_y = contents_composite_y + instance_layer.height + gutter @@ -217,7 +234,7 @@ def generate_preview_image(book_id, rating=None): contents_y = math.floor((IMG_HEIGHT - contents_layer_height) / 2) # Remove Instance Layer from centering calculations contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) - + if contents_y < margin: contents_y = margin @@ -234,7 +251,7 @@ def generate_preview_image(book_id, rating=None): try: old_path = book.preview_image.path except ValueError: - old_path = '' + old_path = "" # Save img.save(image_buffer, format="png") diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index cef11630e..db15be468 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -40,11 +40,11 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Preview image # Specify RGB tuple or RGB hex strings, or 'use_dominant_color' -PREVIEW_BG_COLOR = 'use_dominant_color' +PREVIEW_BG_COLOR = "use_dominant_color" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = '#363636' -PREVIEW_DEFAULT_COVER_COLOR = '#002549' +PREVIEW_TEXT_COLOR = "#363636" +PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ From e305c5d73d42aea0ed51d2053d3766d697fe26c0 Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 23:12:54 +0200 Subject: [PATCH 050/196] Fix color --- bookwyrm/preview_images.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 960762701..6372aa540 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -195,7 +195,7 @@ def generate_preview_image(book_id, rating=None): # Lighten color image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) - image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[1]) + image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[2]) image_bg_color = tuple( [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] ) From 5b03934ec3e243043906dfbd8b1e5b24acf5bebb Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 25 May 2021 23:16:33 +0200 Subject: [PATCH 051/196] Update preview_images.py --- bookwyrm/preview_images.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 6372aa540..31b2dc279 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -195,7 +195,11 @@ def generate_preview_image(book_id, rating=None): # Lighten color image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) - image_bg_color_hls = (image_bg_color_hls[0], 0.9, image_bg_color_hls[2]) + image_bg_color_hls = ( + image_bg_color_hls[0], + max(0.9, image_bg_color_hls[1]), + image_bg_color_hls[2], + ) image_bg_color = tuple( [math.ceil(x * 255) for x in colorsys.hls_to_rgb(*image_bg_color_hls)] ) From 8c25272462ccaa440d2e99e13bd22e844ce73082 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:09:13 +0200 Subject: [PATCH 052/196] Fix last night's bugs --- bookwyrm/activitypub/book.py | 1 - bookwyrm/migrations/0076_book_preview_image.py | 4 +--- bookwyrm/models/book.py | 10 ++++++---- bookwyrm/preview_images.py | 7 +++---- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index ccb4c0ea3..1599b408a 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -37,7 +37,6 @@ class Book(BookData): publishedDate: str = "" cover: Document = None - preview_image: Document = None type: str = "Book" diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index bc756f898..01ff6576c 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -14,8 +14,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name="book", name="preview_image", - field=bookwyrm.models.fields.ImageField( - blank=True, null=True, upload_to="cover_previews/" - ), + field=models.ImageField(blank=True, null=True, upload_to="cover_previews/"), ), ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index af3005606..5298af929 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -85,8 +85,8 @@ class Book(BookDataModel): cover = fields.ImageField( upload_to="covers/", blank=True, null=True, alt_field="alt_text" ) - preview_image = fields.ImageField( - upload_to="cover_previews/", blank=True, null=True, alt_field="alt_text" + preview_image = models.ImageField( + upload_to="cover_previews/", blank=True, null=True ) first_published_date = fields.DateTimeField(blank=True, null=True) published_date = fields.DateTimeField(blank=True, null=True) @@ -302,7 +302,9 @@ def isbn_13_to_10(isbn_13): @receiver(models.signals.post_save, sender=Edition) -def preview_image(instance, **kwargs): +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): updated_fields = kwargs["update_fields"] - generate_preview_image_from_edition_task.delay(instance.id, updated_fields) + if not updated_fields or "preview_image" not in updated_fields: + generate_preview_image_from_edition_task.delay(instance.id) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 31b2dc279..dd4a62141 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -277,7 +277,6 @@ def generate_preview_image(book_id, rating=None): @app.task -def generate_preview_image_from_edition_task(book_id, updated_fields=None): - """generate preview_image after save""" - if not updated_fields or "preview_image" not in updated_fields: - generate_preview_image(book_id=book_id) +def generate_preview_image_from_edition_task(book_id): + """generate preview_image""" + generate_preview_image(book_id=book_id) From a83aa47c9aded79242bc9fa606faf16c0d3a5410 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:10:05 +0200 Subject: [PATCH 053/196] Generate on new rating --- bookwyrm/models/status.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index bd21ec563..987261e46 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -5,11 +5,13 @@ import re from django.apps import apps from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models +from django.dispatch import receiver from django.template.loader import get_template from django.utils import timezone from model_utils.managers import InheritanceManager from bookwyrm import activitypub +from bookwyrm.preview_images import generate_preview_image_from_edition_task from .activitypub_mixin import ActivitypubMixin, ActivityMixin from .activitypub_mixin import OrderedCollectionPageMixin from .base_model import BookWyrmModel @@ -398,3 +400,11 @@ class Boost(ActivityMixin, Status): # This constraint can't work as it would cross tables. # class Meta: # unique_together = ('user', 'boosted_status') + + +@receiver(models.signals.post_save) +# pylint: disable=unused-argument +def preview_image(instance, sender, *args, **kwargs): + if sender in (Review, ReviewRating): + edition = instance.book + generate_preview_image_from_edition_task.delay(edition.id) From fd82567cbf28dadf3e784d92de0d3a48c103ba90 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:16:15 +0200 Subject: [PATCH 054/196] Update 0076_book_preview_image.py --- bookwyrm/migrations/0076_book_preview_image.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py index 01ff6576c..5db550507 100644 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ b/bookwyrm/migrations/0076_book_preview_image.py @@ -1,7 +1,6 @@ # Generated by Django 3.2 on 2021-05-24 18:03 -import bookwyrm.models.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): From 101ca0ff81ee4410e7fd56fb509197d75db162fa Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 09:44:32 +0200 Subject: [PATCH 055/196] Refactor some --- bookwyrm/models/book.py | 4 +- bookwyrm/models/status.py | 4 +- bookwyrm/preview_images.py | 99 +++++++++++++++++++++++--------------- 3 files changed, 65 insertions(+), 42 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 5298af929..01dfbba72 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -6,7 +6,7 @@ from django.dispatch import receiver from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.preview_images import generate_preview_image_from_edition_task +from bookwyrm.preview_images import generate_edition_preview_image_task from bookwyrm.settings import DOMAIN, DEFAULT_LANGUAGE from bookwyrm.tasks import app @@ -307,4 +307,4 @@ def preview_image(instance, *args, **kwargs): updated_fields = kwargs["update_fields"] if not updated_fields or "preview_image" not in updated_fields: - generate_preview_image_from_edition_task.delay(instance.id) + generate_edition_preview_image_task.delay(instance.id) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 987261e46..c55cd8d69 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -11,7 +11,7 @@ from django.utils import timezone from model_utils.managers import InheritanceManager from bookwyrm import activitypub -from bookwyrm.preview_images import generate_preview_image_from_edition_task +from bookwyrm.preview_images import generate_edition_preview_image_task from .activitypub_mixin import ActivitypubMixin, ActivityMixin from .activitypub_mixin import OrderedCollectionPageMixin from .base_model import BookWyrmModel @@ -407,4 +407,4 @@ class Boost(ActivityMixin, Status): def preview_image(instance, sender, *args, **kwargs): if sender in (Review, ReviewRating): edition = instance.book - generate_preview_image_from_edition_task.delay(edition.id) + generate_edition_preview_image_task.delay(edition.id) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index dd4a62141..82e8dc798 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -31,7 +31,6 @@ gutter = math.floor(margin / 2) cover_img_limits = math.floor(IMG_HEIGHT * 0.8) path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") -icon_font_dir = path.joinpath("static/css/fonts") def get_font(font_name, size=28): @@ -41,8 +40,6 @@ def get_font(font_name, size=28): font_path = "%s/PublicSans-Regular.ttf" % font_dir elif font_name == "bold": font_path = "%s/PublicSans-Bold.ttf" % font_dir - elif font_name == "icomoon": - font_path = "%s/icomoon.ttf" % icon_font_dir try: font = ImageFont.truetype(font_path, size) @@ -52,27 +49,44 @@ def get_font(font_name, size=28): return font -def generate_texts_layer(book, content_width): - font_title = get_font("bold", size=48) - font_authors = get_font("regular", size=40) +def generate_texts_layer(texts, content_width): + font_text_zero = get_font("bold", size=20) + font_text_one = get_font("bold", size=48) + font_text_two = get_font("bold", size=40) + font_text_three = get_font("regular", size=40) text_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) text_layer_draw = ImageDraw.Draw(text_layer) text_y = 0 - # title - title = textwrap.fill(book.title, width=28) - text_layer_draw.multiline_text((0, text_y), title, font=font_title, fill=TEXT_COLOR) + if 'text_zero' in texts: + # Text one (Book title) + text_zero = textwrap.fill(texts['text_zero'], width=72) + text_layer_draw.multiline_text((0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR) - text_y = text_y + font_title.getsize_multiline(title)[1] + 16 + text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - # subtitle - authors_text = book.author_text - authors = textwrap.fill(authors_text, width=36) - text_layer_draw.multiline_text( - (0, text_y), authors, font=font_authors, fill=TEXT_COLOR - ) + if 'text_one' in texts: + # Text one (Book title) + text_one = textwrap.fill(texts['text_one'], width=28) + text_layer_draw.multiline_text((0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR) + + text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 + + if 'text_two' in texts: + # Text one (Book subtitle) + text_two = textwrap.fill(texts['text_two'], width=36) + text_layer_draw.multiline_text((0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR) + + text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 + + if 'text_three' in texts: + # Text three (Book authors) + text_three = textwrap.fill(texts['text_three'], width=36) + text_layer_draw.multiline_text( + (0, text_y), text_three, font=font_text_three, fill=TEXT_COLOR + ) text_layer_box = text_layer.getbbox() return text_layer.crop(text_layer_box) @@ -109,8 +123,6 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - font_icons = get_font("icomoon", size=60) - icon_star_full = Image.open(path.joinpath("static/images/icons/star-full.png")) icon_star_empty = Image.open(path.joinpath("static/images/icons/star-empty.png")) icon_star_half = Image.open(path.joinpath("static/images/icons/star-half.png")) @@ -159,7 +171,7 @@ def generate_default_cover(): ) default_cover_draw = ImageDraw.Draw(default_cover) - text = "no cover :(" + text = "no image :(" text_dimensions = font_cover.getsize(text) text_coords = ( math.floor((cover_width - text_dimensions[0]) / 2), @@ -170,20 +182,12 @@ def generate_default_cover(): return default_cover -def generate_preview_image(book_id, rating=None): - book = models.Book.objects.select_subclasses().get(id=book_id) - - rating = models.Review.objects.filter( - privacy="public", - deleted=False, - book__in=[book_id], - ).aggregate(Avg("rating"))["rating__avg"] - +def generate_preview_image(book, texts={}, picture=None, rating=None): # Cover try: - cover_img_layer = Image.open(book.cover) + cover_img_layer = Image.open(picture) cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) - color_thief = ColorThief(book.cover) + color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) except: cover_img_layer = generate_default_cover() @@ -214,7 +218,7 @@ def generate_preview_image(book_id, rating=None): content_width = IMG_WIDTH - content_x - margin instance_layer = generate_instance_layer(content_width) - texts_layer = generate_texts_layer(book, content_width) + texts_layer = generate_texts_layer(texts, content_width) contents_layer = Image.new( "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR @@ -248,8 +252,33 @@ def generate_preview_image(book_id, rating=None): img.paste(cover_img_layer, (margin, cover_y)) img.alpha_composite(contents_layer, (content_x, contents_y)) - file_name = "%s.png" % str(uuid4()) + return img + +@app.task +def generate_edition_preview_image_task(book_id): + """generate preview_image""" + book = models.Book.objects.select_subclasses().get(id=book_id) + + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] + + texts = { + 'text_zero': "ADDED A REVIEW", + 'text_one': book.title, + 'text_two': book.subtitle, + 'text_three': book.author_text + } + + img = generate_preview_image(book=book, + texts=texts, + picture=book.cover, + rating=rating) + + file_name = "%s.png" % str(uuid4()) image_buffer = BytesIO() try: try: @@ -274,9 +303,3 @@ def generate_preview_image(book_id, rating=None): os.remove(old_path) finally: image_buffer.close() - - -@app.task -def generate_preview_image_from_edition_task(book_id): - """generate preview_image""" - generate_preview_image(book_id=book_id) From 34caa36ab70baa51bdeea11cc396289be0e0eebd Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 10:19:39 +0200 Subject: [PATCH 056/196] Add site preview task --- bookwyrm/models/book.py | 2 +- bookwyrm/models/site.py | 13 +++++++ bookwyrm/preview_images.py | 80 +++++++++++++++++++++++++++++++------- 3 files changed, 79 insertions(+), 16 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 01dfbba72..aa9a56017 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -86,7 +86,7 @@ class Book(BookDataModel): upload_to="covers/", blank=True, null=True, alt_field="alt_text" ) preview_image = models.ImageField( - upload_to="cover_previews/", blank=True, null=True + upload_to="previews/covers/", blank=True, null=True ) first_published_date = fields.DateTimeField(blank=True, null=True) published_date = fields.DateTimeField(blank=True, null=True) diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 2c5a21642..dc226bce4 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -4,9 +4,12 @@ import datetime from Crypto import Random from django.db import models, IntegrityError +from django.dispatch import receiver from django.utils import timezone +from bookwyrm.preview_images import generate_site_preview_image_task from bookwyrm.settings import DOMAIN +from bookwyrm.tasks import app from .base_model import BookWyrmModel from .user import User @@ -35,6 +38,7 @@ class SiteSettings(models.Model): logo = models.ImageField(upload_to="logos/", null=True, blank=True) logo_small = models.ImageField(upload_to="logos/", null=True, blank=True) favicon = models.ImageField(upload_to="logos/", null=True, blank=True) + preview_image = models.ImageField(upload_to="previews/logos/", null=True, blank=True) # footer support_link = models.CharField(max_length=255, null=True, blank=True) @@ -119,3 +123,12 @@ class PasswordReset(models.Model): def link(self): """formats the invite link""" return "https://{}/password-reset/{}".format(DOMAIN, self.code) + + +@receiver(models.signals.post_save, sender=SiteSettings) +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): + updated_fields = kwargs["update_fields"] + + if not updated_fields or "preview_image" not in updated_fields: + generate_site_preview_image_task.delay() diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 82e8dc798..949ffac12 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -14,6 +14,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg from bookwyrm import models, settings +from bookwyrm.settings import DOMAIN from bookwyrm.tasks import app # dev @@ -182,7 +183,7 @@ def generate_default_cover(): return default_cover -def generate_preview_image(book, texts={}, picture=None, rating=None): +def generate_preview_image(texts={}, picture=None, rating=None, show_instance_layer=True): # Cover try: cover_img_layer = Image.open(picture) @@ -217,31 +218,35 @@ def generate_preview_image(book, texts={}, picture=None, rating=None): content_x = margin + cover_img_layer.width + gutter content_width = IMG_WIDTH - content_x - margin - instance_layer = generate_instance_layer(content_width) - texts_layer = generate_texts_layer(texts, content_width) - contents_layer = Image.new( "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR ) contents_composite_y = 0 - contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + instance_layer.height + gutter + + if show_instance_layer: + instance_layer = generate_instance_layer(content_width) + contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + instance_layer.height + gutter + + texts_layer = generate_texts_layer(texts, content_width) contents_layer.alpha_composite(texts_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + texts_layer.height + 30 + contents_composite_y = contents_composite_y + texts_layer.height + gutter if rating: # Add some more margin - contents_composite_y = contents_composite_y + 30 + contents_composite_y = contents_composite_y + gutter rating_layer = generate_rating_layer(rating, content_width) contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + rating_layer.height + 30 + contents_composite_y = contents_composite_y + rating_layer.height + gutter contents_layer_box = contents_layer.getbbox() contents_layer_height = contents_layer_box[3] - contents_layer_box[1] contents_y = math.floor((IMG_HEIGHT - contents_layer_height) / 2) - # Remove Instance Layer from centering calculations - contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) + + if show_instance_layer: + # Remove Instance Layer from centering calculations + contents_y = contents_y - math.floor((instance_layer.height + gutter) / 2) if contents_y < margin: contents_y = margin @@ -255,9 +260,56 @@ def generate_preview_image(book, texts={}, picture=None, rating=None): return img +@app.task +def generate_site_preview_image_task(): + """generate preview_image for the website""" + site = models.SiteSettings.objects.get() + + if site.logo: + logo = site.logo + else: + logo = path.joinpath("static/images/logo-small.png") + + texts = { + 'text_zero': DOMAIN, + 'text_one': site.name, + 'text_three': site.instance_tagline, + } + + img = generate_preview_image(texts=texts, + picture=logo, + show_instance_layer=False) + + file_name = "%s.png" % str(uuid4()) + image_buffer = BytesIO() + try: + try: + old_path = site.preview_image.path + except ValueError: + old_path = "" + + # Save + img.save(image_buffer, format="png") + site.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/png", + image_buffer.tell(), + None, + ) + site.save(update_fields=["preview_image"]) + + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + finally: + image_buffer.close() + + @app.task def generate_edition_preview_image_task(book_id): - """generate preview_image""" + """generate preview_image for a book""" book = models.Book.objects.select_subclasses().get(id=book_id) rating = models.Review.objects.filter( @@ -267,14 +319,12 @@ def generate_edition_preview_image_task(book_id): ).aggregate(Avg("rating"))["rating__avg"] texts = { - 'text_zero': "ADDED A REVIEW", 'text_one': book.title, 'text_two': book.subtitle, 'text_three': book.author_text } - img = generate_preview_image(book=book, - texts=texts, + img = generate_preview_image(texts=texts, picture=book.cover, rating=rating) From bf503d370ce05dca92ffe711c5349aab1e3bfce8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 12:54:57 +0200 Subject: [PATCH 057/196] Add user preview task --- bookwyrm/models/user.py | 14 ++++ bookwyrm/preview_images.py | 135 +++++++++++++++++++------------------ 2 files changed, 83 insertions(+), 66 deletions(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index d9f3eba99..2c4851520 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -6,6 +6,7 @@ from django.apps import apps from django.contrib.auth.models import AbstractUser, Group from django.contrib.postgres.fields import CICharField from django.core.validators import MinValueValidator +from django.dispatch import receiver from django.db import models from django.utils import timezone import pytz @@ -14,6 +15,7 @@ from bookwyrm import activitypub from bookwyrm.connectors import get_data, ConnectorException from bookwyrm.models.shelf import Shelf from bookwyrm.models.status import Status, Review +from bookwyrm.preview_images import generate_user_preview_image_task from bookwyrm.settings import DOMAIN from bookwyrm.signatures import create_key_pair from bookwyrm.tasks import app @@ -70,6 +72,9 @@ class User(OrderedCollectionPageMixin, AbstractUser): activitypub_field="icon", alt_field="alt_text", ) + preview_image = models.ImageField( + upload_to="previews/avatars/", blank=True, null=True + ) followers = fields.ManyToManyField( "self", link_only=True, @@ -443,3 +448,12 @@ def get_remote_reviews(outbox): if not activity["type"] == "Review": continue activitypub.Review(**activity).to_model() + + +@receiver(models.signals.post_save, sender=User) +# pylint: disable=unused-argument +def preview_image(instance, *args, **kwargs): + updated_fields = kwargs["update_fields"] + + if not updated_fields or "preview_image" not in updated_fields: + generate_user_preview_image_task.delay(instance.id) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 949ffac12..304250a21 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -29,7 +29,7 @@ TRANSPARENT_COLOR = (0, 0, 0, 0) margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) -cover_img_limits = math.floor(IMG_HEIGHT * 0.8) +inner_img_limits = math.floor(IMG_HEIGHT * 0.8) path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") @@ -163,12 +163,12 @@ def generate_rating_layer(rating, content_width): return rating_layer_composite -def generate_default_cover(): +def generate_default_inner_img(): font_cover = get_font("light", size=28) - cover_width = math.floor(cover_img_limits * 0.7) + cover_width = math.floor(inner_img_limits * 0.7) default_cover = Image.new( - "RGB", (cover_width, cover_img_limits), color=DEFAULT_COVER_COLOR + "RGB", (cover_width, inner_img_limits), color=DEFAULT_COVER_COLOR ) default_cover_draw = ImageDraw.Draw(default_cover) @@ -176,7 +176,7 @@ def generate_default_cover(): text_dimensions = font_cover.getsize(text) text_coords = ( math.floor((cover_width - text_dimensions[0]) / 2), - math.floor((cover_img_limits - text_dimensions[1]) / 2), + math.floor((inner_img_limits - text_dimensions[1]) / 2), ) default_cover_draw.text(text_coords, text, font=font_cover, fill="white") @@ -186,14 +186,15 @@ def generate_default_cover(): def generate_preview_image(texts={}, picture=None, rating=None, show_instance_layer=True): # Cover try: - cover_img_layer = Image.open(picture) - cover_img_layer.thumbnail((cover_img_limits, cover_img_limits), Image.ANTIALIAS) + inner_img_layer = Image.open(picture) + inner_img_layer.thumbnail((inner_img_limits, inner_img_limits), Image.ANTIALIAS) color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) except: - cover_img_layer = generate_default_cover() + inner_img_layer = generate_default_inner_img() dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) + # Color if BG_COLOR == "use_dominant_color": image_bg_color = "rgb(%s, %s, %s)" % dominant_color @@ -215,7 +216,7 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) # Contents - content_x = margin + cover_img_layer.width + gutter + content_x = margin + inner_img_layer.width + gutter content_width = IMG_WIDTH - content_x - margin contents_layer = Image.new( @@ -251,15 +252,45 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la if contents_y < margin: contents_y = margin - cover_y = math.floor((IMG_HEIGHT - cover_img_layer.height) / 2) + cover_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) # Composite layers - img.paste(cover_img_layer, (margin, cover_y)) + img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert('RGBA')) img.alpha_composite(contents_layer, (content_x, contents_y)) return img +def save_and_cleanup(image, instance=None): + if instance: + file_name = "%s.png" % str(uuid4()) + image_buffer = BytesIO() + + try: + try: + old_path = instance.preview_image.path + except ValueError: + old_path = "" + + # Save + image.save(image_buffer, format="png") + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/png", + image_buffer.tell(), + None, + ) + instance.save(update_fields=["preview_image"]) + + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + finally: + image_buffer.close() + + @app.task def generate_site_preview_image_task(): """generate preview_image for the website""" @@ -268,7 +299,7 @@ def generate_site_preview_image_task(): if site.logo: logo = site.logo else: - logo = path.joinpath("static/images/logo-small.png") + logo = path.joinpath("static/images/logo.png") texts = { 'text_zero': DOMAIN, @@ -276,35 +307,11 @@ def generate_site_preview_image_task(): 'text_three': site.instance_tagline, } - img = generate_preview_image(texts=texts, - picture=logo, - show_instance_layer=False) + image = generate_preview_image(texts=texts, + picture=logo, + show_instance_layer=False) - file_name = "%s.png" % str(uuid4()) - image_buffer = BytesIO() - try: - try: - old_path = site.preview_image.path - except ValueError: - old_path = "" - - # Save - img.save(image_buffer, format="png") - site.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/png", - image_buffer.tell(), - None, - ) - site.save(update_fields=["preview_image"]) - - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - finally: - image_buffer.close() + save_and_cleanup(image, instance=site) @app.task @@ -324,32 +331,28 @@ def generate_edition_preview_image_task(book_id): 'text_three': book.author_text } - img = generate_preview_image(texts=texts, - picture=book.cover, - rating=rating) + image = generate_preview_image(texts=texts, + picture=book.cover, + rating=rating) - file_name = "%s.png" % str(uuid4()) - image_buffer = BytesIO() - try: - try: - old_path = book.preview_image.path - except ValueError: - old_path = "" + save_and_cleanup(image, instance=book) - # Save - img.save(image_buffer, format="png") - book.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/png", - image_buffer.tell(), - None, - ) - book.save(update_fields=["preview_image"]) +@app.task +def generate_user_preview_image_task(user_id): + """generate preview_image for a book""" + user = models.User.objects.get(id=user_id) - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - finally: - image_buffer.close() + texts = { + 'text_one': user.display_name, + 'text_three': "@{}@{}".format(user.localname, DOMAIN) + } + + if user.avatar: + avatar = user.avatar + else: + avatar = path.joinpath("static/images/default_avi.jpg") + + image = generate_preview_image(texts=texts, + picture=avatar) + + save_and_cleanup(image, instance=user) From b47edc5f0d15945044346791982cdd9fb4803845 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 13:07:33 +0200 Subject: [PATCH 058/196] Add dark mode --- bookwyrm/preview_images.py | 13 ++++++++++--- bookwyrm/settings.py | 7 ++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 304250a21..9539edbaf 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -196,14 +196,21 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la # Color - if BG_COLOR == "use_dominant_color": + if BG_COLOR in ["use_dominant_color_light", "use_dominant_color_dark"]: image_bg_color = "rgb(%s, %s, %s)" % dominant_color - # Lighten color + + # Adjust color image_bg_color_rgb = [x / 255.0 for x in ImageColor.getrgb(image_bg_color)] image_bg_color_hls = colorsys.rgb_to_hls(*image_bg_color_rgb) + + if BG_COLOR == "use_dominant_color_light": + lightness = max(0.9, image_bg_color_hls[1]) + else: + lightness = min(0.15, image_bg_color_hls[1]) + image_bg_color_hls = ( image_bg_color_hls[0], - max(0.9, image_bg_color_hls[1]), + lightness, image_bg_color_hls[2], ) image_bg_color = tuple( diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index db15be468..ce5c4547d 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -39,11 +39,12 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Preview image -# Specify RGB tuple or RGB hex strings, or 'use_dominant_color' -PREVIEW_BG_COLOR = "use_dominant_color" +# Specify RGB tuple or RGB hex strings, +# or "use_dominant_color_light" / "use_dominant_color_dark" +PREVIEW_BG_COLOR = "use_dominant_color_dark" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#363636" +PREVIEW_TEXT_COLOR = "#FFF" PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production From c894f5ef3546e3d6d5bb2a24d52ead1826662a6c Mon Sep 17 00:00:00 2001 From: Fabien Basmaison Date: Wed, 26 May 2021 13:21:06 +0200 Subject: [PATCH 059/196] Update subtitle behaviour: - on Book - Remove problematic punctuation (locale and multiple punctuation if the title ends with `?`, `!` or similar). - Update view. - Use proper semantic to split combined title into `name`, `alternativeHeadline` and series-related microdata. - The author is not a subtitle, just data. - Use parenthesis in the `get_title` filter instead of punctuation. --- bookwyrm/templates/book/book.html | 39 ++++++++++++++++++------------ bookwyrm/templatetags/utilities.py | 2 +- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index af2230200..94f326e65 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -8,28 +8,35 @@

    -

    - - {{ book.title }}{% if book.subtitle %}: - {{ book.subtitle }} +

    + {{ book.title }} +

    + + {% if book.subtitle or book.series %} +

    + {% if book.subtitle %} + + + {{ book.subtitle }} {% endif %} - - {% if book.series %} - - + {% if book.series %} + + - ({{ book.series }} {% if book.series_number %} #{{ book.series_number }}{% endif %}) - -
    - {% endif %} -

    + {% endif %} +

    + {% endif %} + {% if book.authors %} -

    - {% trans "by" %} {% include 'snippets/authors.html' with book=book %} -

    +
    + {% trans "by" %} {% include 'snippets/authors.html' with book=book %} +
    {% endif %}
    diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 68befa54a..ae66ca6e1 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -25,7 +25,7 @@ def get_title(book): return "" title = book.title if len(title) < 6 and book.subtitle: - title = "{:s}: {:s}".format(title, book.subtitle) + title = "{:s} ({:s})".format(title, book.subtitle) return title From 65de40a95a8aa64a9bdeb563c25f8e88a1a9fb7a Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 13:52:10 +0200 Subject: [PATCH 060/196] Add `generate_preview_images` command --- .../commands/generate_preview_images.py | 48 +++++++++++++++++++ bookwyrm/preview_images.py | 1 + bookwyrm/settings.py | 4 +- bw-dev | 5 +- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/management/commands/generate_preview_images.py diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py new file mode 100644 index 000000000..13eaf3a68 --- /dev/null +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -0,0 +1,48 @@ +""" Generate preview images """ +import sys + +from django.core.management.base import BaseCommand + +from bookwyrm import activitystreams, models, settings, preview_images + + +def generate_preview_images(): + """generate preview images""" + print(" | Hello! I will be generating preview images for your instance.") + print("🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users.") + print(" | ✧ Thank you for your patience ✧") + + # Site + sys.stdout.write(" → Site preview image: ") + preview_images.generate_site_preview_image_task() + sys.stdout.write(" OK 🖼\n") + + + # Users + users = models.User.objects.filter( + local=True, + is_active=True, + ) + sys.stdout.write(" → User preview images ({}): ".format(len(users))) + for user in users: + preview_images.generate_user_preview_image_task(user.id) + sys.stdout.write(".") + sys.stdout.write(" OK 🖼\n") + + # Books + books = models.Book.objects.select_subclasses().filter() + sys.stdout.write(" → Book preview images ({}): ".format(len(books))) + for book in books: + preview_images.generate_edition_preview_image_task(book.id) + sys.stdout.write(".") + sys.stdout.write(" OK 🖼\n") + + print("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") + + +class Command(BaseCommand): + help = "Generate preview images" + # pylint: disable=no-self-use,unused-argument + def handle(self, *args, **options): + """run feed builder""" + generate_preview_images() diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 9539edbaf..b0f9792d7 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -344,6 +344,7 @@ def generate_edition_preview_image_task(book_id): save_and_cleanup(image, instance=book) + @app.task def generate_user_preview_image_task(user_id): """generate preview_image for a book""" diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index ce5c4547d..b3ba312f9 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -41,10 +41,10 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Specify RGB tuple or RGB hex strings, # or "use_dominant_color_light" / "use_dominant_color_dark" -PREVIEW_BG_COLOR = "use_dominant_color_dark" +PREVIEW_BG_COLOR = "use_dominant_color_light" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#FFF" +PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production diff --git a/bw-dev b/bw-dev index c2b63bc17..95681b115 100755 --- a/bw-dev +++ b/bw-dev @@ -107,7 +107,10 @@ case "$CMD" in populate_streams) runweb python manage.py populate_streams ;; + generate_preview_images) + runweb python manage.py generate_preview_images + ;; *) - echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds" + echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds, generate_preview_images" ;; esac From e5e549d125660544fae55c81d11e9e4dd6459edc Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 14:44:15 +0200 Subject: [PATCH 061/196] Add opengraph image depending on context --- bookwyrm/templates/book/book.html | 7 ++++++- bookwyrm/templates/layout.html | 6 ++++-- bookwyrm/templates/user/layout.html | 10 ++++++---- bookwyrm/templatetags/layout.py | 7 +++++++ 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index af2230200..09d5634bf 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,8 +1,13 @@ {% extends 'layout.html' %} -{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %} +{% load i18n %}{% load bookwyrm_tags %}{% load humanize %}{% load utilities %}{% load layout %} {% block title %}{{ book|book_title }}{% endblock %} +{% block opengraph_images %} + + +{% endblock %} + {% block content %} {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %}
    diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index d899d62cb..bd3dbf7c1 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -16,8 +16,10 @@ - - + {% block opengraph_images %} + + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 0830a4068..c1503ec6d 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -1,11 +1,13 @@ {% extends 'layout.html' %} -{% load i18n %} -{% load humanize %} -{% load utilities %} -{% load markdown %} +{% load i18n %}{% load humanize %}{% load utilities %}{% load markdown %}{% load layout %} {% block title %}{{ user.display_name }}{% endblock %} +{% block opengraph_images %} + + +{% endblock %} + {% block content %}
    {% block header %} diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py index e0f1d8ba6..f518808c1 100644 --- a/bookwyrm/templatetags/layout.py +++ b/bookwyrm/templatetags/layout.py @@ -1,6 +1,7 @@ """ template filters used for creating the layout""" from django import template, utils +from bookwyrm.settings import DOMAIN register = template.Library() @@ -10,3 +11,9 @@ def get_lang(): """get current language, strip to the first two letters""" language = utils.translation.get_language() return language[0 : language.find("-")] + + +@register.simple_tag(takes_context=False) +def get_path(): + """get protocol and host""" + return "https://%s" % DOMAIN From eb56cced8d19319d622b866f36307cb583fda8ab Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 14:46:34 +0200 Subject: [PATCH 062/196] Lint --- .../commands/generate_preview_images.py | 5 +- bookwyrm/models/site.py | 4 +- bookwyrm/preview_images.py | 62 ++++++++++--------- bookwyrm/settings.py | 2 +- 4 files changed, 39 insertions(+), 34 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 13eaf3a68..754f6e9a9 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -9,7 +9,9 @@ from bookwyrm import activitystreams, models, settings, preview_images def generate_preview_images(): """generate preview images""" print(" | Hello! I will be generating preview images for your instance.") - print("🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users.") + print( + "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." + ) print(" | ✧ Thank you for your patience ✧") # Site @@ -17,7 +19,6 @@ def generate_preview_images(): preview_images.generate_site_preview_image_task() sys.stdout.write(" OK 🖼\n") - # Users users = models.User.objects.filter( local=True, diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index dc226bce4..d0076dc63 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -38,7 +38,9 @@ class SiteSettings(models.Model): logo = models.ImageField(upload_to="logos/", null=True, blank=True) logo_small = models.ImageField(upload_to="logos/", null=True, blank=True) favicon = models.ImageField(upload_to="logos/", null=True, blank=True) - preview_image = models.ImageField(upload_to="previews/logos/", null=True, blank=True) + preview_image = models.ImageField( + upload_to="previews/logos/", null=True, blank=True + ) # footer support_link = models.CharField(max_length=255, null=True, blank=True) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index b0f9792d7..8b6f90324 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -61,30 +61,36 @@ def generate_texts_layer(texts, content_width): text_y = 0 - if 'text_zero' in texts: + if "text_zero" in texts: # Text one (Book title) - text_zero = textwrap.fill(texts['text_zero'], width=72) - text_layer_draw.multiline_text((0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR) + text_zero = textwrap.fill(texts["text_zero"], width=72) + text_layer_draw.multiline_text( + (0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR + ) text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - if 'text_one' in texts: + if "text_one" in texts: # Text one (Book title) - text_one = textwrap.fill(texts['text_one'], width=28) - text_layer_draw.multiline_text((0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR) + text_one = textwrap.fill(texts["text_one"], width=28) + text_layer_draw.multiline_text( + (0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR + ) text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 - if 'text_two' in texts: + if "text_two" in texts: # Text one (Book subtitle) - text_two = textwrap.fill(texts['text_two'], width=36) - text_layer_draw.multiline_text((0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR) + text_two = textwrap.fill(texts["text_two"], width=36) + text_layer_draw.multiline_text( + (0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR + ) text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 - if 'text_three' in texts: + if "text_three" in texts: # Text three (Book authors) - text_three = textwrap.fill(texts['text_three'], width=36) + text_three = textwrap.fill(texts["text_three"], width=36) text_layer_draw.multiline_text( (0, text_y), text_three, font=font_text_three, fill=TEXT_COLOR ) @@ -183,7 +189,9 @@ def generate_default_inner_img(): return default_cover -def generate_preview_image(texts={}, picture=None, rating=None, show_instance_layer=True): +def generate_preview_image( + texts={}, picture=None, rating=None, show_instance_layer=True +): # Cover try: inner_img_layer = Image.open(picture) @@ -194,7 +202,6 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la inner_img_layer = generate_default_inner_img() dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) - # Color if BG_COLOR in ["use_dominant_color_light", "use_dominant_color_dark"]: image_bg_color = "rgb(%s, %s, %s)" % dominant_color @@ -262,7 +269,7 @@ def generate_preview_image(texts={}, picture=None, rating=None, show_instance_la cover_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) # Composite layers - img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert('RGBA')) + img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert("RGBA")) img.alpha_composite(contents_layer, (content_x, contents_y)) return img @@ -309,14 +316,12 @@ def generate_site_preview_image_task(): logo = path.joinpath("static/images/logo.png") texts = { - 'text_zero': DOMAIN, - 'text_one': site.name, - 'text_three': site.instance_tagline, + "text_zero": DOMAIN, + "text_one": site.name, + "text_three": site.instance_tagline, } - image = generate_preview_image(texts=texts, - picture=logo, - show_instance_layer=False) + image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) save_and_cleanup(image, instance=site) @@ -333,14 +338,12 @@ def generate_edition_preview_image_task(book_id): ).aggregate(Avg("rating"))["rating__avg"] texts = { - 'text_one': book.title, - 'text_two': book.subtitle, - 'text_three': book.author_text + "text_one": book.title, + "text_two": book.subtitle, + "text_three": book.author_text, } - image = generate_preview_image(texts=texts, - picture=book.cover, - rating=rating) + image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) save_and_cleanup(image, instance=book) @@ -351,8 +354,8 @@ def generate_user_preview_image_task(user_id): user = models.User.objects.get(id=user_id) texts = { - 'text_one': user.display_name, - 'text_three': "@{}@{}".format(user.localname, DOMAIN) + "text_one": user.display_name, + "text_three": "@{}@{}".format(user.localname, DOMAIN), } if user.avatar: @@ -360,7 +363,6 @@ def generate_user_preview_image_task(user_id): else: avatar = path.joinpath("static/images/default_avi.jpg") - image = generate_preview_image(texts=texts, - picture=avatar) + image = generate_preview_image(texts=texts, picture=avatar) save_and_cleanup(image, instance=user) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index b3ba312f9..86ad5c035 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -44,7 +44,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" PREVIEW_BG_COLOR = "use_dominant_color_light" PREVIEW_IMG_WIDTH = 1200 PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" +PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" PREVIEW_DEFAULT_COVER_COLOR = "#002549" # Quick-start development settings - unsuitable for production From 4db8aa85f06859d6070a69865a978073e03b0500 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 14:55:55 +0200 Subject: [PATCH 063/196] Fix migration --- .../migrations/0076_book_preview_image.py | 18 ------------ bookwyrm/migrations/0076_preview_images.py | 28 +++++++++++++++++++ 2 files changed, 28 insertions(+), 18 deletions(-) delete mode 100644 bookwyrm/migrations/0076_book_preview_image.py create mode 100644 bookwyrm/migrations/0076_preview_images.py diff --git a/bookwyrm/migrations/0076_book_preview_image.py b/bookwyrm/migrations/0076_book_preview_image.py deleted file mode 100644 index 5db550507..000000000 --- a/bookwyrm/migrations/0076_book_preview_image.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2 on 2021-05-24 18:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0075_announcement"), - ] - - operations = [ - migrations.AddField( - model_name="book", - name="preview_image", - field=models.ImageField(blank=True, null=True, upload_to="cover_previews/"), - ), - ] diff --git a/bookwyrm/migrations/0076_preview_images.py b/bookwyrm/migrations/0076_preview_images.py new file mode 100644 index 000000000..c2f251df0 --- /dev/null +++ b/bookwyrm/migrations/0076_preview_images.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2 on 2021-05-26 12:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0075_announcement'), + ] + + operations = [ + migrations.AddField( + model_name='book', + name='preview_image', + field=models.ImageField(blank=True, null=True, upload_to='previews/covers/'), + ), + migrations.AddField( + model_name='sitesettings', + name='preview_image', + field=models.ImageField(blank=True, null=True, upload_to='previews/logos/'), + ), + migrations.AddField( + model_name='user', + name='preview_image', + field=models.ImageField(blank=True, null=True, upload_to='previews/avatars/'), + ), + ] From d4fc1b0fdfec0b6b0d21e255bf402a28bf1b7e53 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:17:28 +0200 Subject: [PATCH 064/196] Fix line endings --- bookwyrm/static/fonts/public_sans/OFL.txt | 186 +++++++++++----------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/bookwyrm/static/fonts/public_sans/OFL.txt b/bookwyrm/static/fonts/public_sans/OFL.txt index ac793eaaa..0916c2309 100644 --- a/bookwyrm/static/fonts/public_sans/OFL.txt +++ b/bookwyrm/static/fonts/public_sans/OFL.txt @@ -1,93 +1,93 @@ -Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) - -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. +Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. From 5943e6d79acd955ce78f8a7cb3e755dfafd664a7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:18:05 +0200 Subject: [PATCH 065/196] Black --- bookwyrm/migrations/0076_preview_images.py | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/bookwyrm/migrations/0076_preview_images.py b/bookwyrm/migrations/0076_preview_images.py index c2f251df0..8812e9b22 100644 --- a/bookwyrm/migrations/0076_preview_images.py +++ b/bookwyrm/migrations/0076_preview_images.py @@ -6,23 +6,27 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0075_announcement'), + ("bookwyrm", "0075_announcement"), ] operations = [ migrations.AddField( - model_name='book', - name='preview_image', - field=models.ImageField(blank=True, null=True, upload_to='previews/covers/'), + model_name="book", + name="preview_image", + field=models.ImageField( + blank=True, null=True, upload_to="previews/covers/" + ), ), migrations.AddField( - model_name='sitesettings', - name='preview_image', - field=models.ImageField(blank=True, null=True, upload_to='previews/logos/'), + model_name="sitesettings", + name="preview_image", + field=models.ImageField(blank=True, null=True, upload_to="previews/logos/"), ), migrations.AddField( - model_name='user', - name='preview_image', - field=models.ImageField(blank=True, null=True, upload_to='previews/avatars/'), + model_name="user", + name="preview_image", + field=models.ImageField( + blank=True, null=True, upload_to="previews/avatars/" + ), ), ] From 22c13f639c90d6e0eab9f8292f6f46970b60514b Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:18:35 +0200 Subject: [PATCH 066/196] Update layout.html --- bookwyrm/templates/user/layout.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index c1503ec6d..5f09b8c27 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -1,5 +1,9 @@ {% extends 'layout.html' %} -{% load i18n %}{% load humanize %}{% load utilities %}{% load markdown %}{% load layout %} +{% load i18n %} +{% load humanize %} +{% load utilities %} +{% load markdown %} +{% load layout %} {% block title %}{{ user.display_name }}{% endblock %} From a8ae3c995015b8150607f1081c03c73dec832747 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:37:09 +0200 Subject: [PATCH 067/196] Modify inner image position --- bookwyrm/preview_images.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 8b6f90324..13b241b1d 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -17,9 +17,6 @@ from bookwyrm import models, settings from bookwyrm.settings import DOMAIN from bookwyrm.tasks import app -# dev -import logging - IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT BG_COLOR = settings.PREVIEW_BG_COLOR @@ -29,7 +26,8 @@ TRANSPARENT_COLOR = (0, 0, 0, 0) margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) -inner_img_limits = math.floor(IMG_HEIGHT * 0.8) +inner_img_height = math.floor(IMG_HEIGHT * 0.8) +inner_img_width = math.floor(inner_img_height * 0.7) path = Path(__file__).parent.absolute() font_dir = path.joinpath("static/fonts/public_sans") @@ -172,17 +170,16 @@ def generate_rating_layer(rating, content_width): def generate_default_inner_img(): font_cover = get_font("light", size=28) - cover_width = math.floor(inner_img_limits * 0.7) default_cover = Image.new( - "RGB", (cover_width, inner_img_limits), color=DEFAULT_COVER_COLOR + "RGB", (inner_img_width, inner_img_height), color=DEFAULT_COVER_COLOR ) default_cover_draw = ImageDraw.Draw(default_cover) text = "no image :(" text_dimensions = font_cover.getsize(text) text_coords = ( - math.floor((cover_width - text_dimensions[0]) / 2), - math.floor((inner_img_limits - text_dimensions[1]) / 2), + math.floor((inner_img_width - text_dimensions[0]) / 2), + math.floor((inner_img_height - text_dimensions[1]) / 2), ) default_cover_draw.text(text_coords, text, font=font_cover, fill="white") @@ -195,7 +192,7 @@ def generate_preview_image( # Cover try: inner_img_layer = Image.open(picture) - inner_img_layer.thumbnail((inner_img_limits, inner_img_limits), Image.ANTIALIAS) + inner_img_layer.thumbnail((inner_img_width, inner_img_height), Image.ANTIALIAS) color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) except: @@ -230,7 +227,9 @@ def generate_preview_image( img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) # Contents - content_x = margin + inner_img_layer.width + gutter + inner_img_x = margin + inner_img_width - inner_img_layer.width + inner_img_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) + content_x = margin + inner_img_width + gutter content_width = IMG_WIDTH - content_x - margin contents_layer = Image.new( @@ -266,10 +265,8 @@ def generate_preview_image( if contents_y < margin: contents_y = margin - cover_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) - # Composite layers - img.paste(inner_img_layer, (margin, cover_y), inner_img_layer.convert("RGBA")) + img.paste(inner_img_layer, (inner_img_x, inner_img_y), inner_img_layer.convert("RGBA")) img.alpha_composite(contents_layer, (content_x, contents_y)) return img From f7b117e4fb981b081847ffe1eaa346564351af0f Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:46:40 +0200 Subject: [PATCH 068/196] Update preview_images.py --- bookwyrm/preview_images.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 13b241b1d..875755547 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -266,7 +266,9 @@ def generate_preview_image( contents_y = margin # Composite layers - img.paste(inner_img_layer, (inner_img_x, inner_img_y), inner_img_layer.convert("RGBA")) + img.paste( + inner_img_layer, (inner_img_x, inner_img_y), inner_img_layer.convert("RGBA") + ) img.alpha_composite(contents_layer, (content_x, contents_y)) return img From 3ea935e7ce6473c1ff9713b86939cf1aa61c4341 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 15:49:08 +0200 Subject: [PATCH 069/196] Update OFL.txt --- bookwyrm/static/fonts/public_sans/OFL.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/fonts/public_sans/OFL.txt b/bookwyrm/static/fonts/public_sans/OFL.txt index 0916c2309..ba4ea0b96 100644 --- a/bookwyrm/static/fonts/public_sans/OFL.txt +++ b/bookwyrm/static/fonts/public_sans/OFL.txt @@ -1,4 +1,5 @@ -Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida (Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) +Copyright (c) 2015, Pablo Impallari, Rodrigo Fuenzalida +(Modified by Dan O. Williams and USWDS) (https://github.com/uswds/public-sans) This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: From 97d1830952ec5d3f0f95f5e90b786661ab1e9607 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 16:06:51 +0200 Subject: [PATCH 070/196] Apply review suggestions --- locale/fr_FR/LC_MESSAGES/django.mo | Bin 45409 -> 45401 bytes locale/fr_FR/LC_MESSAGES/django.po | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 349ef43a8322a5be7b4efa8c969d8185f70d36b7..b893b1287e9b958ea2c5cc78708ab547f378d4b4 100644 GIT binary patch delta 4717 zcmXZfdtBGm9mnyn$X!%GQ9wZmh?|%s7j?rjl^)YfF)tyGvWKX+ypf2^;;Z6B^Dd?m zu7FlJG}PE^7CBv;m*mm*5PbO9+*G{e+(Uh2OC71S*V}XcdY*H>-|zW+&gY!-L)$NV z{Qa`Wfq@~ezvDQcE^!<`{1f_M3&vm@2IBuP82ySJr!V$L_0zBqK9Bt|-;OWGUi3F% z8rESqJcr?U1--Dd*m0c!G(49&P7jR5o;U=(ag^cei!948JVFd0XoR=5yV!E#i> zn^2W`2P1J0_QeyZgDt2D_)2?Go{!M-$%{=IqLmZj3mBuoyHUBO{YI5q5@{4N}7w>yFyf{i%=CP z!(q4?74VdO-iq3)i>QTNN4?*H+H?OEX5LVAHE{xsXiP<|>?MrExu`v>Kuy$WJ!(CJ zO7tqKV)s$~9xKg4qEX``P!*VhBXKe6FgLBF{+jqO1KQius1>%OR(=b$l1HdB;kC+a zK_IGx15hO%f_k2do;V9NPa&!@#i;jP9Eg>u#E!0_B+B?41EKgIR7JX$J5CY?pgzn* zjgLcBXfj4)Au7;%)ZXqyEoeV#-edN88*2Vbs58}pdf(SwZ5~9SRxk{e@n}?uUPJ|& zjH<*^RDd#!z%8gijhKeVP@WJlyJL)6mK$;ato^1^P2;OIlFZ z@G|PX8>qnFp#lW1ahx!WMU9U@B{&1M;sw?UjH6$Jn&&tY$94WnLz$gJ9g^FqTi{<| zN)(S8e+CC&9%|y{7=YU`9BWZ4Yqp-marE0T6{FUg?Ep#`!(`kH0 zLx(72gL#mEN%XT(D_M*xeFbWQdejfe0n~d(P!+s^+GEd+CSVe(0zW~`KLLI4HPiy; zZKVF1u-p!8Kuz!=>ci7G5HI3T4A^8!HwN{58g|29pw37MDv?U;fsLpNet}xZH#i(0 zqHa~DemYZVRVk-6`>b+^0 zjIW>)UhmS-4@x~MP_y+o2GaiXf}yCh@DysIbX0&GR0VQTD_nxbm>|Rhh3)D{4azyocJ74h%w{?Iy7>)D|Y95_%SU zU=HdGy^5Nz3VZ7Qe?UVeX~IPO9DCt4)QcUcL)!Hnvv&cgiVelVn1f1S6>5dsQGshQ z3O~Vt*ovxzv%|a>ihXteQ2<2 zCsmnW&M_E5eU#ScA&60mJYx>Q=O(0)LCDPzS04 z0lQ5CF{tk*pq}TW5?_p(cMYl%TTr*^BkYGCyEOc1oU#wvP%Ax;s>~JC1mB}p)QOrn z_}6AU9@S5^{cPKxh`JpGs1?6~GjIhyf&W7N(Q=*l%*1i1jE12moPtVh9;#Hus9&@? z9D~ttvC%;i4myZ zfoxPl<4`4@irVu+RAox78!?)GEow`?M4hcOsP8XeB;LUOy8pg)W}-M$$j~)=wCo3?Dv6LU>F7w--)52lBc7#V5}bC zY*gT7_W1@>Lba%g4`3=bqb9zMs$3@yK;Pe(c@t0xXQ7@?L?t{O-Jj8zOXDT{1m8k$ zeqBm&HD+QbreMZL{JRZjq58@7=D$?A7)5^_CSU_Uc!_9h<@@CWoop97{Jh(7cqtZ}Hbk%IX+47p~` zF4T7iF%dt*moexn4Xq&SpgDBUH-*L5jrUku(A2!-?Jgb#Z!~2uof_u3VBvzOruR1g z(8a4DYSGN1$~zO2Dvxgs_ZhjUpyCw+R?m$9 delta 4715 zcmXZgdsLT29>?*Ai(Ex6f&v0@krWZ|2AY>#Br}eti8ritqX5GtSP?8z`#}+lB?)O8 zW*DNbB9`Xw6sg&+shm9SS#$Gjx#3onwytfp8>{A#)4o5>{Pmid=Xqwn-|x))IC`Pi z^Q&IZgQFu{{*L2xRXUD5j=p#XlkgJ^!Rr`?epQY$6o;Yu<8cVyi!r#&jz5iq={Mp8 z+<}4kH;l$!9Dw~*j?1}&hSwU$8H7m~jN{N7XW0HM)WSw|Nf*)6Xl5V+KSNdGdsHAdP#^j| z*n+>H0&02M1o{T55^hw0?_&_U&eG7r7g3R3LS@#E$~<(fnJ5YM-YC>U<1id^PpQ(PhBFYo&MYt;Rnl3g4DwI`Ek$k76Q}^5Lj|zK z_B*Uc?D!efcVFUE?86KkyPmnR0R36t>7b!Z-KYwj!XbDORpLHWCSK2&{t(o{$+kZk zwNS3@FGFQqiaIlEa2URhn*Tl2`yXQ*>pS1jNJK9>F?c6x!5mac7o+yB7**0%NP>FqmdjA?~&wXpmybUW<84v z^ea@w`fNY2)+7>#8lQryKptje8R{?}tfl^%_+19Hw;!Q0{0A!Yf1xtDi8>RW&zda= zLX|KERpK$I=ZjIl8wIF&icyuRK)t^XM`IHzuw&0s5@m3nfk^xoRT1YoPCEFbKAeCW zzYkTR`IvyksD&C(d%Fdd(08i4*Vx)L#FD3f%j7^Iaq=<9JlS6RoZs8p>=QK92dQg^r`P(OenH{#C!rAoC;aH4qFyGHZRk$3(bpNYqXo8KX4EEro zcnY;8BR80d$D=Zyj=CKSa6VSxa6E}B{S{Q@Zlc}~dBMy(9KGq!KvifK4r6_1DGfiY zLLYnvbvT~Kk=TklwcR)Xe?nE@XVhT|d(l)P0ki0*qi#!khV-Oy-o<^1QQ&dL(wEl<+=my?{-c6=rxv2N@ zFclv}1zhi_-u4Ej;GWpJ}O3!_jIjX^Ci2UUTEs0_p)^!L z_uwF0ggQfosQFqkSoePq4VA77Q}B;C7_XpS>_;6^-&f4ug`g@n702KrQ~>p;3|mkO z@5Xq17f0i#s7iSM-nUk4sStH=-7P6%~1#?O(v%^m|c%{~KO46Ml&L z?ksAnE}+iFCDc3~EoPknRN#r|QsfJ0-2QuyVf5?p_QI&=ZFc++>JXj6A@~Jqp=+p9 z?YY(Lc{&Er&&3E_h}wdcs7hC371nO0{wmdV1~if1Yv#pp)DKP)hGP!u!+ca=kKlYP zK`nd~btu0@Rp2^m3q7_OBT(O^ptfinYD=bXqyCvRN*U0H?WhI!V-y}o-HOjq6Wl;m z$m4ZWfpAm+si+K>pq>|_=BY-_`x2@WEvQ@d77oLATr^awbM`?GD$}n~mAQ(V;1(() zpH?$*G-^D<_V2R&xwfB=x*boTGG2=hV*@7QCDb1+m)~|XaT+S3Y*ggSP=QsTO0^#K zi?$DE;t!aInQxdw+kp4ee;=bUppAdLU@~gK$57X|9v{NJ7^(a3y~A9mSk(Q`LS;4; zRf&61zXNko0WCn4csXj%SD`9XYkdV1=y#yD;i>UlmY;78GwOXIgR z7T^(FkAwJism6^s5qn>_=z1~w9njzM^KTkLT!=D_FqFE`g?I498}Le+m}h4y)Ij<`xv8ALIMbAKjRa$L#obsIB`S z&PM;Y%sh)w*RabP?mEDKCNQuH^}!(w!fqUa=TW!f77j$ugJ$7iR6i1ZG1;1iIvbg| z9J7&Y=Cq*#K8z{&A?9P~cQlm2%(u;OUm3kH{JBu zyuJCp&<83`bgU^^T~$z8vbvzMq`b`i@8$;I0eL4nR+PHeZB6$KoL5m;URG9A5nov3 KKCo?H#Qy<(&C9m{ diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 6b4fe8f05..a96f9d76d 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -1392,7 +1392,7 @@ msgstr "Ajouté par %(username)s" #: bookwyrm/templates/lists/list.html:77 msgid "Set" -msgstr "Régler" +msgstr "Appliquer" #: bookwyrm/templates/lists/list.html:80 msgid "List position" @@ -1405,7 +1405,7 @@ msgstr "Retirer" #: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111 msgid "Sort List" -msgstr "Ordonner de la liste" +msgstr "Trier la liste" #: bookwyrm/templates/lists/list.html:105 msgid "Direction" @@ -1551,7 +1551,7 @@ msgstr "Supprimer les notifications" #: bookwyrm/templates/notifications.html:25 msgid "All" -msgstr "Tout" +msgstr "Toutes" #: bookwyrm/templates/notifications.html:29 msgid "Mentions" @@ -1885,7 +1885,7 @@ msgstr "Date de fin :" #: bookwyrm/templates/settings/announcement.html:60 msgid "Active:" -msgstr "Actif :" +msgstr "Active :" #: bookwyrm/templates/settings/announcement_form.html:8 #: bookwyrm/templates/settings/announcements.html:8 @@ -1898,7 +1898,7 @@ msgstr "Date d’ajout" #: bookwyrm/templates/settings/announcements.html:26 msgid "Preview" -msgstr "Prévisualisation" +msgstr "Aperçu" #: bookwyrm/templates/settings/announcements.html:30 msgid "Start date" @@ -2240,7 +2240,7 @@ msgstr "Texte affiché lorsque les enregistrements sont clos :" #: bookwyrm/templates/snippets/announcement.html:31 #, python-format msgid "Posted by %(username)s" -msgstr "Publié par %(username)s" +msgstr "Publiée par %(username)s" #: bookwyrm/templates/snippets/book_cover.html:31 msgid "No cover" @@ -2897,7 +2897,7 @@ msgstr "Niveau d’accès :" #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" -msgstr "Fichier CSV invalide" +msgstr "Fichier CSV non valide" #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." From 7ea31530269721d7ab2856b3ec5d1186836795da Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 16:57:28 +0200 Subject: [PATCH 071/196] Fix site_path tag --- bookwyrm/context_processors.py | 2 ++ bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/layout.html | 4 ++-- bookwyrm/templates/user/layout.html | 4 ++-- bookwyrm/templatetags/layout.py | 8 -------- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index b77c62b02..29775a0b5 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,5 +1,6 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models +from bookwyrm.settings import DOMAIN def site_settings(request): # pylint: disable=unused-argument @@ -7,4 +8,5 @@ def site_settings(request): # pylint: disable=unused-argument return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), + "site_path": "https://%s" % DOMAIN, } diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 09d5634bf..02409b389 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index bd3dbf7c1..47bd434e2 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 5f09b8c27..45b37f763 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py index f518808c1..f42f3bda1 100644 --- a/bookwyrm/templatetags/layout.py +++ b/bookwyrm/templatetags/layout.py @@ -1,8 +1,6 @@ """ template filters used for creating the layout""" from django import template, utils -from bookwyrm.settings import DOMAIN - register = template.Library() @@ -11,9 +9,3 @@ def get_lang(): """get current language, strip to the first two letters""" language = utils.translation.get_language() return language[0 : language.find("-")] - - -@register.simple_tag(takes_context=False) -def get_path(): - """get protocol and host""" - return "https://%s" % DOMAIN From e362c8249563c2c2c371b1136481c6b4c8b1a970 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 17:54:59 +0200 Subject: [PATCH 072/196] Expose static & media paths --- bookwyrm/context_processors.py | 8 ++++++-- bookwyrm/settings.py | 4 ++++ bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/layout.html | 8 ++++---- bookwyrm/templates/user/layout.html | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index 29775a0b5..dcdf615d5 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,6 +1,6 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models -from bookwyrm.settings import DOMAIN +from bookwyrm.settings import SITE_PATH, STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH def site_settings(request): # pylint: disable=unused-argument @@ -8,5 +8,9 @@ def site_settings(request): # pylint: disable=unused-argument return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "site_path": "https://%s" % DOMAIN, + "site_path": SITE_PATH, + "static_url": STATIC_URL, + "media_url": MEDIA_URL, + "static_path": STATIC_PATH, + "media_path": MEDIA_PATH, } diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 86ad5c035..47553c65f 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -182,10 +182,14 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ +SITE_PATH = "https://%s" % DOMAIN + PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) STATIC_URL = "/static/" +STATIC_PATH = "%s/%s" % (SITE_PATH, env("STATIC_ROOT", "static")) STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) MEDIA_URL = "/images/" +MEDIA_PATH = "%s/%s" % (SITE_PATH, env("MEDIA_ROOT", "images")) MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % ( diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 02409b389..7b47e32b6 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 47bd434e2..625a224e6 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -8,7 +8,7 @@ - + @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} @@ -27,7 +27,7 @@
    - +
    diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 45b37f763..b73d47c84 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} From e214d8b87932003e8e87f7249b92dab7426fa581 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 17:55:39 +0200 Subject: [PATCH 073/196] Rationalize paths handling --- bookwyrm/preview_images.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 875755547..1decb36a0 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -6,7 +6,6 @@ import textwrap from colorthief import ColorThief from io import BytesIO from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor -from pathlib import Path from uuid import uuid4 from django.core.files.base import ContentFile @@ -14,7 +13,7 @@ from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg from bookwyrm import models, settings -from bookwyrm.settings import DOMAIN +from bookwyrm.settings import DOMAIN, STATIC_ROOT from bookwyrm.tasks import app IMG_WIDTH = settings.PREVIEW_IMG_WIDTH @@ -28,17 +27,16 @@ margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) inner_img_height = math.floor(IMG_HEIGHT * 0.8) inner_img_width = math.floor(inner_img_height * 0.7) -path = Path(__file__).parent.absolute() -font_dir = path.joinpath("static/fonts/public_sans") +font_dir = os.path.join(STATIC_ROOT, "fonts/public_sans") def get_font(font_name, size=28): if font_name == "light": - font_path = "%s/PublicSans-Light.ttf" % font_dir + font_path = os.path.join(font_dir, "PublicSans-Light.ttf") if font_name == "regular": - font_path = "%s/PublicSans-Regular.ttf" % font_dir + font_path = os.path.join(font_dir, "PublicSans-Regular.ttf") elif font_name == "bold": - font_path = "%s/PublicSans-Bold.ttf" % font_dir + font_path = os.path.join(font_dir, "PublicSans-Bold.ttf") try: font = ImageFont.truetype(font_path, size) @@ -105,7 +103,7 @@ def generate_instance_layer(content_width): if site.logo_small: logo_img = Image.open(site.logo_small) else: - static_path = path.joinpath("static/images/logo-small.png") + static_path = os.path.join(STATIC_ROOT, "images/logo-small.png") logo_img = Image.open(static_path) instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) @@ -128,9 +126,11 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open(path.joinpath("static/images/icons/star-full.png")) - icon_star_empty = Image.open(path.joinpath("static/images/icons/star-empty.png")) - icon_star_half = Image.open(path.joinpath("static/images/icons/star-half.png")) + icon_star_full = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-full.png")) + icon_star_empty = Image.open( + os.path.join(STATIC_ROOT, "images/icons/star-empty.png") + ) + icon_star_half = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-half.png")) icon_size = 64 icon_margin = 10 @@ -312,7 +312,7 @@ def generate_site_preview_image_task(): if site.logo: logo = site.logo else: - logo = path.joinpath("static/images/logo.png") + logo = os.path.join(STATIC_ROOT, "images/logo.png") texts = { "text_zero": DOMAIN, @@ -360,7 +360,7 @@ def generate_user_preview_image_task(user_id): if user.avatar: avatar = user.avatar else: - avatar = path.joinpath("static/images/default_avi.jpg") + avatar = os.path.join(STATIC_ROOT, "images/default_avi.jpg") image = generate_preview_image(texts=texts, picture=avatar) From f848dcd756972f41589687a0d9ce81735a7439c9 Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 18:20:22 +0200 Subject: [PATCH 074/196] Fix issue with protocol --- bookwyrm/context_processors.py | 6 ++++-- bookwyrm/settings.py | 6 ++---- bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templates/layout.html | 4 ++-- bookwyrm/templates/user/layout.html | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index dcdf615d5..a6c535c2b 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,16 +1,18 @@ """ customize the info available in context for rendering templates """ from bookwyrm import models -from bookwyrm.settings import SITE_PATH, STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH +from bookwyrm.settings import STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH def site_settings(request): # pylint: disable=unused-argument """include the custom info about the site""" + request_protocol = "https://" if request.is_secure() else "http://" + return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "site_path": SITE_PATH, "static_url": STATIC_URL, "media_url": MEDIA_URL, "static_path": STATIC_PATH, "media_path": MEDIA_PATH, + "request_protocol": request_protocol, } diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 47553c65f..b0ff5a72c 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -182,14 +182,12 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ -SITE_PATH = "https://%s" % DOMAIN - PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) STATIC_URL = "/static/" -STATIC_PATH = "%s/%s" % (SITE_PATH, env("STATIC_ROOT", "static")) +STATIC_PATH = "%s/%s" % (DOMAIN, env("STATIC_ROOT", "static")) STATIC_ROOT = os.path.join(BASE_DIR, env("STATIC_ROOT", "static")) MEDIA_URL = "/images/" -MEDIA_PATH = "%s/%s" % (SITE_PATH, env("MEDIA_ROOT", "images")) +MEDIA_PATH = "%s/%s" % (DOMAIN, env("MEDIA_ROOT", "images")) MEDIA_ROOT = os.path.join(BASE_DIR, env("MEDIA_ROOT", "images")) USER_AGENT = "%s (BookWyrm/%s; +https://%s/)" % ( diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 7b47e32b6..c40209964 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,8 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 625a224e6..c06294d9c 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,8 @@ {% block opengraph_images %} - - + + {% endblock %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index b73d47c84..a645b07bb 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,8 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + + {% endblock %} {% block content %} From 2ea1cd8319132726c4158ace675bea49d7ea350d Mon Sep 17 00:00:00 2001 From: Joachim Date: Wed, 26 May 2021 23:57:29 +0200 Subject: [PATCH 075/196] Tests --- bookwyrm/tests/activitypub/test_author.py | 10 +- .../tests/activitypub/test_base_activity.py | 45 ++++--- bookwyrm/tests/activitypub/test_quotation.py | 9 +- .../connectors/test_abstract_connector.py | 11 +- .../connectors/test_bookwyrm_connector.py | 6 +- .../connectors/test_connector_manager.py | 16 ++- .../connectors/test_openlibrary_connector.py | 22 ++-- .../tests/connectors/test_self_connector.py | 84 ++++++------ .../tests/importers/test_goodreads_import.py | 74 ++++++----- .../importers/test_librarything_import.py | 74 ++++++----- .../tests/management/test_populate_streams.py | 20 ++- .../tests/models/test_activitypub_mixin.py | 27 ++-- bookwyrm/tests/models/test_base_model.py | 7 +- bookwyrm/tests/models/test_book_model.py | 27 ++-- bookwyrm/tests/models/test_fields.py | 73 ++++++----- bookwyrm/tests/models/test_import_model.py | 7 +- bookwyrm/tests/models/test_list.py | 12 +- .../tests/models/test_readthrough_model.py | 18 +-- .../tests/models/test_relationship_models.py | 11 +- bookwyrm/tests/models/test_shelf_model.py | 14 +- bookwyrm/tests/models/test_status_model.py | 102 +++++++------- bookwyrm/tests/models/test_user_model.py | 19 +-- bookwyrm/tests/test_activitystreams.py | 20 ++- bookwyrm/tests/test_emailing.py | 18 +-- bookwyrm/tests/test_signing.py | 26 ++-- bookwyrm/tests/test_templatetags.py | 58 +++++--- bookwyrm/tests/views/inbox/test_inbox.py | 23 ++-- bookwyrm/tests/views/inbox/test_inbox_add.py | 36 ++--- .../tests/views/inbox/test_inbox_announce.py | 50 +++---- .../tests/views/inbox/test_inbox_block.py | 23 ++-- .../tests/views/inbox/test_inbox_create.py | 37 +++--- .../tests/views/inbox/test_inbox_delete.py | 22 ++-- .../tests/views/inbox/test_inbox_follow.py | 24 ++-- bookwyrm/tests/views/inbox/test_inbox_like.py | 24 ++-- .../tests/views/inbox/test_inbox_remove.py | 36 ++--- .../tests/views/inbox/test_inbox_update.py | 42 +++--- bookwyrm/tests/views/test_announcements.py | 19 +-- bookwyrm/tests/views/test_authentication.py | 33 +++-- bookwyrm/tests/views/test_author.py | 33 ++--- bookwyrm/tests/views/test_block.py | 18 +-- bookwyrm/tests/views/test_book.py | 79 ++++++----- bookwyrm/tests/views/test_directory.py | 39 +++--- bookwyrm/tests/views/test_federation.py | 18 +-- bookwyrm/tests/views/test_feed.py | 55 ++++---- bookwyrm/tests/views/test_follow.py | 66 +++++----- bookwyrm/tests/views/test_get_started.py | 29 ++-- bookwyrm/tests/views/test_goal.py | 45 ++++--- bookwyrm/tests/views/test_helpers.py | 124 +++++++++--------- bookwyrm/tests/views/test_import.py | 18 +-- bookwyrm/tests/views/test_interaction.py | 30 +++-- bookwyrm/tests/views/test_invite.py | 18 +-- bookwyrm/tests/views/test_isbn.py | 35 ++--- bookwyrm/tests/views/test_landing.py | 18 +-- bookwyrm/tests/views/test_list.py | 85 ++++++------ bookwyrm/tests/views/test_list_actions.py | 86 ++++++------ bookwyrm/tests/views/test_notifications.py | 19 +-- bookwyrm/tests/views/test_outbox.py | 81 +++++++----- bookwyrm/tests/views/test_password.py | 18 +-- bookwyrm/tests/views/test_reading.py | 30 +++-- bookwyrm/tests/views/test_readthrough.py | 16 ++- bookwyrm/tests/views/test_reports.py | 33 ++--- bookwyrm/tests/views/test_rss_feed.py | 62 +++++---- bookwyrm/tests/views/test_search.py | 33 ++--- bookwyrm/tests/views/test_shelf.py | 33 ++--- bookwyrm/tests/views/test_status.py | 82 +++++++----- bookwyrm/tests/views/test_updates.py | 20 +-- bookwyrm/tests/views/test_user.py | 29 ++-- bookwyrm/tests/views/test_user_admin.py | 18 +-- bookwyrm/tests/views/test_wellknown.py | 26 ++-- 69 files changed, 1370 insertions(+), 1105 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index e65f86b76..fbb38da26 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -1,15 +1,17 @@ import datetime +from unittest.mock import patch from django.test import TestCase from bookwyrm import models class Author(TestCase): def setUp(self): - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.author = models.Author.objects.create( name="Author fullname", aliases=["One", "Two"], diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 77844a222..54fbb49e6 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -25,24 +25,25 @@ class BaseActivity(TestCase): def setUp(self): """we're probably going to re-use this so why copy/paste""" - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - self.user.remote_id = "http://example.com/a/b" - self.user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + self.user.remote_id = "http://example.com/a/b" + self.user.save(broadcast=False) - datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") - self.userdata = json.loads(datafile.read_bytes()) - # don't try to load the user icon - del self.userdata["icon"] + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + self.userdata = json.loads(datafile.read_bytes()) + # don't try to load the user icon + del self.userdata["icon"] - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - self.image_data = output.getvalue() + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + self.image_data = output.getvalue() def test_init(self, _): """simple successfuly init""" @@ -139,8 +140,9 @@ class BaseActivity(TestCase): self.user.avatar.file # pylint: disable=pointless-statement # this would trigger a broadcast because it's a local user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - activity.to_model(model=models.User, instance=self.user) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + activity.to_model(model=models.User, instance=self.user) self.assertIsNotNone(self.user.avatar.file) self.assertEqual(self.user.name, "New Name") self.assertEqual(self.user.key_pair.public_key, "hi") @@ -152,9 +154,10 @@ class BaseActivity(TestCase): content="test status", user=self.user, ) - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) update_data = activitypub.Note( id=status.remote_id, content=status.content, diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index c90348bc3..7d1b28698 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -22,10 +22,11 @@ class Quotation(TestCase): outbox="https://example.com/user/mouse/outbox", remote_id="https://example.com/user/mouse", ) - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_quotation.json") self.status_data = json.loads(datafile.read_bytes()) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 5c50e4b73..9ca3c8f2f 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -74,11 +74,12 @@ class AbstractConnector(TestCase): Mapping("openlibraryKey"), ] - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1234", - openlibrary_key="OL1234M", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1234", + openlibrary_key="OL1234M", + ) def test_abstract_connector_init(self): """barebones connector for search with defaults""" diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py index 46ea54a91..3a2480de4 100644 --- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -1,4 +1,5 @@ """ testing book data connectors """ +from unittest.mock import patch import json import pathlib from django.test import TestCase @@ -25,8 +26,9 @@ class BookWyrmConnector(TestCase): def test_get_or_create_book_existing(self): """load book activity""" - work = models.Work.objects.create(title="Test Work") - book = models.Edition.objects.create(title="Test Edition", parent_work=work) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + book = models.Edition.objects.create(title="Test Edition", parent_work=work) result = self.connector.get_or_create_book(book.remote_id) self.assertEqual(book, result) diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index 67b108dd1..95920f072 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -1,4 +1,5 @@ """ interface between the app and various connectors """ +from unittest.mock import patch from django.test import TestCase import responses @@ -13,14 +14,15 @@ class ConnectorManager(TestCase): def setUp(self): """we'll need some books and a connector info entry""" - self.work = models.Work.objects.create(title="Example Work") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work, isbn_10="0000000000" - ) - self.edition = models.Edition.objects.create( - title="Another Edition", parent_work=self.work, isbn_10="1111111111" - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work, isbn_10="0000000000" + ) + self.edition = models.Edition.objects.create( + title="Another Edition", parent_work=self.work, isbn_10="1111111111" + ) self.connector = models.Connector.objects.create( identifier="test_connector", diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 699b26ed4..8c00061a4 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -178,20 +178,26 @@ class Openlibrary(TestCase): @responses.activate def test_expand_book_data(self): """given a book, get more editions""" - work = models.Work.objects.create(title="Test Work", openlibrary_key="OL1234W") - edition = models.Edition.objects.create(title="Test Edition", parent_work=work) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create( + title="Test Work", openlibrary_key="OL1234W" + ) + edition = models.Edition.objects.create( + title="Test Edition", parent_work=work + ) responses.add( responses.GET, "https://openlibrary.org/works/OL1234W/editions", json={"entries": []}, ) - with patch( - "bookwyrm.connectors.abstract_connector.AbstractConnector." - "create_edition_from_data" - ): - self.connector.expand_book_data(edition) - self.connector.expand_book_data(work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.connectors.abstract_connector.AbstractConnector." + "create_edition_from_data" + ): + self.connector.expand_book_data(edition) + self.connector.expand_book_data(work) def test_get_description(self): """should do some cleanup on the description data""" diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index db97b65a0..e49d9671f 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -1,4 +1,5 @@ """ testing book data connectors """ +from unittest.mock import patch import datetime from django.test import TestCase from django.utils import timezone @@ -29,11 +30,12 @@ class SelfConnector(TestCase): def test_format_search_result(self): """create a SearchResult""" author = models.Author.objects.create(name="Anonymous") - edition = models.Edition.objects.create( - title="Edition of Example Work", - published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), - ) - edition.authors.add(author) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + edition = models.Edition.objects.create( + title="Edition of Example Work", + published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), + ) + edition.authors.add(author) result = self.connector.search("Edition of Example")[0] self.assertEqual(result.title, "Edition of Example Work") self.assertEqual(result.key, edition.remote_id) @@ -44,32 +46,33 @@ class SelfConnector(TestCase): def test_search_rank(self): """prioritize certain results""" author = models.Author.objects.create(name="Anonymous") - edition = models.Edition.objects.create( - title="Edition of Example Work", - published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), - parent_work=models.Work.objects.create(title=""), - ) - # author text is rank C - edition.authors.add(author) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + edition = models.Edition.objects.create( + title="Edition of Example Work", + published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), + parent_work=models.Work.objects.create(title=""), + ) + # author text is rank C + edition.authors.add(author) - # series is rank D - models.Edition.objects.create( - title="Another Edition", - series="Anonymous", - parent_work=models.Work.objects.create(title=""), - ) - # subtitle is rank B - models.Edition.objects.create( - title="More Editions", - subtitle="The Anonymous Edition", - parent_work=models.Work.objects.create(title=""), - ) - # title is rank A - models.Edition.objects.create(title="Anonymous") - # doesn't rank in this search - edition = models.Edition.objects.create( - title="An Edition", parent_work=models.Work.objects.create(title="") - ) + # series is rank D + models.Edition.objects.create( + title="Another Edition", + series="Anonymous", + parent_work=models.Work.objects.create(title=""), + ) + # subtitle is rank B + models.Edition.objects.create( + title="More Editions", + subtitle="The Anonymous Edition", + parent_work=models.Work.objects.create(title=""), + ) + # title is rank A + models.Edition.objects.create(title="Anonymous") + # doesn't rank in this search + edition = models.Edition.objects.create( + title="An Edition", parent_work=models.Work.objects.create(title="") + ) results = self.connector.search("Anonymous") self.assertEqual(len(results), 3) @@ -79,16 +82,17 @@ class SelfConnector(TestCase): def test_search_multiple_editions(self): """it should get rid of duplicate editions for the same work""" - work = models.Work.objects.create(title="Work Title") - edition_1 = models.Edition.objects.create( - title="Edition 1 Title", parent_work=work - ) - edition_2 = models.Edition.objects.create( - title="Edition 2 Title", - parent_work=work, - edition_rank=20, # that's default babey - ) - edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + work = models.Work.objects.create(title="Work Title") + edition_1 = models.Edition.objects.create( + title="Edition 1 Title", parent_work=work + ) + edition_2 = models.Edition.objects.create( + title="Edition 2 Title", + parent_work=work, + edition_rank=20, # that's default babey + ) + edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) # pick the best edition results = self.connector.search("Edition 1 Title") diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index 655567d05..81f47e6f5 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -21,9 +21,10 @@ class GoodreadsImport(TestCase): self.importer = GoodreadsImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") self.csv = open(datafile, "r", encoding=self.importer.encoding) - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True + ) models.Connector.objects.create( identifier=DOMAIN, @@ -36,12 +37,13 @@ class GoodreadsImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_create_job(self): """creates the import job entry and checks csv""" @@ -92,7 +94,8 @@ class GoodreadsImport(TestCase): def test_import_data(self): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - book = models.Edition.objects.create(title="Test Book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -119,10 +122,11 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -183,13 +187,14 @@ class GoodreadsImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -216,10 +221,11 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.Review.objects.get(book=self.book, user=self.user) self.assertEqual(review.content, "mixed feelings") self.assertEqual(review.rating, 2) @@ -242,10 +248,11 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.ReviewRating.objects.get(book=self.book, user=self.user) self.assertIsInstance(review, models.ReviewRating) self.assertEqual(review.rating, 2) @@ -265,10 +272,11 @@ class GoodreadsImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "unlisted" + ) self.assertFalse( models.Review.objects.filter(book=self.book, user=self.user).exists() ) diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 5ae0944c0..8e299d567 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -22,9 +22,10 @@ class LibrarythingImport(TestCase): # Librarything generates latin encoded exports... self.csv = open(datafile, "r", encoding=self.importer.encoding) - self.user = models.User.objects.create_user( - "mmai", "mmai@mmai.mmai", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mmai", "mmai@mmai.mmai", "password", local=True + ) models.Connector.objects.create( identifier=DOMAIN, @@ -37,12 +38,13 @@ class LibrarythingImport(TestCase): search_url="https://%s/search?q=" % DOMAIN, priority=1, ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_create_job(self): """creates the import job entry and checks csv""" @@ -82,7 +84,8 @@ class LibrarythingImport(TestCase): def test_import_data(self): """resolve entry""" import_job = self.importer.create_job(self.user, self.csv, False, "unlisted") - book = models.Edition.objects.create(title="Test Book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create(title="Test Book") with patch( "bookwyrm.models.import_job.ImportItem.get_book_from_isbn" @@ -111,10 +114,11 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -147,10 +151,11 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -179,13 +184,14 @@ class LibrarythingImport(TestCase): ) break - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) - handle_imported_book( - self.importer.service, self.user, import_item, False, "public" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) + handle_imported_book( + self.importer.service, self.user, import_item, False, "public" + ) shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) @@ -212,10 +218,11 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, True, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, True, "unlisted" + ) review = models.Review.objects.get(book=self.book, user=self.user) self.assertEqual(review.content, "chef d'oeuvre") self.assertEqual(review.rating, 5) @@ -235,10 +242,11 @@ class LibrarythingImport(TestCase): job_id=import_job.id, index=0, data=entry, book=self.book ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - handle_imported_book( - self.importer.service, self.user, import_item, False, "unlisted" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + handle_imported_book( + self.importer.service, self.user, import_item, False, "unlisted" + ) self.assertFalse( models.Review.objects.filter(book=self.book, user=self.user).exists() ) diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index d187c054b..f6d24c53a 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -12,12 +12,17 @@ class Activitystreams(TestCase): def setUp(self): """we need some stuff""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" - ) - self.another_user = models.User.objects.create_user( - "nutria", "nutria@nutria.nutria", "password", local=True, localname="nutria" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + self.another_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -28,7 +33,8 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="test book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test book") def test_populate_streams(self, _): """make sure the function on the redis manager gets called""" diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 1c0975c44..348270edf 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -19,11 +19,12 @@ class ActivitypubMixins(TestCase): def setUp(self): """shared data""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" - ) - self.local_user.remote_id = "http://example.com/a/b" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.local_user.remote_id = "http://example.com/a/b" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -70,9 +71,10 @@ class ActivitypubMixins(TestCase): """attempt to match a remote id to an object in the db""" # uses a different remote id scheme # this isn't really part of this test directly but it's helpful to state - book = models.Edition.objects.create( - title="Test Edition", remote_id="http://book.com/book" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test Edition", remote_id="http://book.com/book" + ) self.assertEqual(book.origin_id, "http://book.com/book") self.assertNotEqual(book.remote_id, "http://book.com/book") @@ -101,10 +103,11 @@ class ActivitypubMixins(TestCase): def test_find_existing(self, _): """match a blob of data to a model""" - book = models.Edition.objects.create( - title="Test edition", - openlibrary_key="OL1234", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test edition", + openlibrary_key="OL1234", + ) result = models.Edition.find_existing({"openlibraryKey": "OL1234"}) self.assertEqual(result, book) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 75d0444c1..8b0e55b7f 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -12,9 +12,10 @@ class BaseModel(TestCase): def setUp(self): """shared data""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index cad00d43a..df61514c1 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -2,6 +2,7 @@ from dateutil.parser import parse from django.test import TestCase from django.utils import timezone +from unittest.mock import patch from bookwyrm import models, settings from bookwyrm.models.book import isbn_10_to_13, isbn_13_to_10 @@ -12,17 +13,18 @@ class Book(TestCase): def setUp(self): """we'll need some books""" - self.work = models.Work.objects.create( - title="Example Work", remote_id="https://example.com/book/1" - ) - self.first_edition = models.Edition.objects.create( - title="Example Edition", - parent_work=self.work, - ) - self.second_edition = models.Edition.objects.create( - title="Another Example Edition", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create( + title="Example Work", remote_id="https://example.com/book/1" + ) + self.first_edition = models.Edition.objects.create( + title="Example Edition", + parent_work=self.work, + ) + self.second_edition = models.Edition.objects.create( + title="Another Example Edition", + parent_work=self.work, + ) def test_remote_id(self): """fanciness with remote/origin ids""" @@ -56,7 +58,8 @@ class Book(TestCase): def test_get_edition_info(self): """text slug about an edition""" - book = models.Edition.objects.create(title="Test Edition") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create(title="Test Edition") self.assertEqual(book.edition_info, "") book.physical_format = "worm" diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index ea692b625..e8c48b0bb 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -188,9 +188,10 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_privacy_field_set_activity_from_field(self, *_): """translate between to/cc fields and privacy""" - user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) public = "https://www.w3.org/ns/activitystreams#Public" followers = "%s/followers" % user.remote_id @@ -248,9 +249,10 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + unrelated_user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) # test receiving an unknown remote id and loading data responses.add( @@ -272,9 +274,10 @@ class ActivitypubFields(TestCase): del userdata["icon"] # it shouldn't match with this unrelated user: - unrelated_user = User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + unrelated_user = User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertIsInstance(value, User) @@ -288,14 +291,16 @@ class ActivitypubFields(TestCase): instance = fields.ForeignKey(User, on_delete=models.CASCADE) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") userdata = json.loads(datafile.read_bytes()) - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - user.remote_id = "https://example.com/user/mouse" - user.save(broadcast=False) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + user.remote_id = "https://example.com/user/mouse" + user.save(broadcast=False) + + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): value = instance.field_from_activity(activitypub.Person(**userdata)) @@ -304,12 +309,13 @@ class ActivitypubFields(TestCase): def test_foreign_key_from_activity_str_existing(self): """test receiving a remote id of an existing object in the db""" instance = fields.ForeignKey(User, on_delete=models.CASCADE) - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - User.objects.create_user( - "rat", "rat@rat.rat", "ratword", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + User.objects.create_user( + "rat", "rat@rat.rat", "ratword", local=True, localname="rat" + ) value = instance.field_from_activity(user.remote_id) self.assertEqual(value, user) @@ -386,16 +392,17 @@ class ActivitypubFields(TestCase): @patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast") def test_image_field(self, _): """storing images""" - user = User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - user.avatar.save("test.jpg", ContentFile(output.getvalue())) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + image.save(output, format=image.format) + user.avatar.save("test.jpg", ContentFile(output.getvalue())) output = fields.image_serializer(user.avatar, alt="alt text") self.assertIsNotNone( diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 76a914d1b..02263e0e4 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -59,9 +59,10 @@ class ImportJob(TestCase): unknown_read_data["Exclusive Shelf"] = "read" unknown_read_data["Date Read"] = "" - user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) job = models.ImportJob.objects.create(user=user) self.item_1 = models.ImportItem.objects.create( job=job, index=1, data=currently_reading_data diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index 8f5bd4976..34517ddcd 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -11,11 +11,13 @@ class List(TestCase): def setUp(self): """look, a list""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - work = models.Work.objects.create(title="hello") - self.book = models.Edition.objects.create(title="hi", parent_work=work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="hello") + self.book = models.Edition.objects.create(title="hi", parent_work=work) def test_remote_id(self, _): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 986b739b6..186e7ad05 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -1,6 +1,7 @@ """ testing models """ from django.test import TestCase from django.core.exceptions import ValidationError +from unittest.mock import patch from bookwyrm import models @@ -10,15 +11,16 @@ class ReadThrough(TestCase): def setUp(self): """look, a shelf""" - self.user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) - self.work = models.Work.objects.create(title="Example Work") - - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Example Work") + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) self.readthrough = models.ReadThrough.objects.create( user=self.user, book=self.edition diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index d629b5c7a..516bfeb12 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -20,11 +20,12 @@ class Relationship(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" - ) - self.local_user.remote_id = "http://local.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.local_user.remote_id = "http://local.com/user/mouse" + self.local_user.save(broadcast=False) def test_user_follows_from_request(self): """convert a follow request into a follow""" diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index 911df059d..f5c255a63 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -12,11 +12,15 @@ class Shelf(TestCase): def setUp(self): """look, a shelf""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create(title="test book", parent_work=work) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="test book", parent_work=work + ) def test_remote_id(self): """shelves use custom remote ids""" diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 4c8930bc4..0005c507e 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -21,9 +21,10 @@ class Status(TestCase): def setUp(self): """useful things for creating a status""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -34,16 +35,17 @@ class Status(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="Test Edition") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="Test Edition") - image_file = pathlib.Path(__file__).parent.joinpath( - "../../static/images/default_avi.jpg" - ) - image = Image.open(image_file) - output = BytesIO() - with patch("bookwyrm.models.Status.broadcast"): - image.save(output, format=image.format) - self.book.cover.save("test.jpg", ContentFile(output.getvalue())) + image_file = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + image = Image.open(image_file) + output = BytesIO() + with patch("bookwyrm.models.Status.broadcast"): + image.save(output, format=image.format) + self.book.cover.save("test.jpg", ContentFile(output.getvalue())) def test_status_generated_fields(self, *_): """setting remote id""" @@ -58,9 +60,10 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + with patch("bookwyrm.preview_images.generate_edition_image_task.delay"): + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -92,9 +95,10 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - models.Review.objects.create( - content="hey", reply_parent=parent, user=self.local_user, book=self.book - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + models.Review.objects.create( + content="hey", reply_parent=parent, user=self.local_user, book=self.book + ) models.Status.objects.create( content="hi hello", reply_parent=child, user=self.local_user ) @@ -251,14 +255,15 @@ class Status(TestCase): def test_review_to_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.Review.objects.create( - name="Review name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create( + name="Review name", + content="test content", + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity() self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Review") self.assertEqual(activity["rating"], 3) @@ -268,14 +273,15 @@ class Status(TestCase): def test_review_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.Review.objects.create( - name="Review's name", - content="test content", - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create( + name="Review's name", + content="test content", + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Article") self.assertEqual( @@ -292,13 +298,14 @@ class Status(TestCase): def test_review_to_pure_activity_no_rating(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.Review.objects.create( - name="Review name", - content="test content", - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create( + name="Review name", + content="test content", + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Article") self.assertEqual( @@ -314,12 +321,13 @@ class Status(TestCase): def test_reviewrating_to_pure_activity(self, *_): """subclass of the base model version with a "pure" serializer""" - status = models.ReviewRating.objects.create( - rating=3.0, - user=self.local_user, - book=self.book, - ) - activity = status.to_activity(pure=True) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.ReviewRating.objects.create( + rating=3.0, + user=self.local_user, + book=self.book, + ) + activity = status.to_activity(pure=True) self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["type"], "Note") self.assertEqual( diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index b2791379d..96ec955a3 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -11,15 +11,16 @@ from bookwyrm.settings import DOMAIN # pylint: disable=missing-function-docstring class User(TestCase): def setUp(self): - self.user = models.User.objects.create_user( - "mouse@%s" % DOMAIN, - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", - name="hi", - bookwyrm_user=False, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse@%s" % DOMAIN, + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + name="hi", + bookwyrm_user=False, + ) def test_computed_fields(self): """username instead of id here""" diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py index 59266383f..bbd6dff9f 100644 --- a/bookwyrm/tests/test_activitystreams.py +++ b/bookwyrm/tests/test_activitystreams.py @@ -11,12 +11,17 @@ class Activitystreams(TestCase): def setUp(self): """use a test csv""" - self.local_user = models.User.objects.create_user( - "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" - ) - self.another_user = models.User.objects.create_user( - "nutria", "nutria@nutria.nutria", "password", local=True, localname="nutria" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.mouse", "password", local=True, localname="mouse" + ) + self.another_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -27,7 +32,8 @@ class Activitystreams(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.book = models.Edition.objects.create(title="test book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test book") class TestStream(activitystreams.ActivityStream): """test stream, don't have to do anything here""" diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index 0f9cc3659..e7b1bb1ca 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -15,14 +15,16 @@ class Emailing(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_invite_email(self, email_mock): """load the invite email""" diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 758ba9bbc..5a2f1b748 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -37,15 +37,20 @@ class Signature(TestCase): def setUp(self): """create users and test data""" - self.mouse = models.User.objects.create_user( - "mouse@%s" % DOMAIN, "mouse@example.com", "", local=True, localname="mouse" - ) - self.rat = models.User.objects.create_user( - "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat" - ) - self.cat = models.User.objects.create_user( - "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.mouse = models.User.objects.create_user( + "mouse@%s" % DOMAIN, + "mouse@example.com", + "", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@%s" % DOMAIN, "rat@example.com", "", local=True, localname="rat" + ) + self.cat = models.User.objects.create_user( + "cat@%s" % DOMAIN, "cat@example.com", "", local=True, localname="cat" + ) private_key, public_key = create_key_pair() @@ -53,7 +58,8 @@ class Signature(TestCase): "http://localhost/user/remote", KeyPair(private_key, public_key) ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def send(self, signature, now, data, digest): """test request""" diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index 4b1aa5946..a472ac74b 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -21,13 +21,14 @@ class TemplateTags(TestCase): def setUp(self): """create some filler objects""" - self.user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -36,12 +37,14 @@ class TemplateTags(TestCase): remote_id="http://example.com/rat", local=False, ) - self.book = models.Edition.objects.create(title="Test Book") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="Test Book") def test_get_user_rating(self, _): """get a user's most recent rating of a book""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.Review.objects.create(user=self.user, book=self.book, rating=3) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.Review.objects.create(user=self.user, book=self.book, rating=3) self.assertEqual(bookwyrm_tags.get_user_rating(self.book, self.user), 3) def test_get_user_rating_doesnt_exist(self, _): @@ -62,9 +65,12 @@ class TemplateTags(TestCase): def test_get_replies(self, _): """direct replies to a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) first_child = models.Status.objects.create( reply_parent=parent, user=self.user, content="hi" ) @@ -90,9 +96,12 @@ class TemplateTags(TestCase): def test_get_parent(self, _): """get the reply parent of a status""" with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - parent = models.Review.objects.create( - user=self.user, book=self.book, content="hi" - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + parent = models.Review.objects.create( + user=self.user, book=self.book, content="hi" + ) child = models.Status.objects.create( reply_parent=parent, user=self.user, content="hi" ) @@ -103,7 +112,8 @@ class TemplateTags(TestCase): def test_get_user_liked(self, _): """did a user like a status""" - status = models.Review.objects.create(user=self.remote_user, book=self.book) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_liked(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -112,7 +122,8 @@ class TemplateTags(TestCase): def test_get_user_boosted(self, _): """did a user boost a status""" - status = models.Review.objects.create(user=self.remote_user, book=self.book) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + status = models.Review.objects.create(user=self.remote_user, book=self.book) self.assertFalse(interaction.get_user_boosted(self.user, status)) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): @@ -121,9 +132,14 @@ class TemplateTags(TestCase): def test_get_boosted(self, _): """load a boosted status""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - status = models.Review.objects.create(user=self.remote_user, book=self.book) - boost = models.Boost.objects.create(user=self.user, boosted_status=status) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + status = models.Review.objects.create( + user=self.remote_user, book=self.book + ) + boost = models.Boost.objects.create( + user=self.user, boosted_status=status + ) boosted = status_display.get_boosted(boost) self.assertIsInstance(boosted, models.Review) self.assertEqual(boosted, status) diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index 697f40100..ccd3a5e5e 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -18,15 +18,17 @@ class Inbox(TestCase): """basic user and book data""" self.client = Client() self.factory = RequestFactory() - local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - local_user.remote_id = "https://example.com/user/mouse" - local_user.save(broadcast=False) + + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + local_user.remote_id = "https://example.com/user/mouse" + local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -45,7 +47,8 @@ class Inbox(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_inbox_invalid_get(self): """shouldn't try to handle if the user is not found""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 5f86b1215..c1fd90fea 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -13,15 +13,16 @@ class InboxAdd(TestCase): def setUp(self): """basic user and book data""" - local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - local_user.remote_id = "https://example.com/user/mouse" - local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + local_user.remote_id = "https://example.com/user/mouse" + local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,14 +33,15 @@ class InboxAdd(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://example.com/book/37292", - parent_work=work, - ) - - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://example.com/book/37292", + parent_work=work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() @responses.activate def test_handle_add_book_to_shelf(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 4243dc78e..853266ed1 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -13,15 +13,16 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,13 +33,14 @@ class InboxActivities(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.status = models.Status.objects.create( - user=self.local_user, - content="Test status", - remote_id="https://example.com/status/1", - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + self.status = models.Status.objects.create( + user=self.local_user, + content="Test status", + remote_id="https://example.com/status/1", + ) self.create_json = { "id": "hi", @@ -48,7 +50,8 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_boost(self, redis_mock): @@ -83,12 +86,13 @@ class InboxActivities(TestCase): @patch("bookwyrm.activitystreams.ActivityStream.add_status") def test_boost_remote_status(self, redis_mock): """boost a status from a remote server""" - work = models.Work.objects.create(title="work title") - book = models.Edition.objects.create( - title="Test", - remote_id="https://bookwyrm.social/book/37292", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="work title") + book = models.Edition.objects.create( + title="Test", + remote_id="https://bookwyrm.social/book/37292", + parent_work=work, + ) self.assertEqual(models.Notification.objects.count(), 0) activity = { "type": "Announce", diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 956cf538a..310a6fa67 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -12,15 +12,16 @@ class InboxBlock(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,8 +32,8 @@ class InboxBlock(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_blocks(self): """create a "block" database entry from an activity""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 958dfee8c..3f677bd2e 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -15,15 +15,16 @@ class InboxCreate(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( @@ -50,7 +51,8 @@ class InboxCreate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_create_status(self): """the "it justs works" mode""" @@ -60,9 +62,11 @@ class InboxCreate(TestCase): "../../data/ap_quotation.json" ) status_data = json.loads(datafile.read_bytes()) - models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = status_data @@ -129,9 +133,10 @@ class InboxCreate(TestCase): def test_create_rating(self): """a remote rating activity""" - book = models.Edition.objects.create( - title="Test Book", remote_id="https://example.com/book/1" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Edition.objects.create( + title="Test Book", remote_id="https://example.com/book/1" + ) activity = self.create_json activity["object"] = { "id": "https://example.com/user/mouse/reviewrating/12", diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 617dcf6f5..07b286a54 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -13,15 +13,16 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -47,7 +48,8 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_delete_status(self): """remove a status""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index f5332b7a3..5d5dcd4ea 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -13,15 +13,17 @@ class InboxRelationships(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,8 +34,8 @@ class InboxRelationships(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_follow(self): """remote user wants to follow local user""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index a5f3a9f09..aa10f93fe 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -12,15 +12,16 @@ class InboxActivities(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,6 +32,7 @@ class InboxActivities(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( @@ -47,7 +49,9 @@ class InboxActivities(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_favorite(self): """fav a status""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index a0c4cdcf9..3c2e72d64 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -12,15 +12,16 @@ class InboxRemove(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,14 +32,17 @@ class InboxRemove(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - self.work = models.Work.objects.create(title="work title") - self.book = models.Edition.objects.create( - title="Test", - remote_id="https://bookwyrm.social/book/37292", - parent_work=self.work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="work title") + self.book = models.Edition.objects.create( + title="Test", + remote_id="https://bookwyrm.social/book/37292", + parent_work=self.work, + ) + + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_unshelve_book(self): """remove a book from a shelf""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 9fdc97922..78d694a2a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -14,15 +14,16 @@ class InboxUpdate(TestCase): def setUp(self): """basic user and book data""" - self.local_user = models.User.objects.create_user( - "mouse@example.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - ) - self.local_user.remote_id = "https://example.com/user/mouse" - self.local_user.save(broadcast=False) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + self.local_user.remote_id = "https://example.com/user/mouse" + self.local_user.save(broadcast=False) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -42,7 +43,8 @@ class InboxUpdate(TestCase): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_update_list(self): """a new list""" @@ -120,12 +122,13 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_edition.json") bookdata = json.loads(datafile.read_bytes()) - models.Work.objects.create( - title="Test Work", remote_id="https://bookwyrm.social/book/5988" - ) - book = models.Edition.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5989" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + models.Work.objects.create( + title="Test Work", remote_id="https://bookwyrm.social/book/5988" + ) + book = models.Edition.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5989" + ) del bookdata["authors"] self.assertEqual(book.title, "Test Book") @@ -150,9 +153,10 @@ class InboxUpdate(TestCase): datafile = pathlib.Path(__file__).parent.joinpath("../../data/bw_work.json") bookdata = json.loads(datafile.read_bytes()) - book = models.Work.objects.create( - title="Test Book", remote_id="https://bookwyrm.social/book/5988" - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = models.Work.objects.create( + title="Test Book", remote_id="https://bookwyrm.social/book/5988" + ) del bookdata["authors"] self.assertEqual(book.title, "Test Book") diff --git a/bookwyrm/tests/views/test_announcements.py b/bookwyrm/tests/views/test_announcements.py index 0f17d3b9a..e25923949 100644 --- a/bookwyrm/tests/views/test_announcements.py +++ b/bookwyrm/tests/views/test_announcements.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import forms, models, views @@ -12,14 +13,16 @@ class AnnouncementViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_announcements_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_authentication.py b/bookwyrm/tests/views/test_authentication.py index c310b0a26..94213c610 100644 --- a/bookwyrm/tests/views/test_authentication.py +++ b/bookwyrm/tests/views/test_authentication.py @@ -19,16 +19,18 @@ class AuthenticationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - self.settings = models.SiteSettings.objects.create(id=1) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.settings = models.SiteSettings.objects.create(id=1) def test_login_get(self): """there are so many views, this just makes sure it LOADS""" @@ -58,8 +60,9 @@ class AuthenticationViews(TestCase): "email": "aa@bb.cccc", }, ) - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) nutria = models.User.objects.last() @@ -74,8 +77,9 @@ class AuthenticationViews(TestCase): "register/", {"localname": "nutria ", "password": "mouseword", "email": "aa@bb.ccc"}, ) - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) nutria = models.User.objects.last() @@ -153,8 +157,9 @@ class AuthenticationViews(TestCase): "invite_code": "testcode", }, ) - with patch("bookwyrm.views.authentication.login"): - response = view(request) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.views.authentication.login"): + response = view(request) self.assertEqual(models.User.objects.count(), 2) self.assertEqual(response.status_code, 302) self.assertEqual(models.SiteInvite.objects.get().times_used, 1) diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 5dfbc3504..06080bb25 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -17,14 +17,15 @@ class AuthorViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -33,13 +34,15 @@ class AuthorViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_author_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index 0b754689d..80d20f11b 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -14,13 +14,14 @@ class BlockViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -31,7 +32,8 @@ class BlockViews(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_block_get(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 909718ec3..37bf3e9ee 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -23,14 +23,15 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( @@ -39,13 +40,15 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_book_page(self): """there are so many views, this just makes sure it LOADS""" @@ -85,8 +88,11 @@ class BookViews(TestCase): form.data["last_edited_by"] = self.local_user.id request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) + self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") @@ -101,8 +107,9 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - result = view(request, self.book.id) - result.render() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + result = view(request, self.book.id) + result.render() # the changes haven't been saved yet self.book.refresh_from_db() @@ -120,8 +127,9 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") @@ -197,8 +205,11 @@ class BookViews(TestCase): def test_switch_edition(self): """updates user's relationships to a book""" work = models.Work.objects.create(title="test work") - edition1 = models.Edition.objects.create(title="first ed", parent_work=work) - edition2 = models.Edition.objects.create(title="second ed", parent_work=work) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + edition1 = models.Edition.objects.create(title="first ed", parent_work=work) + edition2 = models.Edition.objects.create( + title="second ed", parent_work=work + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): shelf = models.Shelf.objects.create(name="Test Shelf", user=self.local_user) models.ShelfBook.objects.create( @@ -251,11 +262,12 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - views.upload_cover(request, self.book.id) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + views.upload_cover(request, self.book.id) + self.assertEqual(delay_mock.call_count, 1) self.book.refresh_from_db() self.assertTrue(self.book.cover) @@ -283,11 +295,12 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - views.upload_cover(request, self.book.id) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + views.upload_cover(request, self.book.id) + self.assertEqual(delay_mock.call_count, 1) self.book.refresh_from_db() self.assertTrue(self.book.cover) diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index cada50bce..79dbd2a23 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import models, views @@ -12,24 +13,26 @@ class DirectoryViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - 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", - discoverable=True, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + 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", + discoverable=True, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_directory_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index 4469040ee..b4d81d54c 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -15,13 +15,14 @@ class FederationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -32,7 +33,8 @@ class FederationViews(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_federation_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index a6a3d9677..81087cd1e 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -22,19 +22,22 @@ class FeedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_feed(self, *_): """there are so many views, this just makes sure it LOADS""" @@ -89,11 +92,14 @@ class FeedViews(TestCase): output = BytesIO() image.save(output, format=image.format) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - status = models.Review.objects.create( - content="hi", - user=self.local_user, - book=self.book, - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + status = models.Review.objects.create( + content="hi", + user=self.local_user, + book=self.book, + ) attachment = models.Image.objects.create( status=status, caption="alt text here" ) @@ -146,12 +152,13 @@ class FeedViews(TestCase): def test_get_suggested_book(self, *_): """gets books the ~*~ algorithm ~*~ thinks you want to post about""" - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - models.ShelfBook.objects.create( - book=self.book, - user=self.local_user, - shelf=self.local_user.shelf_set.get(identifier="reading"), - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + models.ShelfBook.objects.create( + book=self.book, + user=self.local_user, + shelf=self.local_user.shelf_set.get(identifier="reading"), + ) suggestions = views.feed.get_suggested_books(self.local_user) self.assertEqual(suggestions[0]["name"], "Currently Reading") self.assertEqual(suggestions[0]["books"][0], self.book) diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 45e60d3cb..8ea8accc5 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -16,14 +16,15 @@ class BookViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) with patch("bookwyrm.models.user.set_remote_server"): self.remote_user = models.User.objects.create_user( "rat", @@ -42,12 +43,13 @@ class BookViews(TestCase): content_type=ContentType.objects.get_for_model(models.User), ).id ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) def test_handle_follow_remote(self): """send a follow request""" @@ -66,15 +68,16 @@ class BookViews(TestCase): def test_handle_follow_local_manually_approves(self): """send a follow request""" - rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - manually_approves_followers=True, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + manually_approves_followers=True, + ) request = self.factory.post("", {"user": rat}) request.user = self.local_user self.assertEqual(models.UserFollowRequest.objects.count(), 0) @@ -89,14 +92,15 @@ class BookViews(TestCase): def test_handle_follow_local(self): """send a follow request""" - rat = models.User.objects.create_user( - "rat@local.com", - "rat@rat.com", - "ratword", - local=True, - localname="rat", - remote_id="https://example.com/users/rat", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + rat = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) request = self.factory.post("", {"user": rat}) request.user = self.local_user self.assertEqual(models.UserFollowRequest.objects.count(), 0) diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 1c55da086..2eb89f10c 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -13,22 +13,25 @@ class GetStartedViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), - title="Example Edition", - remote_id="https://example.com/book/1", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + parent_work=models.Work.objects.create(title="hi"), + title="Example Edition", + remote_id="https://example.com/book/1", + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_profile_view(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index 4e8f6ee23..013d15950 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -16,29 +16,32 @@ class GoalViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - 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", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + 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", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_goal_page_no_goal(self): """view a reading goal page for another's unset goal""" diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index ab5abed0b..bc99e69fd 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -19,21 +19,23 @@ class ViewsHelpers(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - discoverable=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + discoverable=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", @@ -202,21 +204,22 @@ class ViewsHelpers(TestCase): def test_get_annotated_users(self, _): """list of people you might know""" - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", - local=True, - localname="nutria", - discoverable=True, - ) - user_2 = models.User.objects.create_user( - "fish@local.com", - "fish@fish.com", - "fishword", - local=True, - localname="fish", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user_1 = models.User.objects.create_user( + "nutria@local.com", + "nutria@nutria.com", + "nutriaword", + local=True, + localname="nutria", + discoverable=True, + ) + user_2 = models.User.objects.create_user( + "fish@local.com", + "fish@fish.com", + "fishword", + local=True, + localname="fish", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): # 1 shared follow self.local_user.following.add(user_2) @@ -249,39 +252,42 @@ class ViewsHelpers(TestCase): def test_get_annotated_users_counts(self, _): """correct counting for multiple shared attributed""" - user_1 = models.User.objects.create_user( - "nutria@local.com", - "nutria@nutria.com", - "nutriaword", - local=True, - localname="nutria", - discoverable=True, - ) - for i in range(3): - user = models.User.objects.create_user( - "{:d}@local.com".format(i), - "{:d}@nutria.com".format(i), - "password", + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user_1 = models.User.objects.create_user( + "nutria@local.com", + "nutria@nutria.com", + "nutriaword", local=True, - localname=i, + localname="nutria", + discoverable=True, ) - user.following.add(user_1) - user.followers.add(self.local_user) - - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): for i in range(3): - book = models.Edition.objects.create( - title=i, - parent_work=models.Work.objects.create(title=i), - ) - models.ShelfBook.objects.create( - user=self.local_user, - book=book, - shelf=self.local_user.shelf_set.first(), - ) - models.ShelfBook.objects.create( - user=user_1, book=book, shelf=user_1.shelf_set.first() + user = models.User.objects.create_user( + "{:d}@local.com".format(i), + "{:d}@nutria.com".format(i), + "password", + local=True, + localname=i, ) + user.following.add(user_1) + user.followers.add(self.local_user) + + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + for i in range(3): + book = models.Edition.objects.create( + title=i, + parent_work=models.Work.objects.create(title=i), + ) + models.ShelfBook.objects.create( + user=self.local_user, + book=book, + shelf=self.local_user.shelf_set.first(), + ) + models.ShelfBook.objects.create( + user=user_1, book=book, shelf=user_1.shelf_set.first() + ) result = views.helpers.get_annotated_users( self.local_user, diff --git a/bookwyrm/tests/views/test_import.py b/bookwyrm/tests/views/test_import.py index 22694623a..da8ade989 100644 --- a/bookwyrm/tests/views/test_import.py +++ b/bookwyrm/tests/views/test_import.py @@ -14,14 +14,16 @@ class ImportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_import_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 876d6053c..208d270ce 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -14,14 +14,15 @@ class InteractionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) with patch("bookwyrm.models.user.set_remote_server"): self.remote_user = models.User.objects.create_user( "rat", @@ -33,12 +34,13 @@ class InteractionViews(TestCase): outbox="https://example.com/users/rat/outbox", ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_favorite(self, _): """create and broadcast faving a status""" diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py index 7b5071b36..0743c65e1 100644 --- a/bookwyrm/tests/views/test_invite.py +++ b/bookwyrm/tests/views/test_invite.py @@ -16,14 +16,16 @@ class InviteViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_invite_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index 2aedd3cea..f26a08e53 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -16,25 +16,28 @@ class IsbnViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - isbn_13="1234567890123", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + isbn_13="1234567890123", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_isbn_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_landing.py b/bookwyrm/tests/views/test_landing.py index 864e48f7f..7def39585 100644 --- a/bookwyrm/tests/views/test_landing.py +++ b/bookwyrm/tests/views/test_landing.py @@ -15,16 +15,18 @@ class LandingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_home_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list.py b/bookwyrm/tests/views/test_list.py index d6ad0e865..3783b9b69 100644 --- a/bookwyrm/tests/views/test_list.py +++ b/bookwyrm/tests/views/test_list.py @@ -17,46 +17,48 @@ class ListViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - 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", - ) - work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - work_two = models.Work.objects.create(title="Labori") - self.book_two = models.Edition.objects.create( - title="Example Edition 2", - remote_id="https://example.com/book/2", - parent_work=work_two, - ) - work_three = models.Work.objects.create(title="Trabajar") - self.book_three = models.Edition.objects.create( - title="Example Edition 3", - remote_id="https://example.com/book/3", - parent_work=work_three, - ) - work_four = models.Work.objects.create(title="Travailler") - self.book_four = models.Edition.objects.create( - title="Example Edition 4", - remote_id="https://example.com/book/4", - parent_work=work_four, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + 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", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + work_two = models.Work.objects.create(title="Labori") + self.book_two = models.Edition.objects.create( + title="Example Edition 2", + remote_id="https://example.com/book/2", + parent_work=work_two, + ) + work_three = models.Work.objects.create(title="Trabajar") + self.book_three = models.Edition.objects.create( + title="Example Edition 3", + remote_id="https://example.com/book/3", + parent_work=work_three, + ) + work_four = models.Work.objects.create(title="Travailler") + self.book_four = models.Edition.objects.create( + title="Example Edition 4", + remote_id="https://example.com/book/4", + parent_work=work_four, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.list = models.List.objects.create( @@ -64,7 +66,8 @@ class ListViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_lists_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_list_actions.py b/bookwyrm/tests/views/test_list_actions.py index 30c44a2cb..cbe00d27a 100644 --- a/bookwyrm/tests/views/test_list_actions.py +++ b/bookwyrm/tests/views/test_list_actions.py @@ -15,46 +15,49 @@ class ListActionViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - 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", - ) - work = models.Work.objects.create(title="Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - work_two = models.Work.objects.create(title="Labori") - self.book_two = models.Edition.objects.create( - title="Example Edition 2", - remote_id="https://example.com/book/2", - parent_work=work_two, - ) - work_three = models.Work.objects.create(title="Trabajar") - self.book_three = models.Edition.objects.create( - title="Example Edition 3", - remote_id="https://example.com/book/3", - parent_work=work_three, - ) - work_four = models.Work.objects.create(title="Travailler") - self.book_four = models.Edition.objects.create( - title="Example Edition 4", - remote_id="https://example.com/book/4", - parent_work=work_four, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + 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", + ) + + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + work_two = models.Work.objects.create(title="Labori") + self.book_two = models.Edition.objects.create( + title="Example Edition 2", + remote_id="https://example.com/book/2", + parent_work=work_two, + ) + work_three = models.Work.objects.create(title="Trabajar") + self.book_three = models.Edition.objects.create( + title="Example Edition 3", + remote_id="https://example.com/book/3", + parent_work=work_three, + ) + work_four = models.Work.objects.create(title="Travailler") + self.book_four = models.Edition.objects.create( + title="Example Edition 4", + remote_id="https://example.com/book/4", + parent_work=work_four, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.list = models.List.objects.create( @@ -62,7 +65,8 @@ class ListActionViews(TestCase): ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_curate_approve(self): """approve a pending item""" diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 182753f91..1de196c56 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import models from bookwyrm import views @@ -13,14 +14,16 @@ class NotificationViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_notifications_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index f89258e5f..8877a2441 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -18,20 +18,22 @@ class OutboxView(TestCase): def setUp(self): """we'll need some data""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) def test_outbox(self, _): """returns user's statuses""" @@ -79,13 +81,16 @@ class OutboxView(TestCase): def test_outbox_filter(self, _): """if we only care about reviews, only get reviews""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - models.Review.objects.create( - content="look at this", - name="hi", - rating=1, - book=self.book, - user=self.local_user, - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + models.Review.objects.create( + content="look at this", + name="hi", + rating=1, + book=self.book, + user=self.local_user, + ) models.Status.objects.create(content="look at this", user=self.local_user) request = self.factory.get("", {"type": "bleh"}) @@ -105,13 +110,16 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_true(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + models.Review.objects.create( + name="hi", + content="look at this", + user=self.local_user, + book=self.book, + privacy="public", + ) request = self.factory.get("", {"page": 1}, HTTP_USER_AGENT=USER_AGENT) result = views.Outbox.as_view()(request, "mouse") @@ -123,13 +131,16 @@ class OutboxView(TestCase): def test_outbox_bookwyrm_request_false(self, _): """should differentiate between bookwyrm and outside requests""" with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - models.Review.objects.create( - name="hi", - content="look at this", - user=self.local_user, - book=self.book, - privacy="public", - ) + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + models.Review.objects.create( + name="hi", + content="look at this", + user=self.local_user, + book=self.book, + privacy="public", + ) request = self.factory.get("", {"page": 1}) result = views.Outbox.as_view()(request, "mouse") diff --git a/bookwyrm/tests/views/test_password.py b/bookwyrm/tests/views/test_password.py index ec686db74..982056b5a 100644 --- a/bookwyrm/tests/views/test_password.py +++ b/bookwyrm/tests/views/test_password.py @@ -15,16 +15,18 @@ class PasswordViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "password", - local=True, - localname="mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "password", + local=True, + localname="mouse", + ) self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False - models.SiteSettings.objects.create(id=1) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create(id=1) def test_password_reset_request(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index c591aa604..5a59ab992 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -15,20 +15,22 @@ class ReadingViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.user.set_remote_server.delay"): self.remote_user = models.User.objects.create_user( "rat", diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index 882c79291..a0050a82d 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -15,15 +15,17 @@ class ReadThrough(TestCase): """basic user and book data""" self.client = Client() - self.work = models.Work.objects.create(title="Example Work") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Example Work") - self.edition = models.Edition.objects.create( - title="Example Edition", parent_work=self.work - ) + self.edition = models.Edition.objects.create( + title="Example Edition", parent_work=self.work + ) - self.user = models.User.objects.create_user( - "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "cinco", "cinco@example.com", "seissiete", local=True, localname="cinco" + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.client.force_login(self.user) diff --git a/bookwyrm/tests/views/test_reports.py b/bookwyrm/tests/views/test_reports.py index 84539489d..7944d8b45 100644 --- a/bookwyrm/tests/views/test_reports.py +++ b/bookwyrm/tests/views/test_reports.py @@ -2,6 +2,7 @@ from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory +from unittest.mock import patch from bookwyrm import forms, models, views @@ -12,21 +13,23 @@ class ReportViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", - "rat@mouse.mouse", - "password", - local=True, - localname="rat", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", + "rat@mouse.mouse", + "password", + local=True, + localname="rat", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_reports_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index eacb3c936..57961a316 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -12,39 +12,45 @@ class RssFeedView(TestCase): def setUp(self): """test data""" - self.site = models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + self.site = models.SiteSettings.objects.create() - self.user = models.User.objects.create_user( - "rss_user", "rss@test.rss", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.user = models.User.objects.create_user( + "rss_user", "rss@test.rss", "password", local=True + ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - self.review = models.Review.objects.create( - name="Review name", - content="test content", - rating=3, - user=self.user, - book=self.book, - ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): + self.review = models.Review.objects.create( + name="Review name", + content="test content", + rating=3, + user=self.user, + book=self.book, + ) - self.quote = models.Quotation.objects.create( - quote="a sickening sense", - content="test content", - user=self.user, - book=self.book, - ) + self.quote = models.Quotation.objects.create( + quote="a sickening sense", + content="test content", + user=self.user, + book=self.book, + ) - self.generatednote = models.GeneratedNote.objects.create( - content="test content", user=self.user - ) + self.generatednote = models.GeneratedNote.objects.create( + content="test content", user=self.user + ) self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index ab2c910d4..56413de63 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -19,24 +19,27 @@ class Views(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Test Book", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Test Book", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) models.Connector.objects.create( identifier="self", connector_file="self_connector", local=True ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_search_json_response(self): """searches local data only and returns book data in json format""" diff --git a/bookwyrm/tests/views/test_shelf.py b/bookwyrm/tests/views/test_shelf.py index 239b3318f..21a305444 100644 --- a/bookwyrm/tests/views/test_shelf.py +++ b/bookwyrm/tests/views/test_shelf.py @@ -16,25 +16,28 @@ class ShelfViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) - self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=self.work, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): self.shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=self.local_user ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_shelf_page(self, _): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 6f2fd30d4..c12fd0c43 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -15,14 +15,15 @@ class StatusViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword", - local=True, - localname="mouse", - remote_id="https://example.com/users/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) with patch("bookwyrm.models.user.set_remote_server"): self.remote_user = models.User.objects.create_user( "rat", @@ -34,13 +35,15 @@ class StatusViews(TestCase): outbox="https://example.com/users/rat/outbox", ) - work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( - title="Example Edition", - remote_id="https://example.com/book/1", - parent_work=work, - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_handle_status(self, _): """create a status""" @@ -68,9 +71,10 @@ class StatusViews(TestCase): def test_handle_status_reply(self, _): """create a status in reply to an existing status""" view = views.CreateStatus.as_view() - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True + ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): parent = models.Status.objects.create( content="parent status", user=self.local_user @@ -98,9 +102,14 @@ class StatusViews(TestCase): def test_handle_status_mentions(self, _): """@mention a user in a post""" view = views.CreateStatus.as_view() - user = models.User.objects.create_user( - "rat@%s" % DOMAIN, "rat@rat.com", "password", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "rat@%s" % DOMAIN, + "rat@rat.com", + "password", + local=True, + localname="rat", + ) form = forms.CommentForm( { "content": "hi @rat", @@ -126,9 +135,10 @@ class StatusViews(TestCase): def test_handle_status_reply_with_mentions(self, _): """reply to a post with an @mention'ed user""" view = views.CreateStatus.as_view() - user = models.User.objects.create_user( - "rat", "rat@rat.com", "password", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "rat", "rat@rat.com", "password", local=True, localname="rat" + ) form = forms.CommentForm( { "content": "hi @rat@example.com", @@ -193,10 +203,11 @@ class StatusViews(TestCase): view = views.DeleteAndRedraft.as_view() request = self.factory.post("") request.user = self.local_user - with patch("bookwyrm.activitystreams.ActivityStream.add_status"): - status = models.ReviewRating.objects.create( - book=self.book, rating=2.0, user=self.local_user - ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status"): + status = models.ReviewRating.objects.create( + book=self.book, rating=2.0, user=self.local_user + ) with patch( "bookwyrm.activitystreams.ActivityStream.remove_object_from_related_stores" @@ -230,13 +241,14 @@ class StatusViews(TestCase): def test_find_mentions(self, _): """detect and look up @ mentions of users""" - user = models.User.objects.create_user( - "nutria@%s" % DOMAIN, - "nutria@nutria.com", - "password", - local=True, - localname="nutria", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + user = models.User.objects.create_user( + "nutria@%s" % DOMAIN, + "nutria@nutria.com", + "password", + local=True, + localname="nutria", + ) self.assertEqual(user.username, "nutria@%s" % DOMAIN) self.assertEqual( diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index fb003f8de..07800e2f7 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -14,15 +14,17 @@ class UpdateViews(TestCase): def setUp(self): """we need basic test data and mocks""" - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_get_notification_count(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 3fa78e355..1badf142a 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -20,18 +20,20 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - self.rat = models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) - self.book = models.Edition.objects.create(title="test") + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + self.rat = models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.book = models.Edition.objects.create(title="test") with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): models.ShelfBook.objects.create( book=self.book, @@ -39,7 +41,8 @@ class UserViews(TestCase): shelf=self.local_user.shelf_set.first(), ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False diff --git a/bookwyrm/tests/views/test_user_admin.py b/bookwyrm/tests/views/test_user_admin.py index a044a22c5..ac750be00 100644 --- a/bookwyrm/tests/views/test_user_admin.py +++ b/bookwyrm/tests/views/test_user_admin.py @@ -14,14 +14,16 @@ class UserAdminViews(TestCase): def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() def test_user_admin_list_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 244921d47..bd291d04b 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -15,17 +15,18 @@ class UserViews(TestCase): def setUp(self): """we need basic test data and mocks""" - self.factory = RequestFactory() - self.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + self.factory = RequestFactory() + self.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) with patch("bookwyrm.models.user.set_remote_server.delay"): models.User.objects.create_user( "rat", @@ -36,7 +37,8 @@ class UserViews(TestCase): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser self.anonymous_user.is_authenticated = False From b8bff8a882a3f7d62ee7677a4a008a2823053c18 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 21:09:57 +0200 Subject: [PATCH 076/196] Use field tracker to launch task on field change --- bookwyrm/models/book.py | 8 ++++++-- bookwyrm/models/site.py | 7 +++++-- bookwyrm/models/status.py | 10 ++++++++-- bookwyrm/models/user.py | 6 ++++-- 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index aa9a56017..398517bab 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -3,6 +3,7 @@ import re from django.db import models from django.dispatch import receiver +from model_utils import FieldTracker from model_utils.managers import InheritanceManager from bookwyrm import activitypub @@ -92,6 +93,7 @@ class Book(BookDataModel): published_date = fields.DateTimeField(blank=True, null=True) objects = InheritanceManager() + field_tracker = FieldTracker(fields=['authors', 'title', 'subtitle', 'cover']) @property def author_text(self): @@ -304,7 +306,9 @@ def isbn_13_to_10(isbn_13): @receiver(models.signals.post_save, sender=Edition) # pylint: disable=unused-argument def preview_image(instance, *args, **kwargs): - updated_fields = kwargs["update_fields"] + changed_fields = {} + if instance.field_tracker: + changed_fields = instance.field_tracker.changed() - if not updated_fields or "preview_image" not in updated_fields: + if len(changed_fields) > 0: generate_edition_preview_image_task.delay(instance.id) diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index d0076dc63..c9c015e1e 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -6,6 +6,7 @@ from Crypto import Random from django.db import models, IntegrityError from django.dispatch import receiver from django.utils import timezone +from model_utils import FieldTracker from bookwyrm.preview_images import generate_site_preview_image_task from bookwyrm.settings import DOMAIN @@ -48,6 +49,8 @@ class SiteSettings(models.Model): admin_email = models.EmailField(max_length=255, null=True, blank=True) footer_item = models.TextField(null=True, blank=True) + field_tracker = FieldTracker(fields=['name', 'instance_tagline', 'logo']) + @classmethod def get(cls): """gets the site settings db entry or defaults""" @@ -130,7 +133,7 @@ class PasswordReset(models.Model): @receiver(models.signals.post_save, sender=SiteSettings) # pylint: disable=unused-argument def preview_image(instance, *args, **kwargs): - updated_fields = kwargs["update_fields"] + changed_fields = instance.field_tracker.changed() - if not updated_fields or "preview_image" not in updated_fields: + if len(changed_fields) > 0: generate_site_preview_image_task.delay() diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index c55cd8d69..feedc02a5 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -8,6 +8,7 @@ from django.db import models from django.dispatch import receiver from django.template.loader import get_template from django.utils import timezone +from model_utils import FieldTracker from model_utils.managers import InheritanceManager from bookwyrm import activitypub @@ -306,6 +307,8 @@ class Review(Status): max_digits=3, ) + field_tracker = FieldTracker(fields=['rating']) + @property def pure_name(self): """clarify review names for mastodon serialization""" @@ -406,5 +409,8 @@ class Boost(ActivityMixin, Status): # pylint: disable=unused-argument def preview_image(instance, sender, *args, **kwargs): if sender in (Review, ReviewRating): - edition = instance.book - generate_edition_preview_image_task.delay(edition.id) + changed_fields = instance.field_tracker.changed() + + if len(changed_fields) > 0: + edition = instance.book + generate_edition_preview_image_task.delay(edition.id) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 2c4851520..f2c700b6c 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -9,6 +9,7 @@ from django.core.validators import MinValueValidator from django.dispatch import receiver from django.db import models from django.utils import timezone +from model_utils import FieldTracker import pytz from bookwyrm import activitypub @@ -122,6 +123,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): name_field = "username" property_fields = [("following_link", "following")] + field_tracker = FieldTracker(fields=['name', 'avatar']) @property def following_link(self): @@ -453,7 +455,7 @@ def get_remote_reviews(outbox): @receiver(models.signals.post_save, sender=User) # pylint: disable=unused-argument def preview_image(instance, *args, **kwargs): - updated_fields = kwargs["update_fields"] + changed_fields = instance.field_tracker.changed() - if not updated_fields or "preview_image" not in updated_fields: + if len(changed_fields) > 0: generate_user_preview_image_task.delay(instance.id) From b7965ce2aef2e4984154c00696ab5d45d4de3206 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 21:37:27 +0200 Subject: [PATCH 077/196] Fix tests --- bookwyrm/tests/activitypub/test_person.py | 5 +- bookwyrm/tests/activitypub/test_quotation.py | 21 ++-- .../tests/connectors/test_self_connector.py | 2 +- .../tests/management/test_populate_streams.py | 20 ++-- .../tests/models/test_activitypub_mixin.py | 108 +++++++++--------- bookwyrm/tests/models/test_base_model.py | 20 ++-- .../tests/models/test_federated_server.py | 47 ++++---- .../tests/models/test_relationship_models.py | 20 ++-- bookwyrm/tests/models/test_status_model.py | 29 ++--- bookwyrm/tests/models/test_user_model.py | 19 +-- bookwyrm/tests/test_activitystreams.py | 20 ++-- bookwyrm/tests/test_signing.py | 34 +++--- bookwyrm/tests/test_templatetags.py | 37 +++--- bookwyrm/tests/views/inbox/test_inbox.py | 20 ++-- bookwyrm/tests/views/inbox/test_inbox_add.py | 20 ++-- .../tests/views/inbox/test_inbox_announce.py | 20 ++-- .../tests/views/inbox/test_inbox_block.py | 20 ++-- .../tests/views/inbox/test_inbox_create.py | 20 ++-- .../tests/views/inbox/test_inbox_delete.py | 23 ++-- .../tests/views/inbox/test_inbox_follow.py | 20 ++-- bookwyrm/tests/views/inbox/test_inbox_like.py | 20 ++-- .../tests/views/inbox/test_inbox_remove.py | 20 ++-- .../tests/views/inbox/test_inbox_update.py | 20 ++-- bookwyrm/tests/views/test_block.py | 20 ++-- bookwyrm/tests/views/test_federation.py | 20 ++-- bookwyrm/tests/views/test_follow.py | 20 ++-- bookwyrm/tests/views/test_helpers.py | 22 ++-- bookwyrm/tests/views/test_interaction.py | 20 ++-- bookwyrm/tests/views/test_reading.py | 20 ++-- bookwyrm/tests/views/test_status.py | 20 ++-- bookwyrm/tests/views/test_wellknown.py | 20 ++-- 31 files changed, 380 insertions(+), 367 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py index 67aaf891e..20dbcdfb5 100644 --- a/bookwyrm/tests/activitypub/test_person.py +++ b/bookwyrm/tests/activitypub/test_person.py @@ -20,8 +20,9 @@ class Person(TestCase): def test_user_to_model(self): activity = activitypub.Person(**self.user_data) - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = activity.to_model(model=models.User) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + user = activity.to_model(model=models.User) self.assertEqual(user.username, "mouse@example.com") self.assertEqual(user.remote_id, "https://example.com/user/mouse") self.assertFalse(user.local) diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index 7d1b28698..59d4b1b61 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -12,16 +12,17 @@ class Quotation(TestCase): def setUp(self): """model objects we'll need""" - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.user = models.User.objects.create_user( - "mouse", - "mouse@mouse.mouse", - "mouseword", - local=False, - inbox="https://example.com/user/mouse/inbox", - outbox="https://example.com/user/mouse/outbox", - remote_id="https://example.com/user/mouse", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.user = models.User.objects.create_user( + "mouse", + "mouse@mouse.mouse", + "mouseword", + local=False, + inbox="https://example.com/user/mouse/inbox", + outbox="https://example.com/user/mouse/outbox", + remote_id="https://example.com/user/mouse", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index e49d9671f..e6e64a7dc 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -82,7 +82,7 @@ class SelfConnector(TestCase): def test_search_multiple_editions(self): """it should get rid of duplicate editions for the same work""" - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="Work Title") edition_1 = models.Edition.objects.create( title="Edition 1 Title", parent_work=work diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index f6d24c53a..1705cd348 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -23,16 +23,16 @@ class Activitystreams(TestCase): local=True, localname="nutria", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="test book") diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 348270edf..020d031d2 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -25,16 +25,16 @@ class ActivitypubMixins(TestCase): ) self.local_user.remote_id = "http://example.com/a/b" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.object_mock = { "to": "to field", @@ -143,16 +143,17 @@ class ActivitypubMixins(TestCase): MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + ) MockSelf = namedtuple("Self", ("privacy", "user", "recipients")) mock_self = MockSelf("public", self.local_user, [another_remote_user]) @@ -166,16 +167,17 @@ class ActivitypubMixins(TestCase): MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + ) MockSelf = namedtuple("Self", ("privacy", "user", "recipients")) mock_self = MockSelf("direct", self.local_user, [another_remote_user]) @@ -187,17 +189,18 @@ class ActivitypubMixins(TestCase): """should combine users with the same shared_inbox""" self.remote_user.shared_inbox = "http://example.com/inbox" self.remote_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - shared_inbox="http://example.com/inbox", - outbox="https://example.com/users/nutria/outbox", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + shared_inbox="http://example.com/inbox", + outbox="https://example.com/users/nutria/outbox", + ) MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) @@ -209,17 +212,18 @@ class ActivitypubMixins(TestCase): def test_get_recipients_software(self, _): """should differentiate between bookwyrm and other remote users""" - with patch("bookwyrm.models.user.set_remote_server.delay"): - another_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - bookwyrm_user=False, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + another_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + bookwyrm_user=False, + ) MockSelf = namedtuple("Self", ("privacy", "user")) mock_self = MockSelf("public", self.local_user) self.local_user.followers.add(self.remote_user) diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 8b0e55b7f..496a86104 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -16,16 +16,16 @@ class BaseModel(TestCase): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) class BookWyrmTestModel(base_model.BookWyrmModel): """just making it not abstract""" diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py index 43724568d..fabd69eea 100644 --- a/bookwyrm/tests/models/test_federated_server.py +++ b/bookwyrm/tests/models/test_federated_server.py @@ -11,29 +11,30 @@ class FederatedServer(TestCase): def setUp(self): """we'll need a user""" self.server = models.FederatedServer.objects.create(server_name="test.server") - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - federated_server=self.server, - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - self.inactive_remote_user = models.User.objects.create_user( - "nutria", - "nutria@nutria.com", - "nutriaword", - federated_server=self.server, - local=False, - remote_id="https://example.com/users/nutria", - inbox="https://example.com/users/nutria/inbox", - outbox="https://example.com/users/nutria/outbox", - is_active=False, - deactivation_reason="self_deletion", - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + federated_server=self.server, + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + self.inactive_remote_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.com", + "nutriaword", + federated_server=self.server, + local=False, + remote_id="https://example.com/users/nutria", + inbox="https://example.com/users/nutria/inbox", + outbox="https://example.com/users/nutria/outbox", + is_active=False, + deactivation_reason="self_deletion", + ) def test_block_unblock(self): """block a server and all users on it""" diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index 516bfeb12..0a630dd12 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -10,17 +10,17 @@ class Relationship(TestCase): def setUp(self): """we need some users for this""" - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" ) diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 0005c507e..db4475c78 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -25,16 +25,16 @@ class Status(TestCase): self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="Test Edition") @@ -356,11 +356,12 @@ class Status(TestCase): status = models.Status.objects.create( content="test content", user=self.local_user ) - fav = models.Favorite.objects.create(status=status, user=self.local_user) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + fav = models.Favorite.objects.create(status=status, user=self.local_user) - # can't fav a status twice - with self.assertRaises(IntegrityError): - models.Favorite.objects.create(status=status, user=self.local_user) + # can't fav a status twice + with self.assertRaises(IntegrityError): + models.Favorite.objects.create(status=status, user=self.local_user) activity = fav.to_activity() self.assertEqual(activity["type"], "Like") diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 96ec955a3..b6c716638 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -35,15 +35,16 @@ class User(TestCase): self.assertIsNotNone(self.user.key_pair.public_key) def test_remote_user(self): - with patch("bookwyrm.models.user.set_remote_server.delay"): - user = models.User.objects.create_user( - "rat", - "rat@rat.rat", - "ratword", - local=False, - remote_id="https://example.com/dfjkg", - bookwyrm_user=False, - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + local=False, + remote_id="https://example.com/dfjkg", + bookwyrm_user=False, + ) self.assertEqual(user.username, "rat@example.com") def test_user_shelves(self): diff --git a/bookwyrm/tests/test_activitystreams.py b/bookwyrm/tests/test_activitystreams.py index bbd6dff9f..da335e894 100644 --- a/bookwyrm/tests/test_activitystreams.py +++ b/bookwyrm/tests/test_activitystreams.py @@ -22,16 +22,16 @@ class Activitystreams(TestCase): local=True, localname="nutria", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="test book") diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 5a2f1b748..b9b1af261 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -119,9 +119,10 @@ class Signature(TestCase): status=200, ) - with patch("bookwyrm.models.user.get_remote_reviews.delay"): - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.get_remote_reviews.delay"): + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) @responses.activate def test_key_needs_refresh(self): @@ -142,22 +143,23 @@ class Signature(TestCase): data["publicKey"]["publicKeyPem"] = key_pair.public_key responses.add(responses.GET, self.fake_remote.remote_id, json=data, status=200) - with patch("bookwyrm.models.user.get_remote_reviews.delay"): - # Key correct: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.get_remote_reviews.delay"): + # Key correct: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Old key is cached, so still works: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 200) + # Old key is cached, so still works: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 200) - # Try with new key: - response = self.send_test_request(sender=new_sender) - self.assertEqual(response.status_code, 200) + # Try with new key: + response = self.send_test_request(sender=new_sender) + self.assertEqual(response.status_code, 200) - # Now the old key will fail: - response = self.send_test_request(sender=self.fake_remote) - self.assertEqual(response.status_code, 401) + # Now the old key will fail: + response = self.send_test_request(sender=self.fake_remote) + self.assertEqual(response.status_code, 401) @responses.activate def test_nonexistent_signer(self): diff --git a/bookwyrm/tests/test_templatetags.py b/bookwyrm/tests/test_templatetags.py index a472ac74b..9a215cadf 100644 --- a/bookwyrm/tests/test_templatetags.py +++ b/bookwyrm/tests/test_templatetags.py @@ -29,14 +29,14 @@ class TemplateTags(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.rat", - "ratword", - remote_id="http://example.com/rat", - local=False, - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.rat", + "ratword", + remote_id="http://example.com/rat", + local=False, + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.book = models.Edition.objects.create(title="Test Book") @@ -146,19 +146,20 @@ class TemplateTags(TestCase): def test_get_book_description(self, _): """grab it from the edition or the parent""" - work = models.Work.objects.create(title="Test Work") - self.book.parent_work = work - self.book.save() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + work = models.Work.objects.create(title="Test Work") + self.book.parent_work = work + self.book.save() - self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) + self.assertIsNone(bookwyrm_tags.get_book_description(self.book)) - work.description = "hi" - work.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") + work.description = "hi" + work.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hi") - self.book.description = "hello" - self.book.save() - self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") + self.book.description = "hello" + self.book.save() + self.assertEqual(bookwyrm_tags.get_book_description(self.book), "hello") def test_get_uuid(self, _): """uuid functionality""" diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index ccd3a5e5e..0ac813bb1 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -29,16 +29,16 @@ class Inbox(TestCase): ) local_user.remote_id = "https://example.com/user/mouse" local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.create_json = { "id": "hi", "type": "Create", diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index c1fd90fea..2862fdf57 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -23,16 +23,16 @@ class InboxAdd(TestCase): ) local_user.remote_id = "https://example.com/user/mouse" local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="work title") self.book = models.Edition.objects.create( diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 853266ed1..4815c6895 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -23,16 +23,16 @@ class InboxActivities(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 310a6fa67..8c12e42bf 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -22,16 +22,16 @@ class InboxBlock(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 3f677bd2e..a885239b6 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -25,6 +25,16 @@ class InboxCreate(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( @@ -32,16 +42,6 @@ class InboxCreate(TestCase): content="Test status", remote_id="https://example.com/status/1", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) self.create_json = { "id": "hi", diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 07b286a54..067a30ad3 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -23,16 +23,16 @@ class InboxActivities(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.activitystreams.ActivityStream.add_status"): self.status = models.Status.objects.create( user=self.remote_user, @@ -119,7 +119,8 @@ class InboxActivities(TestCase): "object": self.remote_user.remote_id, } - views.inbox.activity_task(activity) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + views.inbox.activity_task(activity) self.assertFalse(models.User.objects.get(username="rat@example.com").is_active) def test_delete_user_unknown(self): diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 5d5dcd4ea..063ad5d39 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -23,17 +23,17 @@ class InboxRelationships(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index aa10f93fe..5d072fb0c 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -22,16 +22,16 @@ class InboxActivities(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): with patch("bookwyrm.activitystreams.ActivityStream.add_status"): diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index 3c2e72d64..2812ef1ff 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -22,16 +22,16 @@ class InboxRemove(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="work title") diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 78d694a2a..39ac4a895 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -24,16 +24,16 @@ class InboxUpdate(TestCase): ) self.local_user.remote_id = "https://example.com/user/mouse" self.local_user.save(broadcast=False) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.create_json = { "id": "hi", diff --git a/bookwyrm/tests/views/test_block.py b/bookwyrm/tests/views/test_block.py index 80d20f11b..d640617cd 100644 --- a/bookwyrm/tests/views/test_block.py +++ b/bookwyrm/tests/views/test_block.py @@ -22,16 +22,16 @@ class BlockViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_federation.py b/bookwyrm/tests/views/test_federation.py index b4d81d54c..9ff122552 100644 --- a/bookwyrm/tests/views/test_federation.py +++ b/bookwyrm/tests/views/test_federation.py @@ -23,16 +23,16 @@ class FederationViews(TestCase): local=True, localname="mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 8ea8accc5..f37370cc6 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -25,16 +25,16 @@ class BookViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) self.group = Group.objects.create(name="editor") self.group.permissions.add( Permission.objects.create( diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index bc99e69fd..f0807c55b 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -29,6 +29,17 @@ class ViewsHelpers(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + discoverable=True, + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") self.book = models.Edition.objects.create( @@ -36,17 +47,6 @@ class ViewsHelpers(TestCase): remote_id="https://example.com/book/1", parent_work=self.work, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - discoverable=True, - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") self.userdata = json.loads(datafile.read_bytes()) del self.userdata["icon"] diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index 208d270ce..cb974dcdb 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -23,16 +23,16 @@ class InteractionViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="Test Work") diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index 5a59ab992..1ffdde732 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -24,6 +24,16 @@ class ReadingViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") self.book = models.Edition.objects.create( @@ -31,16 +41,6 @@ class ReadingViews(TestCase): remote_id="https://example.com/book/1", parent_work=self.work, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) def test_start_reading(self, _): """begin a book""" diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index c12fd0c43..9253e6e57 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -24,16 +24,16 @@ class StatusViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server"): - self.remote_user = models.User.objects.create_user( - "rat", - "rat@email.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@email.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): work = models.Work.objects.create(title="Test Work") diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index bd291d04b..839240ed6 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -27,16 +27,16 @@ class UserViews(TestCase): models.User.objects.create_user( "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - models.User.objects.create_user( - "rat", - "rat@remote.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + models.User.objects.create_user( + "rat", + "rat@remote.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): models.SiteSettings.objects.create() self.anonymous_user = AnonymousUser From d9d34d82201cd02af1905938e9be7694557dae4b Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 21:40:23 +0200 Subject: [PATCH 078/196] Fix linting --- bookwyrm/models/book.py | 2 +- bookwyrm/models/site.py | 2 +- bookwyrm/models/status.py | 4 ++-- bookwyrm/models/user.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 398517bab..91ebbc463 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -93,7 +93,7 @@ class Book(BookDataModel): published_date = fields.DateTimeField(blank=True, null=True) objects = InheritanceManager() - field_tracker = FieldTracker(fields=['authors', 'title', 'subtitle', 'cover']) + field_tracker = FieldTracker(fields=["authors", "title", "subtitle", "cover"]) @property def author_text(self): diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index c9c015e1e..670816942 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -49,7 +49,7 @@ class SiteSettings(models.Model): admin_email = models.EmailField(max_length=255, null=True, blank=True) footer_item = models.TextField(null=True, blank=True) - field_tracker = FieldTracker(fields=['name', 'instance_tagline', 'logo']) + field_tracker = FieldTracker(fields=["name", "instance_tagline", "logo"]) @classmethod def get(cls): diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index feedc02a5..81c73bf52 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -307,7 +307,7 @@ class Review(Status): max_digits=3, ) - field_tracker = FieldTracker(fields=['rating']) + field_tracker = FieldTracker(fields=["rating"]) @property def pure_name(self): @@ -410,7 +410,7 @@ class Boost(ActivityMixin, Status): def preview_image(instance, sender, *args, **kwargs): if sender in (Review, ReviewRating): changed_fields = instance.field_tracker.changed() - + if len(changed_fields) > 0: edition = instance.book generate_edition_preview_image_task.delay(edition.id) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index f2c700b6c..be65483ca 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -123,7 +123,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): name_field = "username" property_fields = [("following_link", "following")] - field_tracker = FieldTracker(fields=['name', 'avatar']) + field_tracker = FieldTracker(fields=["name", "avatar"]) @property def following_link(self): From f8df5012391a8ae1dec8c6de2f8c9e3d7f2b7937 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 23:19:17 +0200 Subject: [PATCH 079/196] Fix tests (for realz) --- .../tests/activitypub/test_base_activity.py | 9 ++-- .../connectors/test_abstract_connector.py | 5 +- .../connectors/test_openlibrary_connector.py | 11 +++-- .../tests/connectors/test_self_connector.py | 30 ++++++------ bookwyrm/tests/models/test_fields.py | 29 +++++------ bookwyrm/tests/models/test_import_model.py | 3 +- bookwyrm/tests/models/test_status_model.py | 2 +- .../tests/views/inbox/test_inbox_create.py | 7 +-- .../tests/views/inbox/test_inbox_update.py | 48 ++++++++++--------- bookwyrm/tests/views/test_book.py | 21 ++++---- bookwyrm/tests/views/test_get_started.py | 11 +++-- bookwyrm/tests/views/test_helpers.py | 9 ++-- bookwyrm/tests/views/test_user.py | 22 +++++---- 13 files changed, 112 insertions(+), 95 deletions(-) diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 54fbb49e6..9a88b1c66 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -98,10 +98,11 @@ class BaseActivity(TestCase): status=200, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = resolve_remote_id( - "https://example.com/user/mouse", model=models.User - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = resolve_remote_id( + "https://example.com/user/mouse", model=models.User + ) self.assertIsInstance(result, models.User) self.assertEqual(result.remote_id, "https://example.com/user/mouse") self.assertEqual(result.name, "MOUSE?? MOUSE!!") diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 9ca3c8f2f..68a4c7be2 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -111,8 +111,9 @@ class AbstractConnector(TestCase): responses.add( responses.GET, "https://example.com/book/abcd", json=self.edition_data ) - with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): - result = self.connector.get_or_create_book("https://example.com/book/abcd") + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): + result = self.connector.get_or_create_book("https://example.com/book/abcd") self.assertEqual(result, self.book) self.assertEqual(models.Edition.objects.count(), 1) self.assertEqual(models.Edition.objects.count(), 1) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 8c00061a4..b34a68d20 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -230,11 +230,12 @@ class Openlibrary(TestCase): json={"hi": "there"}, status=200, ) - with patch( - "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" - ) as mock: - mock.return_value = [] - result = self.connector.create_edition_from_data(work, self.edition_data) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" + ) as mock: + mock.return_value = [] + 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") diff --git a/bookwyrm/tests/connectors/test_self_connector.py b/bookwyrm/tests/connectors/test_self_connector.py index e6e64a7dc..4f2173085 100644 --- a/bookwyrm/tests/connectors/test_self_connector.py +++ b/bookwyrm/tests/connectors/test_self_connector.py @@ -36,7 +36,7 @@ class SelfConnector(TestCase): published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), ) edition.authors.add(author) - result = self.connector.search("Edition of Example")[0] + result = self.connector.search("Edition of Example")[0] self.assertEqual(result.title, "Edition of Example Work") self.assertEqual(result.key, edition.remote_id) self.assertEqual(result.author, "Anonymous") @@ -46,7 +46,7 @@ class SelfConnector(TestCase): def test_search_rank(self): """prioritize certain results""" author = models.Author.objects.create(name="Anonymous") - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): edition = models.Edition.objects.create( title="Edition of Example Work", published_date=datetime.datetime(1980, 5, 10, tzinfo=timezone.utc), @@ -74,7 +74,7 @@ class SelfConnector(TestCase): title="An Edition", parent_work=models.Work.objects.create(title="") ) - results = self.connector.search("Anonymous") + results = self.connector.search("Anonymous") self.assertEqual(len(results), 3) self.assertEqual(results[0].title, "Anonymous") self.assertEqual(results[1].title, "More Editions") @@ -94,17 +94,17 @@ class SelfConnector(TestCase): ) edition_3 = models.Edition.objects.create(title="Fish", parent_work=work) - # pick the best edition - results = self.connector.search("Edition 1 Title") - self.assertEqual(len(results), 1) - self.assertEqual(results[0].key, edition_1.remote_id) + # pick the best edition + results = self.connector.search("Edition 1 Title") + self.assertEqual(len(results), 1) + self.assertEqual(results[0].key, edition_1.remote_id) - # pick the default edition when no match is best - results = self.connector.search("Edition Title") - self.assertEqual(len(results), 1) - self.assertEqual(results[0].key, edition_2.remote_id) + # pick the default edition when no match is best + results = self.connector.search("Edition Title") + self.assertEqual(len(results), 1) + self.assertEqual(results[0].key, edition_2.remote_id) - # only matches one edition, so no deduplication takes place - results = self.connector.search("Fish") - self.assertEqual(len(results), 1) - self.assertEqual(results[0].key, edition_3.remote_id) + # only matches one edition, so no deduplication takes place + results = self.connector.search("Fish") + self.assertEqual(len(results), 1) + self.assertEqual(results[0].key, edition_3.remote_id) diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index e8c48b0bb..2fb337517 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -254,12 +254,12 @@ class ActivitypubFields(TestCase): "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - # test receiving an unknown remote id and loading data - responses.add( - responses.GET, "https://example.com/user/mouse", json=userdata, status=200 - ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity("https://example.com/user/mouse") + # test receiving an unknown remote id and loading data + responses.add( + responses.GET, "https://example.com/user/mouse", json=userdata, status=200 + ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity("https://example.com/user/mouse") self.assertIsInstance(value, User) self.assertNotEqual(value, unrelated_user) self.assertEqual(value.remote_id, "https://example.com/user/mouse") @@ -278,8 +278,8 @@ class ActivitypubFields(TestCase): unrelated_user = User.objects.create_user( "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertIsInstance(value, User) self.assertNotEqual(value, unrelated_user) self.assertEqual(value.remote_id, "https://example.com/user/mouse") @@ -302,8 +302,8 @@ class ActivitypubFields(TestCase): "rat", "rat@rat.rat", "ratword", local=True, localname="rat" ) - with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): - value = instance.field_from_activity(activitypub.Person(**userdata)) + with patch("bookwyrm.models.activitypub_mixin.ObjectMixin.broadcast"): + value = instance.field_from_activity(activitypub.Person(**userdata)) self.assertEqual(value, user) def test_foreign_key_from_activity_str_existing(self): @@ -357,10 +357,11 @@ class ActivitypubFields(TestCase): responses.add( responses.GET, "https://example.com/user/mouse", json=userdata, status=200 ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - value = instance.field_from_activity( - ["https://example.com/user/mouse", "bleh"] - ) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + value = instance.field_from_activity( + ["https://example.com/user/mouse", "bleh"] + ) self.assertIsInstance(value, list) self.assertEqual(len(value), 1) self.assertIsInstance(value[0], User) diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 02263e0e4..15d8766c1 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -175,6 +175,7 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - book = self.item_1.get_book_from_isbn() + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + book = self.item_1.get_book_from_isbn() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index db4475c78..a14c515ee 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -60,7 +60,7 @@ class Status(TestCase): child = models.Status.objects.create( content="hello", reply_parent=parent, user=self.local_user ) - with patch("bookwyrm.preview_images.generate_edition_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): models.Review.objects.create( content="hey", reply_parent=parent, user=self.local_user, book=self.book ) diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index a885239b6..046291fb5 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -162,9 +162,10 @@ class InboxCreate(TestCase): "rating": 3, "@context": "https://www.w3.org/ns/activitystreams", } - with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: - views.inbox.activity_task(activity) - self.assertTrue(redis_mock.called) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: + views.inbox.activity_task(activity) + self.assertTrue(redis_mock.called) rating = models.ReviewRating.objects.first() self.assertEqual(rating.book, book) self.assertEqual(rating.rating, 3.0) diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 39ac4a895..32cac4713 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -98,16 +98,18 @@ class InboxUpdate(TestCase): del userdata["icon"] self.assertIsNone(self.remote_user.name) self.assertFalse(self.remote_user.discoverable) - views.inbox.activity_task( - { - "type": "Update", - "to": [], - "cc": [], - "actor": "hi", - "id": "sdkjf", - "object": userdata, - } - ) + + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + views.inbox.activity_task( + { + "type": "Update", + "to": [], + "cc": [], + "actor": "hi", + "id": "sdkjf", + "object": userdata, + } + ) user = models.User.objects.get(id=self.remote_user.id) self.assertEqual(user.name, "RAT???") self.assertEqual(user.username, "rat@example.com") @@ -130,20 +132,20 @@ class InboxUpdate(TestCase): title="Test Book", remote_id="https://bookwyrm.social/book/5989" ) - del bookdata["authors"] - self.assertEqual(book.title, "Test Book") + del bookdata["authors"] + self.assertEqual(book.title, "Test Book") - with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): - views.inbox.activity_task( - { - "type": "Update", - "to": [], - "cc": [], - "actor": "hi", - "id": "sdkjf", - "object": bookdata, - } - ) + with patch("bookwyrm.activitypub.base_activity.set_related_field.delay"): + views.inbox.activity_task( + { + "type": "Update", + "to": [], + "cc": [], + "actor": "hi", + "id": "sdkjf", + "object": bookdata, + } + ) book = models.Edition.objects.get(id=book.id) self.assertEqual(book.title, "Piranesi") self.assertEqual(book.last_edited_by, self.remote_user) diff --git a/bookwyrm/tests/views/test_book.py b/bookwyrm/tests/views/test_book.py index 37bf3e9ee..375cdb038 100644 --- a/bookwyrm/tests/views/test_book.py +++ b/bookwyrm/tests/views/test_book.py @@ -74,7 +74,8 @@ class BookViews(TestCase): request = self.factory.get("") request.user = self.local_user request.user.is_superuser = True - result = view(request, self.book.id) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + result = view(request, self.book.id) self.assertIsInstance(result, TemplateResponse) result.render() self.assertEqual(result.status_code, 200) @@ -89,7 +90,7 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): view(request, self.book.id) @@ -127,7 +128,7 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): view(request, self.book.id) @@ -149,8 +150,9 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): - view(request, self.book.id) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.delay"): + view(request, self.book.id) self.book.refresh_from_db() self.assertEqual(self.book.title, "New Title") self.assertFalse(self.book.authors.exists()) @@ -165,7 +167,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - view(request) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + view(request) book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") @@ -180,7 +183,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - view(request) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + view(request) book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work, self.work) @@ -196,7 +200,8 @@ class BookViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - view(request) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + view(request) book = models.Edition.objects.get(title="New Title") self.assertEqual(book.parent_work.title, "New Title") self.assertEqual(book.authors.first().name, "Sappho") diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 2eb89f10c..7a3b0c444 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -55,11 +55,12 @@ class GetStartedViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertTrue(self.local_user.discoverable) diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index f0807c55b..e8d1895cf 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -144,10 +144,11 @@ class ViewsHelpers(TestCase): json=self.userdata, status=200, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - result = views.helpers.handle_remote_webfinger("@mouse@example.com") - self.assertIsInstance(result, models.User) - self.assertEqual(result.username, "mouse@example.com") + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch("bookwyrm.models.user.set_remote_server.delay"): + result = views.helpers.handle_remote_webfinger("@mouse@example.com") + self.assertIsInstance(result, models.User) + self.assertEqual(result.username, "mouse@example.com") def test_user_on_blocked_server(self, _): """find a remote user using webfinger""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 1badf142a..27607f790 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -162,11 +162,12 @@ class UserViews(TestCase): request.user = self.local_user self.assertIsNone(self.local_user.name) - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") @@ -186,11 +187,12 @@ class UserViews(TestCase): request = self.factory.post("", form.data) request.user = self.local_user - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.delay" - ) as delay_mock: - view(request) - self.assertEqual(delay_mock.call_count, 1) + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + with patch( + "bookwyrm.models.activitypub_mixin.broadcast_task.delay" + ) as delay_mock: + view(request) + self.assertEqual(delay_mock.call_count, 1) self.assertEqual(self.local_user.name, "New Name") self.assertEqual(self.local_user.email, "wow@email.com") self.assertIsNotNone(self.local_user.avatar) From 878cc5cb175b09c5b8cfa6a1a1666ba73e306301 Mon Sep 17 00:00:00 2001 From: Joachim Date: Thu, 27 May 2021 23:21:47 +0200 Subject: [PATCH 080/196] Lint --- bookwyrm/tests/connectors/test_abstract_connector.py | 4 +++- bookwyrm/tests/connectors/test_openlibrary_connector.py | 4 +++- bookwyrm/tests/models/test_fields.py | 5 ++++- bookwyrm/tests/models/test_import_model.py | 4 +++- bookwyrm/tests/views/inbox/test_inbox_create.py | 4 +++- bookwyrm/tests/views/inbox/test_inbox_update.py | 2 +- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 68a4c7be2..4390a220a 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -113,7 +113,9 @@ class AbstractConnector(TestCase): ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): with patch("bookwyrm.connectors.abstract_connector.load_more_data.delay"): - result = self.connector.get_or_create_book("https://example.com/book/abcd") + result = self.connector.get_or_create_book( + "https://example.com/book/abcd" + ) self.assertEqual(result, self.book) self.assertEqual(models.Edition.objects.count(), 1) self.assertEqual(models.Edition.objects.count(), 1) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index b34a68d20..1cca34d68 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -235,7 +235,9 @@ class Openlibrary(TestCase): "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ) as mock: mock.return_value = [] - result = self.connector.create_edition_from_data(work, self.edition_data) + 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") diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 2fb337517..339d35685 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -256,7 +256,10 @@ class ActivitypubFields(TestCase): # test receiving an unknown remote id and loading data responses.add( - responses.GET, "https://example.com/user/mouse", json=userdata, status=200 + responses.GET, + "https://example.com/user/mouse", + json=userdata, + status=200, ) with patch("bookwyrm.models.user.set_remote_server.delay"): value = instance.field_from_activity("https://example.com/user/mouse") diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 15d8766c1..be6702b31 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -175,7 +175,9 @@ class ImportJob(TestCase): with patch( "bookwyrm.connectors.openlibrary.Connector." "get_authors_from_data" ): - with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + with patch( + "bookwyrm.preview_images.generate_edition_preview_image_task.delay" + ): book = self.item_1.get_book_from_isbn() self.assertEqual(book.title, "Sabriel") diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 046291fb5..ed5e6f937 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -163,7 +163,9 @@ class InboxCreate(TestCase): "@context": "https://www.w3.org/ns/activitystreams", } with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): - with patch("bookwyrm.activitystreams.ActivityStream.add_status") as redis_mock: + with patch( + "bookwyrm.activitystreams.ActivityStream.add_status" + ) as redis_mock: views.inbox.activity_task(activity) self.assertTrue(redis_mock.called) rating = models.ReviewRating.objects.first() diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index 32cac4713..db9b0ca0b 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -98,7 +98,7 @@ class InboxUpdate(TestCase): del userdata["icon"] self.assertIsNone(self.remote_user.name) self.assertFalse(self.remote_user.discoverable) - + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): views.inbox.activity_task( { From f206f61e9a9c0ab676a2c5789c793c0730cffa6b Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 17:00:07 +0200 Subject: [PATCH 081/196] Use global switch to enable/disable preview images --- .env.dev.example | 12 +++ .env.prod.example | 12 +++ bookwyrm/context_processors.py | 16 ++-- bookwyrm/preview_images.py | 87 ++++++++++--------- bookwyrm/settings.py | 14 ++- bookwyrm/templates/book/book.html | 3 +- bookwyrm/templates/layout.html | 3 +- .../templates/snippets/opengraph_images.html | 12 +++ bookwyrm/templates/user/layout.html | 3 +- 9 files changed, 99 insertions(+), 63 deletions(-) create mode 100644 bookwyrm/templates/snippets/opengraph_images.html diff --git a/.env.dev.example b/.env.dev.example index 2f24378c6..71cc11a1f 100644 --- a/.env.dev.example +++ b/.env.dev.example @@ -52,3 +52,15 @@ EMAIL_USE_SSL=false # Set this to true when initializing certbot for domain, false when not CERTBOT_INIT=false + +# Preview image generation can be computing and storage intensive +# ENABLE_PREVIEW_IMAGES=True + +# Specify RGB tuple or RGB hex strings, +# or use_dominant_color_light / use_dominant_color_dark +PREVIEW_BG_COLOR=use_dominant_color_light +# Change to #FFF if you use use_dominant_color_dark +PREVIEW_TEXT_COLOR=#363636 +PREVIEW_IMG_WIDTH=1200 +PREVIEW_IMG_HEIGHT=630 +PREVIEW_DEFAULT_COVER_COLOR=#002549 diff --git a/.env.prod.example b/.env.prod.example index a82499a32..e132d216b 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -52,3 +52,15 @@ EMAIL_USE_SSL=false # Set this to true when initializing certbot for domain, false when not CERTBOT_INIT=false + +# Preview image generation can be computing and storage intensive +# ENABLE_PREVIEW_IMAGES=True + +# Specify RGB tuple or RGB hex strings, +# or use_dominant_color_light / use_dominant_color_dark +PREVIEW_BG_COLOR=use_dominant_color_light +# Change to #FFF if you use use_dominant_color_dark +PREVIEW_TEXT_COLOR=#363636 +PREVIEW_IMG_WIDTH=1200 +PREVIEW_IMG_HEIGHT=630 +PREVIEW_DEFAULT_COVER_COLOR=#002549 diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index a6c535c2b..f2661a193 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,18 +1,20 @@ """ customize the info available in context for rendering templates """ -from bookwyrm import models -from bookwyrm.settings import STATIC_URL, STATIC_PATH, MEDIA_URL, MEDIA_PATH +from bookwyrm import models, settings def site_settings(request): # pylint: disable=unused-argument """include the custom info about the site""" - request_protocol = "https://" if request.is_secure() else "http://" + request_protocol = "https://" + if not request.is_secure(): + request_protocol = "http://" return { "site": models.SiteSettings.objects.get(), "active_announcements": models.Announcement.active_announcements(), - "static_url": STATIC_URL, - "media_url": MEDIA_URL, - "static_path": STATIC_PATH, - "media_path": MEDIA_PATH, + "static_url": settings.STATIC_URL, + "media_url": settings.MEDIA_URL, + "static_path": settings.STATIC_PATH, + "media_path": settings.MEDIA_PATH, + "preview_images_enabled": settings.ENABLE_PREVIEW_IMAGES, "request_protocol": request_protocol, } diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 1decb36a0..60b69d0a3 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -13,9 +13,9 @@ from django.core.files.uploadedfile import InMemoryUploadedFile from django.db.models import Avg from bookwyrm import models, settings -from bookwyrm.settings import DOMAIN, STATIC_ROOT from bookwyrm.tasks import app + IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT BG_COLOR = settings.PREVIEW_BG_COLOR @@ -27,7 +27,7 @@ margin = math.floor(IMG_HEIGHT / 10) gutter = math.floor(margin / 2) inner_img_height = math.floor(IMG_HEIGHT * 0.8) inner_img_width = math.floor(inner_img_height * 0.7) -font_dir = os.path.join(STATIC_ROOT, "fonts/public_sans") +font_dir = os.path.join(settings.STATIC_ROOT, "fonts/public_sans") def get_font(font_name, size=28): @@ -103,7 +103,7 @@ def generate_instance_layer(content_width): if site.logo_small: logo_img = Image.open(site.logo_small) else: - static_path = os.path.join(STATIC_ROOT, "images/logo-small.png") + static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") logo_img = Image.open(static_path) instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) @@ -126,11 +126,11 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-full.png")) + icon_star_full = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png")) icon_star_empty = Image.open( - os.path.join(STATIC_ROOT, "images/icons/star-empty.png") + os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") ) - icon_star_half = Image.open(os.path.join(STATIC_ROOT, "images/icons/star-half.png")) + icon_star_half = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png")) icon_size = 64 icon_margin = 10 @@ -307,61 +307,64 @@ def save_and_cleanup(image, instance=None): @app.task def generate_site_preview_image_task(): """generate preview_image for the website""" - site = models.SiteSettings.objects.get() + if settings.ENABLE_PREVIEW_IMAGES == True: + site = models.SiteSettings.objects.get() - if site.logo: - logo = site.logo - else: - logo = os.path.join(STATIC_ROOT, "images/logo.png") + if site.logo: + logo = site.logo + else: + logo = os.path.join(settings.STATIC_ROOT, "images/logo.png") - texts = { - "text_zero": DOMAIN, - "text_one": site.name, - "text_three": site.instance_tagline, - } + texts = { + "text_zero": settings.DOMAIN, + "text_one": site.name, + "text_three": site.instance_tagline, + } - image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) + image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) - save_and_cleanup(image, instance=site) + save_and_cleanup(image, instance=site) @app.task def generate_edition_preview_image_task(book_id): """generate preview_image for a book""" - book = models.Book.objects.select_subclasses().get(id=book_id) + if settings.ENABLE_PREVIEW_IMAGES == True: + book = models.Book.objects.select_subclasses().get(id=book_id) - rating = models.Review.objects.filter( - privacy="public", - deleted=False, - book__in=[book_id], - ).aggregate(Avg("rating"))["rating__avg"] + rating = models.Review.objects.filter( + privacy="public", + deleted=False, + book__in=[book_id], + ).aggregate(Avg("rating"))["rating__avg"] - texts = { - "text_one": book.title, - "text_two": book.subtitle, - "text_three": book.author_text, - } + texts = { + "text_one": book.title, + "text_two": book.subtitle, + "text_three": book.author_text, + } - image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) + image = generate_preview_image(texts=texts, picture=book.cover, rating=rating) - save_and_cleanup(image, instance=book) + save_and_cleanup(image, instance=book) @app.task def generate_user_preview_image_task(user_id): """generate preview_image for a book""" - user = models.User.objects.get(id=user_id) + if settings.ENABLE_PREVIEW_IMAGES == True: + user = models.User.objects.get(id=user_id) - texts = { - "text_one": user.display_name, - "text_three": "@{}@{}".format(user.localname, DOMAIN), - } + texts = { + "text_one": user.display_name, + "text_three": "@{}@{}".format(user.localname, settings.DOMAIN), + } - if user.avatar: - avatar = user.avatar - else: - avatar = os.path.join(STATIC_ROOT, "images/default_avi.jpg") + if user.avatar: + avatar = user.avatar + else: + avatar = os.path.join(settings.STATIC_ROOT, "images/default_avi.jpg") - image = generate_preview_image(texts=texts, picture=avatar) + image = generate_preview_image(texts=texts, picture=avatar) - save_and_cleanup(image, instance=user) + save_and_cleanup(image, instance=user) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index b0ff5a72c..a4cf74f0b 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -38,14 +38,12 @@ LOCALE_PATHS = [ DEFAULT_AUTO_FIELD = "django.db.models.AutoField" # Preview image - -# Specify RGB tuple or RGB hex strings, -# or "use_dominant_color_light" / "use_dominant_color_dark" -PREVIEW_BG_COLOR = "use_dominant_color_light" -PREVIEW_IMG_WIDTH = 1200 -PREVIEW_IMG_HEIGHT = 630 -PREVIEW_TEXT_COLOR = "#363636" # Change to "#FFF" if you use "use_dominant_color_dark" -PREVIEW_DEFAULT_COVER_COLOR = "#002549" +ENABLE_PREVIEW_IMAGES = env.bool("ENABLE_PREVIEW_IMAGES", False) +PREVIEW_BG_COLOR = env.str("PREVIEW_BG_COLOR", "use_dominant_color_light") +PREVIEW_TEXT_COLOR = env.str("PREVIEW_TEXT_COLOR", "#363636") +PREVIEW_IMG_WIDTH = env.int("PREVIEW_IMG_WIDTH", 1200) +PREVIEW_IMG_HEIGHT = env.int("PREVIEW_IMG_HEIGHT", 630) +PREVIEW_DEFAULT_COVER_COLOR = env.str("PREVIEW_DEFAULT_COVER_COLOR", "#002549") # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index c40209964..150bda44e 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -4,8 +4,7 @@ {% block title %}{{ book|book_title }}{% endblock %} {% block opengraph_images %} - - + {% include 'snippets/opengraph_images.html' with image=book.preview_image %} {% endblock %} {% block content %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index c06294d9c..6e0c42348 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -17,8 +17,7 @@ {% block opengraph_images %} - - + {% include 'snippets/opengraph_images.html' %} {% endblock %} diff --git a/bookwyrm/templates/snippets/opengraph_images.html b/bookwyrm/templates/snippets/opengraph_images.html new file mode 100644 index 000000000..d2c379a89 --- /dev/null +++ b/bookwyrm/templates/snippets/opengraph_images.html @@ -0,0 +1,12 @@ +{% if preview_images_enabled is True %} + {% if image %} + + + {% else %} + + + {% endif %} +{% else %} + + +{% endif %} diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index a645b07bb..69455806e 100644 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -8,8 +8,7 @@ {% block title %}{{ user.display_name }}{% endblock %} {% block opengraph_images %} - - + {% include 'snippets/opengraph_images.html' with image=user.preview_image %} {% endblock %} {% block content %} From 61367c3f4fa3096a771a7e60ba344d2a6d9446e3 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 17:25:20 +0200 Subject: [PATCH 082/196] Protect generate_preview_images command - add `--all` argument - send computation intensive tasks to Celery --- .../commands/generate_preview_images.py | 82 ++++++++++--------- bw-dev | 2 +- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 754f6e9a9..28ea1c0cb 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -6,44 +6,52 @@ from django.core.management.base import BaseCommand from bookwyrm import activitystreams, models, settings, preview_images -def generate_preview_images(): - """generate preview images""" - print(" | Hello! I will be generating preview images for your instance.") - print( - "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." - ) - print(" | ✧ Thank you for your patience ✧") - - # Site - sys.stdout.write(" → Site preview image: ") - preview_images.generate_site_preview_image_task() - sys.stdout.write(" OK 🖼\n") - - # Users - users = models.User.objects.filter( - local=True, - is_active=True, - ) - sys.stdout.write(" → User preview images ({}): ".format(len(users))) - for user in users: - preview_images.generate_user_preview_image_task(user.id) - sys.stdout.write(".") - sys.stdout.write(" OK 🖼\n") - - # Books - books = models.Book.objects.select_subclasses().filter() - sys.stdout.write(" → Book preview images ({}): ".format(len(books))) - for book in books: - preview_images.generate_edition_preview_image_task(book.id) - sys.stdout.write(".") - sys.stdout.write(" OK 🖼\n") - - print("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") - - class Command(BaseCommand): help = "Generate preview images" + + def add_arguments(self, parser): + parser.add_argument('--all', '-a', action="store_true", help="Generates images for ALL types: site, users and books. Can use a lot of computing power.") + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): - """run feed builder""" - generate_preview_images() + """generate preview images""" + self.stdout.write(" | Hello! I will be generating preview images for your instance.") + if options['all']: + self.stdout.write( + "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." + ) + self.stdout.write(" | ✧ Thank you for your patience ✧") + else: + self.stdout.write( + "🧑‍🎨 ⎨ I will only generate the instance preview image." + ) + self.stdout.write(" | ✧ Be right back! ✧") + + # Site + self.stdout.write(" → Site preview image: ", ending='') + preview_images.generate_site_preview_image_task.delay() + self.stdout.write(" OK 🖼") + + if options['all']: + # Users + users = models.User.objects.filter( + local=True, + is_active=True, + ) + self.stdout.write(" → User preview images ({}): ".format(len(users)), ending='') + for user in users: + preview_images.generate_user_preview_image_task.delay(user.id) + self.stdout.write(".", ending='') + self.stdout.write(" OK 🖼") + + # Books + books = models.Book.objects.select_subclasses().filter() + self.stdout.write(" → Book preview images ({}): ".format(len(books)), ending='') + for book in books: + preview_images.generate_edition_preview_image_task.delay(book.id) + self.stdout.write(".", ending='') + self.stdout.write(" OK 🖼") + + self.stdout.write("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") + + diff --git a/bw-dev b/bw-dev index 95681b115..5ef049f12 100755 --- a/bw-dev +++ b/bw-dev @@ -108,7 +108,7 @@ case "$CMD" in runweb python manage.py populate_streams ;; generate_preview_images) - runweb python manage.py generate_preview_images + runweb python manage.py generate_preview_images $@ ;; *) echo "Unrecognised command. Try: build, clean, up, initdb, resetdb, makemigrations, migrate, bash, shell, dbshell, restart_celery, test, pytest, test_report, black, populate_feeds, generate_preview_images" From 08cebd70513813cce5a72d1c7b33d9fbe5e70dca Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 17:26:43 +0200 Subject: [PATCH 083/196] Lint --- .../commands/generate_preview_images.py | 35 +++++++++++-------- bookwyrm/preview_images.py | 12 +++++-- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 28ea1c0cb..6ca26b2d3 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -10,48 +10,55 @@ class Command(BaseCommand): help = "Generate preview images" def add_arguments(self, parser): - parser.add_argument('--all', '-a', action="store_true", help="Generates images for ALL types: site, users and books. Can use a lot of computing power.") + parser.add_argument( + "--all", + "-a", + action="store_true", + help="Generates images for ALL types: site, users and books. Can use a lot of computing power.", + ) # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """generate preview images""" - self.stdout.write(" | Hello! I will be generating preview images for your instance.") - if options['all']: + self.stdout.write( + " | Hello! I will be generating preview images for your instance." + ) + if options["all"]: self.stdout.write( "🧑‍🎨 ⎨ This might take quite long if your instance has a lot of books and users." ) self.stdout.write(" | ✧ Thank you for your patience ✧") else: - self.stdout.write( - "🧑‍🎨 ⎨ I will only generate the instance preview image." - ) + self.stdout.write("🧑‍🎨 ⎨ I will only generate the instance preview image.") self.stdout.write(" | ✧ Be right back! ✧") # Site - self.stdout.write(" → Site preview image: ", ending='') + self.stdout.write(" → Site preview image: ", ending="") preview_images.generate_site_preview_image_task.delay() self.stdout.write(" OK 🖼") - if options['all']: + if options["all"]: # Users users = models.User.objects.filter( local=True, is_active=True, ) - self.stdout.write(" → User preview images ({}): ".format(len(users)), ending='') + self.stdout.write( + " → User preview images ({}): ".format(len(users)), ending="" + ) for user in users: preview_images.generate_user_preview_image_task.delay(user.id) - self.stdout.write(".", ending='') + self.stdout.write(".", ending="") self.stdout.write(" OK 🖼") # Books books = models.Book.objects.select_subclasses().filter() - self.stdout.write(" → Book preview images ({}): ".format(len(books)), ending='') + self.stdout.write( + " → Book preview images ({}): ".format(len(books)), ending="" + ) for book in books: preview_images.generate_edition_preview_image_task.delay(book.id) - self.stdout.write(".", ending='') + self.stdout.write(".", ending="") self.stdout.write(" OK 🖼") self.stdout.write("🧑‍🎨 ⎨ I’m all done! ✧ Enjoy ✧") - - diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 60b69d0a3..7a23353c8 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -126,11 +126,15 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png")) + icon_star_full = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + ) icon_star_empty = Image.open( os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") ) - icon_star_half = Image.open(os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png")) + icon_star_half = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") + ) icon_size = 64 icon_margin = 10 @@ -321,7 +325,9 @@ def generate_site_preview_image_task(): "text_three": site.instance_tagline, } - image = generate_preview_image(texts=texts, picture=logo, show_instance_layer=False) + image = generate_preview_image( + texts=texts, picture=logo, show_instance_layer=False + ) save_and_cleanup(image, instance=site) From ec159ebcb0bc1742aeb90af83edbe5524af22feb Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 21:24:45 +0200 Subject: [PATCH 084/196] Test generating preview images --- bookwyrm/preview_images.py | 15 ++-- bookwyrm/tests/test_preview_images.py | 99 +++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 bookwyrm/tests/test_preview_images.py diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 7a23353c8..17511ddee 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -57,7 +57,7 @@ def generate_texts_layer(texts, content_width): text_y = 0 - if "text_zero" in texts: + if "text_zero" in texts and texts["text_zero"]: # Text one (Book title) text_zero = textwrap.fill(texts["text_zero"], width=72) text_layer_draw.multiline_text( @@ -66,7 +66,7 @@ def generate_texts_layer(texts, content_width): text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 - if "text_one" in texts: + if "text_one" in texts and texts["text_one"]: # Text one (Book title) text_one = textwrap.fill(texts["text_one"], width=28) text_layer_draw.multiline_text( @@ -75,7 +75,7 @@ def generate_texts_layer(texts, content_width): text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 - if "text_two" in texts: + if "text_two" in texts and texts["text_two"]: # Text one (Book subtitle) text_two = textwrap.fill(texts["text_two"], width=36) text_layer_draw.multiline_text( @@ -84,7 +84,7 @@ def generate_texts_layer(texts, content_width): text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 - if "text_three" in texts: + if "text_three" in texts and texts["text_three"]: # Text three (Book authors) text_three = textwrap.fill(texts["text_three"], width=36) text_layer_draw.multiline_text( @@ -299,7 +299,12 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) - instance.save(update_fields=["preview_image"]) + + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(update_fields=["preview_image"], broadcast=False) + else: + instance.save(update_fields=["preview_image"]) # Clean up old file after saving if os.path.exists(old_path): diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py new file mode 100644 index 000000000..6edf2e791 --- /dev/null +++ b/bookwyrm/tests/test_preview_images.py @@ -0,0 +1,99 @@ +""" test generating preview images """ +import sys +import pathlib +from unittest.mock import patch +from PIL import Image + +from django.test import TestCase +from django.test.client import RequestFactory +from django.core.files.uploadedfile import SimpleUploadedFile +from django.db.models.fields.files import ImageFieldFile + +from bookwyrm import models, settings + +from bookwyrm.preview_images import ( + generate_site_preview_image_task, + generate_edition_preview_image_task, + generate_user_preview_image_task, + generate_preview_image, +) + +import logging + +@patch("bookwyrm.emailing.send_email.delay") +class PreviewImages(TestCase): + """every response to a get request, html or json""" + + def setUp(self): + """we need basic test data and mocks""" + self.factory = RequestFactory() + with patch("bookwyrm.preview_images.generate_user_preview_image_task.delay"): + avatar_file = pathlib.Path(__file__).parent.joinpath( + "../static/images/no_cover.jpg" + ) + self.local_user = models.User.objects.create_user( + "possum@local.com", + "possum@possum.possum", + "password", + local=True, + localname="possum", + avatar=SimpleUploadedFile( + avatar_file, open(avatar_file, "rb").read(), content_type="image/jpeg" + ) + ) + with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): + self.work = models.Work.objects.create(title="Test Work") + self.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + ) + with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): + models.SiteSettings.objects.create() + + def test_generate_preview_image(self, *args, **kwargs): + image_file = pathlib.Path(__file__).parent.joinpath( + "../static/images/no_cover.jpg" + ) + + texts = { + "text_one": "Awesome Possum", + "text_three": "@possum@local.com", + } + + result = generate_preview_image(texts=texts, picture=image_file, rating=5) + self.assertIsInstance(result, Image.Image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + + def test_site_preview(self, *args, **kwargs): + """generate site preview""" + generate_site_preview_image_task() + + updated_site = models.SiteSettings.objects.get() + site_preview_image = updated_site.preview_image + + self.assertIsInstance(site_preview_image, ImageFieldFile) + result = Image.open(site_preview_image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + + def test_edition_preview(self, *args, **kwargs): + """generate user preview""" + generate_edition_preview_image_task(self.book.id) + + updated_book = models.Book.objects.get(id=self.book.id) + book_preview_image = updated_book.preview_image + + self.assertIsInstance(book_preview_image, ImageFieldFile) + result = Image.open(book_preview_image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + + def test_user_preview(self, *args, **kwargs): + """generate user preview""" + generate_user_preview_image_task(self.local_user.id) + + updated_user = models.User.objects.get(id=self.local_user.id) + user_preview_image = updated_user.preview_image + + self.assertIsInstance(user_preview_image, ImageFieldFile) + result = Image.open(user_preview_image) + self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) From 2bf254bce7cf47bc29213cabb87af4d969f362f8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 21:26:13 +0200 Subject: [PATCH 085/196] Update test_preview_images.py --- bookwyrm/tests/test_preview_images.py | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 6edf2e791..86ed00287 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -20,6 +20,7 @@ from bookwyrm.preview_images import ( import logging + @patch("bookwyrm.emailing.send_email.delay") class PreviewImages(TestCase): """every response to a get request, html or json""" @@ -38,8 +39,10 @@ class PreviewImages(TestCase): local=True, localname="possum", avatar=SimpleUploadedFile( - avatar_file, open(avatar_file, "rb").read(), content_type="image/jpeg" - ) + avatar_file, + open(avatar_file, "rb").read(), + content_type="image/jpeg", + ), ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") @@ -63,7 +66,9 @@ class PreviewImages(TestCase): result = generate_preview_image(texts=texts, picture=image_file, rating=5) self.assertIsInstance(result, Image.Image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) def test_site_preview(self, *args, **kwargs): """generate site preview""" @@ -74,7 +79,9 @@ class PreviewImages(TestCase): self.assertIsInstance(site_preview_image, ImageFieldFile) result = Image.open(site_preview_image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) def test_edition_preview(self, *args, **kwargs): """generate user preview""" @@ -85,7 +92,9 @@ class PreviewImages(TestCase): self.assertIsInstance(book_preview_image, ImageFieldFile) result = Image.open(book_preview_image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) def test_user_preview(self, *args, **kwargs): """generate user preview""" @@ -96,4 +105,6 @@ class PreviewImages(TestCase): self.assertIsInstance(user_preview_image, ImageFieldFile) result = Image.open(user_preview_image) - self.assertEqual(result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT)) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) From 8755b92c2e28564bba83b5bba4d4cc6aa58c18bf Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 21:40:20 +0200 Subject: [PATCH 086/196] Fix GitHub FileNotFoundError --- bookwyrm/preview_images.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 17511ddee..624b6afe6 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -103,17 +103,27 @@ def generate_instance_layer(content_width): if site.logo_small: logo_img = Image.open(site.logo_small) else: - static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") - logo_img = Image.open(static_path) + try: + static_path = os.path.join(settings.STATIC_ROOT, "images/logo-small.png") + logo_img = Image.open(static_path) + except FileNotFoundError: + logo_img = None instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) - logo_img.thumbnail((50, 50), Image.ANTIALIAS) + instance_text_x = 0 - instance_layer.paste(logo_img, (0, 0)) + if logo_img: + logo_img.thumbnail((50, 50), Image.ANTIALIAS) + + instance_layer.paste(logo_img, (0, 0)) + + instance_text_x = instance_text_x + 60 instance_layer_draw = ImageDraw.Draw(instance_layer) - instance_layer_draw.text((60, 10), site.name, font=font_instance, fill=TEXT_COLOR) + instance_layer_draw.text( + (instance_text_x, 10), site.name, font=font_instance, fill=TEXT_COLOR + ) line_width = 50 + 10 + font_instance.getsize(site.name)[0] From 71bc35224bb9123a9f5d903368b71efcfcd81197 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 22:00:26 +0200 Subject: [PATCH 087/196] no, this will work --- bookwyrm/preview_images.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 624b6afe6..b083b9631 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -64,7 +64,10 @@ def generate_texts_layer(texts, content_width): (0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR ) - text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 + try: + text_y = text_y + font_text_zero.getsize_multiline(text_zero)[1] + 16 + except: + text_y = text_y + 26 if "text_one" in texts and texts["text_one"]: # Text one (Book title) @@ -73,7 +76,10 @@ def generate_texts_layer(texts, content_width): (0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR ) - text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 + try: + text_y = text_y + font_text_one.getsize_multiline(text_one)[1] + 16 + except: + text_y = text_y + 26 if "text_two" in texts and texts["text_two"]: # Text one (Book subtitle) @@ -82,7 +88,10 @@ def generate_texts_layer(texts, content_width): (0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR ) - text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 + try: + text_y = text_y + font_text_one.getsize_multiline(text_two)[1] + 16 + except: + text_y = text_y + 26 if "text_three" in texts and texts["text_three"]: # Text three (Book authors) From 0e28b79089272dbf9bf83d3b2795f57dc48df5fb Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 22:10:57 +0200 Subject: [PATCH 088/196] third time's the charm --- bookwyrm/preview_images.py | 79 +++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index b083b9631..2fa097a8c 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -145,49 +145,54 @@ def generate_instance_layer(content_width): def generate_rating_layer(rating, content_width): - icon_star_full = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") - ) - icon_star_empty = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") - ) - icon_star_half = Image.open( - os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") - ) + try: + icon_star_full = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") + ) + icon_star_empty = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") + ) + icon_star_half = Image.open( + os.path.join(settings.STATIC_ROOT, "images/icons/star-half.png") + ) - icon_size = 64 - icon_margin = 10 + icon_size = 64 + icon_margin = 10 - rating_layer_base = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR - ) - rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) - rating_layer_mask = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR - ) + rating_layer_base = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) + rating_layer_color = Image.new( + "RGBA", (content_width, icon_size), color=TEXT_COLOR + ) + rating_layer_mask = Image.new( + "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + ) - position_x = 0 + position_x = 0 - for r in range(math.floor(rating)): - rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + for r in range(math.floor(rating)): + rating_layer_mask.alpha_composite(icon_star_full, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - if math.floor(rating) != math.ceil(rating): - rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + if math.floor(rating) != math.ceil(rating): + rating_layer_mask.alpha_composite(icon_star_half, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - for r in range(5 - math.ceil(rating)): - rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) - position_x = position_x + icon_size + icon_margin + for r in range(5 - math.ceil(rating)): + rating_layer_mask.alpha_composite(icon_star_empty, (position_x, 0)) + position_x = position_x + icon_size + icon_margin - rating_layer_mask = rating_layer_mask.getchannel("A") - rating_layer_mask = ImageOps.invert(rating_layer_mask) + rating_layer_mask = rating_layer_mask.getchannel("A") + rating_layer_mask = ImageOps.invert(rating_layer_mask) - rating_layer_composite = Image.composite( - rating_layer_base, rating_layer_color, rating_layer_mask - ) + rating_layer_composite = Image.composite( + rating_layer_base, rating_layer_color, rating_layer_mask + ) - return rating_layer_composite + return rating_layer_composite + except: + return None def generate_default_inner_img(): @@ -273,8 +278,10 @@ def generate_preview_image( # Add some more margin contents_composite_y = contents_composite_y + gutter rating_layer = generate_rating_layer(rating, content_width) - contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) - contents_composite_y = contents_composite_y + rating_layer.height + gutter + + if rating_layer: + contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) + contents_composite_y = contents_composite_y + rating_layer.height + gutter contents_layer_box = contents_layer.getbbox() contents_layer_height = contents_layer_box[3] - contents_layer_box[1] From 9cee11920021b0577c19549ed126d0f4a28add90 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 23:29:28 +0200 Subject: [PATCH 089/196] test --- bookwyrm/tests/test_preview_images.py | 59 +++++++++++++++------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 86ed00287..600a4569d 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -3,6 +3,7 @@ import sys import pathlib from unittest.mock import patch from PIL import Image +import re from django.test import TestCase from django.test.client import RequestFactory @@ -75,36 +76,44 @@ class PreviewImages(TestCase): generate_site_preview_image_task() updated_site = models.SiteSettings.objects.get() - site_preview_image = updated_site.preview_image + # site_preview_image = updated_site.preview_image - self.assertIsInstance(site_preview_image, ImageFieldFile) - result = Image.open(site_preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + output = models.fields.image_serializer(updated_site.preview_image, alt="alt text") + self.assertIsNotNone( + re.match( + r".*\.png", + output.url, + ) ) - def test_edition_preview(self, *args, **kwargs): - """generate user preview""" - generate_edition_preview_image_task(self.book.id) + # self.assertIsInstance(site_preview_image, ImageFieldFile) + # result = Image.open(site_preview_image) + # self.assertEqual( + # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + # ) - updated_book = models.Book.objects.get(id=self.book.id) - book_preview_image = updated_book.preview_image + # def test_edition_preview(self, *args, **kwargs): + # """generate user preview""" + # generate_edition_preview_image_task(self.book.id) - self.assertIsInstance(book_preview_image, ImageFieldFile) - result = Image.open(book_preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + # updated_book = models.Book.objects.get(id=self.book.id) + # book_preview_image = updated_book.preview_image - def test_user_preview(self, *args, **kwargs): - """generate user preview""" - generate_user_preview_image_task(self.local_user.id) + # self.assertIsInstance(book_preview_image, ImageFieldFile) + # result = Image.open(book_preview_image) + # self.assertEqual( + # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + # ) - updated_user = models.User.objects.get(id=self.local_user.id) - user_preview_image = updated_user.preview_image + # def test_user_preview(self, *args, **kwargs): + # """generate user preview""" + # generate_user_preview_image_task(self.local_user.id) - self.assertIsInstance(user_preview_image, ImageFieldFile) - result = Image.open(user_preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + # updated_user = models.User.objects.get(id=self.local_user.id) + # user_preview_image = updated_user.preview_image + + # self.assertIsInstance(user_preview_image, ImageFieldFile) + # result = Image.open(user_preview_image) + # self.assertEqual( + # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + # ) From 872084d61a784813147b67339c305c203c8d8e62 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 23:41:41 +0200 Subject: [PATCH 090/196] Update test_preview_images.py --- bookwyrm/tests/test_preview_images.py | 59 ++++++++++++--------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 600a4569d..86ed00287 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -3,7 +3,6 @@ import sys import pathlib from unittest.mock import patch from PIL import Image -import re from django.test import TestCase from django.test.client import RequestFactory @@ -76,44 +75,36 @@ class PreviewImages(TestCase): generate_site_preview_image_task() updated_site = models.SiteSettings.objects.get() - # site_preview_image = updated_site.preview_image + site_preview_image = updated_site.preview_image - output = models.fields.image_serializer(updated_site.preview_image, alt="alt text") - self.assertIsNotNone( - re.match( - r".*\.png", - output.url, - ) + self.assertIsInstance(site_preview_image, ImageFieldFile) + result = Image.open(site_preview_image) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) - # self.assertIsInstance(site_preview_image, ImageFieldFile) - # result = Image.open(site_preview_image) - # self.assertEqual( - # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - # ) + def test_edition_preview(self, *args, **kwargs): + """generate user preview""" + generate_edition_preview_image_task(self.book.id) - # def test_edition_preview(self, *args, **kwargs): - # """generate user preview""" - # generate_edition_preview_image_task(self.book.id) + updated_book = models.Book.objects.get(id=self.book.id) + book_preview_image = updated_book.preview_image - # updated_book = models.Book.objects.get(id=self.book.id) - # book_preview_image = updated_book.preview_image + self.assertIsInstance(book_preview_image, ImageFieldFile) + result = Image.open(book_preview_image) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) - # self.assertIsInstance(book_preview_image, ImageFieldFile) - # result = Image.open(book_preview_image) - # self.assertEqual( - # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - # ) + def test_user_preview(self, *args, **kwargs): + """generate user preview""" + generate_user_preview_image_task(self.local_user.id) - # def test_user_preview(self, *args, **kwargs): - # """generate user preview""" - # generate_user_preview_image_task(self.local_user.id) + updated_user = models.User.objects.get(id=self.local_user.id) + user_preview_image = updated_user.preview_image - # updated_user = models.User.objects.get(id=self.local_user.id) - # user_preview_image = updated_user.preview_image - - # self.assertIsInstance(user_preview_image, ImageFieldFile) - # result = Image.open(user_preview_image) - # self.assertEqual( - # result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - # ) + self.assertIsInstance(user_preview_image, ImageFieldFile) + result = Image.open(user_preview_image) + self.assertEqual( + result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) + ) From 0f80456a08482602703a56b93311f2a189095464 Mon Sep 17 00:00:00 2001 From: Joachim Date: Fri, 28 May 2021 23:42:04 +0200 Subject: [PATCH 091/196] Save as JPG --- bookwyrm/preview_images.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 2fa097a8c..41dbf8bc7 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -301,12 +301,12 @@ def generate_preview_image( ) img.alpha_composite(contents_layer, (content_x, contents_y)) - return img + return img.convert("RGB") def save_and_cleanup(image, instance=None): if instance: - file_name = "%s.png" % str(uuid4()) + file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) image_buffer = BytesIO() try: @@ -316,12 +316,12 @@ def save_and_cleanup(image, instance=None): old_path = "" # Save - image.save(image_buffer, format="png") + image.save(image_buffer, format="jpeg", quality=75) instance.preview_image = InMemoryUploadedFile( ContentFile(image_buffer.getvalue()), "preview_image", file_name, - "image/png", + "image/jpg", image_buffer.tell(), None, ) From b4e2d8c6e39029ff0dabbec71b62e69f3c39dcd8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 11:17:59 +0200 Subject: [PATCH 092/196] Better refresh object in test --- bookwyrm/tests/test_preview_images.py | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 86ed00287..2777fc488 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -52,7 +52,7 @@ class PreviewImages(TestCase): parent_work=self.work, ) with patch("bookwyrm.preview_images.generate_site_preview_image_task.delay"): - models.SiteSettings.objects.create() + self.site = models.SiteSettings.objects.create() def test_generate_preview_image(self, *args, **kwargs): image_file = pathlib.Path(__file__).parent.joinpath( @@ -74,11 +74,10 @@ class PreviewImages(TestCase): """generate site preview""" generate_site_preview_image_task() - updated_site = models.SiteSettings.objects.get() - site_preview_image = updated_site.preview_image + self.site.refresh_from_db() - self.assertIsInstance(site_preview_image, ImageFieldFile) - result = Image.open(site_preview_image) + self.assertIsInstance(self.site.preview_image, ImageFieldFile) + result = Image.open(self.site.preview_image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) @@ -87,11 +86,10 @@ class PreviewImages(TestCase): """generate user preview""" generate_edition_preview_image_task(self.book.id) - updated_book = models.Book.objects.get(id=self.book.id) - book_preview_image = updated_book.preview_image + self.book.refresh_from_db() - self.assertIsInstance(book_preview_image, ImageFieldFile) - result = Image.open(book_preview_image) + self.assertIsInstance(self.book.preview_image, ImageFieldFile) + result = Image.open(self.book.preview_image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) @@ -100,11 +98,10 @@ class PreviewImages(TestCase): """generate user preview""" generate_user_preview_image_task(self.local_user.id) - updated_user = models.User.objects.get(id=self.local_user.id) - user_preview_image = updated_user.preview_image + self.local_user.refresh_from_db() - self.assertIsInstance(user_preview_image, ImageFieldFile) - result = Image.open(user_preview_image) + self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) + result = Image.open(self.local_user.preview_image) self.assertEqual( result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) From 022182e1146a8c66abdcd6ec913da4b967f40e33 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 11:33:37 +0200 Subject: [PATCH 093/196] See if the image is saved in DB in the Github Actions test environment --- bookwyrm/preview_images.py | 46 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 41dbf8bc7..0d9f26e7d 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -309,33 +309,33 @@ def save_and_cleanup(image, instance=None): file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) image_buffer = BytesIO() + # try: try: - try: - old_path = instance.preview_image.path - except ValueError: - old_path = "" + old_path = instance.preview_image.path + except ValueError: + old_path = "" - # Save - image.save(image_buffer, format="jpeg", quality=75) - instance.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/jpg", - image_buffer.tell(), - None, - ) + # Save + image.save(image_buffer, format="jpeg", quality=75) + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/jpg", + image_buffer.tell(), + None, + ) - save_without_broadcast = isinstance(instance, (models.Book, models.User)) - if save_without_broadcast: - instance.save(update_fields=["preview_image"], broadcast=False) - else: - instance.save(update_fields=["preview_image"]) + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(update_fields=["preview_image"], broadcast=False) + else: + instance.save(update_fields=["preview_image"]) - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - finally: + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + # finally: image_buffer.close() From cc0881b11cae62770dff5d4f667ddf5c9f48a84e Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 12:33:04 +0200 Subject: [PATCH 094/196] Try another way --- bookwyrm/preview_images.py | 46 +++++++++++++-------------- bookwyrm/tests/test_preview_images.py | 35 ++++++++++---------- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 0d9f26e7d..41dbf8bc7 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -309,33 +309,33 @@ def save_and_cleanup(image, instance=None): file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) image_buffer = BytesIO() - # try: try: - old_path = instance.preview_image.path - except ValueError: - old_path = "" + try: + old_path = instance.preview_image.path + except ValueError: + old_path = "" - # Save - image.save(image_buffer, format="jpeg", quality=75) - instance.preview_image = InMemoryUploadedFile( - ContentFile(image_buffer.getvalue()), - "preview_image", - file_name, - "image/jpg", - image_buffer.tell(), - None, - ) + # Save + image.save(image_buffer, format="jpeg", quality=75) + instance.preview_image = InMemoryUploadedFile( + ContentFile(image_buffer.getvalue()), + "preview_image", + file_name, + "image/jpg", + image_buffer.tell(), + None, + ) - save_without_broadcast = isinstance(instance, (models.Book, models.User)) - if save_without_broadcast: - instance.save(update_fields=["preview_image"], broadcast=False) - else: - instance.save(update_fields=["preview_image"]) + save_without_broadcast = isinstance(instance, (models.Book, models.User)) + if save_without_broadcast: + instance.save(update_fields=["preview_image"], broadcast=False) + else: + instance.save(update_fields=["preview_image"]) - # Clean up old file after saving - if os.path.exists(old_path): - os.remove(old_path) - # finally: + # Clean up old file after saving + if os.path.exists(old_path): + os.remove(old_path) + finally: image_buffer.close() diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 2777fc488..a48c60803 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -46,7 +46,7 @@ class PreviewImages(TestCase): ) with patch("bookwyrm.preview_images.generate_edition_preview_image_task.delay"): self.work = models.Work.objects.create(title="Test Work") - self.book = models.Edition.objects.create( + self.edition = models.Edition.objects.create( title="Example Edition", remote_id="https://example.com/book/1", parent_work=self.work, @@ -71,37 +71,34 @@ class PreviewImages(TestCase): ) def test_site_preview(self, *args, **kwargs): - """generate site preview""" + """generate site preview""" generate_site_preview_image_task() self.site.refresh_from_db() self.assertIsInstance(self.site.preview_image, ImageFieldFile) - result = Image.open(self.site.preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + self.assertIsNotNone(self.site.preview_image) + self.assertEqual(self.site.preview_image.width, settings.PREVIEW_IMG_WIDTH) + self.assertEqual(self.site.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_edition_preview(self, *args, **kwargs): - """generate user preview""" - generate_edition_preview_image_task(self.book.id) + """generate edition preview""" + generate_edition_preview_image_task(self.edition.id) - self.book.refresh_from_db() + self.edition.refresh_from_db() - self.assertIsInstance(self.book.preview_image, ImageFieldFile) - result = Image.open(self.book.preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + self.assertIsInstance(self.edition.preview_image, ImageFieldFile) + self.assertIsNotNone(self.edition.preview_image) + self.assertEqual(self.edition.preview_image.width, settings.PREVIEW_IMG_WIDTH) + self.assertEqual(self.edition.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_user_preview(self, *args, **kwargs): - """generate user preview""" + """generate user preview""" generate_user_preview_image_task(self.local_user.id) self.local_user.refresh_from_db() self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) - result = Image.open(self.local_user.preview_image) - self.assertEqual( - result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) - ) + self.assertIsNotNone(self.local_user.preview_image) + self.assertEqual(self.local_user.preview_image.width, settings.PREVIEW_IMG_WIDTH) + self.assertEqual(self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT) From fbb262fe88986001f4a8e00c3a8ceb62ef8be604 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 13:44:43 +0200 Subject: [PATCH 095/196] Try logging output --- bookwyrm/preview_images.py | 16 ++++++++++++++++ bookwyrm/settings.py | 3 +++ 2 files changed, 19 insertions(+) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 41dbf8bc7..aeb5597e4 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -15,6 +15,9 @@ from django.db.models import Avg from bookwyrm import models, settings from bookwyrm.tasks import app +# remove after testing in Github Actions +import sys + IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT @@ -305,8 +308,12 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): + sys.stdout.write("/start save_and_cleanup") + if instance: + sys.stdout.write("\nInstance OK, ") file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) + sys.stdout.write("%s, " % file_name) image_buffer = BytesIO() try: @@ -314,6 +321,8 @@ def save_and_cleanup(image, instance=None): old_path = instance.preview_image.path except ValueError: old_path = "" + + sys.stdout.write("path: %s, " % old_path) # Save image.save(image_buffer, format="jpeg", quality=75) @@ -325,6 +334,8 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) + sys.stdout.write("before save: %sx" % instance.preview_image.width) + sys.stdout.write("%s, " % instance.preview_image.height) save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: @@ -332,12 +343,17 @@ def save_and_cleanup(image, instance=None): else: instance.save(update_fields=["preview_image"]) + instance.refresh_from_db() + sys.stdout.write("after save: %sx" % instance.preview_image.width) + sys.stdout.write("%s\n" % instance.preview_image.height) + # Clean up old file after saving if os.path.exists(old_path): os.remove(old_path) finally: image_buffer.close() + sys.stdout.write("end save_and_cleanup/\n") @app.task def generate_site_preview_image_task(): diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index a4cf74f0b..2bfc96c5b 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -177,6 +177,9 @@ USE_L10N = True USE_TZ = True +NOSE_ARGS = ['--nocapture', + '--nologcapture',] + # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ From 00b09cd07db49358ac9d13035a1e5ed8705880b7 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 14:43:06 +0200 Subject: [PATCH 096/196] Try with logging --- bookwyrm/preview_images.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index aeb5597e4..8cdbcc38f 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -16,7 +16,7 @@ from bookwyrm import models, settings from bookwyrm.tasks import app # remove after testing in Github Actions -import sys +import logging IMG_WIDTH = settings.PREVIEW_IMG_WIDTH @@ -308,12 +308,12 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): - sys.stdout.write("/start save_and_cleanup") + logging.warn("/start save_and_cleanup") if instance: - sys.stdout.write("\nInstance OK, ") + logging.warn("\nInstance OK, ") file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) - sys.stdout.write("%s, " % file_name) + logging.warn("%s, " % file_name) image_buffer = BytesIO() try: @@ -322,7 +322,7 @@ def save_and_cleanup(image, instance=None): except ValueError: old_path = "" - sys.stdout.write("path: %s, " % old_path) + logging.warn("path: %s, " % old_path) # Save image.save(image_buffer, format="jpeg", quality=75) @@ -334,18 +334,18 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) - sys.stdout.write("before save: %sx" % instance.preview_image.width) - sys.stdout.write("%s, " % instance.preview_image.height) + logging.warn("before save: %sx" % instance.preview_image.width) + logging.warn("%s, " % instance.preview_image.height) save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: - instance.save(update_fields=["preview_image"], broadcast=False) + instance.save(broadcast=False) else: - instance.save(update_fields=["preview_image"]) + instance.save() instance.refresh_from_db() - sys.stdout.write("after save: %sx" % instance.preview_image.width) - sys.stdout.write("%s\n" % instance.preview_image.height) + logging.warn("after save: %sx" % instance.preview_image.width) + logging.warn("%s\n" % instance.preview_image.height) # Clean up old file after saving if os.path.exists(old_path): @@ -353,7 +353,7 @@ def save_and_cleanup(image, instance=None): finally: image_buffer.close() - sys.stdout.write("end save_and_cleanup/\n") + logging.warn("end save_and_cleanup/\n") @app.task def generate_site_preview_image_task(): From ba39dad06c49131a4ba622d070f123d8e56d702b Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 15:32:04 +0200 Subject: [PATCH 097/196] Add save_and_cleanup test --- bookwyrm/tests/test_preview_images.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index a48c60803..41d11d439 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -16,6 +16,7 @@ from bookwyrm.preview_images import ( generate_edition_preview_image_task, generate_user_preview_image_task, generate_preview_image, + save_and_cleanup, ) import logging @@ -70,6 +71,19 @@ class PreviewImages(TestCase): result.size, (settings.PREVIEW_IMG_WIDTH, settings.PREVIEW_IMG_HEIGHT) ) + def test_store_preview_image(self, *args, **kwargs): + image = Image.new("RGB", (200, 200), color="#F00") + + result = save_and_cleanup(image, instance=self.local_user) + self.assertTrue(result) + + self.local_user.refresh_from_db() + self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) + self.assertIsNotNone(self.local_user.preview_image) + self.assertEqual(self.local_user.preview_image.width, 200) + self.assertEqual(self.local_user.preview_image.height, 200) + + def test_site_preview(self, *args, **kwargs): """generate site preview""" generate_site_preview_image_task() From cd7c0ccaeaa29d1112241cd579b2e15aba1ab320 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 15:51:56 +0200 Subject: [PATCH 098/196] Enable env on GitHub Actions --- .github/workflows/django-tests.yml | 1 + bookwyrm/preview_images.py | 25 +++++++------------------ bookwyrm/settings.py | 3 --- bookwyrm/tests/test_preview_images.py | 17 +++++++++-------- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 3ce368ecd..391afdd4c 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -64,5 +64,6 @@ jobs: EMAIL_HOST_USER: "" EMAIL_HOST_PASSWORD: "" EMAIL_USE_TLS: true + ENABLE_PREVIEW_IMAGES": true run: | python manage.py test diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 8cdbcc38f..180162cea 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -15,9 +15,6 @@ from django.db.models import Avg from bookwyrm import models, settings from bookwyrm.tasks import app -# remove after testing in Github Actions -import logging - IMG_WIDTH = settings.PREVIEW_IMG_WIDTH IMG_HEIGHT = settings.PREVIEW_IMG_HEIGHT @@ -308,12 +305,8 @@ def generate_preview_image( def save_and_cleanup(image, instance=None): - logging.warn("/start save_and_cleanup") - - if instance: - logging.warn("\nInstance OK, ") + if isinstance(instance, (models.Book, models.User, models.SiteSettings)): file_name = "%s-%s.jpg" % (str(instance.id), str(uuid4())) - logging.warn("%s, " % file_name) image_buffer = BytesIO() try: @@ -321,11 +314,10 @@ def save_and_cleanup(image, instance=None): old_path = instance.preview_image.path except ValueError: old_path = "" - - logging.warn("path: %s, " % old_path) # Save image.save(image_buffer, format="jpeg", quality=75) + instance.preview_image = InMemoryUploadedFile( ContentFile(image_buffer.getvalue()), "preview_image", @@ -334,26 +326,23 @@ def save_and_cleanup(image, instance=None): image_buffer.tell(), None, ) - logging.warn("before save: %sx" % instance.preview_image.width) - logging.warn("%s, " % instance.preview_image.height) save_without_broadcast = isinstance(instance, (models.Book, models.User)) if save_without_broadcast: - instance.save(broadcast=False) + result = instance.save(broadcast=False) else: instance.save() - instance.refresh_from_db() - logging.warn("after save: %sx" % instance.preview_image.width) - logging.warn("%s\n" % instance.preview_image.height) - # Clean up old file after saving if os.path.exists(old_path): os.remove(old_path) + finally: image_buffer.close() + return True + else: + return False - logging.warn("end save_and_cleanup/\n") @app.task def generate_site_preview_image_task(): diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 2bfc96c5b..a4cf74f0b 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -177,9 +177,6 @@ USE_L10N = True USE_TZ = True -NOSE_ARGS = ['--nocapture', - '--nologcapture',] - # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/3.2/howto/static-files/ diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 41d11d439..c65615e8a 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -1,5 +1,4 @@ """ test generating preview images """ -import sys import pathlib from unittest.mock import patch from PIL import Image @@ -22,7 +21,6 @@ from bookwyrm.preview_images import ( import logging -@patch("bookwyrm.emailing.send_email.delay") class PreviewImages(TestCase): """every response to a get request, html or json""" @@ -83,9 +81,8 @@ class PreviewImages(TestCase): self.assertEqual(self.local_user.preview_image.width, 200) self.assertEqual(self.local_user.preview_image.height, 200) - def test_site_preview(self, *args, **kwargs): - """generate site preview""" + """generate site preview""" generate_site_preview_image_task() self.site.refresh_from_db() @@ -96,7 +93,7 @@ class PreviewImages(TestCase): self.assertEqual(self.site.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_edition_preview(self, *args, **kwargs): - """generate edition preview""" + """generate edition preview""" generate_edition_preview_image_task(self.edition.id) self.edition.refresh_from_db() @@ -107,12 +104,16 @@ class PreviewImages(TestCase): self.assertEqual(self.edition.preview_image.height, settings.PREVIEW_IMG_HEIGHT) def test_user_preview(self, *args, **kwargs): - """generate user preview""" + """generate user preview""" generate_user_preview_image_task(self.local_user.id) self.local_user.refresh_from_db() self.assertIsInstance(self.local_user.preview_image, ImageFieldFile) self.assertIsNotNone(self.local_user.preview_image) - self.assertEqual(self.local_user.preview_image.width, settings.PREVIEW_IMG_WIDTH) - self.assertEqual(self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT) + self.assertEqual( + self.local_user.preview_image.width, settings.PREVIEW_IMG_WIDTH + ) + self.assertEqual( + self.local_user.preview_image.height, settings.PREVIEW_IMG_HEIGHT + ) From 5966520f0d4639ba82a06bb041329af0bd022a6c Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 29 May 2021 16:01:33 +0200 Subject: [PATCH 099/196] Ok this is stupid. --- .github/workflows/django-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django-tests.yml b/.github/workflows/django-tests.yml index 391afdd4c..c4f7bb6e5 100644 --- a/.github/workflows/django-tests.yml +++ b/.github/workflows/django-tests.yml @@ -64,6 +64,6 @@ jobs: EMAIL_HOST_USER: "" EMAIL_HOST_PASSWORD: "" EMAIL_USE_TLS: true - ENABLE_PREVIEW_IMAGES": true + ENABLE_PREVIEW_IMAGES: true run: | python manage.py test From 2816d7cc88a5f671bb4a66cdec59ac22bfed4b89 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 1 Jun 2021 14:28:53 -0700 Subject: [PATCH 100/196] Use "instance" consistently --- bookwyrm/templates/layout.html | 2 +- bookwyrm/templates/moderation/reports.html | 4 +- bookwyrm/templates/settings/admin_layout.html | 2 +- bookwyrm/templates/settings/edit_server.html | 8 +- bookwyrm/templates/settings/federation.html | 10 +- .../templates/settings/server_blocklist.html | 8 +- .../templates/user_admin/server_filter.html | 2 +- bookwyrm/templates/user_admin/user_admin.html | 4 +- locale/de_DE/LC_MESSAGES/django.po | 269 +++++++++-------- locale/en_US/LC_MESSAGES/django.po | 221 +++++++------- locale/es/LC_MESSAGES/django.po | 107 ++++--- locale/fr_FR/LC_MESSAGES/django.po | 223 ++++++++------ locale/zh_Hans/LC_MESSAGES/django.po | 274 ++++++++++-------- 13 files changed, 651 insertions(+), 483 deletions(-) diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index d899d62cb..56530a841 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -203,7 +203,7 @@

    - {% trans "About this server" %} + {% trans "About this instance" %}

    {% if site.admin_email %}

    diff --git a/bookwyrm/templates/moderation/reports.html b/bookwyrm/templates/moderation/reports.html index f9d9d99b6..95a276af4 100644 --- a/bookwyrm/templates/moderation/reports.html +++ b/bookwyrm/templates/moderation/reports.html @@ -3,7 +3,7 @@ {% block title %} {% if server %} -{% blocktrans with server_name=server.server_name %}Reports: {{ server_name }}{% endblocktrans %} +{% blocktrans with instance_name=server.server_name %}Reports: {{ instance_name }}{% endblocktrans %} {% else %} {% trans "Reports" %} {% endif %} @@ -11,7 +11,7 @@ {% block header %} {% if server %} -{% blocktrans with server_name=server.server_name %}Reports: {{ server_name }}{% endblocktrans %} +{% blocktrans with instance_name=server.server_name %}Reports: {{ instance_name }}{% endblocktrans %} Clear filters {% else %} {% trans "Reports" %} diff --git a/bookwyrm/templates/settings/admin_layout.html b/bookwyrm/templates/settings/admin_layout.html index 635e86072..9e57076bf 100644 --- a/bookwyrm/templates/settings/admin_layout.html +++ b/bookwyrm/templates/settings/admin_layout.html @@ -36,7 +36,7 @@

  • {% url 'settings-federation' as url %} - {% trans "Federated Servers" %} + {% trans "Federated Instances" %}
    • {% endif %} diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html index c5702c848..d7ca3a788 100644 --- a/bookwyrm/templates/settings/edit_server.html +++ b/bookwyrm/templates/settings/edit_server.html @@ -1,10 +1,10 @@ {% extends 'settings/admin_layout.html' %} {% load i18n %} -{% block title %}{% trans "Add server" %}{% endblock %} +{% block title %}{% trans "Add instance" %}{% endblock %} {% block header %} -{% trans "Add server" %} -{% trans "Back to server list" %} +{% trans "Add instance" %} +{% trans "Back to instance list" %} {% endblock %} {% block panel %} @@ -17,7 +17,7 @@ {% url 'settings-add-federated-server' as url %}
  • - {% trans "Add server" %} + {% trans "Add instance" %}
    • diff --git a/bookwyrm/templates/settings/federation.html b/bookwyrm/templates/settings/federation.html index bf1986725..208ecf8d2 100644 --- a/bookwyrm/templates/settings/federation.html +++ b/bookwyrm/templates/settings/federation.html @@ -1,13 +1,13 @@ {% extends 'settings/admin_layout.html' %} {% load i18n %} -{% block title %}{% trans "Federated Servers" %}{% endblock %} +{% block title %}{% trans "Federated Instances" %}{% endblock %} -{% block header %}{% trans "Federated Servers" %}{% endblock %} +{% block header %}{% trans "Federated Instances" %}{% endblock %} {% block edit-button %} - - {% trans "Add server" %} + + {% trans "Add instance" %} {% endblock %} @@ -16,7 +16,7 @@ {% url 'settings-federation' as url %} - {% trans "Server name" as text %} + {% trans "Instance name" as text %} {% include 'snippets/table-sort-header.html' with field="server_name" sort=sort text=text %} diff --git a/bookwyrm/templates/settings/server_blocklist.html b/bookwyrm/templates/settings/server_blocklist.html index 0de49acd7..171cf1339 100644 --- a/bookwyrm/templates/settings/server_blocklist.html +++ b/bookwyrm/templates/settings/server_blocklist.html @@ -1,10 +1,10 @@ {% extends 'settings/admin_layout.html' %} {% load i18n %} -{% block title %}{% trans "Add server" %}{% endblock %} +{% block title %}{% trans "Add instance" %}{% endblock %} {% block header %} {% trans "Import Blocklist" %} -{% trans "Back to server list" %} +{% trans "Back to instance list" %} {% endblock %} {% block panel %} @@ -17,7 +17,7 @@ {% url 'settings-add-federated-server' as url %}
  • - {% trans "Add server" %} + {% trans "Add instance" %}
    • @@ -51,7 +51,7 @@ 
     [
     {
-        "instance": "example.server.com",
+        "instance": "example.instance.com",
         "url": "https://link.to.more/info"
     },
     ...
diff --git a/bookwyrm/templates/user_admin/server_filter.html b/bookwyrm/templates/user_admin/server_filter.html
index fd8760cce..2a4b89fdb 100644
--- a/bookwyrm/templates/user_admin/server_filter.html
+++ b/bookwyrm/templates/user_admin/server_filter.html
@@ -2,6 +2,6 @@
 {% load i18n %}
 
 {% block filter %}
-
+
 
 {% endblock %}
diff --git a/bookwyrm/templates/user_admin/user_admin.html b/bookwyrm/templates/user_admin/user_admin.html
index 2ab526a9f..4b4c79793 100644
--- a/bookwyrm/templates/user_admin/user_admin.html
+++ b/bookwyrm/templates/user_admin/user_admin.html
@@ -4,7 +4,7 @@
 
 {% block header %}
 {% if server %}
-{% blocktrans with server_name=server.server_name %}Users: {{ server_name }}{% endblocktrans %}
+{% blocktrans with instance_name=server.server_name %}Users: {{ instance_name }}{% endblocktrans %}
 Clear filters
 {% else %}
 {% trans "Users" %}
@@ -35,7 +35,7 @@
             {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %}
         
         
-            {% trans "Remote server" as text %}
+            {% trans "Remote instance" as text %}
             {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %}
         
     
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index 40f770b56..9649dc149 100644
--- a/locale/de_DE/LC_MESSAGES/django.po
+++ b/locale/de_DE/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\n"
 "PO-Revision-Date: 2021-03-02 17:19-0800\n"
 "Last-Translator: Mouse Reeve \n"
 "Language-Team: English \n"
@@ -62,12 +62,12 @@ msgid "Book Title"
 msgstr "Titel"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
@@ -83,41 +83,41 @@ msgstr "Zu lesen angefangen"
 msgid "Descending"
 msgstr "Zu lesen angefangen"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s ist keine gültige remote_id"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s ist kein gültiger Username"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "Username"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Dieser Benutzename ist bereits vergeben."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "Englisch"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Französisch"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
@@ -266,7 +266,7 @@ msgstr ""
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -398,7 +398,7 @@ msgstr "Themen"
 msgid "Places"
 msgstr "Orte"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -414,7 +414,7 @@ msgstr "Zur Liste"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -559,7 +559,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr ""
 
@@ -688,7 +688,7 @@ msgstr "Föderiert"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr ""
 
@@ -902,7 +902,7 @@ msgid "Direct Messages with %(username)s"
 msgstr "Direktnachrichten mit %(username)s"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "Direktnachrichten"
 
@@ -960,7 +960,6 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Deine Bücher"
@@ -1022,7 +1021,7 @@ msgid "What are you reading?"
 msgstr "Zu lesen angefangen"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Nach einem Buch suchen"
 
@@ -1042,7 +1041,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -1061,7 +1060,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Über %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "Keine Bücher gefunden"
 
@@ -1184,7 +1183,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)ss %(year)s Bücher"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "Bücher importieren"
 
@@ -1271,14 +1270,14 @@ msgstr "Buch"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "Titel"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "Autor*in"
 
@@ -1320,15 +1319,21 @@ msgstr "Suche nach Buch oder Benutzer*in"
 msgid "Main navigation menu"
 msgstr "Navigationshauptmenü"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+#, fuzzy
+#| msgid "Your books"
+msgid "Your Books"
+msgstr "Deine Bücher"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1336,45 +1341,47 @@ msgstr "Einstellungen"
 msgid "Invites"
 msgstr "Einladungen"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "Abmelden"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "Passwort"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Anmelden"
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "Über diesen Server"
 
 #: bookwyrm/templates/layout.html:210
@@ -1438,7 +1445,7 @@ msgid "Discard"
 msgstr "Ablehnen"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "Liste bearbeiten"
 
@@ -1487,63 +1494,64 @@ msgstr "Alle können Bücher hinzufügen"
 msgid "This list is currently empty"
 msgstr "Diese Liste ist momentan leer"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, fuzzy, python-format
 #| msgid "Direct Messages with %(username)s"
 msgid "Added by %(username)s"
 msgstr "Direktnachrichten mit %(username)s"
 
-#: bookwyrm/templates/lists/list.html:77
-#, fuzzy
-#| msgid "Started"
-msgid "Set"
-msgstr "Gestartet"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+#, fuzzy
+#| msgid "Started"
+msgid "Set"
+msgstr "Gestartet"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Entfernen"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "Deine Listen"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 #, fuzzy
 #| msgid "List curation:"
 msgid "Direction"
 msgstr "Listenkuratierung:"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "Bücher hinzufügen"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "Bücher vorschlagen"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "suchen"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "Suche leeren"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Keine passenden Bücher zu \"%(query)s\" gefunden"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "Vorschlagen"
 
@@ -1643,7 +1651,7 @@ msgstr "Lösen"
 #: bookwyrm/templates/moderation/reports.html:6
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
-msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1657,7 +1665,7 @@ msgstr "Aktuelle Importe"
 #: bookwyrm/templates/moderation/reports.html:14
 #, fuzzy, python-format
 #| msgid "Lists: %(username)s"
-msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/moderation/reports.html:28
@@ -1863,6 +1871,26 @@ msgstr "Profil"
 msgid "Relationships"
 msgstr "Beziehungen"
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr "bewertete"
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr "kommentierte"
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr "zitierte"
+
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -1922,7 +1950,9 @@ msgstr "Nutzer*innen verwalten"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "Föderierende Server"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1976,6 +2006,7 @@ msgid "Back to list"
 msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/settings/announcement.html:11
+#: bookwyrm/templates/settings/announcement_form.html:6
 #, fuzzy
 #| msgid "Announcements"
 msgid "Edit Announcement"
@@ -2017,7 +2048,7 @@ msgstr "Geburtsdatum:"
 msgid "Active:"
 msgstr "Aktivität"
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 #, fuzzy
 #| msgid "Announcements"
@@ -2076,15 +2107,15 @@ msgstr "Aktivität"
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
 #, fuzzy
-#| msgid "Add cover"
-msgid "Add server"
-msgstr "Cover hinzufügen"
+#| msgid "Instance Name:"
+msgid "Add instance"
+msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
 #, fuzzy
 #| msgid "Back to reports"
-msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2213,8 +2244,10 @@ msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "Servername"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "Instanzname"
 
 #: bookwyrm/templates/settings/federation.html:23
 #, fuzzy
@@ -2353,7 +2386,7 @@ msgid "Import Blocklist"
 msgstr "Bücher importieren"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr "Erfolg!"
 
@@ -2446,15 +2479,15 @@ msgstr "Cover hinzufügen"
 msgid "%(title)s by "
 msgstr "%(title)s von "
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "teilt"
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2554,13 +2587,13 @@ msgstr "Diese Lesedaten löschen?"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Fortschrittsupdates."
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
+#: bookwyrm/templates/snippets/fav_button.html:19
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2664,17 +2697,17 @@ msgstr "Posten"
 msgid "Set goal"
 msgstr "Ziel setzen"
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr "%(percent)s%% komplett!"
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read %(read_count)s of %(goal_count)s books."
 msgstr "Du hast %(read_count)s von %(goal_count)s Büchern gelesen."
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read %(read_count)s of %(goal_count)s books."
 msgstr "%(username)s hat %(read_count)s von %(goal_count)s Büchern gelesen."
@@ -2787,26 +2820,6 @@ msgstr "Registrieren"
 msgid "Report"
 msgstr "Importieren"
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr "bewertete"
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr "kommentierte"
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr "zitierte"
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "Buch importieren"
@@ -2989,7 +3002,7 @@ msgstr "Regal bearbeiten"
 msgid "Update shelf"
 msgstr "Regal aktualisieren"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 #, fuzzy
 #| msgid "books"
 msgid "All books"
@@ -2999,30 +3012,30 @@ msgstr "Bücher"
 msgid "Create shelf"
 msgstr "Regal erstellen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "Regal bearbeiten"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "Ins Regal gestellt"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "Gestartet"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "Abgeschlossen"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "Dieses Regal ist leer."
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "Regal löschen"
 
@@ -3084,9 +3097,10 @@ msgid "Back to users"
 msgstr "Zurück zu den Meldungen"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: %(server_name)s"
-msgstr ""
+#, fuzzy, python-format
+#| msgid "Lists: %(username)s"
+msgid "Users: %(instance_name)s"
+msgstr "Listen: %(username)s"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
 #: bookwyrm/templates/user_admin/username_filter.html:5
@@ -3107,9 +3121,9 @@ msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
 #, fuzzy
-#| msgid "Remove"
-msgid "Remote server"
-msgstr "Entfernen"
+#| msgid "Instance Name:"
+msgid "Remote instance"
+msgstr "Instanzname"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 #, fuzzy
@@ -3158,6 +3172,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 #, fuzzy
 #| msgid "Email address:"
@@ -3175,6 +3193,27 @@ msgstr "Dieser Benutzename ist bereits vergeben."
 msgid "A password reset link sent to %s"
 msgstr ""
 
+#, fuzzy, python-format
+#~| msgid "Lists: %(username)s"
+#~ msgid "Reports: %(server_name)s"
+#~ msgstr "Listen: %(username)s"
+
+#~ msgid "Federated Servers"
+#~ msgstr "Föderierende Server"
+
+#~ msgid "Server name"
+#~ msgstr "Servername"
+
+#, fuzzy
+#~| msgid "Add cover"
+#~ msgid "Add server"
+#~ msgstr "Cover hinzufügen"
+
+#, fuzzy
+#~| msgid "Remove"
+#~ msgid "Remote server"
+#~ msgstr "Entfernen"
+
 #, fuzzy
 #~| msgid "Book"
 #~ msgid "BookWyrm\\"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 1fa5eb304..7d1044b2b 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve \n"
 "Language-Team: English \n"
@@ -56,12 +56,12 @@ msgid "Book Title"
 msgstr ""
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr ""
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
@@ -73,41 +73,41 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr ""
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr ""
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr ""
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr ""
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr ""
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr ""
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr ""
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -248,7 +248,7 @@ msgstr ""
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -367,7 +367,7 @@ msgstr ""
 msgid "Places"
 msgstr ""
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -381,7 +381,7 @@ msgstr ""
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr ""
 
@@ -511,7 +511,7 @@ msgid "John Doe, Jane Smith"
 msgstr ""
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr ""
 
@@ -630,7 +630,7 @@ msgstr ""
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr ""
 
@@ -831,7 +831,7 @@ msgid "Direct Messages with %(username)s"
 msgstr ""
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr ""
 
@@ -887,7 +887,6 @@ msgid "Updates"
 msgstr ""
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr ""
@@ -942,7 +941,7 @@ msgid "What are you reading?"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr ""
 
@@ -962,7 +961,7 @@ msgstr ""
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -978,7 +977,7 @@ msgid "Popular on %(site_name)s"
 msgstr ""
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr ""
 
@@ -1090,7 +1089,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr ""
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr ""
 
@@ -1175,14 +1174,14 @@ msgstr ""
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr ""
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr ""
 
@@ -1224,15 +1223,19 @@ msgstr ""
 msgid "Main navigation menu"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+msgid "Your Books"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1240,45 +1243,45 @@ msgstr ""
 msgid "Invites"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr ""
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+msgid "About this instance"
 msgstr ""
 
 #: bookwyrm/templates/layout.html:210
@@ -1338,7 +1341,7 @@ msgid "Discard"
 msgstr ""
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr ""
 
@@ -1385,54 +1388,55 @@ msgstr ""
 msgid "This list is currently empty"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by %(username)s"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:77
-msgid "Set"
-msgstr ""
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 msgid "List position"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+msgid "Set"
+msgstr ""
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr ""
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr ""
 
@@ -1523,7 +1527,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:6
 #, python-format
-msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1534,7 +1538,7 @@ msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:14
 #, python-format
-msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr ""
 
 #: bookwyrm/templates/moderation/reports.html:28
@@ -1733,6 +1737,26 @@ msgstr ""
 msgid "Relationships"
 msgstr ""
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr ""
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr ""
+
 #: bookwyrm/templates/search/book.html:64
 msgid "Load results from other catalogues"
 msgstr ""
@@ -1783,7 +1807,7 @@ msgstr ""
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr ""
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1833,6 +1857,7 @@ msgid "Back to list"
 msgstr ""
 
 #: bookwyrm/templates/settings/announcement.html:11
+#: bookwyrm/templates/settings/announcement_form.html:6
 msgid "Edit Announcement"
 msgstr ""
 
@@ -1866,7 +1891,7 @@ msgstr ""
 msgid "Active:"
 msgstr ""
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 msgid "Create Announcement"
 msgstr ""
@@ -1910,12 +1935,12 @@ msgstr ""
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-msgid "Add server"
+msgid "Add instance"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+msgid "Back to instance list"
 msgstr ""
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2022,7 +2047,7 @@ msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
+msgid "Instance name"
 msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:23
@@ -2144,7 +2169,7 @@ msgid "Import Blocklist"
 msgstr ""
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr ""
 
@@ -2230,13 +2255,13 @@ msgstr ""
 msgid "%(title)s by "
 msgstr ""
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 msgid "Boost"
 msgstr ""
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 msgid "Un-boost"
 msgstr ""
 
@@ -2326,13 +2351,13 @@ msgstr ""
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
+#: bookwyrm/templates/snippets/fav_button.html:19
 msgid "Un-like"
 msgstr ""
 
@@ -2427,17 +2452,17 @@ msgstr ""
 msgid "Set goal"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read %(read_count)s of %(goal_count)s books."
 msgstr ""
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read %(read_count)s of %(goal_count)s books."
 msgstr ""
@@ -2546,26 +2571,6 @@ msgstr ""
 msgid "Report"
 msgstr ""
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr ""
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr ""
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr ""
@@ -2735,7 +2740,7 @@ msgstr ""
 msgid "Update shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr ""
 
@@ -2743,30 +2748,30 @@ msgstr ""
 msgid "Create shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr ""
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr ""
 
@@ -2825,7 +2830,7 @@ msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
 #, python-format
-msgid "Users: %(server_name)s"
+msgid "Users: %(instance_name)s"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2842,7 +2847,7 @@ msgid "Last Active"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
+msgid "Remote instance"
 msgstr ""
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
@@ -2886,6 +2891,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr ""
diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index cbf07ea50..012d1e138 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-25 01:44+0000\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -73,41 +73,41 @@ msgstr "Ascendente"
 msgid "Descending"
 msgstr "Descendente"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s no es un remote_id válido"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s no es un usuario válido"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:152
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nombre de usuario"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Ya existe un usuario con ese nombre."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "Inglés"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Aléman"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Francés"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
@@ -1281,7 +1281,9 @@ msgid "Join"
 msgstr "Unirse"
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "Sobre este servidor"
 
 #: bookwyrm/templates/layout.html:210
@@ -1526,8 +1528,9 @@ msgid "Resolve"
 msgstr "Resolver"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, python-format
-msgid "Reports: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Informes: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1537,9 +1540,10 @@ msgid "Reports"
 msgstr "Informes"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, python-format
-msgid "Reports: %(server_name)s"
-msgstr "Informes: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Users: %(server_name)s"
+msgid "Reports: %(instance_name)s"
+msgstr "Usuarios %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -1660,6 +1664,7 @@ msgid " suggested adding %(book_title)s t
 msgstr " sugirió agregar %(book_title)s a tu lista \"%(list_name)s\""
 
 #: bookwyrm/templates/notifications.html:128
+#, python-format
 msgid "Your import completed."
 msgstr "Tu importación ha terminado."
 
@@ -1791,6 +1796,7 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: bookwyrm/templates/search/layout.html:58
+#, python-format
 msgid "No results found for \"%(query)s\""
 msgstr "No se encontró ningún resultado correspondiente a \"%(query)s\""
 
@@ -1805,7 +1811,9 @@ msgstr "Administrar usuarios"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "Servidores federalizados"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1933,12 +1941,16 @@ msgstr "inactivo"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-msgid "Add server"
-msgstr "Agregar servidor"
+#, fuzzy
+#| msgid "View instance"
+msgid "Add instance"
+msgstr "Ver instancia"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "Volver a la lista de servidores"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2045,8 +2057,10 @@ msgstr "Todos los usuarios en esta instancia serán re-activados."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "Nombre de servidor"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "Nombre de instancia:"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2240,6 +2254,7 @@ msgid "Registration closed text:"
 msgstr "Texto de registración cerrada:"
 
 #: bookwyrm/templates/snippets/announcement.html:31
+#, python-format
 msgid "Posted by %(username)s"
 msgstr "Publicado por %(username)s"
 
@@ -2395,14 +2410,6 @@ msgstr "Aceptar"
 msgid "No rating"
 msgstr "No calificación"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
-#: bookwyrm/templates/snippets/stars.html:7
-#, python-format
-msgid "%(rating)s star"
-msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s estrella"
-msgstr[1] "%(rating)s estrellas"
-
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2478,6 +2485,8 @@ msgid "page %(page)s of %(total_pages)s"
 msgstr "página %(page)s de %(total_pages)s"
 
 #: bookwyrm/templates/snippets/page_text.html:6
+#, fuzzy, python-format
+#| msgid "page %(page)s"
 msgid "page %(page)s"
 msgstr "página %(pages)s"
 
@@ -2822,6 +2831,7 @@ msgid "%(counter)s following"
 msgstr "%(counter)s siguiendo"
 
 #: bookwyrm/templates/user/user_preview.html:26
+#, python-format
 msgid "%(mutuals_display)s follower you follow"
 msgid_plural "%(mutuals_display)s followers you follow"
 msgstr[0] "%(mutuals_display)s seguidor que sigues"
@@ -2832,8 +2842,9 @@ msgid "Back to users"
 msgstr "Volver a usuarios"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Users: %(server_name)s"
+msgid "Users: %(instance_name)s"
 msgstr "Usuarios %(server_name)s"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2850,8 +2861,10 @@ msgid "Last Active"
 msgstr "Actividad reciente"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
-msgstr "Quitar servidor"
+#, fuzzy
+#| msgid "View instance"
+msgid "Remote instance"
+msgstr "Ver instancia"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -2894,6 +2907,10 @@ msgstr "Des-suspender usuario"
 msgid "Access level:"
 msgstr "Nivel de acceso:"
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "No un archivo csv válido"
@@ -2907,6 +2924,28 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic
 msgid "A password reset link sent to %s"
 msgstr "Un enlace para reestablecer tu contraseña se enviará a %s"
 
+#, python-format
+#~ msgid "Reports: %(server_name)s"
+#~ msgstr "Informes: %(server_name)s"
+
+#~ msgid "Federated Servers"
+#~ msgstr "Servidores federalizados"
+
+#~ msgid "Server name"
+#~ msgstr "Nombre de servidor"
+
+#~ msgid "Add server"
+#~ msgstr "Agregar servidor"
+
+#~ msgid "Remote server"
+#~ msgstr "Quitar servidor"
+
+#, python-format
+#~ msgid "%(rating)s star"
+#~ msgid_plural "%(rating)s stars"
+#~ msgstr[0] "%(rating)s estrella"
+#~ msgstr[1] "%(rating)s estrellas"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index a96f9d76d..71b154ba1 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-23 10:45+0000\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison \n"
 "Language-Team: Mouse Reeve \n"
@@ -56,12 +56,12 @@ msgid "Book Title"
 msgstr "Titre du livre"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "Note"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr "Trier par"
 
@@ -73,41 +73,41 @@ msgstr "Ordre croissant"
 msgid "Descending"
 msgstr "Ordre décroissant"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s n’est pas une remote_id valide."
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s n’est pas un nom de compte valide."
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:157
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "nom du compte :"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "Ce nom est déjà associé à un compte."
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "English"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Français"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "简化字"
 
@@ -367,7 +367,7 @@ msgstr "Sujets"
 msgid "Places"
 msgstr "Lieux"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -381,7 +381,7 @@ msgstr "Ajouter à la liste"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "Ajouter"
 
@@ -511,7 +511,7 @@ msgid "John Doe, Jane Smith"
 msgstr "Claude Dupont, Dominique Durand"
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "Couverture"
 
@@ -630,7 +630,7 @@ msgstr "Communauté fédérée"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr "Répertoire"
 
@@ -831,7 +831,7 @@ msgid "Direct Messages with %(username)s"
 msgstr "Messages directs avec %(username)s"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "Messages directs"
 
@@ -887,7 +887,6 @@ msgid "Updates"
 msgstr "Mises à jour"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "Vos livres"
@@ -942,7 +941,7 @@ msgid "What are you reading?"
 msgstr "Que lisez‑vous ?"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "Chercher un livre"
 
@@ -962,7 +961,7 @@ msgstr "Vous pourrez ajouter des livres lorsque vous commencerez à utiliser %(s
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -978,7 +977,7 @@ msgid "Popular on %(site_name)s"
 msgstr "Populaire sur %(site_name)s"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "Aucun livre trouvé"
 
@@ -1090,7 +1089,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "Livres de %(username)s en %(year)s"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "Importer des livres"
 
@@ -1175,14 +1174,14 @@ msgstr "Livre"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "Titre"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "Auteur ou autrice"
 
@@ -1224,15 +1223,21 @@ msgstr "Chercher un livre ou un compte"
 msgid "Main navigation menu"
 msgstr "Menu de navigation principal "
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr "Fil d’actualité"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+#, fuzzy
+#| msgid "Your books"
+msgid "Your Books"
+msgstr "Vos livres"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "Paramètres"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1240,61 +1245,63 @@ msgstr "Paramètres"
 msgid "Invites"
 msgstr "Invitations"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr "Admin"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "Notifications"
 
-#: bookwyrm/templates/layout.html:156 bookwyrm/templates/layout.html:160
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "Nom du compte :"
 
-#: bookwyrm/templates/layout.html:161
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "Mot de passe"
 
-#: bookwyrm/templates/layout.html:162 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "Mot de passe oublié ?"
 
-#: bookwyrm/templates/layout.html:165 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "Se connecter"
 
-#: bookwyrm/templates/layout.html:173
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "Rejoindre"
 
-#: bookwyrm/templates/layout.html:211
-msgid "About this server"
+#: bookwyrm/templates/layout.html:206
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "À propos de ce serveur"
 
-#: bookwyrm/templates/layout.html:215
+#: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"
 msgstr "Contacter l’administrateur du site"
 
-#: bookwyrm/templates/layout.html:219
+#: bookwyrm/templates/layout.html:214
 msgid "Documentation"
 msgstr "Documentation"
 
-#: bookwyrm/templates/layout.html:226
+#: bookwyrm/templates/layout.html:221
 #, python-format
 msgid "Support %(site_name)s on %(support_title)s"
 msgstr "Soutenez %(site_name)s avec %(support_title)s"
 
-#: bookwyrm/templates/layout.html:230
+#: bookwyrm/templates/layout.html:225
 msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub."
 msgstr "BookWyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via GitHub."
 
@@ -1338,7 +1345,7 @@ msgid "Discard"
 msgstr "Rejeter"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "Modifier la liste"
 
@@ -1385,54 +1392,55 @@ msgstr "Vous avez ajouté un livre à cette liste !"
 msgid "This list is currently empty"
 msgstr "Cette liste est actuellement vide"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by %(username)s"
 msgstr "Ajouté par %(username)s"
 
-#: bookwyrm/templates/lists/list.html:77
-msgid "Set"
-msgstr "Appliquer"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 msgid "List position"
 msgstr "Position"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+msgid "Set"
+msgstr "Appliquer"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "Retirer"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 msgid "Direction"
 msgstr "Direction"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "Ajouter des livres"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "Suggérer des livres"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "chercher"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "Vider la requête"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "Aucun livre trouvé pour la requête « %(query)s »"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "Suggérer"
 
@@ -1522,8 +1530,9 @@ msgid "Resolve"
 msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, python-format
-msgid "Reports: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "Signalements : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1533,9 +1542,10 @@ msgid "Reports"
 msgstr "Signalements"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, python-format
-msgid "Reports: %(server_name)s"
-msgstr "Signalements: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Users: %(server_name)s"
+msgid "Reports: %(instance_name)s"
+msgstr "Comptes : %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -1803,7 +1813,9 @@ msgstr "Gérer les comptes"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "Serveurs fédérés"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1931,12 +1943,16 @@ msgstr "inactive"
 #: bookwyrm/templates/settings/federation.html:10
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
-msgid "Add server"
-msgstr "Ajouter un serveur"
+#, fuzzy
+#| msgid "View instance"
+msgid "Add instance"
+msgstr "Voir l’instance"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "Retour à la liste des serveurs"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2043,8 +2059,10 @@ msgstr "Tous les comptes de cette instance seront réactivés."
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "Nom du serveur"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "Nom de l’instance :"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2394,14 +2412,6 @@ msgstr "Accepter"
 msgid "No rating"
 msgstr "Aucune note"
 
-#: bookwyrm/templates/snippets/form_rate_stars.html:44
-#: bookwyrm/templates/snippets/stars.html:7
-#, python-format
-msgid "%(rating)s star"
-msgid_plural "%(rating)s stars"
-msgstr[0] "%(rating)s étoile"
-msgstr[1] "%(rating)s étoiles"
-
 #: bookwyrm/templates/snippets/generated_status/goal.html:1
 #, python-format
 msgid "set a goal to read %(counter)s book in %(year)s"
@@ -2752,30 +2762,30 @@ msgstr "Tous les livres"
 msgid "Create shelf"
 msgstr "Créer une étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "Modifier l’étagère"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "Date d’ajout"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "Commencé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "Terminé"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "Cette étagère est vide"
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "Supprimer l’étagère"
 
@@ -2833,8 +2843,9 @@ msgid "Back to users"
 msgstr "Retour aux comptes"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Users: %(server_name)s"
+msgid "Users: %(instance_name)s"
 msgstr "Comptes : %(server_name)s"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2851,8 +2862,10 @@ msgid "Last Active"
 msgstr "Dernière activité"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
-msgstr "Serveur distant"
+#, fuzzy
+#| msgid "View instance"
+msgid "Remote instance"
+msgstr "Voir l’instance"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -2895,6 +2908,10 @@ msgstr "Rétablir le compte"
 msgid "Access level:"
 msgstr "Niveau d’accès :"
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 msgid "Not a valid csv file"
 msgstr "Fichier CSV non valide"
@@ -2908,6 +2925,28 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé."
 msgid "A password reset link sent to %s"
 msgstr "Un lien de réinitialisation a été envoyé à %s."
 
+#, python-format
+#~ msgid "Reports: %(server_name)s"
+#~ msgstr "Signalements: %(server_name)s"
+
+#~ msgid "Federated Servers"
+#~ msgstr "Serveurs fédérés"
+
+#~ msgid "Server name"
+#~ msgstr "Nom du serveur"
+
+#~ msgid "Add server"
+#~ msgstr "Ajouter un serveur"
+
+#~ msgid "Remote server"
+#~ msgstr "Serveur distant"
+
+#, python-format
+#~ msgid "%(rating)s star"
+#~ msgid_plural "%(rating)s stars"
+#~ msgstr[0] "%(rating)s étoile"
+#~ msgstr[1] "%(rating)s étoiles"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 0ec8b1d88..56b424a4a 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-20 14:40-0700\n"
+"POT-Creation-Date: 2021-06-01 14:49-0700\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana \n"
 "Language-Team: Mouse Reeve \n"
@@ -58,12 +58,12 @@ msgid "Book Title"
 msgstr "标题"
 
 #: bookwyrm/forms.py:301 bookwyrm/templates/snippets/create_status_form.html:34
-#: bookwyrm/templates/user/shelf/shelf.html:84
-#: bookwyrm/templates/user/shelf/shelf.html:115
+#: bookwyrm/templates/user/shelf/shelf.html:85
+#: bookwyrm/templates/user/shelf/shelf.html:116
 msgid "Rating"
 msgstr "评价"
 
-#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:101
+#: bookwyrm/forms.py:303 bookwyrm/templates/lists/list.html:107
 msgid "Sort By"
 msgstr ""
 
@@ -79,41 +79,41 @@ msgstr "升序排序"
 msgid "Descending"
 msgstr "升序排序"
 
-#: bookwyrm/models/fields.py:24
+#: bookwyrm/models/fields.py:25
 #, python-format
 msgid "%(value)s is not a valid remote_id"
 msgstr "%(value)s 不是有效的 remote_id"
 
-#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#: bookwyrm/models/fields.py:34 bookwyrm/models/fields.py:43
 #, python-format
 msgid "%(value)s is not a valid username"
 msgstr "%(value)s 不是有效的用户名"
 
-#: bookwyrm/models/fields.py:165 bookwyrm/templates/layout.html:155
+#: bookwyrm/models/fields.py:166 bookwyrm/templates/layout.html:152
 msgid "username"
 msgstr "用户名"
 
-#: bookwyrm/models/fields.py:170
+#: bookwyrm/models/fields.py:171
 msgid "A user with that username already exists."
 msgstr "已经存在使用该用户名的用户。"
 
-#: bookwyrm/settings.py:155
+#: bookwyrm/settings.py:156
 msgid "English"
 msgstr "English（英语）"
 
-#: bookwyrm/settings.py:156
+#: bookwyrm/settings.py:157
 msgid "German"
 msgstr "Deutsch（德语）"
 
-#: bookwyrm/settings.py:157
+#: bookwyrm/settings.py:158
 msgid "Spanish"
 msgstr "Español（西班牙语）"
 
-#: bookwyrm/settings.py:158
+#: bookwyrm/settings.py:159
 msgid "French"
 msgstr "Français（法语）"
 
-#: bookwyrm/settings.py:159
+#: bookwyrm/settings.py:160
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
@@ -260,7 +260,7 @@ msgstr "Goodreads key:"
 #: bookwyrm/templates/book/edit_book.html:263
 #: bookwyrm/templates/lists/form.html:42
 #: bookwyrm/templates/preferences/edit_user.html:70
-#: bookwyrm/templates/settings/announcement_form.html:65
+#: bookwyrm/templates/settings/announcement_form.html:69
 #: bookwyrm/templates/settings/edit_server.html:68
 #: bookwyrm/templates/settings/federated_server.html:98
 #: bookwyrm/templates/settings/site.html:97
@@ -386,7 +386,7 @@ msgstr "主题"
 msgid "Places"
 msgstr "地点"
 
-#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book/book.html:276 bookwyrm/templates/layout.html:61
 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12
 #: bookwyrm/templates/search/layout.html:25
 #: bookwyrm/templates/search/layout.html:50
@@ -400,7 +400,7 @@ msgstr "添加到列表"
 
 #: bookwyrm/templates/book/book.html:297
 #: bookwyrm/templates/book/cover_modal.html:31
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Add"
 msgstr "添加"
 
@@ -532,7 +532,7 @@ msgid "John Doe, Jane Smith"
 msgstr "张三, 李四"
 
 #: bookwyrm/templates/book/edit_book.html:183
-#: bookwyrm/templates/user/shelf/shelf.html:77
+#: bookwyrm/templates/user/shelf/shelf.html:78
 msgid "Cover"
 msgstr "封面"
 
@@ -655,7 +655,7 @@ msgstr "跨站社区"
 
 #: bookwyrm/templates/directory/directory.html:4
 #: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:92
+#: bookwyrm/templates/layout.html:64
 msgid "Directory"
 msgstr "目录"
 
@@ -854,7 +854,7 @@ msgid "Direct Messages with %(username)s"
 msgstr "与 %(username)s 私信"
 
 #: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:87
+#: bookwyrm/templates/layout.html:92
 msgid "Direct Messages"
 msgstr "私信"
 
@@ -910,7 +910,6 @@ msgid "Updates"
 msgstr "更新"
 
 #: bookwyrm/templates/feed/feed_layout.html:10
-#: bookwyrm/templates/layout.html:58
 #: bookwyrm/templates/user/shelf/books_header.html:3
 msgid "Your books"
 msgstr "你的书目"
@@ -963,7 +962,7 @@ msgid "What are you reading?"
 msgstr "你在阅读什么？"
 
 #: bookwyrm/templates/get_started/books.html:9
-#: bookwyrm/templates/lists/list.html:120
+#: bookwyrm/templates/lists/list.html:135
 msgid "Search for a book"
 msgstr "搜索书目"
 
@@ -983,7 +982,7 @@ msgstr "你可以在开始使用 %(site_name)s 后添加书目。"
 #: bookwyrm/templates/get_started/users.html:18
 #: bookwyrm/templates/get_started/users.html:19
 #: bookwyrm/templates/layout.html:37 bookwyrm/templates/layout.html:38
-#: bookwyrm/templates/lists/list.html:124
+#: bookwyrm/templates/lists/list.html:139
 #: bookwyrm/templates/search/layout.html:4
 #: bookwyrm/templates/search/layout.html:9
 msgid "Search"
@@ -999,7 +998,7 @@ msgid "Popular on %(site_name)s"
 msgstr "%(site_name)s 上的热门"
 
 #: bookwyrm/templates/get_started/books.html:58
-#: bookwyrm/templates/lists/list.html:137
+#: bookwyrm/templates/lists/list.html:152
 msgid "No books found"
 msgstr "没有找到书目"
 
@@ -1111,7 +1110,7 @@ msgid "%(username)s's %(year)s Books"
 msgstr "%(username)s 在 %(year)s 的书目"
 
 #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9
-#: bookwyrm/templates/layout.html:97
+#: bookwyrm/templates/user/shelf/shelf.html:40
 msgid "Import Books"
 msgstr "导入书目"
 
@@ -1196,14 +1195,14 @@ msgstr "书目"
 
 #: bookwyrm/templates/import_status.html:114
 #: bookwyrm/templates/snippets/create_status_form.html:13
-#: bookwyrm/templates/user/shelf/shelf.html:78
-#: bookwyrm/templates/user/shelf/shelf.html:98
+#: bookwyrm/templates/user/shelf/shelf.html:79
+#: bookwyrm/templates/user/shelf/shelf.html:99
 msgid "Title"
 msgstr "标题"
 
 #: bookwyrm/templates/import_status.html:117
-#: bookwyrm/templates/user/shelf/shelf.html:79
-#: bookwyrm/templates/user/shelf/shelf.html:101
+#: bookwyrm/templates/user/shelf/shelf.html:80
+#: bookwyrm/templates/user/shelf/shelf.html:102
 msgid "Author"
 msgstr "作者"
 
@@ -1245,15 +1244,21 @@ msgstr "搜索书目或用户"
 msgid "Main navigation menu"
 msgstr "主导航菜单"
 
-#: bookwyrm/templates/layout.html:61
+#: bookwyrm/templates/layout.html:58
 msgid "Feed"
 msgstr "动态"
 
-#: bookwyrm/templates/layout.html:102
+#: bookwyrm/templates/layout.html:87
+#, fuzzy
+#| msgid "Your books"
+msgid "Your Books"
+msgstr "你的书目"
+
+#: bookwyrm/templates/layout.html:97
 msgid "Settings"
 msgstr "设置"
 
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:106
 #: bookwyrm/templates/settings/admin_layout.html:31
 #: bookwyrm/templates/settings/manage_invite_requests.html:15
 #: bookwyrm/templates/settings/manage_invites.html:3
@@ -1261,45 +1266,47 @@ msgstr "设置"
 msgid "Invites"
 msgstr "邀请"
 
-#: bookwyrm/templates/layout.html:118
+#: bookwyrm/templates/layout.html:113
 msgid "Admin"
 msgstr "管理员"
 
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:120
 msgid "Log out"
 msgstr "登出"
 
-#: bookwyrm/templates/layout.html:133 bookwyrm/templates/layout.html:134
+#: bookwyrm/templates/layout.html:128 bookwyrm/templates/layout.html:129
 #: bookwyrm/templates/notifications.html:6
 #: bookwyrm/templates/notifications.html:11
 msgid "Notifications"
 msgstr "通知"
 
-#: bookwyrm/templates/layout.html:154 bookwyrm/templates/layout.html:158
+#: bookwyrm/templates/layout.html:151 bookwyrm/templates/layout.html:155
 #: bookwyrm/templates/login.html:17
 #: bookwyrm/templates/snippets/register_form.html:4
 msgid "Username:"
 msgstr "用户名:"
 
-#: bookwyrm/templates/layout.html:159
+#: bookwyrm/templates/layout.html:156
 msgid "password"
 msgstr "密码"
 
-#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:36
+#: bookwyrm/templates/layout.html:157 bookwyrm/templates/login.html:36
 msgid "Forgot your password?"
 msgstr "忘记了密码？"
 
-#: bookwyrm/templates/layout.html:163 bookwyrm/templates/login.html:10
+#: bookwyrm/templates/layout.html:160 bookwyrm/templates/login.html:10
 #: bookwyrm/templates/login.html:33
 msgid "Log in"
 msgstr "登录"
 
-#: bookwyrm/templates/layout.html:171
+#: bookwyrm/templates/layout.html:168
 msgid "Join"
 msgstr "加入"
 
 #: bookwyrm/templates/layout.html:206
-msgid "About this server"
+#, fuzzy
+#| msgid "About this server"
+msgid "About this instance"
 msgstr "关于本服务器"
 
 #: bookwyrm/templates/layout.html:210
@@ -1361,7 +1368,7 @@ msgid "Discard"
 msgstr "削除"
 
 #: bookwyrm/templates/lists/edit_form.html:5
-#: bookwyrm/templates/lists/list_layout.html:17
+#: bookwyrm/templates/lists/list_layout.html:16
 msgid "Edit List"
 msgstr "编辑列表"
 
@@ -1410,62 +1417,63 @@ msgstr "任何人都可以向此列表中添加书目"
 msgid "This list is currently empty"
 msgstr "此列表当前是空的"
 
-#: bookwyrm/templates/lists/list.html:65
+#: bookwyrm/templates/lists/list.html:66
 #, python-format
 msgid "Added by %(username)s"
 msgstr "由 %(username)s 添加"
 
-#: bookwyrm/templates/lists/list.html:77
-#, fuzzy
-#| msgid "Sent"
-msgid "Set"
-msgstr "已发送"
-
-#: bookwyrm/templates/lists/list.html:80
+#: bookwyrm/templates/lists/list.html:74
 #, fuzzy
 #| msgid "List curation:"
 msgid "List position"
 msgstr "列表策展:"
 
-#: bookwyrm/templates/lists/list.html:86
+#: bookwyrm/templates/lists/list.html:81
+#, fuzzy
+#| msgid "Sent"
+msgid "Set"
+msgstr "已发送"
+
+#: bookwyrm/templates/lists/list.html:89
 #: bookwyrm/templates/snippets/shelf_selector.html:26
 msgid "Remove"
 msgstr "移除"
 
-#: bookwyrm/templates/lists/list.html:99 bookwyrm/templates/lists/list.html:111
+#: bookwyrm/templates/lists/list.html:103
+#: bookwyrm/templates/lists/list.html:120
 #, fuzzy
 #| msgid "Your Lists"
 msgid "Sort List"
 msgstr "你的列表"
 
-#: bookwyrm/templates/lists/list.html:105
+#: bookwyrm/templates/lists/list.html:113
 #, fuzzy
 #| msgid "Directory"
 msgid "Direction"
 msgstr "目录"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:127
 msgid "Add Books"
 msgstr "添加书目"
 
-#: bookwyrm/templates/lists/list.html:116
+#: bookwyrm/templates/lists/list.html:129
 msgid "Suggest Books"
 msgstr "推荐书目"
 
-#: bookwyrm/templates/lists/list.html:125
+#: bookwyrm/templates/lists/list.html:140
 msgid "search"
 msgstr "搜索"
 
-#: bookwyrm/templates/lists/list.html:131
+#: bookwyrm/templates/lists/list.html:146
 msgid "Clear search"
 msgstr "清除搜索"
 
-#: bookwyrm/templates/lists/list.html:136
+#: bookwyrm/templates/lists/list.html:151
 #, python-format
 msgid "No books found matching the query \"%(query)s\""
 msgstr "没有符合 \"%(query)s\" 请求的书目"
 
-#: bookwyrm/templates/lists/list.html:164
+#: bookwyrm/templates/lists/list.html:179
 msgid "Suggest"
 msgstr "推荐"
 
@@ -1557,8 +1565,9 @@ msgid "Resolve"
 msgstr "已解决"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, python-format
-msgid "Reports: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Reports: %(server_name)s"
+msgid "Reports: %(instance_name)s"
 msgstr "报告: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
@@ -1568,9 +1577,10 @@ msgid "Reports"
 msgstr "报告"
 
 #: bookwyrm/templates/moderation/reports.html:14
-#, python-format
-msgid "Reports: %(server_name)s"
-msgstr "报告: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Users: %(server_name)s"
+msgid "Reports: %(instance_name)s"
+msgstr "用户: %(server_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:28
 msgid "Resolved"
@@ -1771,6 +1781,26 @@ msgstr "个人资料"
 msgid "Relationships"
 msgstr "关系"
 
+#: bookwyrm/templates/rss/title.html:5
+#: bookwyrm/templates/snippets/status/status_header.html:35
+msgid "rated"
+msgstr "评价了"
+
+#: bookwyrm/templates/rss/title.html:7
+#: bookwyrm/templates/snippets/status/status_header.html:37
+msgid "reviewed"
+msgstr "写了书评给"
+
+#: bookwyrm/templates/rss/title.html:9
+#: bookwyrm/templates/snippets/status/status_header.html:39
+msgid "commented on"
+msgstr "评论了"
+
+#: bookwyrm/templates/rss/title.html:11
+#: bookwyrm/templates/snippets/status/status_header.html:41
+msgid "quoted"
+msgstr "引用了"
+
 #: bookwyrm/templates/search/book.html:64
 #, fuzzy
 #| msgid "Show results from other catalogues"
@@ -1828,7 +1858,9 @@ msgstr "管理用户"
 #: bookwyrm/templates/settings/admin_layout.html:39
 #: bookwyrm/templates/settings/federation.html:3
 #: bookwyrm/templates/settings/federation.html:5
-msgid "Federated Servers"
+#, fuzzy
+#| msgid "Federated Servers"
+msgid "Federated Instances"
 msgstr "互联的服务器"
 
 #: bookwyrm/templates/settings/admin_layout.html:44
@@ -1882,6 +1914,7 @@ msgid "Back to list"
 msgstr "回到服务器列表"
 
 #: bookwyrm/templates/settings/announcement.html:11
+#: bookwyrm/templates/settings/announcement_form.html:6
 #, fuzzy
 #| msgid "Announcements"
 msgid "Edit Announcement"
@@ -1923,7 +1956,7 @@ msgstr "出生日期:"
 msgid "Active:"
 msgstr "活跃"
 
-#: bookwyrm/templates/settings/announcement_form.html:5
+#: bookwyrm/templates/settings/announcement_form.html:8
 #: bookwyrm/templates/settings/announcements.html:8
 #, fuzzy
 #| msgid "Announcements"
@@ -1982,13 +2015,15 @@ msgstr "停用"
 #: bookwyrm/templates/settings/server_blocklist.html:3
 #: bookwyrm/templates/settings/server_blocklist.html:20
 #, fuzzy
-#| msgid "Add cover"
-msgid "Add server"
-msgstr "添加封面"
+#| msgid "Instance Name:"
+msgid "Add instance"
+msgstr "实例名称"
 
 #: bookwyrm/templates/settings/edit_server.html:7
 #: bookwyrm/templates/settings/server_blocklist.html:7
-msgid "Back to server list"
+#, fuzzy
+#| msgid "Back to server list"
+msgid "Back to instance list"
 msgstr "回到服务器列表"
 
 #: bookwyrm/templates/settings/edit_server.html:16
@@ -2103,8 +2138,10 @@ msgstr ""
 
 #: bookwyrm/templates/settings/federation.html:19
 #: bookwyrm/templates/user_admin/server_filter.html:5
-msgid "Server name"
-msgstr "服务器名称"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Instance name"
+msgstr "实例名称"
 
 #: bookwyrm/templates/settings/federation.html:23
 msgid "Date federated"
@@ -2231,7 +2268,7 @@ msgid "Import Blocklist"
 msgstr "导入书目"
 
 #: bookwyrm/templates/settings/server_blocklist.html:26
-#: bookwyrm/templates/snippets/goal_progress.html:5
+#: bookwyrm/templates/snippets/goal_progress.html:7
 msgid "Success!"
 msgstr "成功！"
 
@@ -2320,15 +2357,15 @@ msgstr "没有封面"
 msgid "%(title)s by "
 msgstr "%(title)s 来自"
 
-#: bookwyrm/templates/snippets/boost_button.html:9
-#: bookwyrm/templates/snippets/boost_button.html:10
+#: bookwyrm/templates/snippets/boost_button.html:20
+#: bookwyrm/templates/snippets/boost_button.html:21
 #, fuzzy
 #| msgid "boosted"
 msgid "Boost"
 msgstr "转发了"
 
-#: bookwyrm/templates/snippets/boost_button.html:16
-#: bookwyrm/templates/snippets/boost_button.html:17
+#: bookwyrm/templates/snippets/boost_button.html:33
+#: bookwyrm/templates/snippets/boost_button.html:34
 #, fuzzy
 #| msgid "Un-boost status"
 msgid "Un-boost"
@@ -2422,13 +2459,13 @@ msgstr "删除这些阅读日期吗？"
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
 msgstr "你正要删除这篇阅读经过以及与之相关的 %(count)s 次进度更新。"
 
-#: bookwyrm/templates/snippets/fav_button.html:9
-#: bookwyrm/templates/snippets/fav_button.html:11
+#: bookwyrm/templates/snippets/fav_button.html:10
+#: bookwyrm/templates/snippets/fav_button.html:12
 msgid "Like"
 msgstr ""
 
-#: bookwyrm/templates/snippets/fav_button.html:17
 #: bookwyrm/templates/snippets/fav_button.html:18
+#: bookwyrm/templates/snippets/fav_button.html:19
 #, fuzzy
 #| msgid "Un-like status"
 msgid "Un-like"
@@ -2522,17 +2559,17 @@ msgstr "发布到消息流中"
 msgid "Set goal"
 msgstr "设置目标"
 
-#: bookwyrm/templates/snippets/goal_progress.html:7
+#: bookwyrm/templates/snippets/goal_progress.html:9
 #, python-format
 msgid "%(percent)s%% complete!"
 msgstr "完成了 %(percent)s%% ！"
 
-#: bookwyrm/templates/snippets/goal_progress.html:10
+#: bookwyrm/templates/snippets/goal_progress.html:12
 #, python-format
 msgid "You've read %(read_count)s of %(goal_count)s books."
 msgstr "你已经阅读了 %(goal_count)s 本书中的 %(read_count)s 本。"
 
-#: bookwyrm/templates/snippets/goal_progress.html:12
+#: bookwyrm/templates/snippets/goal_progress.html:14
 #, python-format
 msgid "%(username)s has read %(read_count)s of %(goal_count)s books."
 msgstr "%(username)s 已经阅读了 %(goal_count)s 本书中的 %(read_count)s 本。"
@@ -2641,26 +2678,6 @@ msgstr "注册"
 msgid "Report"
 msgstr "报告"
 
-#: bookwyrm/templates/snippets/rss_title.html:5
-#: bookwyrm/templates/snippets/status/status_header.html:35
-msgid "rated"
-msgstr "评价了"
-
-#: bookwyrm/templates/snippets/rss_title.html:7
-#: bookwyrm/templates/snippets/status/status_header.html:37
-msgid "reviewed"
-msgstr "写了书评给"
-
-#: bookwyrm/templates/snippets/rss_title.html:9
-#: bookwyrm/templates/snippets/status/status_header.html:39
-msgid "commented on"
-msgstr "评论了"
-
-#: bookwyrm/templates/snippets/rss_title.html:11
-#: bookwyrm/templates/snippets/status/status_header.html:41
-msgid "quoted"
-msgstr "引用了"
-
 #: bookwyrm/templates/snippets/search_result_text.html:36
 msgid "Import book"
 msgstr "导入书目"
@@ -2832,7 +2849,7 @@ msgstr "编辑书架"
 msgid "Update shelf"
 msgstr "更新书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:51
+#: bookwyrm/templates/user/shelf/shelf.html:25 bookwyrm/views/shelf.py:56
 msgid "All books"
 msgstr "所有书目"
 
@@ -2840,30 +2857,30 @@ msgstr "所有书目"
 msgid "Create shelf"
 msgstr "创建书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:61
+#: bookwyrm/templates/user/shelf/shelf.html:62
 msgid "Edit shelf"
 msgstr "编辑书架"
 
-#: bookwyrm/templates/user/shelf/shelf.html:80
-#: bookwyrm/templates/user/shelf/shelf.html:104
+#: bookwyrm/templates/user/shelf/shelf.html:81
+#: bookwyrm/templates/user/shelf/shelf.html:105
 msgid "Shelved"
 msgstr "上架时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:81
-#: bookwyrm/templates/user/shelf/shelf.html:108
+#: bookwyrm/templates/user/shelf/shelf.html:82
+#: bookwyrm/templates/user/shelf/shelf.html:109
 msgid "Started"
 msgstr "开始时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:82
-#: bookwyrm/templates/user/shelf/shelf.html:111
+#: bookwyrm/templates/user/shelf/shelf.html:83
+#: bookwyrm/templates/user/shelf/shelf.html:112
 msgid "Finished"
 msgstr "完成时间"
 
-#: bookwyrm/templates/user/shelf/shelf.html:137
+#: bookwyrm/templates/user/shelf/shelf.html:138
 msgid "This shelf is empty."
 msgstr "此书架是空的。"
 
-#: bookwyrm/templates/user/shelf/shelf.html:143
+#: bookwyrm/templates/user/shelf/shelf.html:144
 msgid "Delete shelf"
 msgstr "删除书架"
 
@@ -2923,8 +2940,9 @@ msgid "Back to users"
 msgstr "回到报告"
 
 #: bookwyrm/templates/user_admin/user_admin.html:7
-#, python-format
-msgid "Users: %(server_name)s"
+#, fuzzy, python-format
+#| msgid "Users: %(server_name)s"
+msgid "Users: %(instance_name)s"
 msgstr "用户: %(server_name)s"
 
 #: bookwyrm/templates/user_admin/user_admin.html:22
@@ -2941,8 +2959,10 @@ msgid "Last Active"
 msgstr "最后或缺"
 
 #: bookwyrm/templates/user_admin/user_admin.html:38
-msgid "Remote server"
-msgstr "移除服务器"
+#, fuzzy
+#| msgid "Instance Name:"
+msgid "Remote instance"
+msgstr "实例名称"
 
 #: bookwyrm/templates/user_admin/user_admin.html:47
 msgid "Active"
@@ -2989,6 +3009,10 @@ msgstr ""
 msgid "Access level:"
 msgstr ""
 
+#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:3
+msgid "File exceeds maximum size: 10MB"
+msgstr ""
+
 #: bookwyrm/views/import_data.py:67
 #, fuzzy
 #| msgid "Email address:"
@@ -3004,6 +3028,24 @@ msgstr "没有找到使用该邮箱的用户。"
 msgid "A password reset link sent to %s"
 msgstr "密码重置连接已发送给 %s"
 
+#, python-format
+#~ msgid "Reports: %(server_name)s"
+#~ msgstr "报告: %(server_name)s"
+
+#~ msgid "Federated Servers"
+#~ msgstr "互联的服务器"
+
+#~ msgid "Server name"
+#~ msgstr "服务器名称"
+
+#, fuzzy
+#~| msgid "Add cover"
+#~ msgid "Add server"
+#~ msgstr "添加封面"
+
+#~ msgid "Remote server"
+#~ msgstr "移除服务器"
+
 #, fuzzy
 #~| msgid "BookWyrm users"
 #~ msgid "BookWyrm\\"

From 5d2f01d7ffef9bccda2ea75500ba3aa4f18b18cc Mon Sep 17 00:00:00 2001
From: Mouse Reeve 
Date: Tue, 1 Jun 2021 14:51:57 -0700
Subject: [PATCH 101/196] Updates locales

---
 locale/de_DE/LC_MESSAGES/django.mo   | Bin 24502 -> 24354 bytes
 locale/de_DE/LC_MESSAGES/django.po   |   2 +-
 locale/en_US/LC_MESSAGES/django.po   |   2 +-
 locale/es/LC_MESSAGES/django.mo      | Bin 43765 -> 42979 bytes
 locale/es/LC_MESSAGES/django.po      |   2 +-
 locale/fr_FR/LC_MESSAGES/django.mo   | Bin 45401 -> 44654 bytes
 locale/fr_FR/LC_MESSAGES/django.po   |   2 +-
 locale/zh_Hans/LC_MESSAGES/django.mo | Bin 36590 -> 36011 bytes
 locale/zh_Hans/LC_MESSAGES/django.po |   2 +-
 9 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo
index 089ac656a8b3cf4cdb6fdbabd8127cd33bb6afab..dde00be621032b841673a440278b1fb305361245 100644
GIT binary patch
delta 7362
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
RVXbQN2OSHkNvL={{C|FM-#q{T

delta 7503
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\n"
 "Language-Team: English \n"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 7d1044b2b..b88dad088 100644
--- a/locale/en_US/LC_MESSAGES/django.po
+++ b/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve \n"
 "Language-Team: English \n"
diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index 0e5df226ff94914032c35b735f32bebe7ae3630e..ea8dada7bc1a39ae38e7c218be0b586dae3ac452 100644
GIT binary patch
delta 13312
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

delta 13996
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

diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index 012d1e138..eee94c1f4 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\n"
 "PO-Revision-Date: 2021-03-19 11:49+0800\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index b893b1287e9b958ea2c5cc78708ab547f378d4b4..29020216d94cec7b210cab035fcb6aecfbf08b73 100644
GIT binary patch
delta 13288
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
IN_N2i1I$B2_y7O^

delta 14009
zcmajjcYIbwzQ^%HfD{NNfdBzgC?SO!YC`Y5hYpei5+INQDRg;|DuRFn5F|=dF^IIF
zE=o14h$14zhEheu1r!w!1>Dc~naN)7y?^X^?eL!8oH#U5QyudvI8L|X)Wg;4I5ABfCktb7A-;iSu}L$>iNcN;fN59?=VLWoj+Jmbw#TE`
zA3d5oP9u!Na*pG27Eq~7!)gr09oQQ`!62;K!f^&+4A#MCQSJM%BA&*YcpYnCsTi}M
zdKgID5m~b{3M=DtSR3=PG4neosbtVlEY>&$(}^!*9QJSNI5Y8OY>y$W%+3;!O*zvr
z6yLx|Jc(N9?^qH;T00I&b;8gOW6=|Pp*Qn81F4k3k?4gfw!;(~Pq*=08!tw0`mI3j
zl(Pim+CTbzGP!qdQ6E8vaUymC1Rcwr3VkIoymi#LbDuS@Lj0>hfo0r}K8lTjJZm(1@JP|*bk
zQ61k$O?b|F)wbWk60{fVV!m*ms0CL??Wh520WDDzbh8eyj
zo_GPP62F34@ewSE4^XN63-vIS?P?yP5Y&VbsEstXwzPIcUDp$p+2OW5y({_Gz*A|^
z(>NP7&_dMCR-hiX&8TN%A1VVMq89!Mdg9j@ikDFnd2}=5`JonC6$7v?s(%O6hP!to
z|C(r+ZJ3B!z)aLY3v8Tg;}=l_?LaSl4>jONs11CETIkod{WdDqcTu<0>2Ag?i$R1z
zE-IR^6}lfD)D8!tE*Og5m~2f)Wo#PqKj%sQ(E>g|J)ED|_?q=5Dg(cw#xK#sjO&Nm
zxGRK;9-e61&<2&7ei(@H=#4Y1^X&Phs7!1?Ep!hmV~0@#pS0&Mp%!otebB3?>F0;c
z<8nf&cyXc;*1#AH#}TN9WgaRc&!Z;FLoH}KYM})<5(`lig!D2gk3?;(DXL$4?2G+T
z-;<44R`35|D()4dCc1>B@tTeAU@78zs2vvTZ5C1w<(K8{8$
zWErae8q~PkY`mv0`PYd;8nokc7>busEA;4R{>ZG1+F?i31fx*{J&EeK7?r_1)Pi3|
zrFc7P;d@XUJdEmh0(Je_e&k;(yg)+(yp9^6Qh&44>Zosh4J?N(u{`!fT{jXnQ4(sv
zNvH{PP#c?%dN$Ue`sJg>+l|WPaTgVL>aFLoF(-aN?X21W`*xrvjKQ+l0kxq17={U`
zoh`C1NA+Keez*~}z&)siyoNF0EE*af}x{tu<19mS*W%>)d`r%+$Gd{pWVqZWGH
z`X%avbse>1pTTAvKh(oq6}8YhxE$+aJv@Nwe?#j1ze7bSdVm%1G3rA9A!for)KedU
zT6s5AW`^513zgc1sEJphK3FfI#>=zMnx+sKGY0U8Z}TAERMA?
z4I|L~P+2#ku6qs3<8IVKj-oPl()uN8!YfwqVdlC9!^posCz{isd)x!HprNRV#-Rqv
zz;K*_b#XIl;!o`PbEpMeL}ln_d)|Y;wKZNT)Uy?cAsC6uP>fuU4-HNHGd%O^}fDNe3<)b!q0M-8#YMd)r2mggyn14JQ
zV16frN+5=#2JChY9FGdoF6gwW!Q&wf=_v
zh`Wq4|KHCV)Ghc3)&C4e;H7acbHZo5S*bs^=R`2_S$E>C`!J5!XM*`Jq9;)IdM#?F
z`520CV@doHz3~Ei;dR^o6M7Qgwedq26>l0mQuvD(OQYg(sE!$^XJaZR;7ZhhcToKv
zV6S3aKan3S;=YskdlFBfz7Hv>=6#=w`he|1y(P!68oEwXsY2y8D%D75Or%dSht{VNj~b{??I*bZS=wS?D-Q|i});-$KTPP
z`5m7eGhub~CvJ*LSvS-tc(iSwg%yaGV^iFMdcD3tE&M8K0gqAde~GE)Lsc8g5jR0C
zypxT4qDwm+LB$U~%`=6C=j@mCDRplN2OZBZHPin^|!jT2G*Ct_DzjRANbm5Dp3
zh5U)SuJm;BuZJgy8>@$-6KaPUs1(jet#~;qGixvyU&G3H47JmX_WWO{Tj4*$Ok5Qe
zH?qc{Qs3U5A25UbD`n$tLmHMPo{##Zu0maK2iKv;OndK93*Cas#9OEZ9>y|w8a44H
z)Ixti^>=2OomWI{td5I{I@U)`)C?Tpc4(nd^$msQ&cx*887AQK~ah8JL5yxB@ldaeMv@>Q-Gu?d&?L{{z%L
zFE!T;Tm|(^L|_e!Mr|w(wXg}OTecYexYpUJ3LdeZMy>QaRLbt7;<9|;wUZjC_O_@D
z48{&P1@$l&pvK#ey0sspHh3Ae^INEmJVN*X|6g*Rxdr7>DGWiSxC!c^8IC0|2{lj(
zDl<8#{w}PCxu}I5K`rvE+via`
z+JzeUs6BrcHNhp+L-hdF-+O^+4@GSt7Pa8cs0{T*%`<2L`By5Y(x3_EU=XfEO|%o6
z;!)JSzK2@5*Ftk$HPnu4p%&cI+7-32fj9w2qUQN0>Xw{9y@pp@RMhbXYT{o|6O>=L6J4pQ0A_1?m~Oje2%UEjAenN42}!Q3;_k5;gEF
z)UVxYtcsgaJ3C%?yR0?mP?s17{&4f{?475T`&=0+E3~B=tQRB_G@iNr)
zub{5`80+Chbj48dU2am>1=V3Fmc~h_R8B)JBp1u#PE-mHqIU8p(YrB%D`~c4zsZtuEjt+f$H}?
z`r>WWt@so5+ErX-G7^n?7~`$uTvW8PG%SZRtV?W%^{5qZ!dkcowUBeDr}<~pgx)QXh&z!1Mi`3#RK$1uhnK@fv9^JiCR#5EQsmm$8#@st!RLWwo5e`5tU><5mt5Fkg#!%dg
z_3#WT6V6)GuL>#-v$nw|#Dh^2FG0N>xfrAOKhHLt!&f+Q0rmU8;CVCPA=HH*qi)qX
z)U$CJHP9ohjGpVv!h=x@?}z%JC89shMfb$^e4g6%{_mushv+C)!t%t03_Q+HA0c)noz`C|xi4XlVA(4~7cgo;)+8VBHb)WrKy
z_wpKQg1e}D_?NZ926J6F>J~LZ-I6xg3@4(l+k{%^b_~S*sJG(G2J)|of2KhxdVtD+
zZ=P8|E!2hmQ0GUZRz3wa@FG+uR-#_3SFswtfu-=cZ9j|J=y_CTuA;90Esy+bM~`XH
z!2U0q6XB>h+QwaN+#mIJB%^kmg`;pT*2Hg7KU&U9X528;f?`qQ4Mr_&A}UikE-Lz>
zZNV;h9S36ljpnJHi+zaqVO8|lM0zm@HQ`9q>pKTW;wG$u53K>4&HLW~wd1C!OteLP
z2V7mLXhpqHDIS8l=P9Vn%&2P;W~}F{sIQ$4XlpdTg*6NsEjp3ZJ-nC
z`q9YvE+>tO`}Y~OfTwMT4X6vZqh6g-Urd)Gg>~
z+sC0cHr;)m`@f8eRj_3O}~(eYTT-y$-{uXyqxWdo<0)t5COQ6E?5e2!+cP-pbzou*Z|+O?cbs9
z-7V~e#dey3`k-FJT~^;+{6G<>p!#peGI$8X@dTE{-*%CIUn+ml;Ei6pOcHjYqkz`-5!j@cW@YfhuT1!J?3HThQ)}Bj)u14>+&dS`X9ffr{3iZ&W)!8
zQqqY1Xun6PN1a>jJ}TMkKO?%!xm(x}{mf}+26cb>G{O6{&BYFs8xzM9DE^nPgDgxwf{MiIn#l1jg~Jcy%}1^07@!#9((gOUYWErQ*l(hKnbMV#!@0qf3zW=aJT-68*oBK@@O>I}^tXdeq&|$g9#I{7
z0$S4No;%{#!MYTA2mf;nq0eiSgS6bC@KifZ?btW1>O9ti{SQ%%W0XCSjJ23l&;3gj
zZ|dV{J4(@$qvI{xHw&Mjd_`NT`;7Ug8g1EBJ?%zrP(NeO>&35QuRo{!>mxhNHmFZG
z>c#AZxoY6pN87)!p>20J+JEYCPM@WLDx4on+{&K&iTYw&Z-hgMb@Vkju9Z~U+s5Cl
z`nI*Byh_}h0UOxPq8D+H?e{X4w+lMLxg*4d>claflES%2+9D`H#F>O1T0PY7llu-Qx%`2w5EQOGJ^8=;}6a)*8Beqm7*hn`T$CQ%6GQ$73wP~
zI-;<Tgo?_(+Az3GLds*a1{37oDLuA@9F**9UpQ+zj0M;
zhrW1>_zfGUazTIMOT-^hDi9B$G^MQq@fgY$>N@lj*qGQw=|pKjzumZy_MNCBO=^Dq
zv8Cfp%4Hg(>0ERqQz=hdBYTnBS5cpg>nQouGf@AvphG|UMMo5s5}XfWyuG&ZMLW((
z;`-EGU)zScw!=f>%C`PC`Ve=t3tCToB=uUf2T}@%%Mt&B`b6sUD2FKziFL$LZ$~LZ
zeIxd8xAK#w@ywVe|J@1Rq3u^X6&+qwJZSGo+dpi31a0GJyN#1*tBAi+%2KaPiRYYt
z)B~w6qx?qwFG?Qu`C2hniUHWpEej;9HxqmDEN??X95{0rrG+C1@H
z$`tB9QTkAHyhv$5d7rY1Qgr-D-wQkGK6oh+9!~Jf>Wyy{mrzXSe_ydIbT4#jxDs6!?$rM
zrM2y&`Q3lH1=Cr_V5^CE0By%LH0+|jmQse&g7O(OFHt{2>
zUGNFU`3B>O%b|`_2ImkyMJcB5e>2-CnsHGIoqwkOIi;(;a6fe~&UL_8+B)JsijKCl
z>llGw<8aPbr_`bp9gC=JAg)iJ36wht%Gw*D$kX3U{BZc2SB*PhcD)VI=p(M8b9cKAElwCngCr{Nw-8{3wr6CCS^
z*W(v>&7O0g;Gg}(y_rPEbChYsWr@SEA8`m}1!c%q8isS?FoBLGl;!Rkbr>Pd4X_eto+SEf+Q?jxPV%yg7@``i!%PJVu<%+LQ
zc5=~m(E~5Got%-Goz*flEW%tApPrbO9GT?|OtvRlXQd^krndb*=UX>4%>`xRGCh2>
zh)`WvFnh3%SJ+^NV#xn;<$_U#)C9!u+Jd{LI4qtb%rP{rt<>6QN0DE-^iOYrj>+`oyJ-PftuuPD@VD&bl&p*Z)t|
r-#h%*UH8o$U)-~AMp|f6PQi|~nLbgSGSVhzC!3M~OU8mW4Ji9>w!Rao

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 71b154ba1..6fc145d17 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\n"
 "PO-Revision-Date: 2021-04-05 12:44+0100\n"
 "Last-Translator: Fabien Basmaison \n"
 "Language-Team: Mouse Reeve \n"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo
index 17b3df6956342292739f79d1aa1f47e4e6dd7793..496caabcf282089a8988b0acb1f577dc27ddbe8a 100644
GIT binary patch
delta 11507
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
l0sh`2gF^zn*R%SB)yQhRSoQDW7KAffhGVgWU
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
WQAz$$^ETW_+4HZP+mMtl^Zx;wXZ9=r

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 56b424a4a..ef5cd2da4 100644
--- a/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-01 14:49-0700\n"
+"POT-Creation-Date: 2021-06-01 14:50-0700\n"
 "PO-Revision-Date: 2021-03-20 00:56+0000\n"
 "Last-Translator: Kana \n"
 "Language-Team: Mouse Reeve \n"

From 3301de5e5453845a9977372a4ae64eee4df25787 Mon Sep 17 00:00:00 2001
From: Mouse Reeve 
Date: Wed, 2 Jun 2021 07:21:18 -0700
Subject: [PATCH 102/196] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim 
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6fc145d17..562d2ffed 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1530,10 +1530,8 @@ msgid "Resolve"
 msgstr "Résoudre"
 
 #: bookwyrm/templates/moderation/reports.html:6
-#, fuzzy, python-format
-#| msgid "Reports: %(server_name)s"
 msgid "Reports: %(instance_name)s"
-msgstr "Signalements : %(server_name)s"
+msgstr "Signalements : %(instance_name)s"
 
 #: bookwyrm/templates/moderation/reports.html:8
 #: bookwyrm/templates/moderation/reports.html:17

From 34b93679f0b952723d696563ad0cab9d3224fa4b Mon Sep 17 00:00:00 2001
From: Mouse Reeve 
Date: Wed, 2 Jun 2021 07:21:32 -0700
Subject: [PATCH 103/196] Update locale/fr_FR/LC_MESSAGES/django.po

Co-authored-by: Joachim 
---
 locale/fr_FR/LC_MESSAGES/django.po | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 562d2ffed..23308c8ba 100644
--- a/locale/fr_FR/LC_MESSAGES/django.po
+++ b/locale/fr_FR/LC_MESSAGES/django.po
@@ -1283,10 +1283,8 @@ msgid "Join"
 msgstr "Rejoindre"
 
 #: bookwyrm/templates/layout.html:206
-#, fuzzy
-#| msgid "About this server"
 msgid "About this instance"
-msgstr "À propos de ce serveur"
+msgstr "À propos de cette instance"
 
 #: bookwyrm/templates/layout.html:210
 msgid "Contact site admin"

From 7d1e4aebbc03346a15a5078f879d3c4dbfc48373 Mon Sep 17 00:00:00 2001
From: Joachim 
Date: Wed, 2 Jun 2021 18:17:53 +0200
Subject: [PATCH 104/196] Better forms

---
 bookwyrm/templates/author/edit_author.html    |  98 ++++---
 bookwyrm/templates/book/edit_book.html        | 266 +++++++++++-------
 bookwyrm/templates/import.html                |   4 +-
 bookwyrm/templates/import_status.html         |  36 +--
 bookwyrm/templates/settings/edit_server.html  |  12 +-
 bookwyrm/templates/settings/site.html         |  36 +--
 .../templates/snippets/readthrough_form.html  |   8 +-
 .../shelve_button/finish_reading_modal.html   |   8 +-
 .../shelve_button/start_reading_modal.html    |   6 +-
 .../clearable_file_input_with_warning.html    |  25 +-
 bookwyrm/templatetags/utilities.py            |  13 +
 11 files changed, 314 insertions(+), 198 deletions(-)

diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html
index 010d36efc..103341bfd 100644
--- a/bookwyrm/templates/author/edit_author.html
+++ b/bookwyrm/templates/author/edit_author.html
@@ -29,67 +29,85 @@
     
    
         
    
             
    {% trans "Metadata" %}
    
-            
     {{ form.name }}
    
-            {% for error in form.name.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+            
    
+                
+                {{ form.name }}
+                {% for error in form.name.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
    
+            
    
                 
                 {{ form.aliases }}
                 {% trans "Separate multiple values with commas." %}
-            
    
-            {% for error in form.aliases.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+                {% for error in form.aliases.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
     {{ form.bio }}
    
-            {% for error in form.bio.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+            
    
+                
+                {{ form.bio }}
+                {% for error in form.bio.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
     {{ form.wikipedia_link }}
    
+            
     {{ form.wikipedia_link }}
    
             {% for error in form.wikipedia_link.errors %}
             
    {{ error | escape }}
    
             {% endfor %}
 
-            
    
+            
    
                 
                 
-            
    
-            {% for error in form.born.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+                {% for error in form.born.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
    
+            
    
                 
                 
-            
    
-            {% for error in form.died.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+                {% for error in form.died.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
         
    
         
    
             
    {% trans "Author Identifiers" %}
    
-            
     {{ form.openlibrary_key }}
    
-            {% for error in form.openlibrary_key.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+            
    
+                
+                {{ form.openlibrary_key }}
+                {% for error in form.openlibrary_key.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
     {{ form.inventaire_id }}
    
-            {% for error in form.inventaire_id.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+            
    
+                
+                {{ form.inventaire_id }}
+                {% for error in form.inventaire_id.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
     {{ form.librarything_key }}
    
-            {% for error in form.librarything_key.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+            
    
+                
+                {{ form.librarything_key }}
+                {% for error in form.librarything_key.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
-            
     {{ form.goodreads_key }}
    
-            {% for error in form.goodreads_key.errors %}
-            
    {{ error | escape }}
    
-            {% endfor %}
+            
    
+                
+                {{ form.goodreads_key }}
+                {% for error in form.goodreads_key.errors %}
+                
    {{ error | escape }}
    
+                {% endfor %}
+            
    
 
         
    
     
    
diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8dae1d044..32018a251 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -14,11 +14,25 @@
         {% endif %}
     
     {% if book %}
-    
    
-        
    {% trans "Added:" %} {{ book.created_date | naturaltime }}
    
-        
    {% trans "Updated:" %} {{ book.updated_date | naturaltime }}
    
-        
    {% trans "Last edited by:" %} {{ book.last_edited_by.display_name }}
    
-    
    
+    
    
+        
    
+            
    {% trans "Added:" %}
    
+            
    {{ book.created_date | naturaltime }}
    
+        
    
+
+        
    
+            
    {% trans "Updated:" %}
    
+            
    {{ book.updated_date | naturaltime }}
    
+        
    
+
+        {% if book.last_edited_by %}
+        
    
+            
    {% trans "Last edited by:" %}
    
+            
    {{ book.last_edited_by.display_name }}
    
+        
    
+        {% endif %}
+
+    
    
     {% endif %}
    @@ -38,21 +52,28 @@ {% if confirm_mode %}

    {% trans "Confirm Book Info" %}

    -
    +
    {% if author_matches %}
    {% for author in author_matches %} -
    - {% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %} +
    + + {% blocktrans with name=author.name %}Is "{{ name }}" an existing author?{% endblocktrans %} + {% with forloop.counter0 as counter %} {% for match in author.matches %} - +

    {% blocktrans with book_title=match.book_set.first.title %}Author of {{ book_title }}{% endblocktrans %}

    {% endfor %} - + {% endwith %}
    {% endfor %} @@ -64,11 +85,17 @@ {% if not book %}
    - {% trans "Is this an edition of an existing work?" %} + + {% trans "Is this an edition of an existing work?" %} + {% for match in book_matches %} - + {% endfor %} - +
    {% endif %} @@ -89,76 +116,79 @@

    {% trans "Metadata" %}

    -

    +

    -

    - {% for error in form.title.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.title.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    -

    - {% for error in form.subtitle.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.subtitle.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.description }}

    - {% for error in form.description.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.description }} + {% for error in form.description.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    -

    - {% for error in form.series.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.series.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    {{ form.series_number }} -

    - {% for error in form.series_number.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.series_number.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    {{ form.languages }} {% trans "Separate multiple values with commas." %} -

    - {% for error in form.languages.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.languages.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    {{ form.publishers }} {% trans "Separate multiple values with commas." %} -

    - {% for error in form.publishers.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.publishers.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    -

    - {% for error in form.first_published_date.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.first_published_date.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    +

    -

    - {% for error in form.published_date.errors %} -

    {{ error | escape }}

    - {% endfor %} + {% for error in form.published_date.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    @@ -166,16 +196,23 @@ {% if book.authors.exists %}
    {% for author in book.authors.all %} - +
    + +

    + {% blocktrans with name=author.name %}Author page for {{ name }}{% endblocktrans %} +

    +
    {% endfor %}
    {% endif %} - - - {% trans "Separate multiple values with commas." %} +
    + + + {% trans "Separate multiple values with commas." %} +
    @@ -188,17 +225,17 @@
    -

    +

    {{ form.cover }} -

    +
    {% if book %} -

    +

    -

    +
    {% endif %} {% for error in form.cover.errors %}

    {{ error | escape }}

    @@ -209,51 +246,72 @@

    {% trans "Physical Properties" %}

    -

    {{ form.physical_format }}

    - {% for error in form.physical_format.errors %} -

    {{ error | escape }}

    - {% endfor %} - {% for error in form.physical_format.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.physical_format }} + {% for error in form.physical_format.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.pages }}

    - {% for error in form.pages.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.pages }} + {% for error in form.pages.errors %} +

    {{ error | escape }}

    + {% endfor %} +

    {% trans "Book Identifiers" %}

    -

    {{ form.isbn_13 }}

    - {% for error in form.isbn_13.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.isbn_13 }} + {% for error in form.isbn_13.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.isbn_10 }}

    - {% for error in form.isbn_10.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.isbn_10 }} + {% for error in form.isbn_10.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.openlibrary_key }}

    - {% for error in form.openlibrary_key.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.openlibrary_key }} + {% for error in form.openlibrary_key.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.inventaire_id }}

    - {% for error in form.inventaire_id.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.inventaire_id }} + {% for error in form.inventaire_id.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.oclc_number }}

    - {% for error in form.oclc_number.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.oclc_number }} + {% for error in form.oclc_number.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    -

    {{ form.asin }}

    - {% for error in form.ASIN.errors %} -

    {{ error | escape }}

    - {% endfor %} +
    + + {{ form.asin }} + {% for error in form.ASIN.errors %} +

    {{ error | escape }}

    + {% endfor %} +
    @@ -261,7 +319,7 @@ {% if not confirm_mode %}
    - {% trans "Cancel" %} + {% trans "Cancel" %}
    {% endif %} diff --git a/bookwyrm/templates/import.html b/bookwyrm/templates/import.html index 2b7d69e10..d2e407486 100644 --- a/bookwyrm/templates/import.html +++ b/bookwyrm/templates/import.html @@ -41,8 +41,8 @@
    -
    diff --git a/bookwyrm/templates/import_status.html b/bookwyrm/templates/import_status.html index b1145611d..ff80ad71c 100644 --- a/bookwyrm/templates/import_status.html +++ b/bookwyrm/templates/import_status.html @@ -8,13 +8,17 @@

    {% trans "Import Status" %}

    -

    - {% trans "Import started:" %} {{ job.created_date | naturaltime }} -

    - {% if job.complete %} -

    - {% trans "Import completed:" %} {{ task.date_done | naturaltime }} -

    +
    +
    +
    {% trans "Import started:" %}
    +
    {{ job.created_date | naturaltime }}
    +
    + {% if job.complete %} +
    +
    {% trans "Import completed:" %}
    +
    {{ task.date_done | naturaltime }}
    +
    +
    {% elif task.failed %}
    {% trans "TASK FAILED" %}
    {% endif %} @@ -22,8 +26,9 @@
    {% if not job.complete %} - {% trans "Import still in progress." %}

    + {% trans "Import still in progress." %} +
    {% trans "(Hit reload to update!)" %}

    {% endif %} @@ -49,16 +54,13 @@
      {% for item in failed_items %} -
    • - - -

      +

    • + +
      • {% endfor %}
    diff --git a/bookwyrm/templates/settings/edit_server.html b/bookwyrm/templates/settings/edit_server.html index c5702c848..04585fe59 100644 --- a/bookwyrm/templates/settings/edit_server.html +++ b/bookwyrm/templates/settings/edit_server.html @@ -26,14 +26,14 @@ {% csrf_token %}
    -
    +
    {% for error in form.server_name.errors %}

    {{ error | escape }}

    {% endfor %}
    -
    +
    {% for error in form.application_type.errors %}

    {{ error | escape }}

    {% endfor %}
    -
    +
    {% for error in form.application_version.errors %} @@ -60,10 +60,10 @@
    -

    +

    -

    +
    diff --git a/bookwyrm/templates/settings/site.html b/bookwyrm/templates/settings/site.html index 1b9424527..d36371a41 100644 --- a/bookwyrm/templates/settings/site.html +++ b/bookwyrm/templates/settings/site.html @@ -11,23 +11,23 @@ {% csrf_token %}

    {% trans "Instance Info" %}

    -
    +
    {{ site_form.name }}
    -
    +
    {{ site_form.instance_tagline }}
    -
    +
    {{ site_form.instance_description }}
    -
    +
    {{ site_form.code_of_conduct }}
    -
    +
    {{ site_form.privacy_policy }}
    @@ -57,19 +57,19 @@