From: unarist <m.unarist@gmail.com>
Date: Fri, 1 Sep 2017 19:00:43 +0000 (+0900)
Subject: Deduplicate with local status on Create activity (#4763)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8fd8f81ae7ab7c02c4cb75c3c65ff3ed8c193f38;p=mastodon.git

Deduplicate with local status on Create activity (#4763)
---

diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 2eea1827a..a6f1e60d9 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -25,7 +25,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   private
 
   def find_existing_status
-    status   = Status.find_by(uri: object_uri)
+    status   = status_from_uri(object_uri)
     status ||= Status.find_by(uri: @object['_:atomUri']) if @object['_:atomUri'].present?
     status
   end