Add notifications for new reports (#18697)
This commit is contained in:
parent
602f291da9
commit
2936f42a14
18 changed files with 235 additions and 17 deletions
|
@ -2,7 +2,7 @@
|
|||
|
||||
class REST::Admin::ReportSerializer < ActiveModel::Serializer
|
||||
attributes :id, :action_taken, :action_taken_at, :category, :comment,
|
||||
:created_at, :updated_at
|
||||
:forwarded, :created_at, :updated_at
|
||||
|
||||
has_one :account, serializer: REST::Admin::AccountSerializer
|
||||
has_one :target_account, serializer: REST::Admin::AccountSerializer
|
||||
|
|
|
@ -5,6 +5,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
|
|||
|
||||
belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
|
||||
belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
|
||||
belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
|
||||
|
||||
def id
|
||||
object.id.to_s
|
||||
|
@ -13,4 +14,8 @@ class REST::NotificationSerializer < ActiveModel::Serializer
|
|||
def status_type?
|
||||
[:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
|
||||
end
|
||||
|
||||
def report_type?
|
||||
object.type == :'admin.report'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class REST::ReportSerializer < ActiveModel::Serializer
|
||||
attributes :id, :action_taken
|
||||
attributes :id, :action_taken, :action_taken_at, :category, :comment,
|
||||
:forwarded, :created_at, :status_ids, :rule_ids
|
||||
|
||||
has_one :target_account, serializer: REST::AccountSerializer
|
||||
|
||||
def id
|
||||
object.id.to_s
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue