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

This reverts commit ccf98d2002
This commit is contained in:
admin
2021-01-24 16:29:57 +00:00
parent ccf98d2002
commit 5d13162204
7 changed files with 18 additions and 61 deletions

View File

@@ -13,14 +13,7 @@ class ReblogService < BaseService
authorize_with account, reblogged_status, :reblog?
reblog = nil
begin
reblog = account.statuses.find_by(reblog: reblogged_status)
rescue ActiveRecord::RecordNotFound
account.statuses.connection.stick_to_master!
reblog = account.statuses.find_by(reblog: reblogged_status)
end
#reblog = account.statuses.find_by(reblog: reblogged_status)
reblog = account.statuses.find_by(reblog: reblogged_status)
return reblog unless reblog.nil?