Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix not being able to unbookmark toots when blocked by their author (#14604)

Browse source 
* Fix not being able to unbookmark toots when blocked by their author

* Add tests
This commit is contained in:
ThibG 2020-08-19 19:02:06 +02:00 • committed by GitHub
parent 62a45ae26e
commit f6a82cb2cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/controllers/api/v1/statuses/bookmarks_controller.rb
View file

@ -5,7 +5,7 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' }
before_action :require_user!
before_action :set_status
before_action :set_status, only: [:create]
def create
current_account.bookmarks.find_or_create_by!(account: current_account, status: @status)
@ -13,10 +13,20 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
end
def destroy
bookmark = current_account.bookmarks.find_by(status: @status)
bookmark = current_account.bookmarks.find_by(status_id: params[:status_id])
if bookmark
@status = bookmark.status
else
@status = Status.find(params[:status_id])
authorize @status, :show?
end
bookmark&.destroy!
render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, bookmarks_map: { @status.id => false })
rescue Mastodon::NotPermittedError
not_found
end
private