Merge pull request #2990 from glitch-soc/glitch-soc/merge-4.3

Merge upstream changes up to a8613b7cda in stable-4.3

.github/actions/setup-ruby/action.yml

@@ -21,3 +21,4 @@ runs:
       with:
         ruby-version: ${{ inputs.ruby-version }}
         bundler-cache: true
+        cache-version: 4.3

.github/workflows/test-ruby.yml

@@ -127,6 +127,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
     steps:
       - uses: actions/checkout@v4
 
@@ -229,6 +230,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
     steps:
       - uses: actions/checkout@v4
 
@@ -308,6 +310,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
 
     steps:
       - uses: actions/checkout@v4
@@ -425,6 +428,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
         search-image:
           - docker.elastic.co/elasticsearch/elasticsearch:7.17.13
         include:

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.3.5] - 2025-03-10
+
+### Changed
+
+- Change hashtag suggestion to prefer personal history capitalization (#34070 by @ClearlyClaire)
+
+### Fixed
+
+- Fix processing errors for some HEIF images from iOS 18 (#34086 by @renchap)
+- Fix streaming server not filtering unknown-language posts from public timelines (#33774 by @ClearlyClaire)
+- Fix preview cards under Content Warnings not being shown in detailed statuses (#34068 by @ClearlyClaire)
+- Fix username and display name being hidden on narrow screens in moderation interface (#33064 by @ClearlyClaire)
+
 ## [4.3.4] - 2025-02-27
 
 ### Security

Dockerfile

@@ -92,6 +92,9 @@ RUN \
 # Set /opt/mastodon as working directory
 WORKDIR /opt/mastodon
 
+# Add backport repository for some specific packages where we need the latest version
+RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list
+
 # hadolint ignore=DL3008,DL3005
 RUN \
 # Mount Apt cache and lib directories from Docker buildx caches
@@ -161,7 +164,7 @@ RUN \
     libexif-dev \
     libexpat1-dev \
     libgirepository1.0-dev \
-    libheif-dev \
+    libheif-dev/bookworm-backports \
     libimagequant-dev \
     libjpeg62-turbo-dev \
     liblcms2-dev \
@@ -344,7 +347,7 @@ RUN \
   # libvips components
     libcgif0 \
     libexif12 \
-    libheif1 \
+    libheif1/bookworm-backports \
     libimagequant0 \
     libjpeg62-turbo \
     liblcms2-2 \

Gemfile.lock

@@ -270,11 +270,11 @@ GEM
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
-    flatware (2.3.3)
+    flatware (2.3.4)
       drb
       thor (< 2.0)
-    flatware-rspec (2.3.3)
+    flatware-rspec (2.3.4)
-      flatware (= 2.3.3)
+      flatware (= 2.3.4)
       rspec (>= 3.6)
     fog-core (2.5.0)
       builder
@@ -1065,4 +1065,4 @@ RUBY VERSION
    ruby 3.3.4p94
 
 BUNDLED WITH
-   2.5.18
+   2.6.5

app/javascript/flavours/glitch/features/status/components/detailed_status.tsx

@@ -273,12 +273,12 @@ export const DetailedStatus: React.FC<{
       );
       mediaIcons.push('video-camera');
     }
-  } else if (status.get('spoiler_text').length === 0) {
+  } else if (status.get('card')) {
     media.push(
       <Card
         sensitive={status.get('sensitive')}
         onOpenMedia={onOpenMedia}
-        card={status.get('card', null)}
+        card={status.get('card')}
       />,
     );
     mediaIcons.push('link');

app/javascript/flavours/glitch/reducers/compose.js

@@ -330,12 +330,26 @@ const expiresInFromExpiresAt = expires_at => {
 
 const mergeLocalHashtagResults = (suggestions, prefix, tagHistory) => {
   prefix = prefix.toLowerCase();
+
   if (suggestions.length < 4) {
     const localTags = tagHistory.filter(tag => tag.toLowerCase().startsWith(prefix) && !suggestions.some(suggestion => suggestion.type === 'hashtag' && suggestion.name.toLowerCase() === tag.toLowerCase()));
-    return suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
+    suggestions = suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
-  } else {
-    return suggestions;
   }
+
+  // Prefer capitalization from personal history, unless personal history is all lower-case
+  const fixSuggestionCapitalization = (suggestion) => {
+    if (suggestion.type !== 'hashtag')
+      return suggestion;
+
+    const tagFromHistory = tagHistory.find((tag) => tag.localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) === 0);
+
+    if (!tagFromHistory || tagFromHistory.toLowerCase() === tagFromHistory)
+      return suggestion;
+
+    return { ...suggestion, name: tagFromHistory };
+  };
+
+  return suggestions.map(fixSuggestionCapitalization);
 };
 
 const normalizeSuggestions = (state, { accounts, emojis, tags, token }) => {

app/javascript/flavours/glitch/styles/components.scss

@@ -7640,6 +7640,8 @@ img.modal-warning {
   }
 
   &--layout-3 {
+    min-height: calc(64px * 2 + 8px);
+
     & > .media-gallery__item:nth-child(1) {
       border-end-end-radius: 0;
       border-start-end-radius: 0;
@@ -7659,6 +7661,8 @@ img.modal-warning {
   }
 
   &--layout-4 {
+    min-height: calc(64px * 2 + 8px);
+
     & > .media-gallery__item:nth-child(1) {
       border-end-end-radius: 0;
       border-start-end-radius: 0;

app/javascript/flavours/glitch/styles/widgets.scss

@@ -82,9 +82,9 @@
 
 .accounts-table {
   width: 100%;
-  table-layout: fixed;
 
   .account {
+    max-width: calc(56px + 30ch);
     padding: 0;
     border: 0;
   }

app/javascript/mastodon/features/status/components/detailed_status.tsx

@@ -219,12 +219,12 @@ export const DetailedStatus: React.FC<{
         />
       );
     }
-  } else if (status.get('spoiler_text').length === 0) {
+  } else if (status.get('card')) {
     media = (
       <Card
         sensitive={status.get('sensitive')}
         onOpenMedia={onOpenMedia}
-        card={status.get('card', null)}
+        card={status.get('card')}
       />
     );
   }

app/javascript/mastodon/reducers/compose.js

@@ -254,12 +254,26 @@ const expiresInFromExpiresAt = expires_at => {
 
 const mergeLocalHashtagResults = (suggestions, prefix, tagHistory) => {
   prefix = prefix.toLowerCase();
+
   if (suggestions.length < 4) {
     const localTags = tagHistory.filter(tag => tag.toLowerCase().startsWith(prefix) && !suggestions.some(suggestion => suggestion.type === 'hashtag' && suggestion.name.toLowerCase() === tag.toLowerCase()));
-    return suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
+    suggestions = suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
-  } else {
-    return suggestions;
   }
+
+  // Prefer capitalization from personal history, unless personal history is all lower-case
+  const fixSuggestionCapitalization = (suggestion) => {
+    if (suggestion.type !== 'hashtag')
+      return suggestion;
+
+    const tagFromHistory = tagHistory.find((tag) => tag.localeCompare(suggestion.name, undefined, { sensitivity: 'accent' }) === 0);
+
+    if (!tagFromHistory || tagFromHistory.toLowerCase() === tagFromHistory)
+      return suggestion;
+
+    return { ...suggestion, name: tagFromHistory };
+  };
+
+  return suggestions.map(fixSuggestionCapitalization);
 };
 
 const normalizeSuggestions = (state, { accounts, emojis, tags, token }) => {

app/javascript/styles/mastodon/widgets.scss

@@ -82,9 +82,9 @@
 
 .accounts-table {
   width: 100%;
-  table-layout: fixed;
 
   .account {
+    max-width: calc(56px + 30ch);
     padding: 0;
     border: 0;
   }

docker-compose.yml

@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.4
+    image: ghcr.io/mastodon/mastodon:v4.3.5
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.4
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.5
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -100,8 +100,9 @@ services:
       - redis
 
   sidekiq:
-    build: .
+    # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
-    image: ghcr.io/mastodon/mastodon:v4.3.4
+    # build: .
+    image: ghcr.io/mastodon/mastodon:v4.3.5
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq

lib/mastodon/version.rb

@@ -13,7 +13,7 @@ module Mastodon
     end
 
     def patch
-      4
+      5
     end
 
     def default_prerelease

streaming/index.js

@@ -658,7 +658,7 @@ const startServer = async () => {
       // filtering of statuses:
 
       // Filter based on language:
-      if (Array.isArray(req.chosenLanguages) && payload.language !== null && req.chosenLanguages.indexOf(payload.language) === -1) {
+      if (Array.isArray(req.chosenLanguages) && req.chosenLanguages.indexOf(payload.language) === -1) {
         log.debug(`Message ${payload.id} filtered by language (${payload.language})`);
         return;
       }