diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-23 22:01:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-23 22:01:34 +0200 |
| commit | 72bf354e979a9b8c14c41bf34c47060d5ff4d232 (patch) | |
| tree | ed9029c8575c933b9ac407b7180f00f6ca99039f /app | |
| parent | d6a7d62dc698d6ebaa3a40f44c20ef12f8474fd7 (diff) | |
| parent | bf988123bad3c5341941376c946421c8e3fb4700 (diff) | |
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 6b16c9986..2bc33c04b 100644 --- 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 |