Revert "Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop"

This reverts commit ccf98d2002

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

@@ -34,15 +34,6 @@ class Api::V1::Statuses::FavouritesController < Api::BaseController
   end
 
   def requested_status
-    rs = nil
-    begin
-      rs = Status.find(params[:status_id])
-    rescue ActiveRecord::RecordNotFound
-      Status.connection.stick_to_master!
-      rs = Status.find(params[:status_id])
-    end
-    return rs unless rs.nil?
-    raise ActiveRecord::RecordNotFound
+    Status.find(params[:status_id])
   end
-
 end

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

@@ -31,15 +31,7 @@ class Api::V1::Statuses::ReblogsController < Api::BaseController
   private
 
   def status_for_reblog
-    rs = nil
-    begin
-      rs = Status.find(params[:status_id])
-    rescue ActiveRecord::RecordNotFound
-      Status.connection.stick_to_master!
-      rs = Status.find(params[:status_id])
-    end
-    return rs unless rs.nil?
-    raise ActiveRecord::RecordNotFound
+    Status.find params[:status_id]
   end
 
   def status_for_destroy