Merge commit '629bb74451242060298c6fb305c5337002379cc2' into glitch-soc/merge-upstream

app/javascript/mastodon/features/about/components/rules.tsx

@@ -29,7 +29,7 @@ interface BaseRule {
 
 interface Rule extends BaseRule {
   id: string;
-  translations: Record<string, BaseRule>;
+  translations?: Record<string, BaseRule>;
 }
 
 export const RulesSection: FC<RulesSectionProps> = ({ isLoading = false }) => {
@@ -113,15 +113,23 @@ const rulesSelector = createSelector(
   (rules, locale): Rule[] => {
     return rules.map((rule) => {
       const translations = rule.translations;
-      if (translations[locale]) {
-        rule.text = translations[locale].text;
-        rule.hint = translations[locale].hint;
+
+      // Handle cached responses from earlier versions
+      if (!translations) {
+        return rule;
       }
+
       const partialLocale = locale.split('-')[0];
       if (partialLocale && translations[partialLocale]) {
         rule.text = translations[partialLocale].text;
         rule.hint = translations[partialLocale].hint;
       }
+
+      if (translations[locale]) {
+        rule.text = translations[locale].text;
+        rule.hint = translations[locale].hint;
+      }
+
       return rule;
     });
   },

app/javascript/mastodon/features/account_timeline/index.jsx

@@ -135,7 +135,7 @@ class AccountTimeline extends ImmutablePureComponent {
   };
 
   render () {
-    const { accountId, statusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl } = this.props;
+    const { accountId, statusIds, isLoading, hasMore, blockedBy, suspended, isAccount, hidden, multiColumn, remote, remoteUrl, params: { tagged } } = this.props;
 
     if (isLoading && statusIds.isEmpty()) {
       return (
@@ -172,8 +172,8 @@ class AccountTimeline extends ImmutablePureComponent {
         <StatusList
           prepend={
             <>
-              <AccountHeader accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={this.props.params.tagged} />
-              {!forceEmptyState && <FeaturedCarousel accountId={this.props.accountId} />}
+              <AccountHeader accountId={this.props.accountId} hideTabs={forceEmptyState} tagged={tagged} />
+              {!forceEmptyState && <FeaturedCarousel accountId={this.props.accountId} tagged={tagged} />}
             </>
         }
           alwaysPrepend

app/javascript/mastodon/features/explore/components/story.jsx

@@ -66,7 +66,7 @@ export const Story = ({
       <a className='story__thumbnail' href={url} target='blank' rel='noopener'>
         {thumbnail ? (
           <>
-            <div className={classNames('story__thumbnail__preview', { 'story__thumbnail__preview--hidden': thumbnailLoaded })}><Blurhash hash={blurhash} /></div>
+            {!thumbnailLoaded && <Blurhash hash={blurhash} className='story__thumbnail__preview' />}
             <img src={thumbnail} onLoad={handleImageLoad} alt={thumbnailDescription} title={thumbnailDescription} lang={lang} />
           </>
         ) : <Skeleton />}