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

@@ -10,14 +10,7 @@ class FavouriteService < BaseService
def call(account, status)
authorize_with account, status, :favourite?
favourite = nil
begin
favourite = Favourite.find_by(account: account, status: status)
rescue ActiveRecord::RecordNotFound
Favourite.connection.stick_to_master!
favourite = Favourite.find_by(account: account, status: status)
end
# favourite = Favourite.find_by(account: account, status: status)
favourite = Favourite.find_by(account: account, status: status)
return favourite unless favourite.nil?