From bcf846880e9c01b6fdca9f74429d72215d62afe5 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Mon, 20 Dec 2021 22:59:32 -0500
Subject: [PATCH] allow mark/review visible to oneself

---
 books/forms.py                                | 15 ++------
 .../templates/books/create_update_review.html |  2 +-
 books/templates/books/delete_review.html      |  2 +-
 books/templates/books/detail.html             | 12 +++---
 books/templates/books/mark_list.html          |  2 +-
 books/templates/books/review_detail.html      |  2 +-
 books/templates/books/review_list.html        |  2 +-
 books/views.py                                | 17 ++++++---
 common/forms.py                               | 38 ++++++++++---------
 common/models.py                              |  9 +++--
 games/forms.py                                | 13 +------
 .../templates/games/create_update_review.html |  2 +-
 games/templates/games/delete_review.html      |  2 +-
 games/templates/games/detail.html             | 12 +++---
 games/templates/games/mark_list.html          |  2 +-
 games/templates/games/review_detail.html      |  2 +-
 games/templates/games/review_list.html        |  2 +-
 games/views.py                                | 16 +++++---
 mastodon/api.py                               | 19 +---------
 movies/forms.py                               | 13 +------
 .../movies/create_update_review.html          |  2 +-
 movies/templates/movies/delete_review.html    |  2 +-
 movies/templates/movies/detail.html           | 12 +++---
 movies/templates/movies/mark_list.html        |  2 +-
 movies/templates/movies/review_detail.html    |  2 +-
 movies/templates/movies/review_list.html      |  2 +-
 movies/views.py                               | 16 +++++---
 music/forms.py                                | 26 ++-----------
 music/templates/music/album_detail.html       | 12 +++---
 music/templates/music/album_mark_list.html    |  2 +-
 .../templates/music/album_review_detail.html  |  2 +-
 music/templates/music/album_review_list.html  |  2 +-
 .../music/create_update_album_review.html     |  2 +-
 .../music/create_update_song_review.html      |  2 +-
 .../templates/music/delete_album_review.html  |  2 +-
 music/templates/music/delete_song_review.html |  2 +-
 music/templates/music/song_detail.html        | 12 +++---
 music/templates/music/song_mark_list.html     |  2 +-
 music/templates/music/song_review_detail.html |  2 +-
 music/templates/music/song_review_list.html   |  2 +-
 music/views.py                                | 30 ++++++++++-----
 sync/jobs.py                                  |  4 +-
 users/templates/users/book_list.html          |  2 +-
 users/templates/users/game_list.html          |  2 +-
 users/templates/users/movie_list.html         |  2 +-
 users/templates/users/music_list.html         |  2 +-
 46 files changed, 156 insertions(+), 178 deletions(-)

diff --git a/books/forms.py b/books/forms.py
index da7ecee6..098fad5d 100644
--- a/books/forms.py
+++ b/books/forms.py
@@ -96,11 +96,8 @@ class BookMarkForm(MarkForm):
             'status',
             'rating',
             'text',
-            'is_private',
-        ]
-        labels = {
-            'rating': _("评分"),
-        }        
+            'visibility',
+        ]       
         widgets = {
             'book': forms.TextInput(attrs={"hidden": ""}),
         }      
@@ -115,14 +112,8 @@ class BookReviewForm(ReviewForm):
             'book',
             'title',
             'content',
-            'is_private'
+            'visibility'
         ]
-        labels = {
-            'book': "",
-            'title': _("标题"),
-            'content': _("正文"),
-            'share_to_mastodon': _("分享到长毛象")
-        }
         widgets = {
             'book': forms.TextInput(attrs={"hidden": ""}),
         }
diff --git a/books/templates/books/create_update_review.html b/books/templates/books/create_update_review.html
index 1d056b7c..acdeb325 100644
--- a/books/templates/books/create_update_review.html
+++ b/books/templates/books/create_update_review.html
@@ -80,7 +80,7 @@
                                 <div class="review-form__option">
                                     <div class="review-form__visibility-radio">
 
-                                        {{ form.is_private.label }}{{ form.is_private }}
+                                        {{ form.visibility.label }}{{ form.visibility }}
                                     </div>
                                     <div class="review-form__share-checkbox">
                                         {{ form.share_to_mastodon }}{{ form.share_to_mastodon.label }}
diff --git a/books/templates/books/delete_review.html b/books/templates/books/delete_review.html
index da03447b..b5c33a7b 100644
--- a/books/templates/books/delete_review.html
+++ b/books/templates/books/delete_review.html
@@ -35,7 +35,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                         viewBox="0 0 20 20"><svg xmlns="http://www.w3.org/2000/svg"
                                             viewBox="0 0 20 20">
diff --git a/books/templates/books/detail.html b/books/templates/books/detail.html
index dc802aa8..9751aebf 100644
--- a/books/templates/books/detail.html
+++ b/books/templates/books/detail.html
@@ -161,7 +161,7 @@
                                     {% if others_mark.rating %}
                                     <span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
