add warning for conflict settings

common/static/scss/_common.scss

@@ -70,6 +70,14 @@ details {
   margin: 0;
 }
 
+.invalid {
+  color: var(--pico-del-color);
+}
+
+.valid {
+  color: var(--pico-ins-color);
+}
+
 .empty {
   font-style: italic;
   font-size: 80%;

common/static/scss/_layout.scss

@@ -31,7 +31,7 @@
 
 .item-page {
   main {
-    width: 100vw;
+    // width: 100vw;
     padding: calc(1*var(--pico-spacing)) calc(3*var(--pico-spacing));
 
     .middle {
@@ -78,7 +78,7 @@
 .classic-page,
 .feed-page {
   main {
-    width: 100vw;
+    // width: 100vw;
     display: grid;
     grid-template-columns: 64% 32%;
     grid-template-areas: "main aside";

journal/templates/mark.html

@@ -66,7 +66,7 @@
             <textarea name="text"
                       rows="5"
                       autofocus
-                      placeholder="提示： 善用 &gt;!文字!&lt; 标记可隐藏剧透； 超过360字可能无法分享到联邦宇宙实例时间线。"
+                      placeholder="提示： 善用 &gt;!文字!&lt; 标记可隐藏剧透； 超过360字可能无法分享到联邦宇宙实例时间轴。"
                       id="id_text">{{ mark.comment_text|default:"" }}</textarea>
           </fieldset>
         </div>

journal/views/wrapped.py

@@ -2,11 +2,13 @@ import base64
 import calendar
 from typing import Any
 
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db.models import Count, F
 from django.db.models.functions import ExtractMonth
 from django.http import HttpRequest, HttpResponseRedirect
 from django.http.response import HttpResponse
+from django.utils.translation import gettext_lazy as _
 from django.views.generic.base import TemplateView
 
 from catalog.models import (
@@ -134,4 +136,5 @@ class WrappedShareView(LoginRequiredMixin, TemplateView):
             )
         elif post:
             boost_toot_later(user, post.url)
+        messages.add_message(request, messages.INFO, _("已分享到时间轴。"))
         return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/"))

users/templates/users/account.html

@@ -97,6 +97,9 @@
             <form action="{% url 'users:profile' %}?next={{ request.path }}"
                   method="post"
                   enctype="multipart/form-data">
+              {% if request.user.mastodon_acct and not request.user.preference.mastodon_skip_userinfo %}
+                <small class="invalid">请先关闭「自动同步用户昵称等基本信息」设置，否则这里的设置会在同步时被覆盖。</small>
+              {% endif %}
               {% include "_field.html" with field=profile_form.name %}
               {% include "_field.html" with field=profile_form.summary %}
               {% include "_field.html" with field=profile_form.icon %}