Merge pull request #446 from cheeaun/main

Update from main

src/components/account-block.jsx

@@ -62,6 +62,7 @@ function AccountBlock({
     group,
     followersCount,
     createdAt,
+    locked,
   } = account;
   let [_, acct1, acct2] = acct.match(/([^@]+)(@.+)/i) || [, acct];
   if (accountInstance) {
@@ -123,6 +124,12 @@ function AccountBlock({
           @{acct1}
           <wbr />
           {acct2}
+          {locked && (
+            <>
+              {' '}
+              <Icon icon="lock" size="s" alt="Locked" />
+            </>
+          )}
         </span>
         {showActivity && (
           <>

src/components/report-modal.jsx

@@ -232,8 +232,8 @@ function ReportModal({ account, post, onClose }) {
               disabled={uiState === 'loading'}
             />
           </section>
-          <section>
+          {!!domain && domain !== currentDomain && (
-            {domain !== currentDomain && (
+            <section>
               <p>
                 <label>
                   <input
@@ -247,8 +247,8 @@ function ReportModal({ account, post, onClose }) {
                   </span>
                 </label>
               </p>
-            )}
+            </section>
-          </section>
+          )}
           <footer>
             <button type="submit" disabled={uiState === 'loading'}>
               Send Report

src/components/search-form.jsx

@@ -73,7 +73,7 @@ const SearchForm = forwardRef((props, ref) => {
         autocomplete="off"
         autocorrect="off"
         autocapitalize="off"
-        spellcheck="false"
+        spellCheck="false"
         onSearch={(e) => {
           if (!e.target.value) {
             setSearchParams({});

src/components/shortcuts-settings.jsx

@@ -671,7 +671,7 @@ function ShortcutForm({
                       }
                       autocorrect="off"
                       autocapitalize="off"
-                      spellcheck={false}
+                      spellCheck={false}
                       pattern={pattern}
                     />
                     {currentType === 'hashtag' &&

src/components/status.jsx

@@ -947,7 +947,7 @@ function Status({
           }}
         >
           <Icon icon="code" />
-          <span>Embed</span>
+          <span>Embed post</span>
         </MenuItem>
       )}
       {(isSelf || mentionSelf) && <MenuDivider />}

src/pages/catchup.jsx

@@ -32,12 +32,12 @@ import { oklab2rgb, rgb2oklab } from '../utils/color-utils';
 import db from '../utils/db';
 import emojifyText from '../utils/emojify-text';
 import { isFiltered } from '../utils/filters';
-import getHTMLText from '../utils/getHTMLText';
 import htmlContentLength from '../utils/html-content-length';
 import niceDateTime from '../utils/nice-date-time';
 import shortenNumber from '../utils/shorten-number';
 import showToast from '../utils/show-toast';
 import states, { statusKey } from '../utils/states';
+import statusPeek from '../utils/status-peek';
 import store from '../utils/store';
 import { getCurrentAccountNS } from '../utils/store-utils';
 import { assignFollowedTags } from '../utils/timeline-utils';
@@ -1484,7 +1484,7 @@ function PostPeek({ post, filterInfo }) {
   const isThread =
     (inReplyToId && inReplyToAccountId === account.id) || !!_thread;
   const showMedia = !spoilerText && !sensitive;
-  const postText = content ? getHTMLText(content) : '';
+  const postText = content ? statusPeek(post) : '';
 
   return (
     <div class="post-peek" title={!spoilerText ? postText : ''}>
@@ -1518,19 +1518,27 @@ function PostPeek({ post, filterInfo }) {
                 <span class="post-peek-tag post-peek-thread">Thread</span>{' '}
               </>
             )}
-            {content ? (
+            {!!content && (
               <div
                 dangerouslySetInnerHTML={{
                   __html: emojifyText(content, emojis),
                 }}
               />
-            ) : mediaAttachments?.length === 1 &&
+            )}
-              mediaAttachments[0].description ? (
+            {!!poll?.options?.length &&
-              <>
+              poll.options.map((o) => (
-                <span class="post-peek-tag post-peek-alt">ALT</span>{' '}
+                <div>
-                <div>{mediaAttachments[0].description}</div>
+                  {poll.multiple ? '▪️' : '•'} {o.title}
-              </>
+                </div>
-            ) : null}
+              ))}
+            {!content &&
+              mediaAttachments?.length === 1 &&
+              mediaAttachments[0].description && (
+                <>
+                  <span class="post-peek-tag post-peek-alt">ALT</span>{' '}
+                  <div>{mediaAttachments[0].description}</div>
+                </>
+              )}
           </div>
         )}
       </span>

src/pages/hashtag.jsx

@@ -285,7 +285,7 @@ function Hashtags({ media: mediaView, columnMode, ...props }) {
                   required
                   autocorrect="off"
                   autocapitalize="off"
-                  spellcheck={false}
+                  spellCheck={false}
                   // no spaces, no hashtags
                   pattern="[^#][^\s#]+[^#]"
                   disabled={reachLimit}

src/pages/login.jsx

@@ -160,7 +160,7 @@ function Login() {
             autocorrect="off"
             autocapitalize="off"
             autocomplete="off"
-            spellcheck={false}
+            spellCheck={false}
             placeholder="instance domain"
             onInput={(e) => {
               setInstanceText(e.target.value);

src/pages/notifications.jsx

@@ -221,6 +221,9 @@ function Notifications({ columnMode }) {
         lastHiddenTime.current = Date.now();
       }
       unsub = subscribeKey(states, 'notificationsShowNew', (v) => {
+        if (uiState === 'loading') {
+          return;
+        }
         if (v) {
           loadUpdates();
         }

src/utils/status-peek.jsx

@@ -9,8 +9,10 @@ function statusPeek(status) {
     text += getHTMLText(content);
   }
   text = text.trim();
-  if (poll) {
+  if (poll?.options?.length) {
-    text += ' 📊';
+    text += `\n\n📊:\n${poll.options
+      .map((o) => `${poll.multiple ? '▪️' : '•'} ${o.title}`)
+      .join('\n')}`;
   }
   if (mediaAttachments?.length) {
     text +=