Commiting

app/controllers/api/v1/statuses/bookmarks_controller.rb

@@ -6,8 +6,6 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:bookmarks' }
   before_action :require_user!
 
-  respond_to :json
-
   def create
     if current_user.account.is_pro
       @status = bookmarked_status
@@ -17,6 +15,10 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
     end
   end
 
+  def show
+    # is status bookmarked by user?
+  end
+
   def destroy
     if current_user.account.is_pro
       @status = requested_status

app/controllers/api/v1/statuses/favourites_controller.rb

@@ -6,11 +6,10 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:favourites' }
   before_action :require_user!
 
-  respond_to :json
-
   def create
     @status = favourited_status
-    render json: @status, serializer: REST::StatusSerializer
+    puts "tilly -- status: " + @status.inspect
+    render json: @status, serializer: REST::StatusStatSerializer
   end
 
   def destroy
@@ -19,7 +18,7 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
 
     UnfavouriteWorker.perform_async(current_user.account_id, @status.id)
 
-    render json: @status, serializer: REST::StatusSerializer, unfavourite: true, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, favourites_map: @favourites_map)
+    render json: @status, serializer: REST::StatusStatSerializer, unfavourite: true, relationships: StatusRelationshipsPresenter.new([@status], current_user&.account_id, favourites_map: @favourites_map)
   end
 
   private

app/controllers/api/v1/statuses/mutes_controller.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-class Api::V1::Statuses::MutesController < Api::BaseController
-  include Authorization
-
-  before_action -> { doorkeeper_authorize! :write, :'write:mutes' }
-  before_action :require_user!
-  before_action :set_status
-  before_action :set_conversation
-
-  respond_to :json
-
-  def create
-    current_account.mute_conversation!(@conversation)
-    @mutes_map = { @conversation.id => true }
-
-    render json: @status, serializer: REST::StatusSerializer
-  end
-
-  def destroy
-    current_account.unmute_conversation!(@conversation)
-    @mutes_map = { @conversation.id => false }
-
-    render json: @status, serializer: REST::StatusSerializer
-  end
-
-  private
-
-  def set_status
-    @status = Status.find(params[:status_id])
-    authorize @status, :show?
-  rescue GabSocial::NotPermittedError
-    # Reraise in order to get a 404 instead of a 403 error code
-    raise ActiveRecord::RecordNotFound
-  end
-
-  def set_conversation
-    @conversation = @status.conversation
-    raise GabSocial::ValidationError if @conversation.nil?
-  end
-end

app/controllers/api/v1/statuses/pins_controller.rb

@@ -7,13 +7,15 @@ class Api::V1::Statuses::PinsController < Api::BaseController
   before_action :require_user!
   before_action :set_status
 
-  respond_to :json
-
   def create
     StatusPin.create!(account: current_account, status: @status)
     render json: @status, serializer: REST::StatusSerializer
   end
 
+  def show
+    # is status pinned by user?
+  end
+
   def destroy
     pin = StatusPin.find_by(account: current_account, status: @status)
 

app/controllers/api/v1/statuses/reblogged_by_accounts_controller.rb

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
+class Api::V1::Statuses::RepostedByAccountsController < Api::BaseController
   include Authorization
 
   before_action -> { authorize_if_got_token! :read, :'read:accounts' }
   before_action :set_status
   after_action :insert_pagination_headers
 
-  respond_to :json
-
   def index
     @accounts = load_accounts
     render json: @accounts, each_serializer: REST::AccountSerializer
@@ -38,13 +36,13 @@ class Api::V1::Statuses::RebloggedByAccountsController < Api::BaseController
 
   def next_path
     if records_continue?
-      api_v1_status_reblogged_by_index_url pagination_params(max_id: pagination_max_id)
+      api_v1_status_reposted_by_index_url pagination_params(max_id: pagination_max_id)
     end
   end
 
   def prev_path
     unless @accounts.empty?
-      api_v1_status_reblogged_by_index_url pagination_params(since_id: pagination_since_id)
+      api_v1_status_reposted_by_index_url pagination_params(since_id: pagination_since_id)
     end
   end
 

app/controllers/api/v1/statuses/reblogs_controller.rb

@@ -6,8 +6,6 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }
   before_action :require_user!
 
-  respond_to :json
-
   def create
     if !current_user.account.local? || !status_for_reblog.local
       return render json: { error: 'Invalid action' }, status: 422