From 1103ebdc550265da114b8eb92ed947bfc8bfbc53 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 16 Feb 2026 03:24:39 -0500 Subject: [PATCH 1/2] Capture output in `cli/emoji` spec (#37861) --- spec/lib/mastodon/cli/emoji_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/lib/mastodon/cli/emoji_spec.rb b/spec/lib/mastodon/cli/emoji_spec.rb index b21c533e97..c257bdf792 100644 --- a/spec/lib/mastodon/cli/emoji_spec.rb +++ b/spec/lib/mastodon/cli/emoji_spec.rb @@ -46,7 +46,8 @@ RSpec.describe Mastodon::CLI::Emoji do it 'reports a successful purge' do expect { subject } - .to change { CustomEmoji.by_domain_and_subdomains(blocked_domain).count }.to(0) + .to output_results('OK') + .and change { CustomEmoji.by_domain_and_subdomains(blocked_domain).count }.to(0) .and change { CustomEmoji.by_domain_and_subdomains('evil.org').count }.to(0) .and not_change { CustomEmoji.by_domain_and_subdomains(silenced_domain).count } .and(not_change { CustomEmoji.local.count }) From ab872f28b9ff8f09026461ed4874070f4e62be84 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 24 Feb 2026 14:55:18 +0100 Subject: [PATCH 2/2] Bump version to v4.5.7 (#37963) --- CHANGELOG.md | 20 ++++++++++++++++++++ docker-compose.yml | 6 +++--- lib/mastodon/version.rb | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfbc450d74..c6c0ff20d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ All notable changes to this project will be documented in this file. +## [4.5.7] - 2026-02-24 + +### Security + +- Reject unconfirmed FASPs (#37926 by @oneiros, [GHSA-qgmm-vr4c-ggjg](https://github.com/mastodon/mastodon/security/advisories/GHSA-qgmm-vr4c-ggjg)) +- Re-use custom socket class for FASP requests (#37925 by @oneiros, [GHSA-46w6-g98f-wxqm](https://github.com/mastodon/mastodon/security/advisories/GHSA-46w6-g98f-wxqm)) + +### Added + +- Add `--suspended-only` option to `tootctl emoji purge` (#37828 and #37861 by @ClearlyClaire and @mjankowski) + +### Fixed + +- Fix emoji data not being properly cached (#37858 by @ChaosExAnima) +- Fix delete & redraft of pending posts (#37839 by @ClearlyClaire) +- Fix processing separate key documents without the ActivityStreams context (#37826 by @ClearlyClaire) +- Fix custom emojis not being purged on domain suspension (#37808 by @ClearlyClaire) +- Fix users without special permissions being able to stream disabled timelines (#37791 by @ClearlyClaire) +- Fix processing of object updates with duplicate hashtags (#37756 by @ClearlyClaire) + ## [4.5.6] - 2026-02-03 ### Security diff --git a/docker-compose.yml b/docker-compose.yml index caff99be16..b9c7fb79e5 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.5.6 + image: ghcr.io/mastodon/mastodon:v4.5.7 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.5.6 + image: ghcr.io/mastodon/mastodon-streaming:v4.5.7 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.5.6 + image: ghcr.io/mastodon/mastodon:v4.5.7 restart: always env_file: .env.production command: bundle exec sidekiq diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 9a7415aa8c..a216f417bc 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 6 + 7 end def default_prerelease