From b87eb8ea146a54fcfd2533f47622070d0f30a9fa Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 8 Jun 2017 15:07:39 +0200
Subject: [PATCH] Fix #3378 - If favourite/reblog already exists, return it
instead of failing (#3641)
---
app/services/favourite_service.rb | 4 ++++
app/services/reblog_service.rb | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index f27145c961..90267af332 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -10,6 +10,10 @@ class FavouriteService < BaseService
def call(account, status)
authorize_with account, status, :show?
+ favourite = Favourite.find_by(account: account, status: status)
+
+ return favourite unless favourite.nil?
+
favourite = Favourite.create!(account: account, status: status)
if status.local?
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index a3636a283a..ba24b1f9d8 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -13,6 +13,10 @@ class ReblogService < BaseService
authorize_with account, reblogged_status, :reblog?
+ reblog = account.statuses.find_by(reblog: reblogged_status)
+
+ return reblog unless reblog.nil?
+
reblog = account.statuses.create!(reblog: reblogged_status, text: '')
DistributionWorker.perform_async(reblog.id)
--
GitLab