diff --git a/journal/models/renderers.py b/journal/models/renderers.py index f708432a..bb2ddc0e 100644 --- a/journal/models/renderers.py +++ b/journal/models/renderers.py @@ -4,9 +4,7 @@ from typing import TYPE_CHECKING, cast import mistune from django.utils.html import escape -if TYPE_CHECKING: - from catalog.models import Item - from users.models import User +from catalog.models import Item, ItemCategory _mistune_plugins = [ "url", @@ -56,9 +54,11 @@ def render_text(s: str) -> str: return _spolier(s).strip().replace("\n", "
") -def render_post_with_macro(txt: str, item: "Item") -> str: +def render_post_with_macro(txt: str, item: Item) -> str: + if not txt: + return "" return ( - txt.replace("[category]", item.category.name) + txt.replace("[category]", str(ItemCategory(item.category).label)) .replace("[title]", item.display_title) .replace("[url]", item.absolute_url) ) diff --git a/mastodon/api.py b/mastodon/api.py index c72d3cd4..3a26e542 100644 --- a/mastodon/api.py +++ b/mastodon/api.py @@ -735,7 +735,7 @@ def share_review(review): tpl = ShelfManager.get_action_template("reviewed", review.item.category) content = ( _(tpl).format(item=review.item.display_title) - + "\n{review.title}\n{review.absolute_url} " + + f"\n{review.title}\n{review.absolute_url} " + tags ) update_id = None