diff --git a/journal/templates/comment.html b/journal/templates/comment.html index b316f3f9..47b0e6a1 100644 --- a/journal/templates/comment.html +++ b/journal/templates/comment.html @@ -25,7 +25,7 @@
- +
diff --git a/journal/templates/mark.html b/journal/templates/mark.html index 37b4ef25..a4641fbb 100644 --- a/journal/templates/mark.html +++ b/journal/templates/mark.html @@ -45,7 +45,7 @@
- +
diff --git a/users/data.py b/users/data.py index ab868988..ee3cec75 100644 --- a/users/data.py +++ b/users/data.py @@ -38,6 +38,7 @@ def preferences(request): preference = request.user.get_preference() if request.method == "POST": preference.default_visibility = int(request.POST.get("default_visibility")) + preference.default_no_share = bool(request.POST.get("default_no_share")) preference.classic_homepage = bool(request.POST.get("classic_homepage")) preference.mastodon_publish_public = bool( request.POST.get("mastodon_publish_public") @@ -49,6 +50,7 @@ def preferences(request): preference.save( update_fields=[ "default_visibility", + "default_no_share", "classic_homepage", "mastodon_publish_public", "mastodon_append_tag", diff --git a/users/migrations/0002_preference_default_no_share.py b/users/migrations/0002_preference_default_no_share.py new file mode 100644 index 00000000..88d1ef28 --- /dev/null +++ b/users/migrations/0002_preference_default_no_share.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.16 on 2023-02-12 13:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("users", "0001_initial"), + ] + + operations = [ + migrations.AddField( + model_name="preference", + name="default_no_share", + field=models.BooleanField(default=False), + ), + ] diff --git a/users/models.py b/users/models.py index eda71a74..21264dbe 100644 --- a/users/models.py +++ b/users/models.py @@ -214,6 +214,7 @@ class Preference(models.Model): import_status = models.JSONField( blank=True, null=True, encoder=DjangoJSONEncoder, default=dict ) + default_no_share = models.BooleanField(default=False) default_visibility = models.PositiveSmallIntegerField(default=0) classic_homepage = models.BooleanField(null=False, default=False) mastodon_publish_public = models.BooleanField(null=False, default=False) diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html index df449039..96023589 100644 --- a/users/templates/users/preferences.html +++ b/users/templates/users/preferences.html @@ -69,8 +69,8 @@
{% trans '在联邦网络上以公开方式分享的帖文是否发布到公共时间轴上:' %}
- - + +


{% trans '在联邦网络上分享帖文时附加标签:' %} @@ -78,6 +78,12 @@
+
+ {% trans '默认不分享到联邦网络:' %} +
+ + +