From 51d403d3c075a6f57d5d2687d8459044c3c5e045 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 11 Jun 2022 00:31:33 -0400
Subject: [PATCH] show timeline and profile link on nav bar

---
 common/templates/partial/_navbar.html  | 3 ++-
 common/views.py                        | 4 ++--
 users/templates/users/preferences.html | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/templates/partial/_navbar.html b/common/templates/partial/_navbar.html
index 660bba39..5af05c18 100644
--- a/common/templates/partial/_navbar.html
+++ b/common/templates/partial/_navbar.html
@@ -26,7 +26,8 @@
                     
                     {% if request.user.is_authenticated %}
          
-                        <a class="navbar__link" href="{% url 'common:home' %}">{% trans '首页' %}</a>
+                        <a class="navbar__link" href="{% url 'timeline:timeline' %}">{% trans '动态' %}</a>
+                        <a class="navbar__link" href="{% url 'users:home' request.user.mastodon_username %}">{% trans '主页' %}</a>
                         <a class="navbar__link" id="logoutLink" href="{% url 'users:data' %}">{% trans '数据' %}</a>
                         <a class="navbar__link" id="logoutLink" href="{% url 'users:preferences' %}">{% trans '设置' %}</a>
                         <a class="navbar__link" id="logoutLink" href="{% url 'users:logout' %}">{% trans '登出' %}</a>
diff --git a/common/views.py b/common/views.py
index befe54d8..bba71936 100644
--- a/common/views.py
+++ b/common/views.py
@@ -35,9 +35,9 @@ logger = logging.getLogger(__name__)
 @login_required
 def home(request):
     if request.user.get_preference().classic_homepage:
-        return user_home(request, request.user.id)
+        return redirect(reverse("users:home", args=[request.user.mastodon_username]))
     else:
-        return user_timeline(request)
+        return redirect(reverse("timeline:timeline"))
 
 
 @login_required
diff --git a/users/templates/users/preferences.html b/users/templates/users/preferences.html
index 4e83cec0..6a0c115a 100644
--- a/users/templates/users/preferences.html
+++ b/users/templates/users/preferences.html
@@ -43,10 +43,10 @@
                                                  仅自己</label>
                                             </div>
                                             <br>
-                                            <span>{% trans '使用个人主页作为首页：' %}</span>
+                                            <span>{% trans '登录后显示个人主页：' %}</span>
                                             <div class="import-panel__checkbox import-panel__checkbox--last">
                                                 <input type="checkbox" name="classic_homepage" id="classic_homepage" {%if request.user.preference.classic_homepage %}checked{% endif %}>
-                                                <label for="classic_homepage">{% trans '默认启用时间轴视图作为首页，如果希望使用原版风格首页可选中此处' %}</label>
+                                                <label for="classic_homepage">{% trans '默认登录后显示好友动态，如果希望登录后显示原版风格个人主页可选中此处' %}</label>
                                             </div>
                                         </div>
                                     </div>