SWREI/instrumental
0
0
Fork 0
Code Issues Activity

Add optional filtered attribute to notification entities in REST API (#31011)

Browse Source
This commit is contained in:
Claire 2024-07-15 11:29:57 +02:00 committed by GitHub
parent 17117109ad
commit 1dd8262071
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/rest/notification_serializer.rb
View File

@ -3,6 +3,8 @@
class REST::NotificationSerializer < ActiveModel::Serializer class REST::NotificationSerializer < ActiveModel::Serializer
attributes :id, :type, :created_at, :group_key attributes :id, :type, :created_at, :group_key
attribute :filtered, if: :filtered?
belongs_to :from_account, key: :account, serializer: REST::AccountSerializer belongs_to :from_account, key: :account, serializer: REST::AccountSerializer
belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer belongs_to :target_status, key: :status, if: :status_type?, serializer: REST::StatusSerializer
belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer belongs_to :report, if: :report_type?, serializer: REST::ReportSerializer
@ -32,4 +34,6 @@ class REST::NotificationSerializer < ActiveModel::Serializer
def moderation_warning_event? def moderation_warning_event?
object.type == :moderation_warning object.type == :moderation_warning
end end
delegate :filtered?, to: :object
end end

26
spec/requests/api/v1/notifications_spec.rb
View File

@ -20,8 +20,8 @@ RSpec.describe 'Notifications' do
before do before do
first_status = PostStatusService.new.call(user.account, text: 'Test') first_status = PostStatusService.new.call(user.account, text: 'Test')
ReblogService.new.call(bob.account, first_status) ReblogService.new.call(bob.account, first_status)
mentioning_status = PostStatusService.new.call(bob.account, text: 'Hello @alice') PostStatusService.new.call(bob.account, text: 'Hello @alice')
mentioning_status.mentions.first PostStatusService.new.call(tom.account, text: 'Hello @alice', visibility: :direct) # Filtered by default
FavouriteService.new.call(bob.account, first_status) FavouriteService.new.call(bob.account, first_status)
FavouriteService.new.call(tom.account, first_status) FavouriteService.new.call(tom.account, first_status)
FollowService.new.call(bob.account, user.account) FollowService.new.call(bob.account, user.account)
@ -34,10 +34,22 @@ RSpec.describe 'Notifications' do
subject subject
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
expect(body_json_types).to include 'reblog' expect(body_as_json.size).to eq 5
expect(body_json_types).to include 'mention' expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
expect(body_json_types).to include 'favourite' expect(body_as_json.any? { |x| x[:filtered] }).to be false
expect(body_json_types).to include 'follow' end
end
context 'with include_filtered' do
let(:params) { { include_filtered: true } }
it 'returns expected notification types, including filtered notifications' do
subject
expect(response).to have_http_status(200)
expect(body_as_json.size).to eq 6
expect(body_json_types).to include('reblog', 'mention', 'favourite', 'follow')
expect(body_as_json.any? { |x| x[:filtered] }).to be true
end end
end end
@ -96,7 +108,7 @@ RSpec.describe 'Notifications' do
it 'returns the requested number of notifications paginated', :aggregate_failures do it 'returns the requested number of notifications paginated', :aggregate_failures do
subject subject
notifications = user.account.notifications notifications = user.account.notifications.browserable
expect(body_as_json.size) expect(body_as_json.size)
.to eq(params[:limit]) .to eq(params[:limit])