diff options
author | Starfall <root@starfall.blue> | 2020-03-01 14:49:21 -0600 |
---|---|---|
committer | Starfall <root@starfall.blue> | 2020-03-01 14:49:21 -0600 |
commit | 12d35783db1bb302d7540d8d3690ab6eed3dac3b (patch) | |
tree | 66f1db08a2f6f9ae2254ba7a81b71835039d671e /app/controllers/api/v1/statuses/favourites_controller.rb | |
parent | 22a55edc158352003a3953964c9d332a60c86428 (diff) |
Revert "Merge branch 'glitch'"
Login is broken This reverts commit 22a55edc158352003a3953964c9d332a60c86428, reversing changes made to 5902299384d15249fe4b84b8761d4a49f3c7f6fd.
Diffstat (limited to 'app/controllers/api/v1/statuses/favourites_controller.rb')
-rw-r--r-- | app/controllers/api/v1/statuses/favourites_controller.rb | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/app/controllers/api/v1/statuses/favourites_controller.rb b/app/controllers/api/v1/statuses/favourites_controller.rb index f18ace996..cceee9060 100644 --- a/app/controllers/api/v1/statuses/favourites_controller.rb +++ b/app/controllers/api/v1/statuses/favourites_controller.rb @@ -5,26 +5,34 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController before_action -> { doorkeeper_authorize! :write, :'write:favourites' } before_action :require_user! - before_action :set_status respond_to :json def create - FavouriteService.new.call(current_account, @status) + @status = favourited_status render json: @status, serializer: REST::StatusSerializer end def destroy - UnfavouriteWorker.perform_async(current_account.id, @status.id) - render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, favourites_map: { @status.id => false }) + @status = requested_status + @favourites_map = { @status.id => false } + + UnfavouriteWorker.perform_async(current_user.account_id, @status.id) + + render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, favourites_map: @favourites_map) end private - def set_status - @status = Status.find(params[:status_id]) - authorize @status, :show? - rescue Mastodon::NotPermittedError - not_found + def favourited_status + service_result.status.reload + end + + def service_result + FavouriteService.new.call(current_user.account, requested_status) + end + + def requested_status + Status.find(params[:status_id]) end end |