diff --git a/books/templates/books/list.html b/books/templates/books/list.html index 7add3454..ca158071 100644 --- a/books/templates/books/list.html +++ b/books/templates/books/list.html @@ -45,6 +45,11 @@
+
+
+ {{ user.username }}{{ list_title }} +
+
    {% for mark in marks %} diff --git a/books/views.py b/books/views.py index 4871972a..6ab9cc90 100644 --- a/books/views.py +++ b/books/views.py @@ -222,15 +222,13 @@ def create_update_mark(request): if form.cleaned_data['share_to_mastodon']: if form.cleaned_data['is_private']: visibility = TootVisibilityEnum.PRIVATE - local_only = False else: - visibility = TootVisibilityEnum.PUBLIC - local_only = True + visibility = TootVisibilityEnum.UNLISTED url = "https://" + request.get_host() + reverse("books:retrieve", args=[book.id]) 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'] - post_toot(content, visibility, request.session['oauth_token'], local_only=local_only) + post_toot(content, visibility, request.session['oauth_token']) else: return HttpResponseBadRequest() @@ -304,7 +302,7 @@ def create_review(request, book_id): if form.cleaned_data['is_private']: visibility = TootVisibilityEnum.PRIVATE else: - visibility = TootVisibilityEnum.PUBLIC + visibility = TootVisibilityEnum.UNLISTED url = "https://" + request.get_host() + reverse("books:retrieve_review", args=[form.instance.id]) words = "发布了关于" + f"《{form.instance.book.title}》" + "的评论" content = words + '\n' + url + '\n' + form.cleaned_data['title'] @@ -349,7 +347,7 @@ def update_review(request, id): if form.cleaned_data['is_private']: visibility = TootVisibilityEnum.PRIVATE else: - visibility = TootVisibilityEnum.PUBLIC + visibility = TootVisibilityEnum.UNLISTED url = "https://" + request.get_host() + reverse("books:retrieve_review", args=[form.instance.id]) words = "发布了关于" + f"《{form.instance.book.title}》" + "的评论" content = words + '\n' + url + '\n' + form.cleaned_data['title'] diff --git a/common/templates/common/search_result.html b/common/templates/common/search_result.html index 7463890d..327f73c6 100644 --- a/common/templates/common/search_result.html +++ b/common/templates/common/search_result.html @@ -43,6 +43,13 @@
    + {% if request.GET.q %} +
    +
    + “{{ request.GET.q }}” {% trans '的搜索结果' %} +
    +
    + {% endif %}
      {% for book in items %} diff --git a/users/views.py b/users/views.py index 4a0f9699..adfa12bc 100644 --- a/users/views.py +++ b/users/views.py @@ -15,6 +15,7 @@ from common.views import BOOKS_PER_SET, ITEMS_PER_PAGE from common.models import MarkStatusEnum from books.models import * from boofilsic.settings import MASTODON_DOMAIN_NAME, CLIENT_ID, CLIENT_SECRET +from books.forms import BookMarkStatusTranslator # Views @@ -276,8 +277,8 @@ def book_list(request, id, status): 'secondary_msg': sec_msg, } ) - # mastodon request if not user == request.user: + # mastodon request relation = get_relationships([user.mastodon_id], request.session['oauth_token'])[0] if relation['blocked_by']: msg = _("你没有访问TA主页的权限😥") @@ -294,12 +295,14 @@ def book_list(request, id, status): paginator = Paginator(queryset, ITEMS_PER_PAGE) page_number = request.GET.get('page', default=1) marks = paginator.get_page(page_number) + list_title = str(BookMarkStatusTranslator(MarkStatusEnum[status.upper()])) + str(_("的书")) return render( request, 'books/list.html', { 'marks': marks, 'user': user, + 'list_title' : list_title, } ) else: