- {{ activity.action_object.mark.action_label }}
+ {{ activity.action_object.mark.action_label_for_feed }}
{% comment %} {{ activity.action_object.item.title }} {% endcomment %}
{% if activity.action_object.mark.rating_grade %}
{{ activity.action_object.mark.rating_grade | rating_star }}
diff --git a/takahe/utils.py b/takahe/utils.py
index 4e948462..f52c0d3c 100644
--- a/takahe/utils.py
+++ b/takahe/utils.py
@@ -548,7 +548,9 @@ class Takahe:
action_label = "创建"
category = "收藏单"
item_link = collection.absolute_url
- pre_conetent = f'{action_label}{category}
《{collection.title}》'
+ pre_conetent = (
+ f'{action_label}{category}
{collection.title}'
+ )
content = collection.plain_content
if len(content) > 360:
content = content[:357] + "..."
@@ -587,7 +589,7 @@ class Takahe:
)
item_link = f"{settings.SITE_INFO['site_url']}/~neodb~{comment.item_url}"
action_label = "评论" if comment.text else "分享"
- pre_conetent = f'{action_label}{category}
《{comment.item.display_title}》'
+ pre_conetent = f'{action_label}{category}
{comment.item.display_title}'
spoiler, txt = Takahe.get_spoiler_text(comment.text, comment.item)
content = f"{txt}\n{tags}"
data = {
@@ -630,7 +632,7 @@ class Takahe:
stars = _rating_to_emoji(review.rating_grade, 1)
item_link = f"{settings.SITE_INFO['site_url']}/~neodb~{review.item.url}"
- pre_conetent = f'发布了关于
《{review.item.display_title}》的评论:
{review.title}'
+ pre_conetent = f'发布了关于
{review.item.display_title} 的评论:
{review.title}'
content = f"{stars}\n{tags}"
data = {
"object": {
@@ -671,10 +673,8 @@ class Takahe:
)
stars = _rating_to_emoji(mark.rating_grade, 1)
item_link = f"{settings.SITE_INFO['site_url']}/~neodb~{mark.item.url}"
-
- pre_conetent = (
- f'{mark.action_label}
《{mark.item.display_title}》'
- )
+ action = mark.action_label_for_feed
+ pre_conetent = f'{action}
{mark.item.display_title}'
spoiler, txt = Takahe.get_spoiler_text(mark.comment_text, mark.item)
content = f"{stars} \n{txt}\n{tags}"
data = {