diff options
author | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-09-09 14:28:08 -0500 |
commit | 514fc908a373306b32b2b6b9fc0d849161d88271 (patch) | |
tree | 0f0028e424b43dcf4a59b21ccc7170dfe883746b /app/lib/activitypub/activity/create.rb | |
parent | b9f7bc149b2a6abfbdaee83e6992b617b8bdb18e (diff) | |
parent | 11bddd31ce33b654ef72b00221715e6026486e7c (diff) |
Merge tag 'v1.6.0rc3' into sync/upstream
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
-rw-r--r-- | app/lib/activitypub/activity/create.rb | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 081e80570..9a34484f5 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -33,7 +33,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity def status_params { uri: @object['id'], - url: @object['url'] || @object['id'], + url: object_url || @object['id'], account: @account, text: text_from_content || '', language: language_from_content, @@ -147,6 +147,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity @object['contentMap'].keys.first end + def object_url + return if @object['url'].blank? + + value = first_of_value(@object['url']) + + return value if value.is_a?(String) + + value['href'] + end + def language_map? @object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty? end |