nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add API method to remove a suggestion (#7978) 

DELETE /api/v1/suggestions/:account_id

When blocking, remove suggestion from both sides. Muting not affected,
since muting is supposed to be invisible to the target.
This commit is contained in:
Eugen Rochko 2018-07-07 21:09:54 +02:00 committed by GitHub
parent ef2bcf51d7
commit 6b9e03e002
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/api/v1/suggestions_controller.rb
View File

@ -13,6 +13,11 @@ class Api::V1::SuggestionsController < Api::BaseController
render json: @accounts, each_serializer: REST::AccountSerializer render json: @accounts, each_serializer: REST::AccountSerializer
end end
def destroy
PotentialFriendshipTracker.remove(current_account.id, params[:id])
render_empty
end
private private
def set_accounts def set_accounts

3
app/models/concerns/account_interactions.rb
View File

@ -203,7 +203,8 @@ module AccountInteractions
private private
def remove_potential_friendship(other_account) def remove_potential_friendship(other_account, mutual = false)
PotentialFriendshipTracker.remove(id, other_account.id) PotentialFriendshipTracker.remove(id, other_account.id)
PotentialFriendshipTracker.remove(other_account.id, id) if mutual
end end
end end

2
config/routes.rb
View File

@ -246,7 +246,7 @@ Rails.application.routes.draw do
resources :streaming, only: [:index] resources :streaming, only: [:index]
resources :custom_emojis, only: [:index] resources :custom_emojis, only: [:index]
resources :suggestions, only: [:index] resources :suggestions, only: [:index, :destroy]
get '/search', to: 'search#index', as: :search get '/search', to: 'search#index', as: :search