techhub/mastodon
2
0
Fork 0
Code Activity

Fix GET /api/v2/notifications/:id and POST /api/v2/notifications/:id/dismiss for ungrouped notifications (#33990)

Browse Source
This commit is contained in:
Claire
2025-02-25 15:37:44 +01:00
committed by GitHub
parent 33643c4c07
commit 20531d1e07
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/v2/notifications_controller.rb
View File

@@ -46,7 +46,7 @@ class Api::V2::NotificationsController < Api::BaseController
end
def show
@notification = current_account.notifications.without_suspended.find_by!(group_key: params[:group_key])
@notification = current_account.notifications.without_suspended.by_group_key(params[:group_key]).take!
presenter = GroupedNotificationsPresenter.new(NotificationGroup.from_notifications([@notification]))
render json: presenter, serializer: REST::DedupNotificationGroupSerializer
end
@@ -57,7 +57,7 @@ class Api::V2::NotificationsController < Api::BaseController
end
def dismiss
current_account.notifications.where(group_key: params[:group_key]).destroy_all
current_account.notifications.by_group_key(params[:group_key]).destroy_all
render_empty
end