logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 8fd8f81ae7ab7c02c4cb75c3c65ff3ed8c193f38
parent: 921cf3e9c8087ce0cd9923f40a8f9b565d07a146
Author: unarist <m.unarist@gmail.com>
Date:   Sat,  2 Sep 2017 04:00:43 +0900

Deduplicate with local status on Create activity (#4763)


Diffstat:

Mapp/lib/activitypub/activity/create.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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