Merge pull request #2148 from hughrun/quotes

add page numbers to comment and quote statuses

bookwyrm/models/status.py

@@ -303,10 +303,17 @@ class Comment(BookStatus):
     @property
     def pure_content(self):
         """indicate the book in question for mastodon (or w/e) users"""
-        return (
+        if self.progress_mode == "PG" and self.progress and (self.progress > 0):
-            f'{self.content}<p>(comment on <a href="{self.book.remote_id}">'
+            return_value = (
-            f'"{self.book.title}"</a>)</p>'
+                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.book.title}"</a>)</p>'
+            )
+        return return_value
 
     activity_serializer = activitypub.Comment
 
@@ -332,10 +339,17 @@ class Quotation(BookStatus):
         """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>', quote)
-        return (
+        if self.position_mode == "PG" and self.position and (self.position > 0):
-            f'{quote} <p>-- <a href="{self.book.remote_id}">'
+            return_value = (
-            f'"{self.book.title}"</a></p>{self.content}'
+                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'"{self.book.title}"</a></p>{self.content}'
+            )
+        return return_value
 
     activity_serializer = activitypub.Quotation
 

bookwyrm/templates/snippets/status/content_status.html

@@ -112,6 +112,9 @@
                     {% with full=status.content|safe no_trim=status.content_warning itemprop="reviewBody" %}
                         {% include 'snippets/trimmed_text.html' %}
                     {% endwith %}
+                    {% if status.progress %}
+                    <div class="is-small is-italic has-text-right mr-3">{% trans "page" %} {{ status.progress }}</div>
+                    {% endif %}
                 {% endif %}
 
                 {% if status.attachments.exists %}