Merge branch 'master' into glitch-soc/merge-upstream

2019-05-23 21:18:27 +02:00 · 2019-05-23 21:18:27 +02:00 · bf988123ba
parent c394d3cb25 9a5561a5b8
commit bf988123ba
1 changed files with 5 additions and 1 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@ -267,7 +267,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
  def conversation_from_uri(uri)
    return nil if uri.nil?
    return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri)
-    Conversation.find_by(uri: uri) || Conversation.create(uri: uri)
+    begin
+      Conversation.find_or_create_by!(uri: uri)
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+      retry
+    end
  end

  def visibility_from_audience