diff options
Diffstat (limited to 'app/controllers/api/v1/statuses/bookmarks_controller.rb')
-rw-r--r-- | app/controllers/api/v1/statuses/bookmarks_controller.rb | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb index a7f1eed00..bb9729cf5 100644 --- a/app/controllers/api/v1/statuses/bookmarks_controller.rb +++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb @@ -5,28 +5,35 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' } before_action :require_user! - before_action :set_status respond_to :json def create - current_account.bookmarks.find_or_create_by!(account: current_account, status: @status) + @status = bookmarked_status render json: @status, serializer: REST::StatusSerializer end def destroy - bookmark = current_account.bookmarks.find_by(status: @status) - bookmark&.destroy! + @status = requested_status + @bookmarks_map = { @status.id => false } - render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, bookmarks_map: { @status.id => false }) + bookmark = Bookmark.find_by!(account: current_user.account, status: @status) + bookmark.destroy! + + render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, bookmarks_map: @bookmarks_map) end private - def set_status - @status = Status.find(params[:status_id]) - authorize @status, :show? - rescue Mastodon::NotPermittedError - not_found + def bookmarked_status + authorize_with current_user.account, requested_status, :show? + + bookmark = Bookmark.find_or_create_by!(account: current_user.account, status: requested_status) + + bookmark.status.reload + end + + def requested_status + Status.find(params[:status_id]) end end |