mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 22:36:21 +01:00
Code Issues Projects Releases Wiki Activity

Add _:atomUri property for deduplicating OStatus/ActivityPub legacy records (#4593)

Browse Source
This commit is contained in:
Eugen Rochko 2017-08-17 21:35:00 +02:00 committed by GitHub
parent 075d6a1e13
commit ad892dbc0c
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/lib/activitypub/activity/create.rb
View File

@ -4,7 +4,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def perform
return if delete_arrived_first?(object_uri) || unsupported_object_type?
status = Status.find_by(uri: object_uri)
status = find_existing_status
return status unless status.nil?
@ -23,6 +23,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
private
def find_existing_status
status = Status.find_by(uri: object_uri)
status ||= Status.find_by(uri: @object['_:atomUri']) if @object['_:atomUri'].present?
status
end
def status_params
{
uri: @object['id'],

10
app/serializers/activitypub/note_serializer.rb
View File

@ -8,6 +8,8 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
has_many :media_attachments, key: :attachment
has_many :virtual_tags, key: :tag
attribute :atom_uri, key: '_:atomUri', if: :local?
def id
ActivityPub::TagManager.instance.uri_for(object)
end
@ -52,6 +54,14 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer
object.mentions + object.tags
end
def atom_uri
::TagManager.instance.uri_for(object)
end
def local?
object.account.local?
end
class MediaAttachmentSerializer < ActiveModel::Serializer
include RoutingHelper