mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
Add endpoints to accept and dismiss multiple notification requests at once (#31242)
This commit is contained in:
parent
584b1524dd
commit
da5b45a573
3 changed files with 54 additions and 1 deletions
|
@ -5,7 +5,8 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
|
||||||
before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
|
before_action -> { doorkeeper_authorize! :write, :'write:notifications' }, except: :index
|
||||||
|
|
||||||
before_action :require_user!
|
before_action :require_user!
|
||||||
before_action :set_request, except: :index
|
before_action :set_request, only: [:show, :accept, :dismiss]
|
||||||
|
before_action :set_requests, only: [:accept_bulk, :dismiss_bulk]
|
||||||
|
|
||||||
after_action :insert_pagination_headers, only: :index
|
after_action :insert_pagination_headers, only: :index
|
||||||
|
|
||||||
|
@ -32,6 +33,16 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
|
||||||
render_empty
|
render_empty
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def accept_bulk
|
||||||
|
@requests.each { |request| AcceptNotificationRequestService.new.call(request) }
|
||||||
|
render_empty
|
||||||
|
end
|
||||||
|
|
||||||
|
def dismiss_bulk
|
||||||
|
@requests.each(&:destroy!)
|
||||||
|
render_empty
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def load_requests
|
def load_requests
|
||||||
|
@ -53,6 +64,10 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
|
||||||
@request = NotificationRequest.where(account: current_account).find(params[:id])
|
@request = NotificationRequest.where(account: current_account).find(params[:id])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def set_requests
|
||||||
|
@requests = NotificationRequest.where(account: current_account, id: Array(params[:id]).uniq.map(&:to_i))
|
||||||
|
end
|
||||||
|
|
||||||
def next_path
|
def next_path
|
||||||
api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
|
api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
|
||||||
end
|
end
|
||||||
|
|
|
@ -155,6 +155,11 @@ namespace :api, format: false do
|
||||||
|
|
||||||
namespace :notifications do
|
namespace :notifications do
|
||||||
resources :requests, only: [:index, :show] do
|
resources :requests, only: [:index, :show] do
|
||||||
|
collection do
|
||||||
|
post :accept, to: 'requests#accept_bulk'
|
||||||
|
post :dismiss, to: 'requests#dismiss_bulk'
|
||||||
|
end
|
||||||
|
|
||||||
member do
|
member do
|
||||||
post :accept
|
post :accept
|
||||||
post :dismiss
|
post :dismiss
|
||||||
|
|
|
@ -87,4 +87,37 @@ RSpec.describe 'Requests' do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'POST /api/v1/notifications/requests/accept' do
|
||||||
|
subject do
|
||||||
|
post '/api/v1/notifications/requests/accept', params: { id: [notification_request.id] }, headers: headers
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:notification_request) { Fabricate(:notification_request, account: user.account) }
|
||||||
|
|
||||||
|
it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
|
||||||
|
|
||||||
|
it 'returns http success and creates notification permission', :aggregate_failures do
|
||||||
|
subject
|
||||||
|
|
||||||
|
expect(NotificationPermission.find_by(account: notification_request.account, from_account: notification_request.from_account)).to_not be_nil
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe 'POST /api/v1/notifications/requests/dismiss' do
|
||||||
|
subject do
|
||||||
|
post '/api/v1/notifications/requests/dismiss', params: { id: [notification_request.id] }, headers: headers
|
||||||
|
end
|
||||||
|
|
||||||
|
let!(:notification_request) { Fabricate(:notification_request, account: user.account) }
|
||||||
|
|
||||||
|
it_behaves_like 'forbidden for wrong scope', 'read read:notifications'
|
||||||
|
|
||||||
|
it 'returns http success and destroys the notification request', :aggregate_failures do
|
||||||
|
expect { subject }.to change(NotificationRequest, :count).by(-1)
|
||||||
|
|
||||||
|
expect(response).to have_http_status(200)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue