Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.
This commit is contained in:
@ -6,6 +6,7 @@ class ReportFilter
|
||||
account_id
|
||||
target_account_id
|
||||
by_target_domain
|
||||
target_origin
|
||||
).freeze
|
||||
|
||||
attr_reader :params
|
||||
@ -34,8 +35,21 @@ class ReportFilter
|
||||
Report.where(account_id: value)
|
||||
when :target_account_id
|
||||
Report.where(target_account_id: value)
|
||||
when :target_origin
|
||||
target_origin_scope(value)
|
||||
else
|
||||
raise "Unknown filter: #{key}"
|
||||
end
|
||||
end
|
||||
|
||||
def target_origin_scope(value)
|
||||
case value.to_sym
|
||||
when :local
|
||||
Report.where(target_account: Account.local)
|
||||
when :remote
|
||||
Report.where(target_account: Account.remote)
|
||||
else
|
||||
raise "Unknown value: #{value}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user