From f3ae69cd265069d13d35a8cdd48f47f2cceaedc1 Mon Sep 17 00:00:00 2001
From: thislight <l1589002388@gmail.com>
Date: Wed, 6 Nov 2024 19:38:34 +0800
Subject: [PATCH 1/4] typography: fix 'undefined' class

---
 src/material/typography.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/material/typography.tsx b/src/material/typography.tsx
index 40f690d..ddc8cdd 100644
--- a/src/material/typography.tsx
+++ b/src/material/typography.tsx
@@ -43,7 +43,7 @@ export function Typography<T extends AnyElement>(
     <Dynamic
       ref={managed.ref}
       component={managed.component ?? "span"}
-      class={`${managed.class} ${managed.typography}`}
+      class={`${managed.class || ""} ${managed.typography}`}
       {...passthough}
     ></Dynamic>
   );

From d7b27f037f93e386721a0e43fef0f200c5306b80 Mon Sep 17 00:00:00 2001
From: thislight <l1589002388@gmail.com>
Date: Wed, 6 Nov 2024 19:38:53 +0800
Subject: [PATCH 2/4] RegularToot: adjust retoot hint

---
 src/timelines/RegularToot.tsx | 6 ++----
 src/timelines/toot.module.css | 9 ++++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/timelines/RegularToot.tsx b/src/timelines/RegularToot.tsx
index 35809df..8f65cf2 100644
--- a/src/timelines/RegularToot.tsx
+++ b/src/timelines/RegularToot.tsx
@@ -369,7 +369,6 @@ const RegularToot: Component<TootCardProps> = (props) => {
         <Show when={!!status().reblog}>
           <div class={tootStyle.tootRetootGrp}>
             <BoostIcon />
-            <span>
               <Body2
                 ref={(e: { innerHTML: string }) => {
                   createRenderEffect(() => {
@@ -379,9 +378,8 @@ const RegularToot: Component<TootCardProps> = (props) => {
                     );
                   });
                 }}
-              ></Body2>{" "}
-              boosted
-            </span>
+              ></Body2>
+            <span>boosts</span>
           </div>
         </Show>
         <TootAuthorGroup
diff --git a/src/timelines/toot.module.css b/src/timelines/toot.module.css
index ea28a41..10cb412 100644
--- a/src/timelines/toot.module.css
+++ b/src/timelines/toot.module.css
@@ -221,11 +221,14 @@
 }
 
 .tootRetootGrp {
-  display: grid;
-  grid-template-columns: auto 1fr auto;
-  gap: 8px;
+  display: flex;
+  gap: 0.25em;
   margin-bottom: 8px;
   align-items: center;
+
+  > :first-child {
+    margin-right: 0.25em;
+  }
 }
 
 .tootAttachmentGrp {

From 9cb2a1292a77c3ff0670c182feda6dd870dd4fd8 Mon Sep 17 00:00:00 2001
From: thislight <l1589002388@gmail.com>
Date: Wed, 6 Nov 2024 19:55:51 +0800
Subject: [PATCH 3/4] RegularToot: support locked acct

---
 src/timelines/RegularToot.tsx | 6 +++++-
 src/timelines/toot.module.css | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/timelines/RegularToot.tsx b/src/timelines/RegularToot.tsx
index 8f65cf2..cfb963c 100644
--- a/src/timelines/RegularToot.tsx
+++ b/src/timelines/RegularToot.tsx
@@ -21,6 +21,7 @@ import {
   Bookmark,
   Share,
   SmartToySharp,
+  Lock,
 } from "@suid/icons-material";
 import { useTimeSource } from "../platform/timesrc.js";
 import { resolveCustomEmoji } from "../masto/toot.js";
@@ -154,7 +155,10 @@ function TootAuthorGroup(
       <div class={tootStyle.tootAuthorNameGrp}>
         <div class={tootStyle.tootAuthorNamePrimary}>
           <Show when={toot().account.bot}>
-            <SmartToySharp class="bot-mark" aria-label="Bot" />
+            <SmartToySharp class="acct-mark" aria-label="Bot" />
+          </Show>
+          <Show when={toot().account.locked}>
+            <Lock class="acct-mark" aria-label="Locked" />
           </Show>
           <Body2
             component="span"
diff --git a/src/timelines/toot.module.css b/src/timelines/toot.module.css
index 10cb412..69d7ba1 100644
--- a/src/timelines/toot.module.css
+++ b/src/timelines/toot.module.css
@@ -72,8 +72,9 @@
   align-items: center;
   gap: 4px;
 
-  > :global(.bot-mark) {
+  > :global(.acct-mark) {
     font-size: 1.2em;
+    color: var(--tutu-color-secondary-text-on-surface);
   }
 }
 

From 245f10ba5b4e56cab4dafccae3c9fc67ae72e727 Mon Sep 17 00:00:00 2001
From: thislight <l1589002388@gmail.com>
Date: Wed, 6 Nov 2024 19:56:17 +0800
Subject: [PATCH 4/4] Profile: support locked acct

---
 src/profiles/Profile.css |  2 +-
 src/profiles/Profile.tsx | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/profiles/Profile.css b/src/profiles/Profile.css
index 8e24a3c..48f31ae 100644
--- a/src/profiles/Profile.css
+++ b/src/profiles/Profile.css
@@ -53,7 +53,7 @@
     flex-flow: column nowrap;
   }
 
-  .bot-mark {
+  .acct-mark {
     font-size: 1.2em;
   }
 
diff --git a/src/profiles/Profile.tsx b/src/profiles/Profile.tsx
index 5c00c20..caf3cd0 100644
--- a/src/profiles/Profile.tsx
+++ b/src/profiles/Profile.tsx
@@ -33,6 +33,7 @@ import {
   Edit,
   ExpandMore,
   Group,
+  Lock,
   MoreVert,
   OpenInBrowser,
   PersonOff,
@@ -41,7 +42,6 @@ import {
   Share,
   SmartToySharp,
   Subject,
-  Translate,
   Verified,
 } from "@suid/icons-material";
 import { Body2, Title } from "../material/typography";
@@ -372,13 +372,19 @@ const Profile: Component = () => {
       <Menu {...subscribeMenuState}>
         <MenuItem
           onClick={toggleSubscribeHome}
-          aria-details="Subscribe or Unsubscribe this account on your home timeline"
+          aria-label={`${relationship()?.following ? "Unfollow" : "Follow"} on your home timeline`}
         >
           <ListItemAvatar>
             <Avatar src={session().account?.inf?.avatar}></Avatar>
           </ListItemAvatar>
           <ListItemText
-            secondary={relationship()?.following ? "Subscribed" : undefined}
+            secondary={
+              relationship()?.following
+                ? undefined
+                : profile()?.locked
+                  ? "A request will be sent"
+                  : undefined
+            }
           >
             <span ref={useSessionDisplayName}></span>
             <span>'s Home</span>
@@ -408,7 +414,10 @@ const Profile: Component = () => {
           <div class="name-grp">
             <div class="display-name">
               <Show when={profile()?.bot}>
-                <SmartToySharp class="bot-mark" aria-label="Bot" />
+                <SmartToySharp class="acct-mark" aria-label="Bot" />
+              </Show>
+              <Show when={profile()?.locked}>
+                <Lock class="acct-mark" aria-label="Locked" />
               </Show>
               <Body2
                 component="span"