mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-11-26 03:21:05 +00:00
Merge pull request #2148 from hughrun/quotes
add page numbers to comment and quote statuses
This commit is contained in:
commit
e3471fcc35
2 changed files with 25 additions and 8 deletions
|
@ -303,10 +303,17 @@ class Comment(BookStatus):
|
||||||
@property
|
@property
|
||||||
def pure_content(self):
|
def pure_content(self):
|
||||||
"""indicate the book in question for mastodon (or w/e) users"""
|
"""indicate the book in question for mastodon (or w/e) users"""
|
||||||
return (
|
if self.progress_mode == "PG" and self.progress and (self.progress > 0):
|
||||||
|
return_value = (
|
||||||
|
f'{self.content}<p>(comment on <a href="{self.book.remote_id}">'
|
||||||
|
f'"{self.book.title}"</a>, page {self.progress})</p>'
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return_value = (
|
||||||
f'{self.content}<p>(comment on <a href="{self.book.remote_id}">'
|
f'{self.content}<p>(comment on <a href="{self.book.remote_id}">'
|
||||||
f'"{self.book.title}"</a>)</p>'
|
f'"{self.book.title}"</a>)</p>'
|
||||||
)
|
)
|
||||||
|
return return_value
|
||||||
|
|
||||||
activity_serializer = activitypub.Comment
|
activity_serializer = activitypub.Comment
|
||||||
|
|
||||||
|
@ -332,10 +339,17 @@ class Quotation(BookStatus):
|
||||||
"""indicate the book in question for mastodon (or w/e) users"""
|
"""indicate the book in question for mastodon (or w/e) users"""
|
||||||
quote = re.sub(r"^<p>", '<p>"', self.quote)
|
quote = re.sub(r"^<p>", '<p>"', self.quote)
|
||||||
quote = re.sub(r"</p>$", '"</p>', quote)
|
quote = re.sub(r"</p>$", '"</p>', quote)
|
||||||
return (
|
if self.position_mode == "PG" and self.position and (self.position > 0):
|
||||||
|
return_value = (
|
||||||
|
f'{quote} <p>-- <a href="{self.book.remote_id}">'
|
||||||
|
f'"{self.book.title}"</a>, page {self.position}</p>{self.content}'
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return_value = (
|
||||||
f'{quote} <p>-- <a href="{self.book.remote_id}">'
|
f'{quote} <p>-- <a href="{self.book.remote_id}">'
|
||||||
f'"{self.book.title}"</a></p>{self.content}'
|
f'"{self.book.title}"</a></p>{self.content}'
|
||||||
)
|
)
|
||||||
|
return return_value
|
||||||
|
|
||||||
activity_serializer = activitypub.Quotation
|
activity_serializer = activitypub.Quotation
|
||||||
|
|
||||||
|
|
|
@ -112,6 +112,9 @@
|
||||||
{% with full=status.content|safe no_trim=status.content_warning itemprop="reviewBody" %}
|
{% with full=status.content|safe no_trim=status.content_warning itemprop="reviewBody" %}
|
||||||
{% include 'snippets/trimmed_text.html' %}
|
{% include 'snippets/trimmed_text.html' %}
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
|
{% if status.progress %}
|
||||||
|
<div class="is-small is-italic has-text-right mr-3">{% trans "page" %} {{ status.progress }}</div>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if status.attachments.exists %}
|
{% if status.attachments.exists %}
|
||||||
|
|
Loading…
Reference in a new issue