mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-06-03 05:49:35 +00:00
Note content: use italics for book titles + em-dash for Quotation
This commit is contained in:
parent
ce3885d4f6
commit
cc05cabcb5
|
@ -270,7 +270,7 @@ class GeneratedNote(Status):
|
||||||
"""indicate the book in question for mastodon (or w/e) users"""
|
"""indicate the book in question for mastodon (or w/e) users"""
|
||||||
message = self.content
|
message = self.content
|
||||||
books = ", ".join(
|
books = ", ".join(
|
||||||
f'<a href="{book.remote_id}">"{book.title}"</a>'
|
f'<a href="{book.remote_id}"><i>{book.title}</i></a>'
|
||||||
for book in self.mention_books.all()
|
for book in self.mention_books.all()
|
||||||
)
|
)
|
||||||
return f"{self.user.display_name} {message} {books}"
|
return f"{self.user.display_name} {message} {books}"
|
||||||
|
@ -324,7 +324,7 @@ class Comment(BookStatus):
|
||||||
progress = self.progress or 0
|
progress = self.progress or 0
|
||||||
citation = (
|
citation = (
|
||||||
f'comment on <a href="{self.book.remote_id}">'
|
f'comment on <a href="{self.book.remote_id}">'
|
||||||
f'"{self.book.title}"</a>'
|
f"<i>{self.book.title}</i></a>"
|
||||||
)
|
)
|
||||||
if self.progress_mode == "PG" and progress > 0:
|
if self.progress_mode == "PG" and progress > 0:
|
||||||
citation += f", p. {progress}"
|
citation += f", p. {progress}"
|
||||||
|
@ -365,7 +365,8 @@ 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)
|
||||||
citation = f'-- <a href="{self.book.remote_id}">"{self.book.title}"</a>'
|
title, href = self.book.title, self.book.remote_id
|
||||||
|
citation = f'— <a href="{href}"><i>{title}</i></a>'
|
||||||
if position := self._format_position():
|
if position := self._format_position():
|
||||||
citation += f", {position}"
|
citation += f", {position}"
|
||||||
return f"{quote} <p>{citation}</p>{self.content}"
|
return f"{quote} <p>{citation}</p>{self.content}"
|
||||||
|
|
|
@ -212,7 +212,7 @@ class Status(TestCase):
|
||||||
def test_generated_note_to_pure_activity(self, *_):
|
def test_generated_note_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.GeneratedNote.objects.create(
|
status = models.GeneratedNote.objects.create(
|
||||||
content="test content", user=self.local_user
|
content="reads", user=self.local_user
|
||||||
)
|
)
|
||||||
status.mention_books.set([self.book])
|
status.mention_books.set([self.book])
|
||||||
status.mention_users.set([self.local_user])
|
status.mention_users.set([self.local_user])
|
||||||
|
@ -220,7 +220,7 @@ class Status(TestCase):
|
||||||
self.assertEqual(activity["id"], status.remote_id)
|
self.assertEqual(activity["id"], status.remote_id)
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
activity["content"],
|
activity["content"],
|
||||||
f'mouse test content <a href="{self.book.remote_id}">"Test Edition"</a>',
|
f'mouse reads <a href="{self.book.remote_id}"><i>Test Edition</i></a>',
|
||||||
)
|
)
|
||||||
self.assertEqual(len(activity["tag"]), 2)
|
self.assertEqual(len(activity["tag"]), 2)
|
||||||
self.assertEqual(activity["type"], "Note")
|
self.assertEqual(activity["type"], "Note")
|
||||||
|
@ -256,7 +256,11 @@ class Status(TestCase):
|
||||||
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. 27)</p>',
|
(
|
||||||
|
"test content"
|
||||||
|
f'<p>(comment on <a href="{self.book.remote_id}">'
|
||||||
|
"<i>Test Edition</i></a>, p. 27)</p>"
|
||||||
|
),
|
||||||
)
|
)
|
||||||
self.assertEqual(activity["attachment"][0]["type"], "Document")
|
self.assertEqual(activity["attachment"][0]["type"], "Document")
|
||||||
# self.assertTrue(
|
# self.assertTrue(
|
||||||
|
@ -295,7 +299,11 @@ class Status(TestCase):
|
||||||
self.assertEqual(activity["type"], "Note")
|
self.assertEqual(activity["type"], "Note")
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
activity["content"],
|
activity["content"],
|
||||||
f'a sickening sense <p>-- <a href="{self.book.remote_id}">"Test Edition"</a></p>test content',
|
(
|
||||||
|
"a sickening sense "
|
||||||
|
f'<p>— <a href="{self.book.remote_id}">'
|
||||||
|
"<i>Test Edition</i></a></p>test content"
|
||||||
|
),
|
||||||
)
|
)
|
||||||
self.assertEqual(activity["attachment"][0]["type"], "Document")
|
self.assertEqual(activity["attachment"][0]["type"], "Document")
|
||||||
self.assertTrue(
|
self.assertTrue(
|
||||||
|
@ -326,7 +334,7 @@ class Status(TestCase):
|
||||||
activity = status.to_activity(pure=True)
|
activity = status.to_activity(pure=True)
|
||||||
self.assertRegex(
|
self.assertRegex(
|
||||||
activity["content"],
|
activity["content"],
|
||||||
f'^<p>"my quote"</p> <p>-- <a .+</a>, {pages}</p>$',
|
f'^<p>"my quote"</p> <p>— <a .+</a>, {pages}</p>$',
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_review_to_activity(self, *_):
|
def test_review_to_activity(self, *_):
|
||||||
|
|
Loading…
Reference in a new issue