From e6c45767f8a6463d58de91824f6e9514f15b26d7 Mon Sep 17 00:00:00 2001 From: doubaniux Date: Wed, 29 Jul 2020 23:34:06 +0800 Subject: [PATCH] add mastodon tags when toot --- boofilsic/settings.py | 5 ++++- books/views.py | 12 +++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/boofilsic/settings.py b/boofilsic/settings.py index 010ac5b9..086bac28 100644 --- a/boofilsic/settings.py +++ b/boofilsic/settings.py @@ -86,7 +86,7 @@ if DEBUG: 'NAME': 'test', 'USER': 'donotban', 'PASSWORD': 'donotbansilvousplait', - 'HOST': '172.17.132.12', + 'HOST': '172.18.47.7', 'OPTIONS': { 'client_encoding': 'UTF8', # 'isolation_level': psycopg2.extensions.ISOLATION_LEVEL_DEFAULT, @@ -189,6 +189,9 @@ MASTODON_DOMAIN_NAME = 'donotban.com' # Timeout of requests to Mastodon, in seconds MASTODON_TIMEOUT = 30 +# Tags for toots posted from this site +MASTODON_TAGS = '#NiceDB #NiceDB%(category)s #NiceDB%(category)s%(type)s' + # Emoji code in mastodon STAR_SOLID = ':star_solid:' STAR_HALF = ':star_half:' diff --git a/books/views.py b/books/views.py index 81bbcc9b..63317552 100644 --- a/books/views.py +++ b/books/views.py @@ -16,6 +16,7 @@ from common.views import PAGE_LINK_NUMBER from .models import * from .forms import * from .forms import BookMarkStatusTranslator +from boofilsic.settings import MASTODON_TAGS # how many marks showed on the detail page @@ -276,7 +277,10 @@ def create_update_mark(request): words = BookMarkStatusTranslator(int(form.cleaned_data['status'])) +\ f"《{book.title}》" + \ rating_to_emoji(form.cleaned_data['rating']) - content = words + '\n' + url + '\n' + form.cleaned_data['text'] + + tags = MASTODON_TAGS % {'category': '书', 'type': '标记'} + content = words + '\n' + url + '\n' + \ + form.cleaned_data['text'] + '\n' + tags post_toot(content, visibility, request.session['oauth_token']) else: return HttpResponseBadRequest("invalid form data") @@ -358,8 +362,9 @@ def create_review(request, book_id): url = "https://" + request.get_host() + reverse("books:retrieve_review", args=[form.instance.id]) words = "发布了关于" + f"《{form.instance.book.title}》" + "的评论" + tags = MASTODON_TAGS % {'category': '书', 'type': '评论'} content = words + '\n' + url + \ - '\n' + form.cleaned_data['title'] + '\n' + form.cleaned_data['title'] + '\n' + tags post_toot(content, visibility, request.session['oauth_token']) return redirect(reverse("books:retrieve_review", args=[form.instance.id])) else: @@ -405,8 +410,9 @@ def update_review(request, id): url = "https://" + request.get_host() + reverse("books:retrieve_review", args=[form.instance.id]) words = "发布了关于" + f"《{form.instance.book.title}》" + "的评论" + tags = MASTODON_TAGS % {'category': '书', 'type': '评论'} content = words + '\n' + url + \ - '\n' + form.cleaned_data['title'] + '\n' + form.cleaned_data['title'] + '\n' + tags post_toot(content, visibility, request.session['oauth_token']) return redirect(reverse("books:retrieve_review", args=[form.instance.id])) else: