post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests 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
parent 10bcbf15af
commit 8787077462
3 changed files with 28 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

1
app/models/notification.rb
View file

@ -106,6 +106,7 @@ class Notification < ApplicationRecord
validates :type, inclusion: { in: TYPES }
scope :without_suspended, -> { joins(:from_account).merge(Account.without_suspended) }
scope :by_group_key, ->(group_key) { group_key&.start_with?('ungrouped-') ? where(id: group_key.delete_prefix('ungrouped-')) : where(group_key: group_key) }
def type
@type ||= (super || LEGACY_TYPE_CLASS_MAP[activity_type]).to_sym