diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-19 19:36:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 19:36:58 +0200 |
| commit | 83cd512777e1b479b4721f4d0253745949962910 (patch) | |
| tree | d87b9fee2b074132128942c1b9e77530e1b068c2 /app/controllers/api | |
| parent | 5dcc406abee23ff8a5a88b5646550ea266e3bf49 (diff) | |
| parent | 74a9affdcc4293027bb5a42407dd05c8a8a6961f (diff) | |
Merge pull request #1408 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/v1/statuses/bookmarks_controller.rb | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb index 3954af3c9..19963c002 100644 --- a/app/controllers/api/v1/statuses/bookmarks_controller.rb +++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb @@ -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 |