From bcfd6ab3e44697f4df5fbdf8566a7c66fe00a353 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 28 Feb 2025 11:17:18 +0100
Subject: [PATCH 01/12] Add Ruby 3.4 to Mastodon 4.3 test matrix (#34028)
---
.github/actions/setup-ruby/action.yml | 1 +
.github/workflows/test-ruby.yml | 4 ++++
Gemfile.lock | 8 ++++----
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/.github/actions/setup-ruby/action.yml b/.github/actions/setup-ruby/action.yml
index 3e232f134..672a06f9e 100644
--- a/.github/actions/setup-ruby/action.yml
+++ b/.github/actions/setup-ruby/action.yml
@@ -21,3 +21,4 @@ runs:
with:
ruby-version: ${{ inputs.ruby-version }}
bundler-cache: true
+ cache-version: 4.3
diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml
index c05c8333b..6fbf7a7de 100644
--- a/.github/workflows/test-ruby.yml
+++ b/.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:
diff --git a/Gemfile.lock b/Gemfile.lock
index 2c972ae2c..4bad85f1a 100644
--- a/Gemfile.lock
+++ b/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 (= 2.3.3)
+ flatware-rspec (2.3.4)
+ 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
From b73e968641f08ec88d6cfecb50ed318a76fc1f0c Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 25 Nov 2024 10:18:06 +0100
Subject: [PATCH 02/12] Fix username and display name being hidden on narrow
screens in moderation interface (#33064)
---
app/javascript/styles/mastodon/widgets.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index e1e879746..f46706905 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/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;
}
From 1ed1cdba1bbd1b059e434640768c3bbb6d2608ea Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 5 Mar 2025 09:43:31 +0100
Subject: [PATCH 03/12] Fix preview cards under Content Warnings not being
shown in detailed statuses (#34068)
---
.../mastodon/features/status/components/detailed_status.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index 5811efb19..7ad82edb3 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/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')}
/>
);
}
From 7e20ee76957aabffe2a33e9fd5a25f60bb988a1f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 21 Feb 2025 08:48:31 +0100
Subject: [PATCH 04/12] Fix streaming server not filtering unknown-language
posts from public timelines (#33774)
---
streaming/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/streaming/index.js b/streaming/index.js
index 3e362f186..22c606bea 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -651,7 +651,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;
}
From 4228ca614cf74fe81612e3ae9b225439fb1d34d4 Mon Sep 17 00:00:00 2001
From: Renaud Chaput <renchap@gmail.com>
Date: Thu, 6 Mar 2025 11:44:27 +0100
Subject: [PATCH 05/12] Fix processing errors for some HEIF images from iOS 18
(#34086)
---
Dockerfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 8d5045813..bb4e8947a 100644
--- a/Dockerfile
+++ b/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 \
From 62f019252a4bfc7b09432e85e536c5f4dfcf369e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 6 Mar 2025 11:00:33 +0100
Subject: [PATCH 06/12] Change hashtag suggestion to prefer personal history
capitalization (#34070)
---
app/javascript/mastodon/reducers/compose.js | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 4e16c5b35..bfa2ec6a0 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/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 })));
- } else {
- return suggestions;
+ suggestions = suggestions.concat(localTags.slice(0, 4 - suggestions.length).toJS().map(tag => ({ type: 'hashtag', name: tag })));
}
+
+ // 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 }) => {
From 0c2fa2aab426f481f4c871e0eec695c3ed1f9fbb Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@noeldemartin.com>
Date: Tue, 7 Jan 2025 16:40:24 +0100
Subject: [PATCH 07/12] Comment sidekiq build in docker compose (#33483)
---
docker-compose.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index ddc0ded73..dbc8d563f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -100,7 +100,8 @@ 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
+ # build: .
image: ghcr.io/mastodon/mastodon:v4.3.4
restart: always
env_file: .env.production
From a8613b7cda61e46209cace4379a9dea81f45529e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 7 Mar 2025 10:14:31 +0100
Subject: [PATCH 08/12] Bump version to v4.3.5
---
CHANGELOG.md | 13 +++++++++++++
docker-compose.yml | 6 +++---
lib/mastodon/version.rb | 2 +-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7103f059c..a092daaff 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/docker-compose.yml b/docker-compose.yml
index dbc8d563f..c0b9721ed 100644
--- a/docker-compose.yml
+++ b/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
@@ -102,7 +102,7 @@ services:
sidekiq:
# 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 sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 7d77328e2..ef2d921d6 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 4
+ 5
end
def default_prerelease
From d01e407177afd4b9cfdb89ca764eb6963936a99f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Mon, 10 Mar 2025 15:27:43 +0100
Subject: [PATCH 09/12] Fix Stoplight errors when using `REDIS_NAMESPACE`
(#34126)
---
lib/redis/namespace_extensions.rb | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/redis/namespace_extensions.rb b/lib/redis/namespace_extensions.rb
index 9af59c296..2be738b04 100644
--- a/lib/redis/namespace_extensions.rb
+++ b/lib/redis/namespace_extensions.rb
@@ -5,6 +5,10 @@ class Redis
def exists?(...)
call_with_namespace('exists?', ...)
end
+
+ def with
+ yield self
+ end
end
end
From e84031ea97a56634bd337c4d92e83355906d767d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 13 Mar 2025 09:22:13 +0100
Subject: [PATCH 10/12] Update dependency `rack`
---
Gemfile.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 4bad85f1a..616a6c86f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -619,7 +619,7 @@ GEM
activesupport (>= 3.0.0)
raabro (1.4.0)
racc (1.8.1)
- rack (2.2.11)
+ rack (2.2.13)
rack-attack (6.7.0)
rack (>= 1.0, < 4)
rack-cors (2.0.2)
From c79c9e8c426b3dcce94fab9320d035672b52a34e Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 13 Mar 2025 09:37:45 +0100
Subject: [PATCH 11/12] Update dependency `omniauth-saml`
---
Gemfile.lock | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 616a6c86f..cdd6b15dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -464,7 +464,7 @@ GEM
oj (3.16.6)
bigdecimal (>= 3.0)
ostruct (>= 0.2)
- omniauth (2.1.2)
+ omniauth (2.1.3)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
@@ -475,9 +475,9 @@ GEM
omniauth-rails_csrf_protection (1.0.2)
actionpack (>= 4.2)
omniauth (~> 2.0)
- omniauth-saml (2.2.1)
+ omniauth-saml (2.2.3)
omniauth (~> 2.1)
- ruby-saml (~> 1.17)
+ ruby-saml (~> 1.18)
omniauth_openid_connect (0.6.1)
omniauth (>= 1.9, < 3)
openid_connect (~> 1.1)
@@ -767,7 +767,7 @@ GEM
rubocop-rspec (~> 3, >= 3.0.1)
ruby-prof (1.7.0)
ruby-progressbar (1.13.0)
- ruby-saml (1.17.0)
+ ruby-saml (1.18.0)
nokogiri (>= 1.13.10)
rexml
ruby-vips (2.2.3)
From cdcd77ebff3ff2093d47dbd622df763e88eaa731 Mon Sep 17 00:00:00 2001
From: David Roetzel <david@roetzel.de>
Date: Thu, 13 Mar 2025 13:32:38 +0100
Subject: [PATCH 12/12] Bump version to v4.3.6
---
CHANGELOG.md | 11 +++++++++++
docker-compose.yml | 6 +++---
lib/mastodon/version.rb | 2 +-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a092daaff..c05fdd679 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
All notable changes to this project will be documented in this file.
+## [4.3.6] - 2025-03-13
+
+### Security
+
+- Update dependency `omniauth-saml`
+- Update dependency `rack`
+
+### Fixed
+
+- Fix Stoplight errors when using `REDIS_NAMESPACE` (#34126 by @ClearlyClaire)
+
## [4.3.5] - 2025-03-10
### Changed
diff --git a/docker-compose.yml b/docker-compose.yml
index c0b9721ed..5158342a4 100644
--- a/docker-compose.yml
+++ b/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.5
+ image: ghcr.io/mastodon/mastodon:v4.3.6
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.5
+ image: ghcr.io/mastodon/mastodon-streaming:v4.3.6
restart: always
env_file: .env.production
command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
sidekiq:
# 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.5
+ image: ghcr.io/mastodon/mastodon:v4.3.6
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index ef2d921d6..58a99ab54 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -13,7 +13,7 @@ module Mastodon
end
def patch
- 5
+ 6
end
def default_prerelease