about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-19 00:02:39 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-19 00:02:39 +0100
commit580b91c38740620488816755a5ccb2ec16ff8b1c (patch)
treeff616dc6d0ab2b8d3047c3f108d17e6010d77bc5 /app/services
parent48aeacd5f985f2c61262686170db5776982dce19 (diff)
Fix more subtle bugs with first_or_create
Diffstat (limited to 'app/services')
-rw-r--r--app/services/process_interaction_service.rb2
-rw-r--r--app/services/process_mentions_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb
index 43c8ca4fd..cdc720083 100644
--- a/app/services/process_interaction_service.rb
+++ b/app/services/process_interaction_service.rb
@@ -62,7 +62,7 @@ class ProcessInteractionService < BaseService
   end
 
   def favourite!(xml, from_account)
-    status(xml).favourites.first_or_create!(account: from_account)
+    status(xml).favourites.where(account: from_account).first_or_create!(account: from_account)
   end
 
   def add_post!(body, account)
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
index 760fdcf15..6e92d16b4 100644
--- a/app/services/process_mentions_service.rb
+++ b/app/services/process_mentions_service.rb
@@ -14,7 +14,7 @@ class ProcessMentionsService < BaseService
         mentioned_account = follow_remote_account_service.("#{match.first}")
       end
 
-      mentioned_account.mentions.first_or_create(status: status)
+      mentioned_account.mentions.where(status: status).first_or_create(status: status)
     end
 
     status.mentions.each do |mentioned_account|