From 2a181f56e3241dc010f34337ba1bf1a033715519 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 26 Mar 2025 03:26:28 -0400 Subject: [PATCH 1/3] Convert `settings/deletes` spec controller->request/system (#34274) --- .../settings/deletes_controller_spec.rb | 87 ------------------- spec/requests/settings/deletes_spec.rb | 62 +++++++++++-- spec/system/settings/deletes_spec.rb | 38 ++++++++ 3 files changed, 95 insertions(+), 92 deletions(-) delete mode 100644 spec/controllers/settings/deletes_controller_spec.rb create mode 100644 spec/system/settings/deletes_spec.rb diff --git a/spec/controllers/settings/deletes_controller_spec.rb b/spec/controllers/settings/deletes_controller_spec.rb deleted file mode 100644 index 98104b8454..0000000000 --- a/spec/controllers/settings/deletes_controller_spec.rb +++ /dev/null @@ -1,87 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -RSpec.describe Settings::DeletesController do - render_views - - describe 'GET #show' do - context 'when signed in' do - let(:user) { Fabricate(:user) } - - before do - sign_in user, scope: :user - get :show - end - - it 'renders confirmation page with private cache control headers', :aggregate_failures do - expect(response).to have_http_status(200) - expect(response.headers['Cache-Control']).to include('private, no-store') - end - - context 'when suspended' do - let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) } - - it 'returns http forbidden with private cache control headers', :aggregate_failures do - expect(response).to have_http_status(403) - expect(response.headers['Cache-Control']).to include('private, no-store') - end - end - end - - context 'when not signed in' do - it 'redirects' do - get :show - expect(response).to redirect_to '/auth/sign_in' - end - end - end - - describe 'DELETE #destroy' do - context 'when signed in' do - let(:user) { Fabricate(:user, password: 'petsmoldoggos') } - - before do - sign_in user, scope: :user - end - - context 'with correct password' do - before do - delete :destroy, params: { form_delete_confirmation: { password: 'petsmoldoggos' } } - end - - it 'removes user record and redirects', :aggregate_failures, :inline_jobs do - expect(response).to redirect_to '/auth/sign_in' - expect(User.find_by(id: user.id)).to be_nil - expect(user.account.reload).to be_suspended - expect(CanonicalEmailBlock.block?(user.email)).to be false - end - - context 'when suspended' do - let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) } - - it 'returns http forbidden' do - expect(response).to have_http_status(403) - end - end - end - - context 'with incorrect password' do - before do - delete :destroy, params: { form_delete_confirmation: { password: 'blaze420' } } - end - - it 'redirects back to confirmation page' do - expect(response).to redirect_to settings_delete_path - end - end - end - - context 'when not signed in' do - it 'redirects' do - delete :destroy - expect(response).to redirect_to '/auth/sign_in' - end - end - end -end diff --git a/spec/requests/settings/deletes_spec.rb b/spec/requests/settings/deletes_spec.rb index 4563f639d5..c277181999 100644 --- a/spec/requests/settings/deletes_spec.rb +++ b/spec/requests/settings/deletes_spec.rb @@ -4,13 +4,65 @@ require 'rails_helper' RSpec.describe 'Settings Deletes' do describe 'DELETE /settings/delete' do - before { sign_in Fabricate(:user) } + context 'when signed in' do + before { sign_in(user) } - it 'gracefully handles invalid nested params' do - delete settings_delete_path(form_delete_confirmation: 'invalid') + let(:user) { Fabricate(:user) } - expect(response) - .to have_http_status(400) + it 'gracefully handles invalid nested params' do + delete settings_delete_path(form_delete_confirmation: 'invalid') + + expect(response) + .to have_http_status(400) + end + + context 'when suspended' do + let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) } + + it 'returns http forbidden' do + delete settings_delete_path + + expect(response) + .to have_http_status(403) + end + end + end + + context 'when not signed in' do + it 'redirects to sign in' do + delete settings_delete_path + + expect(response) + .to redirect_to(new_user_session_path) + end + end + end + + describe 'GET /settings/delete' do + context 'when signed in' do + before { sign_in(user) } + + context 'when suspended' do + let(:user) { Fabricate(:user, account_attributes: { suspended_at: Time.now.utc }) } + + it 'returns http forbidden with private cache control headers' do + get settings_delete_path + + expect(response) + .to have_http_status(403) + expect(response.headers['Cache-Control']) + .to include('private, no-store') + end + end + end + + context 'when not signed in' do + it 'redirects to sign in' do + get settings_delete_path + + expect(response) + .to redirect_to(new_user_session_path) + end end end end diff --git a/spec/system/settings/deletes_spec.rb b/spec/system/settings/deletes_spec.rb new file mode 100644 index 0000000000..91f7104252 --- /dev/null +++ b/spec/system/settings/deletes_spec.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Settings Deletes' do + describe 'Deleting user from settings area' do + let(:user) { Fabricate(:user) } + + before { sign_in(user) } + + it 'requires password and deletes user record', :inline_jobs do + visit settings_delete_path + expect(page) + .to have_title(I18n.t('settings.delete')) + .and have_private_cache_control + + # Wrong confirmation value + fill_in 'form_delete_confirmation_password', with: 'wrongvalue' + click_on I18n.t('deletes.proceed') + expect(page) + .to have_content(I18n.t('deletes.challenge_not_passed')) + + # Correct confirmation value + fill_in 'form_delete_confirmation_password', with: user.password + click_on I18n.t('deletes.proceed') + expect(page) + .to have_content(I18n.t('deletes.success_msg')) + expect(page) + .to have_title(I18n.t('auth.login')) + expect(User.find_by(id: user.id)) + .to be_nil + expect(user.account.reload) + .to be_suspended + expect(CanonicalEmailBlock.block?(user.email)) + .to be(false) + end + end +end From c93b2c6809905d24262b5973efe20832f1b04a6d Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 26 Mar 2025 08:31:05 +0100 Subject: [PATCH 2/3] Add new filter action to blur media (#34256) --- .../mastodon/components/media_gallery.jsx | 5 +++-- .../mastodon/components/spoiler_button.tsx | 16 ++++++++++++++++ app/javascript/mastodon/components/status.jsx | 5 ++++- app/javascript/mastodon/features/audio/index.jsx | 5 +++-- .../status/components/detailed_status.tsx | 3 +++ app/javascript/mastodon/features/video/index.jsx | 5 +++-- app/javascript/mastodon/selectors/index.js | 10 +++++++++- app/models/custom_filter.rb | 2 +- app/views/filters/_filter_fields.html.haml | 2 +- config/locales/simple_form.en.yml | 2 ++ lib/mastodon/version.rb | 2 +- 11 files changed, 46 insertions(+), 11 deletions(-) diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx index b841745add..64250236d8 100644 --- a/app/javascript/mastodon/components/media_gallery.jsx +++ b/app/javascript/mastodon/components/media_gallery.jsx @@ -226,6 +226,7 @@ class MediaGallery extends PureComponent { visible: PropTypes.bool, autoplay: PropTypes.bool, onToggleVisibility: PropTypes.func, + matchedFilters: PropTypes.arrayOf(PropTypes.string), }; state = { @@ -296,7 +297,7 @@ class MediaGallery extends PureComponent { } render () { - const { media, lang, sensitive, defaultWidth, autoplay } = this.props; + const { media, lang, sensitive, defaultWidth, autoplay, matchedFilters } = this.props; const { visible } = this.state; const width = this.state.width || defaultWidth; @@ -323,7 +324,7 @@ class MediaGallery extends PureComponent {
{children} - {(!visible || uncached) && } + {(!visible || uncached) && } {(visible && !uncached) && (
diff --git a/app/javascript/mastodon/components/spoiler_button.tsx b/app/javascript/mastodon/components/spoiler_button.tsx index 3ba2cbc5fa..bf84ffd04d 100644 --- a/app/javascript/mastodon/components/spoiler_button.tsx +++ b/app/javascript/mastodon/components/spoiler_button.tsx @@ -6,6 +6,7 @@ interface Props { hidden?: boolean; sensitive: boolean; uncached?: boolean; + matchedFilters?: string[]; onClick: React.MouseEventHandler; } @@ -13,6 +14,7 @@ export const SpoilerButton: React.FC = ({ hidden = false, sensitive, uncached = false, + matchedFilters, onClick, }) => { let warning; @@ -28,6 +30,20 @@ export const SpoilerButton: React.FC = ({ action = ( ); + } else if (matchedFilters) { + warning = ( + {chunks}, + }} + /> + ); + action = ( + + ); } else if (sensitive) { warning = ( { status = status.get('reblog'); } - return (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all'); + return !status.get('matched_media_filters') && (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all'); }; const messages = defineMessages({ @@ -470,6 +470,7 @@ class Status extends ImmutablePureComponent { defaultWidth={this.props.cachedMediaWidth} visible={this.state.showMedia} onToggleVisibility={this.handleToggleMediaVisibility} + matchedFilters={status.get('matched_media_filters')} /> )} @@ -498,6 +499,7 @@ class Status extends ImmutablePureComponent { blurhash={attachment.get('blurhash')} visible={this.state.showMedia} onToggleVisibility={this.handleToggleMediaVisibility} + matchedFilters={status.get('matched_media_filters')} /> )} @@ -522,6 +524,7 @@ class Status extends ImmutablePureComponent { deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined} visible={this.state.showMedia} onToggleVisibility={this.handleToggleMediaVisibility} + matchedFilters={status.get('matched_media_filters')} /> )} diff --git a/app/javascript/mastodon/features/audio/index.jsx b/app/javascript/mastodon/features/audio/index.jsx index 2ce67a94ab..dc48756906 100644 --- a/app/javascript/mastodon/features/audio/index.jsx +++ b/app/javascript/mastodon/features/audio/index.jsx @@ -62,6 +62,7 @@ class Audio extends PureComponent { volume: PropTypes.number, muted: PropTypes.bool, deployPictureInPicture: PropTypes.func, + matchedFilters: PropTypes.arrayOf(PropTypes.string), }; state = { @@ -472,7 +473,7 @@ class Audio extends PureComponent { }; render () { - const { src, intl, alt, lang, editable, autoPlay, sensitive, blurhash } = this.props; + const { src, intl, alt, lang, editable, autoPlay, sensitive, blurhash, matchedFilters } = this.props; const { paused, volume, currentTime, duration, buffer, dragging, revealed } = this.state; const progress = Math.min((currentTime / duration) * 100, 100); const muted = this.state.muted || volume === 0; @@ -514,7 +515,7 @@ class Audio extends PureComponent { lang={lang} /> -