add list title to user marked book list page

books/templates/books/list.html

@@ -45,6 +45,11 @@
             <section id="content" class="container">
                 <div class="row">
                     <div id="main">
+                        <div class="set">
+                            <h5 class="set-title">
+                                {{ user.username }}{{ list_title }}
+                            </h5>
+                        </div>
                         <ul class="result-items">
                             
                             {% for mark in marks %}

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
+                    visibility = TootVisibilityEnum.UNLISTED
-                    local_only = True
                 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']

common/templates/common/search_result.html

@@ -43,6 +43,13 @@
             <section id="content" class="container">
                 <div class="row">
                     <div id="main">
+                        {% if request.GET.q %}
+                        <div class="set">
+                            <h5 class="set-title">
+                                “{{ request.GET.q }}” {% trans '的搜索结果' %}
+                            </h5>
+                        </div>
+                        {% endif %}
                         <ul class="result-items">
                             
                             {% for book in items %}

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: