Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 16:59:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '6166e616389b051039dc76635048e2519271832a' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-06-24 20:45:46 +02:00
parent 94c644983e 6166e61638
commit 9fccf0a8c6
41 changed files with 479 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/filters_controller.rb
View File

@@ -32,7 +32,7 @@ class Api::V1::FiltersController < Api::BaseController
ApplicationRecord.transaction do
@filter.update!(keyword_params)
@filter.custom_filter.assign_attributes(filter_params)
raise Mastodon::ValidationError, I18n.t('filters.errors.deprecated_api_multiple_keywords') if @filter.custom_filter.changed? && @filter.custom_filter.keywords.count > 1
raise Mastodon::ValidationError, I18n.t('filters.errors.deprecated_api_multiple_keywords') if @filter.custom_filter.changed? && @filter.custom_filter.keywords.many?
@filter.custom_filter.save!
end