From c77158c8b7eac88ade85392903e294765097fee9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 2 Jun 2025 14:21:31 +0200 Subject: [PATCH 1/3] Fix nested buttons in search popout in web UI (#34871) --- app/javascript/mastodon/actions/search.ts | 9 +++++++-- .../mastodon/features/compose/components/search.tsx | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/actions/search.ts b/app/javascript/mastodon/actions/search.ts index 13a4ee4432..1e57c30715 100644 --- a/app/javascript/mastodon/actions/search.ts +++ b/app/javascript/mastodon/actions/search.ts @@ -121,10 +121,15 @@ export const clickSearchResult = createAppAsyncThunk( export const forgetSearchResult = createAppAsyncThunk( 'search/forgetResult', - (q: string, { dispatch, getState }) => { + ( + { q, type }: { q: string; type?: RecentSearchType }, + { dispatch, getState }, + ) => { const previous = getState().search.recent; const me = getState().meta.get('me') as string; - const current = previous.filter((result) => result.q !== q); + const current = previous.filter( + (result) => result.q !== q || result.type !== type, + ); searchHistory.set(me, current); dispatch(updateSearchHistory(current)); diff --git a/app/javascript/mastodon/features/compose/components/search.tsx b/app/javascript/mastodon/features/compose/components/search.tsx index 84e11e44b5..2186ff36ab 100644 --- a/app/javascript/mastodon/features/compose/components/search.tsx +++ b/app/javascript/mastodon/features/compose/components/search.tsx @@ -221,7 +221,7 @@ export const Search: React.FC<{ }, forget: (e) => { e.stopPropagation(); - void dispatch(forgetSearchResult(search.q)); + void dispatch(forgetSearchResult(search)); }, })); @@ -497,8 +497,10 @@ export const Search: React.FC<{
{recentOptions.length > 0 ? ( recentOptions.map(({ label, key, action, forget }, i) => ( - - +
)) ) : (
From d4bbe8b719bdfa713e89070e35f5144eaa723bd4 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 2 Jun 2025 15:38:47 +0200 Subject: [PATCH 2/3] Fix blocked accounts not being automatically removed from trending statuses (#34891) --- app/models/trends/statuses.rb | 10 +++++++++- app/services/suspend_account_service.rb | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb index 1a41eb9e9a..c85b0170fd 100644 --- a/app/models/trends/statuses.rb +++ b/app/models/trends/statuses.rb @@ -89,7 +89,15 @@ class Trends::Statuses < Trends::Base private def eligible?(status) - status.created_at.past? && status.public_visibility? && status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language) + status.created_at.past? && + status.public_visibility? && + status.account.discoverable? && + !status.account.silenced? && + !status.account.sensitized? && + status.spoiler_text.blank? && + !status.sensitive? && + !status.reply? && + valid_locale?(status.language) end def calculate_scores(statuses, at_time) diff --git a/app/services/suspend_account_service.rb b/app/services/suspend_account_service.rb index 2de9cd250f..1b9d051b38 100644 --- a/app/services/suspend_account_service.rb +++ b/app/services/suspend_account_service.rb @@ -15,6 +15,7 @@ class SuspendAccountService < BaseService unmerge_from_home_timelines! unmerge_from_list_timelines! privatize_media_attachments! + remove_from_trends! end private @@ -101,6 +102,10 @@ class SuspendAccountService < BaseService end end + def remove_from_trends! + StatusTrend.where(account: @account).delete_all + end + def signed_activity_json @signed_activity_json ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account)) end From 8224178e8ca9746f97ce341179d2c636fa22a082 Mon Sep 17 00:00:00 2001 From: Claire Date: Mon, 2 Jun 2025 15:51:27 +0200 Subject: [PATCH 3/3] Revert "Remove cookie rotator (#32289)" (#34892) --- config/initializers/cookie_rotator.rb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 config/initializers/cookie_rotator.rb diff --git a/config/initializers/cookie_rotator.rb b/config/initializers/cookie_rotator.rb new file mode 100644 index 0000000000..ccc2c6b21f --- /dev/null +++ b/config/initializers/cookie_rotator.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +# TODO: remove this file some time after 4.3.0 + +Rails.application.config.after_initialize do + Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies| + authenticated_encrypted_cookie_salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt + signed_cookie_salt = Rails.application.config.action_dispatch.signed_cookie_salt + + secret_key_base = Rails.application.secret_key_base + + key_generator = ActiveSupport::KeyGenerator.new( + secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1 + ) + key_len = ActiveSupport::MessageEncryptor.key_len + + old_encrypted_secret = key_generator.generate_key(authenticated_encrypted_cookie_salt, key_len) + old_signed_secret = key_generator.generate_key(signed_cookie_salt) + + cookies.rotate :encrypted, old_encrypted_secret + cookies.rotate :signed, old_signed_secret + end +end