mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-29 21:11:16 +00:00
Code Issues Projects Releases Wiki Activity

Substitute “p.” for “page” in page progress serialization

Browse source
This commit is contained in:
Adeodato Simó 2023-09-17 15:05:34 -03:00
parent 25fd7276ea
commit 1322a0c693
No known key found for this signature in database
GPG key ID: CDF447845F1A986F
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bookwyrm/models/status.py
View file

@ -326,7 +326,7 @@ class Comment(BookStatus):
f'"{self.book.title}"</a>' f'"{self.book.title}"</a>'
) )
if self.progress_mode == "PG" and progress > 0: if self.progress_mode == "PG" and progress > 0:
citation += f", page {progress}" citation += f", p. {progress}"
return f"{self.content}<p>({citation})</p>" return f"{self.content}<p>({citation})</p>"
activity_serializer = activitypub.Comment activity_serializer = activitypub.Comment
@ -358,7 +358,7 @@ class Quotation(BookStatus):
quote = re.sub(r"</p>$", '"</p>', quote) quote = re.sub(r"</p>$", '"</p>', quote)
citation = f'-- <a href="{self.book.remote_id}">"{self.book.title}"</a>' citation = f'-- <a href="{self.book.remote_id}">"{self.book.title}"</a>'
if self.position_mode == "PG" and self.position and (self.position > 0): if self.position_mode == "PG" and self.position and (self.position > 0):
citation += f", page {self.position}" citation += f", p. {self.position}"
return f"{quote} <p>{citation}</p>{self.content}" return f"{quote} <p>{citation}</p>{self.content}"
activity_serializer = activitypub.Quotation activity_serializer = activitypub.Quotation

4
bookwyrm/tests/models/test_status_model.py
View file

@ -249,14 +249,14 @@ class Status(TestCase):
def test_comment_to_pure_activity(self, *_): def test_comment_to_pure_activity(self, *_):
"""subclass of the base model version with a "pure" serializer""" """subclass of the base model version with a "pure" serializer"""
status = models.Comment.objects.create( status = models.Comment.objects.create(
content="test content", user=self.local_user, book=self.book content="test content", user=self.local_user, book=self.book, progress=27
) )
activity = status.to_activity(pure=True) activity = status.to_activity(pure=True)
self.assertEqual(activity["id"], status.remote_id) self.assertEqual(activity["id"], status.remote_id)
self.assertEqual(activity["type"], "Note") self.assertEqual(activity["type"], "Note")
self.assertEqual( self.assertEqual(
activity["content"], activity["content"],
f'test content<p>(comment on <a href="{self.book.remote_id}">"Test Edition"</a>)</p>', f'test content<p>(comment on <a href="{self.book.remote_id}">"Test Edition"</a>, p. 27)</p>',
) )
self.assertEqual(activity["attachment"][0]["type"], "Document") self.assertEqual(activity["attachment"][0]["type"], "Document")
# self.assertTrue( # self.assertTrue(