Replace Makara with an initial Rails 6 role based splitting method.
This commit is contained in:
committed by
admin
parent
31922ea58b
commit
473c48b2aa
@@ -14,7 +14,6 @@ class FavouriteService < BaseService
|
||||
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
|
||||
|
||||
|
||||
@@ -153,7 +153,6 @@ class PostStatusService < BaseService
|
||||
|
||||
raise GabSocial::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
|
||||
|
||||
@account.media_attachments.connection.stick_to_master!
|
||||
@media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
|
||||
|
||||
hasVideoOrGif = @media.find(&:video?) || @media.find(&:gifv?)
|
||||
|
||||
@@ -14,12 +14,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)
|
||||
|
||||
return reblog unless reblog.nil?
|
||||
|
||||
|
||||
Reference in New Issue
Block a user