-                                    {% if others_mark.is_private %}
+                                    {% if others_mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-marks__mark-time">{{ others_mark.edited_time }}</span>
@@ -185,7 +185,7 @@
                                 {% for others_review in review_list %}
                                 <li class="entity-reviews__review">
                                     <a href="{% url 'users:home' others_review.owner.id %}" class="entity-reviews__owner-link">{{ others_review.owner.username }}</a>
-                                    {% if others_review.is_private %}
+                                    {% if others_review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-reviews__review-time">{{ others_review.edited_time }}</span>
@@ -212,7 +212,7 @@
                                     <span class="mark-panel__rating-star rating-star" data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
                                 {% endif %}
-                                {% if mark.is_private %}
+                                {% if mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                 {% endif %}                                        
                                 <span class="mark-panel__actions">
@@ -254,7 +254,7 @@
                             <div class="review-panel">
    
                                 <span class="review-panel__label">{% trans '我的评论' %}</span>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>                                      
                                 {% endif %}
 
@@ -371,8 +371,8 @@
                     
                     <div class="mark-modal__option">
                         <div class="mark-modal__visibility-radio">
-                            <span>{{ mark_form.is_private.label }}:</span>
-                            {{ mark_form.is_private }}
+                            <span>{{ mark_form.visibility.label }}:
+                            {{ mark_form.visibility }}</span>
                         </div>
                         <div class="mark-modal__share-checkbox">
                             {{ mark_form.share_to_mastodon }}{{ mark_form.share_to_mastodon.label }}
diff --git a/books/templates/books/mark_list.html b/books/templates/books/mark_list.html
index 9c47035f..0eb401bb 100644
--- a/books/templates/books/mark_list.html
+++ b/books/templates/books/mark_list.html
@@ -45,7 +45,7 @@
                                         <span class="entity-marks__rating-star rating-star"
                                             data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                         {% endif %}
-                                        {% if mark.is_private %}
+                                        {% if mark.visibility > 0 %}
                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
    
                                                     <path
diff --git a/books/templates/books/review_detail.html b/books/templates/books/review_detail.html
index 8022d952..dbb2383e 100644
--- a/books/templates/books/review_detail.html
+++ b/books/templates/books/review_detail.html
@@ -37,7 +37,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                             <path
                                                 d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/books/templates/books/review_list.html b/books/templates/books/review_list.html
index 892fe451..23f5aee5 100644
--- a/books/templates/books/review_list.html
+++ b/books/templates/books/review_list.html
@@ -40,7 +40,7 @@
                                     <li class="entity-reviews__review entity-reviews__review--wider">
                                         
                                             <a href="{% url 'users:home' review.owner.id %}" class="entity-reviews__owner-link">{{ review.owner.username }}</a>
-                                            {% if review.is_private %}
+                                            {% if review.visibility > 0 %}
                                             <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                             {% endif %}
                                             <span class="entity-reviews__review-time">{{ review.edited_time }}</span>
diff --git a/books/views.py b/books/views.py
index 32997a90..1c9ac847 100644
--- a/books/views.py
+++ b/books/views.py
@@ -10,7 +10,7 @@ from django.utils import timezone
 from django.core.paginator import Paginator
 from mastodon import mastodon_request_included
 from mastodon.models import MastodonApplication
-from mastodon.api import check_visibility, post_toot, TootVisibilityEnum
+from mastodon.api import post_toot, TootVisibilityEnum
 from mastodon.utils import rating_to_emoji
 from common.utils import PageLinksGenerator
 from common.views import PAGE_LINK_NUMBER, jump_or_scrape
@@ -303,7 +303,10 @@ def create_update_mark(request):
                 return HttpResponseServerError("integrity error")
 
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                print(form.cleaned_data)
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -396,7 +399,9 @@ def create_review(request, book_id):
             form.instance.owner = request.user
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -448,7 +453,9 @@ def update_review(request, id):
             form.instance.edited_time = timezone.now()
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -502,7 +509,7 @@ def delete_review(request, id):
 def retrieve_review(request, id):
     if request.method == 'GET':
         review = get_object_or_404(BookReview, pk=id)
-        if not check_visibility(review, request.session['oauth_token'], request.user):
+        if not review.is_visible_to(request.user):
             msg = _("你没有访问这个页面的权限😥")
             return render(
                 request,
diff --git a/common/forms.py b/common/forms.py
index 747d06e1..2b97cf79 100644
--- a/common/forms.py
+++ b/common/forms.py
@@ -1,4 +1,5 @@
 from django import forms
+from markdownx.fields import MarkdownxFormField
 import django.contrib.postgres.forms as postgres
 from django.utils import formats
 from django.core.exceptions import ValidationError
@@ -223,22 +224,25 @@ class DurationField(forms.TimeField):
 #############################
 # Form
 #############################
+VISIBILITY_CHOICES = [
+    (0, _("公开")),
+    (1, _("仅关注者")),
+    (2, _("仅自己")),
+]
 
-class MarkForm(forms.ModelForm):
-    IS_PRIVATE_CHOICES = [
-        (True, _("仅关注者")),
-        (False, _("公开")),
-    ]
-    
+
+class MarkForm(forms.ModelForm):    
     id = forms.IntegerField(required=False, widget=forms.HiddenInput())
     share_to_mastodon = forms.BooleanField(
         label=_("分享到长毛象"), initial=True, required=False)
     rating = forms.IntegerField(
-        validators=[RatingValidator()], widget=forms.HiddenInput(), required=False)
-    is_private = RadioBooleanField(
+        label=_("评分"), validators=[RatingValidator()], widget=forms.HiddenInput(), required=False)
+    visibility = forms.TypedChoiceField(
         label=_("可见性"),
-        initial=True,
-        choices=IS_PRIVATE_CHOICES
+        initial=0,
+        coerce=int,
+        choices=VISIBILITY_CHOICES,
+        widget=forms.RadioSelect
     )
     tags = TagField(
         required=False,
@@ -259,15 +263,15 @@ class MarkForm(forms.ModelForm):
 
 
 class ReviewForm(forms.ModelForm):
-    IS_PRIVATE_CHOICES = [
-        (True, _("仅关注者")),
-        (False, _("公开")),
-    ]
+    title = forms.CharField(label=_("标题"))
+    content = MarkdownxFormField(label=_("正文 (Markdown)"))
     share_to_mastodon = forms.BooleanField(
         label=_("分享到长毛象"), initial=True, required=False)
     id = forms.IntegerField(required=False, widget=forms.HiddenInput())
-    is_private = RadioBooleanField(
+    visibility = forms.TypedChoiceField(
         label=_("可见性"),
-        initial=True,
-        choices=IS_PRIVATE_CHOICES
+        initial=0,
+        coerce=int,
+        choices=VISIBILITY_CHOICES,
+        widget=forms.RadioSelect
     )
diff --git a/common/models.py b/common/models.py
index 3750ee5a..a7fefc0a 100644
--- a/common/models.py
+++ b/common/models.py
@@ -150,7 +150,8 @@ class Entity(models.Model):
 
 
 class UserOwnedEntity(models.Model):
-    is_private = models.BooleanField()
+    is_private = models.BooleanField(default=False, null=True)  # first set allow null, then migration, finally (in a few days) remove for good
+    visibility = models.PositiveSmallIntegerField(default=0)  # 0: Public / 1: Follower only / 2: Self only
     owner = models.ForeignKey(
         User, on_delete=models.CASCADE, related_name='user_%(class)ss')
     created_time = models.DateTimeField(default=timezone.now)
@@ -163,9 +164,11 @@ class UserOwnedEntity(models.Model):
         owner = self.owner
         if owner == viewer:
             return True
+        if self.visibility == 2:
+            return False
         if viewer.is_blocking(owner) or owner.is_blocking(viewer) or viewer.is_muting(owner):
             return False
-        if self.is_private:
+        if self.visibility == 1:
             return viewer.is_following(owner)
         else:
             return True
@@ -189,7 +192,7 @@ class UserOwnedEntity(models.Model):
         """
         user_owned_entities = cls.objects.filter(owner=owner)
         if not is_following:
-            user_owned_entities = user_owned_entities.exclude(is_private=True)
+            user_owned_entities = user_owned_entities.exclude(visibility__gt=0)
         return user_owned_entities
 
 
diff --git a/games/forms.py b/games/forms.py
index 5aa53330..62789036 100644
--- a/games/forms.py
+++ b/games/forms.py
@@ -66,11 +66,8 @@ class GameMarkForm(MarkForm):
             'status',
             'rating',
             'text',
-            'is_private',
+            'visibility',
         ]
-        labels = {
-            'rating': _("评分"),
-        }
         widgets = {
             'game': forms.TextInput(attrs={"hidden": ""}),
         }
@@ -85,14 +82,8 @@ class GameReviewForm(ReviewForm):
             'game',
             'title',
             'content',
-            'is_private'
+            'visibility'
         ]
-        labels = {
-            'book': "",
-            'title': _("标题"),
-            'content': _("正文"),
-            'share_to_mastodon': _("分享到长毛象")
-        }
         widgets = {
             'game': forms.TextInput(attrs={"hidden": ""}),
         }
diff --git a/games/templates/games/create_update_review.html b/games/templates/games/create_update_review.html
index 4c46dbdd..b79a0983 100644
--- a/games/templates/games/create_update_review.html
+++ b/games/templates/games/create_update_review.html
@@ -94,7 +94,7 @@
                                 <div class="review-form__option">
                                     <div class="review-form__visibility-radio">
 
-                                        {{ form.is_private.label }}{{ form.is_private }}
+                                        {{ form.visibility.label }}{{ form.visibility }}
                                     </div>
                                     <div class="review-form__share-checkbox">
                                         {{ form.share_to_mastodon }}{{ form.share_to_mastodon.label }}
diff --git a/games/templates/games/delete_review.html b/games/templates/games/delete_review.html
index bcd87049..0923f397 100644
--- a/games/templates/games/delete_review.html
+++ b/games/templates/games/delete_review.html
@@ -35,7 +35,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                         viewBox="0 0 20 20">
                                             <path
diff --git a/games/templates/games/detail.html b/games/templates/games/detail.html
index f3bfde75..3a524e79 100644
--- a/games/templates/games/detail.html
+++ b/games/templates/games/detail.html
@@ -190,7 +190,7 @@
                                     {% if others_mark.rating %}
                                     <span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
-                                    {% if others_mark.is_private %}
+                                    {% if others_mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-marks__mark-time">{{ others_mark.edited_time }}</span>
@@ -215,7 +215,7 @@
                                 {% for others_review in review_list %}
                                 <li class="entity-reviews__review">
                                     <a href="{% url 'users:home' others_review.owner.id %}" class="entity-reviews__owner-link">{{ others_review.owner.username }}</a>
-                                    {% if others_review.is_private %}
+                                    {% if others_review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-reviews__review-time">{{ others_review.edited_time }}</span>
@@ -243,7 +243,7 @@
                                     <span class="mark-panel__rating-star rating-star" data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
                                 {% endif %}
-                                {% if mark.is_private %}
+                                {% if mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                 {% endif %}                                        
                                 <span class="mark-panel__actions">
@@ -287,7 +287,7 @@
                             <div class="review-panel">
    
                                 <span class="review-panel__label">{% trans '我的评论' %}</span>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>                                      
                                 {% endif %}
 
@@ -378,8 +378,8 @@
                     
                     <div class="mark-modal__option">
                         <div class="mark-modal__visibility-radio">
-                            <span>{{ mark_form.is_private.label }}:</span>
-                            {{ mark_form.is_private }}
+                            <span>{{ mark_form.visibility.label }}:</span>
+                            {{ mark_form.visibility }}
                         </div>
                         <div class="mark-modal__share-checkbox">
                             {{ mark_form.share_to_mastodon }}{{ mark_form.share_to_mastodon.label }}
diff --git a/games/templates/games/mark_list.html b/games/templates/games/mark_list.html
index 16f00f8d..c2838fe6 100644
--- a/games/templates/games/mark_list.html
+++ b/games/templates/games/mark_list.html
@@ -47,7 +47,7 @@
                                         <span class="entity-marks__rating-star rating-star"
                                             data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                         {% endif %}
-                                        {% if mark.is_private %}
+                                        {% if mark.visibility > 0 %}
                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                                     <path
                                                         d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/games/templates/games/review_detail.html b/games/templates/games/review_detail.html
index 8f08a533..8a442183 100644
--- a/games/templates/games/review_detail.html
+++ b/games/templates/games/review_detail.html
@@ -39,7 +39,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                             <path
                                                 d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/games/templates/games/review_list.html b/games/templates/games/review_list.html
index 6463325d..738cd057 100644
--- a/games/templates/games/review_list.html
+++ b/games/templates/games/review_list.html
@@ -42,7 +42,7 @@
                                     <li class="entity-reviews__review entity-reviews__review--wider">
                                         
                                             <a href="{% url 'users:home' review.owner.id %}" class="entity-reviews__owner-link">{{ review.owner.username }}</a>
-                                            {% if review.is_private %}
+                                            {% if review.visibility > 0 %}
                                             <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                             {% endif %}
                                             <span class="entity-reviews__review-time">{{ review.edited_time }}</span>
diff --git a/games/views.py b/games/views.py
index 20a30350..54315fa9 100644
--- a/games/views.py
+++ b/games/views.py
@@ -10,7 +10,7 @@ from django.utils import timezone
 from django.core.paginator import Paginator
 from mastodon import mastodon_request_included
 from mastodon.models import MastodonApplication
-from mastodon.api import check_visibility, post_toot, TootVisibilityEnum
+from mastodon.api import post_toot, TootVisibilityEnum
 from mastodon.utils import rating_to_emoji
 from common.utils import PageLinksGenerator
 from common.views import PAGE_LINK_NUMBER, jump_or_scrape
@@ -305,7 +305,9 @@ def create_update_mark(request):
                 return HttpResponseServerError("integrity error")
 
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -399,7 +401,9 @@ def create_review(request, game_id):
             form.instance.owner = request.user
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -451,7 +455,9 @@ def update_review(request, id):
             form.instance.edited_time = timezone.now()
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -506,7 +512,7 @@ def delete_review(request, id):
 def retrieve_review(request, id):
     if request.method == 'GET':
         review = get_object_or_404(GameReview, pk=id)
-        if not check_visibility(review, request.session['oauth_token'], request.user):
+        if not review.is_visible_to(request.user):
             msg = _("你没有访问这个页面的权限😥")
             return render(
                 request,
diff --git a/mastodon/api.py b/mastodon/api.py
index 4442c4df..c950b1be 100644
--- a/mastodon/api.py
+++ b/mastodon/api.py
@@ -76,6 +76,7 @@ def post_toot(site, content, visibility, token, local_only=False):
     }
     if not local_only:
         del payload['local_only']
+    print(payload)
     response = post(url, headers=headers, data=payload)
     return response
 
@@ -135,7 +136,7 @@ def get_site_id(username, user_site, target_site, token):
 
 
 # high level api below
-def get_relationship(request_user, target_user, token):
+def get_relationship(request_user, target_user, useless_token=None):
     return [{
         'blocked_by': target_user.is_blocking(request_user),
         'following': request_user.is_following(target_user),
@@ -172,22 +173,6 @@ def get_cross_site_id(target_user, target_site, token):
     return cross_site_info.site_id
 
 
-def check_visibility(user_owned_entity, token, visitor):
-    """
-    check if given user can see the user owned entity
-    """
-    if not visitor == user_owned_entity.owner:
-        # mastodon request
-        relationship = get_relationship(visitor, user_owned_entity.owner, token)[0]
-        if relationship['blocked_by']:
-            return False
-        if not relationship['following'] and user_owned_entity.is_private:
-            return False
-        return True
-    else:
-        return True
-
-
 # utils below
 def random_string_generator(n):
     s = string.ascii_letters + string.punctuation + string.digits
diff --git a/movies/forms.py b/movies/forms.py
index aa320bd5..2b4eff61 100644
--- a/movies/forms.py
+++ b/movies/forms.py
@@ -119,11 +119,8 @@ class MovieMarkForm(MarkForm):
             'status',
             'rating',
             'text',
-            'is_private',
+            'visibility',
         ]
-        labels = {
-            'rating': _("评分"),
-        }
         widgets = {
             'movie': forms.TextInput(attrs={"hidden": ""}),
         }
@@ -138,14 +135,8 @@ class MovieReviewForm(ReviewForm):
             'movie',
             'title',
             'content',
-            'is_private'
+            'visibility'
         ]
-        labels = {
-            'book': "",
-            'title': _("标题"),
-            'content': _("正文"),
-            'share_to_mastodon': _("分享到长毛象")
-        }
         widgets = {
             'movie': forms.TextInput(attrs={"hidden": ""}),
         }
diff --git a/movies/templates/movies/create_update_review.html b/movies/templates/movies/create_update_review.html
index bcb9a038..a944f3b1 100644
--- a/movies/templates/movies/create_update_review.html
+++ b/movies/templates/movies/create_update_review.html
@@ -138,7 +138,7 @@
                                 <div class="review-form__option">
                                     <div class="review-form__visibility-radio">
 
-                                        {{ form.is_private.label }}{{ form.is_private }}
+                                        {{ form.visibility.label }}{{ form.visibility }}
                                     </div>
                                     <div class="review-form__share-checkbox">
                                         {{ form.share_to_mastodon }}{{ form.share_to_mastodon.label }}
diff --git a/movies/templates/movies/delete_review.html b/movies/templates/movies/delete_review.html
index 515108f0..536b3da6 100644
--- a/movies/templates/movies/delete_review.html
+++ b/movies/templates/movies/delete_review.html
@@ -35,7 +35,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                         viewBox="0 0 20 20">
                                             <path
diff --git a/movies/templates/movies/detail.html b/movies/templates/movies/detail.html
index 515be907..0a37833b 100644
--- a/movies/templates/movies/detail.html
+++ b/movies/templates/movies/detail.html
@@ -261,7 +261,7 @@
                                     {% if others_mark.rating %}
                                     <span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
-                                    {% if others_mark.is_private %}
+                                    {% if others_mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-marks__mark-time">{{ others_mark.edited_time }}</span>
@@ -290,7 +290,7 @@
                                 {% for others_review in review_list %}
                                 <li class="entity-reviews__review">
                                     <a href="{% url 'users:home' others_review.owner.id %}" class="entity-reviews__owner-link">{{ others_review.owner.username }}</a>
-                                    {% if others_review.is_private %}
+                                    {% if others_review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-reviews__review-time">{{ others_review.edited_time }}</span>
@@ -318,7 +318,7 @@
                                     <span class="mark-panel__rating-star rating-star" data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
                                 {% endif %}
-                                {% if mark.is_private %}
+                                {% if mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                 {% endif %}                                        
                                 <span class="mark-panel__actions">
@@ -366,7 +366,7 @@
                             <div class="review-panel">
    
                                 <span class="review-panel__label">{% trans '我的评论' %}</span>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>                                      
                                 {% endif %}
 
@@ -483,8 +483,8 @@
                     
                     <div class="mark-modal__option">
                         <div class="mark-modal__visibility-radio">
-                            <span>{{ mark_form.is_private.label }}:</span>
-                            {{ mark_form.is_private }}
+                            <span>{{ mark_form.visibility.label }}:</span>
+                            {{ mark_form.visibility }}
                         </div>
                         <div class="mark-modal__share-checkbox">
                             {{ mark_form.share_to_mastodon }}{{ mark_form.share_to_mastodon.label }}
diff --git a/movies/templates/movies/mark_list.html b/movies/templates/movies/mark_list.html
index 060d92ec..0d50e2bb 100644
--- a/movies/templates/movies/mark_list.html
+++ b/movies/templates/movies/mark_list.html
@@ -47,7 +47,7 @@
                                         <span class="entity-marks__rating-star rating-star"
                                             data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                         {% endif %}
-                                        {% if mark.is_private %}
+                                        {% if mark.visibility > 0 %}
                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                                     <path
                                                         d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/movies/templates/movies/review_detail.html b/movies/templates/movies/review_detail.html
index 096033d9..0a9ef162 100644
--- a/movies/templates/movies/review_detail.html
+++ b/movies/templates/movies/review_detail.html
@@ -39,7 +39,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                             <path
                                                 d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/movies/templates/movies/review_list.html b/movies/templates/movies/review_list.html
index c1ae710c..7e96e5ec 100644
--- a/movies/templates/movies/review_list.html
+++ b/movies/templates/movies/review_list.html
@@ -42,7 +42,7 @@
                                     <li class="entity-reviews__review entity-reviews__review--wider">
                                         
                                             <a href="{% url 'users:home' review.owner.id %}" class="entity-reviews__owner-link">{{ review.owner.username }}</a>
-                                            {% if review.is_private %}
+                                            {% if review.visibility > 0 %}
                                             <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                             {% endif %}
                                             <span class="entity-reviews__review-time">{{ review.edited_time }}</span>
diff --git a/movies/views.py b/movies/views.py
index dc2f24d7..0530c725 100644
--- a/movies/views.py
+++ b/movies/views.py
@@ -10,7 +10,7 @@ from django.utils import timezone
 from django.core.paginator import Paginator
 from mastodon import mastodon_request_included
 from mastodon.models import MastodonApplication
-from mastodon.api import check_visibility, post_toot, TootVisibilityEnum
+from mastodon.api import post_toot, TootVisibilityEnum
 from mastodon.utils import rating_to_emoji
 from common.utils import PageLinksGenerator
 from common.views import PAGE_LINK_NUMBER, jump_or_scrape
@@ -304,7 +304,9 @@ def create_update_mark(request):
                 return HttpResponseServerError("integrity error")
 
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -398,7 +400,9 @@ def create_review(request, movie_id):
             form.instance.owner = request.user
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -450,7 +454,9 @@ def update_review(request, id):
             form.instance.edited_time = timezone.now()
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -505,7 +511,7 @@ def delete_review(request, id):
 def retrieve_review(request, id):
     if request.method == 'GET':
         review = get_object_or_404(MovieReview, pk=id)
-        if not check_visibility(review, request.session['oauth_token'], request.user):
+        if not review.is_visible_to(request.user):
             msg = _("你没有访问这个页面的权限😥")
             return render(
                 request,
diff --git a/music/forms.py b/music/forms.py
index 3eec5646..6cfb54e8 100644
--- a/music/forms.py
+++ b/music/forms.py
@@ -65,11 +65,8 @@ class SongMarkForm(MarkForm):
             'status',
             'rating',
             'text',
-            'is_private',
+            'visibility',
         ]
-        labels = {
-            'rating': _("评分"),
-        }
         widgets = {
             'song': forms.TextInput(attrs={"hidden": ""}),
         }
@@ -84,14 +81,8 @@ class SongReviewForm(ReviewForm):
             'song',
             'title',
             'content',
-            'is_private'
+            'visibility'
         ]
-        labels = {
-            'song': "",
-            'title': _("标题"),
-            'content': _("正文"),
-            'share_to_mastodon': _("分享到长毛象")
-        }
         widgets = {
             'song': forms.TextInput(attrs={"hidden": ""}),
         }
@@ -148,11 +139,8 @@ class AlbumMarkForm(MarkForm):
             'status',
             'rating',
             'text',
-            'is_private',
+            'visibility',
         ]
-        labels = {
-            'rating': _("评分"),
-        }
         widgets = {
             'album': forms.TextInput(attrs={"hidden": ""}),
         }
@@ -167,14 +155,8 @@ class AlbumReviewForm(ReviewForm):
             'album',
             'title',
             'content',
-            'is_private'
+            'visibility'
         ]
-        labels = {
-            'album': "",
-            'title': _("标题"),
-            'content': _("正文"),
-            'share_to_mastodon': _("分享到长毛象")
-        }
         widgets = {
             'album': forms.TextInput(attrs={"hidden": ""}),
         }
diff --git a/music/templates/music/album_detail.html b/music/templates/music/album_detail.html
index e9981253..341589dd 100644
--- a/music/templates/music/album_detail.html
+++ b/music/templates/music/album_detail.html
@@ -225,7 +225,7 @@
                                     {% if others_mark.rating %}
                                     <span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
-                                    {% if others_mark.is_private %}
+                                    {% if others_mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-marks__mark-time">{{ others_mark.edited_time }}</span>
@@ -250,7 +250,7 @@
                                 {% for others_review in review_list %}
                                 <li class="entity-reviews__review">
                                     <a href="{% url 'users:home' others_review.owner.id %}" class="entity-reviews__owner-link">{{ others_review.owner.username }}</a>
-                                    {% if others_review.is_private %}
+                                    {% if others_review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-reviews__review-time">{{ others_review.edited_time }}</span>
@@ -278,7 +278,7 @@
                                     <span class="mark-panel__rating-star rating-star" data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
                                 {% endif %}
-                                {% if mark.is_private %}
+                                {% if mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                 {% endif %}                                        
                                 <span class="mark-panel__actions">
@@ -321,7 +321,7 @@
                             <div class="review-panel">
    
                                 <span class="review-panel__label">{% trans '我的评论' %}</span>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>                                      
                                 {% endif %}
 
@@ -415,8 +415,8 @@
                     
                     <div class="mark-modal__option">
                         <div class="mark-modal__visibility-radio">
-                            <span>{{ mark_form.is_private.label }}:</span>
-                            {{ mark_form.is_private }}
+                            <span>{{ mark_form.visibility.label }}:</span>
+                            {{ mark_form.visibility }}
                         </div>
                         <div class="mark-modal__share-checkbox">
                             {{ mark_form.share_to_mastodon }}{{ mark_form.share_to_mastodon.label }}
diff --git a/music/templates/music/album_mark_list.html b/music/templates/music/album_mark_list.html
index 36ab340c..fddb3810 100644
--- a/music/templates/music/album_mark_list.html
+++ b/music/templates/music/album_mark_list.html
@@ -47,7 +47,7 @@
                                         <span class="entity-marks__rating-star rating-star"
                                             data-rating-score="{{ mark.rating | floatformat:" 0" }}"></span>
                                         {% endif %}
-                                        {% if mark.is_private %}
+                                        {% if mark.visibility > 0 %}
                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                                 viewBox="0 0 20 20">
                                                     <path
diff --git a/music/templates/music/album_review_detail.html b/music/templates/music/album_review_detail.html
index 798b860d..06be286a 100644
--- a/music/templates/music/album_review_detail.html
+++ b/music/templates/music/album_review_detail.html
@@ -39,7 +39,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                             <path
                                                 d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/music/templates/music/album_review_list.html b/music/templates/music/album_review_list.html
index fd6acf3d..63eca05a 100644
--- a/music/templates/music/album_review_list.html
+++ b/music/templates/music/album_review_list.html
@@ -42,7 +42,7 @@
 
                                         <a href="{% url 'users:home' review.owner.id %}"
                                             class="entity-reviews__owner-link">{{ review.owner.username }}</a>
-                                        {% if review.is_private %}
+                                        {% if review.visibility > 0 %}
                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                                 viewBox="0 0 20 20">
                                                     <path
diff --git a/music/templates/music/create_update_album_review.html b/music/templates/music/create_update_album_review.html
index f49014e2..bf00ba9f 100644
--- a/music/templates/music/create_update_album_review.html
+++ b/music/templates/music/create_update_album_review.html
@@ -96,7 +96,7 @@
                                 <div class="review-form__option">
                                     <div class="review-form__visibility-radio">
 
-                                        {{ form.is_private.label }}{{ form.is_private }}
+                                        {{ form.visibility.label }}{{ form.visibility }}
                                     </div>
                                     <div class="review-form__share-checkbox">
                                         {{ form.share_to_mastodon }}{{ form.share_to_mastodon.label }}
diff --git a/music/templates/music/create_update_song_review.html b/music/templates/music/create_update_song_review.html
index c4ec4539..499c3fd3 100644
--- a/music/templates/music/create_update_song_review.html
+++ b/music/templates/music/create_update_song_review.html
@@ -100,7 +100,7 @@
                                 <div class="review-form__option">
                                     <div class="review-form__visibility-radio">
 
-                                        {{ form.is_private.label }}{{ form.is_private }}
+                                        {{ form.visibility.label }}{{ form.visibility }}
                                     </div>
                                     <div class="review-form__share-checkbox">
                                         {{ form.share_to_mastodon }}{{ form.share_to_mastodon.label }}
diff --git a/music/templates/music/delete_album_review.html b/music/templates/music/delete_album_review.html
index 4a48e456..99936ba5 100644
--- a/music/templates/music/delete_album_review.html
+++ b/music/templates/music/delete_album_review.html
@@ -35,7 +35,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                         viewBox="0 0 20 20">
                                             <path
diff --git a/music/templates/music/delete_song_review.html b/music/templates/music/delete_song_review.html
index ff57a838..96f14481 100644
--- a/music/templates/music/delete_song_review.html
+++ b/music/templates/music/delete_song_review.html
@@ -35,7 +35,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                         viewBox="0 0 20 20">
                                             <path
diff --git a/music/templates/music/song_detail.html b/music/templates/music/song_detail.html
index 1ae9a13f..ae385b02 100644
--- a/music/templates/music/song_detail.html
+++ b/music/templates/music/song_detail.html
@@ -171,7 +171,7 @@
                                     {% if others_mark.rating %}
                                     <span class="entity-marks__rating-star rating-star" data-rating-score="{{ others_mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
-                                    {% if others_mark.is_private %}
+                                    {% if others_mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-marks__mark-time">{{ others_mark.edited_time }}</span>
@@ -196,7 +196,7 @@
                                 {% for others_review in review_list %}
                                 <li class="entity-reviews__review">
                                     <a href="{% url 'users:home' others_review.owner.id %}" class="entity-reviews__owner-link">{{ others_review.owner.username }}</a>
-                                    {% if others_review.is_private %}
+                                    {% if others_review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                     {% endif %}
                                     <span class="entity-reviews__review-time">{{ others_review.edited_time }}</span>
@@ -224,7 +224,7 @@
                                     <span class="mark-panel__rating-star rating-star" data-rating-score="{{ mark.rating | floatformat:"0" }}"></span>
                                     {% endif %}
                                 {% endif %}
-                                {% if mark.is_private %}
+                                {% if mark.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                 {% endif %}                                        
                                 <span class="mark-panel__actions">
@@ -267,7 +267,7 @@
                             <div class="review-panel">
    
                                 <span class="review-panel__label">{% trans '我的评论' %}</span>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                     <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>                                      
                                 {% endif %}
 
@@ -361,8 +361,8 @@
                     
                     <div class="mark-modal__option">
                         <div class="mark-modal__visibility-radio">
-                            <span>{{ mark_form.is_private.label }}:</span>
-                            {{ mark_form.is_private }}
+                            <span>{{ mark_form.visibility.label }}:</span>
+                            {{ mark_form.visibility }}
                         </div>
                         <div class="mark-modal__share-checkbox">
                             {{ mark_form.share_to_mastodon }}{{ mark_form.share_to_mastodon.label }}
diff --git a/music/templates/music/song_mark_list.html b/music/templates/music/song_mark_list.html
index db50c48e..f51712be 100644
--- a/music/templates/music/song_mark_list.html
+++ b/music/templates/music/song_mark_list.html
@@ -47,7 +47,7 @@
                                         <span class="entity-marks__rating-star rating-star"
                                             data-rating-score="{{ mark.rating | floatformat:" 0" }}"></span>
                                         {% endif %}
-                                        {% if mark.is_private %}
+                                        {% if mark.visibility > 0 %}
                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg"
                                                 viewBox="0 0 20 20">
                                                     <path
diff --git a/music/templates/music/song_review_detail.html b/music/templates/music/song_review_detail.html
index d5b762dc..a052dc87 100644
--- a/music/templates/music/song_review_detail.html
+++ b/music/templates/music/song_review_detail.html
@@ -39,7 +39,7 @@
                                 <h5 class="review-head__title">
                                     {{ review.title }}
                                 </h5>
-                                {% if review.is_private %}
+                                {% if review.visibility > 0 %}
                                 <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                             <path
                                                 d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/music/templates/music/song_review_list.html b/music/templates/music/song_review_list.html
index 632470ef..b0ec4cf8 100644
--- a/music/templates/music/song_review_list.html
+++ b/music/templates/music/song_review_list.html
@@ -41,7 +41,7 @@
                                     <li class="entity-reviews__review entity-reviews__review--wider">
                                         
                                             <a href="{% url 'users:home' review.owner.id %}" class="entity-reviews__owner-link">{{ review.owner.username }}</a>
-                                            {% if review.is_private %}
+                                            {% if review.visibility > 0 %}
                                             <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
                                             {% endif %}
                                             <span class="entity-reviews__review-time">{{ review.edited_time }}</span>
diff --git a/music/views.py b/music/views.py
index dbba1f7b..4de189bb 100644
--- a/music/views.py
+++ b/music/views.py
@@ -5,7 +5,7 @@ from common.views import PAGE_LINK_NUMBER, jump_or_scrape
 from common.utils import PageLinksGenerator
 from mastodon.models import MastodonApplication
 from mastodon.utils import rating_to_emoji
-from mastodon.api import check_visibility, post_toot, TootVisibilityEnum
+from mastodon.api import post_toot, TootVisibilityEnum
 from mastodon import mastodon_request_included
 from django.core.paginator import Paginator
 from django.utils import timezone
@@ -323,7 +323,9 @@ def create_update_song_mark(request):
                 return HttpResponseServerError("integrity error")
 
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -417,7 +419,9 @@ def create_song_review(request, song_id):
             form.instance.owner = request.user
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -469,7 +473,9 @@ def update_song_review(request, id):
             form.instance.edited_time = timezone.now()
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -524,7 +530,7 @@ def delete_song_review(request, id):
 def retrieve_song_review(request, id):
     if request.method == 'GET':
         review = get_object_or_404(SongReview, pk=id)
-        if not check_visibility(review, request.session['oauth_token'], request.user):
+        if not review.is_visible_to(request.user):
             msg = _("你没有访问这个页面的权限😥")
             return render(
                 request,
@@ -890,7 +896,9 @@ def create_update_album_mark(request):
                 return HttpResponseServerError("integrity error")
 
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -984,7 +992,9 @@ def create_album_review(request, album_id):
             form.instance.owner = request.user
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -1036,7 +1046,9 @@ def update_album_review(request, id):
             form.instance.edited_time = timezone.now()
             form.save()
             if form.cleaned_data['share_to_mastodon']:
-                if form.cleaned_data['is_private']:
+                if form.cleaned_data['visibility'] == 2:
+                    visibility = TootVisibilityEnum.DIRECT
+                elif form.cleaned_data['visibility'] == 1:
                     visibility = TootVisibilityEnum.PRIVATE
                 else:
                     visibility = TootVisibilityEnum.PUBLIC if request.user.preference.mastodon_publish_public else TootVisibilityEnum.UNLISTED
@@ -1091,7 +1103,7 @@ def delete_album_review(request, id):
 def retrieve_album_review(request, id):
     if request.method == 'GET':
         review = get_object_or_404(AlbumReview, pk=id)
-        if not check_visibility(review, request.session['oauth_token'], request.user):
+        if not review.is_visible_to(request.user):
             msg = _("你没有访问这个页面的权限😥")
             return render(
                 request,
diff --git a/sync/jobs.py b/sync/jobs.py
index 9c5c4aa4..095a1d2e 100644
--- a/sync/jobs.py
+++ b/sync/jobs.py
@@ -187,7 +187,7 @@ class DoufenRowData:
     rating: int
 
 
-def add_new_mark(data, user, entity, entity_class, mark_class, tag_class, sheet, is_private):
+def add_new_mark(data, user, entity, entity_class, mark_class, tag_class, sheet, default_public):
     params = {
         'owner': user,
         'created_time': data.time,
@@ -195,7 +195,7 @@ def add_new_mark(data, user, entity, entity_class, mark_class, tag_class, sheet,
         'rating': data.rating,
         'text': data.content,
         'status': translate_status(sheet),
-        'is_private': not is_private,
+        'visibility': 0 if default_public else 1,
         entity_class.__name__.lower(): entity,
     }
     mark = mark_class.objects.create(**params)
diff --git a/users/templates/users/book_list.html b/users/templates/users/book_list.html
index 7be50f9c..02a5cf34 100644
--- a/users/templates/users/book_list.html
+++ b/users/templates/users/book_list.html
@@ -118,7 +118,7 @@
                                                         <span class="entity-marks__rating-star rating-star"
                                                             data-rating-score="{{ mark.rating | floatformat:"0" }}" style="left: -4px;"></span>
                                                         {% endif %}
-                                                        {% if mark.is_private %}
+                                                        {% if mark.visibility > 0 %}
                                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                                                     <path
                                                                         d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/users/templates/users/game_list.html b/users/templates/users/game_list.html
index 43729375..fe38db77 100644
--- a/users/templates/users/game_list.html
+++ b/users/templates/users/game_list.html
@@ -108,7 +108,7 @@
                                                         <span class="entity-marks__rating-star rating-star"
                                                             data-rating-score="{{ mark.rating | floatformat:"0" }}" style="left: -4px;"></span>
                                                         {% endif %}
-                                                        {% if mark.is_private %}
+                                                        {% if mark.visibility > 0 %}
                                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                                                     <path
                                                                         d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/users/templates/users/movie_list.html b/users/templates/users/movie_list.html
index 71b977ea..81a6de16 100644
--- a/users/templates/users/movie_list.html
+++ b/users/templates/users/movie_list.html
@@ -121,7 +121,7 @@
                                                         <span class="entity-marks__rating-star rating-star"
                                                             data-rating-score="{{ mark.rating | floatformat:"0" }}" style="left: -4px;"></span>
                                                         {% endif %}
-                                                        {% if mark.is_private %}
+                                                        {% if mark.visibility > 0 %}
                                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                                                     <path
                                                                         d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
diff --git a/users/templates/users/music_list.html b/users/templates/users/music_list.html
index 1291588f..a101fe8d 100644
--- a/users/templates/users/music_list.html
+++ b/users/templates/users/music_list.html
@@ -124,7 +124,7 @@
                                                         <span class="entity-marks__rating-star rating-star"
                                                             data-rating-score="{{ mark.rating | floatformat:"0" }}" style="left: -4px;"></span>
                                                         {% endif %}
-                                                        {% if mark.is_private %}
+                                                        {% if mark.visibility > 0 %}
                                                         <span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
                                                                     <path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" />
                                                                 </svg></span>