logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 0cb329f63a292598ef9ed1af6b8f8b56658e7984
parent: 0129f5eada3d146c4e3550c7c82b94520a18d2ba
Author: puckipedia <puck@puckipedia.com>
Date:   Fri, 27 Oct 2017 16:10:36 +0200

Allow ActivityPub Note's tag and attachment to be single objects (#5534)


Diffstat:

Mapp/helpers/jsonld_helper.rb4++++
Mapp/lib/activitypub/activity/create.rb8++++----
2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb @@ -9,6 +9,10 @@ module JsonLdHelper value.is_a?(Array) ? value.first : value end + def as_array(value) + value.is_a?(Array) ? value : [value] + end + def value_or_id(value) value.is_a?(String) || value.nil? ? value : value['id'] end diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb @@ -53,9 +53,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end def process_tags(status) - return unless @object['tag'].is_a?(Array) + return if @object['tag'].nil? - @object['tag'].each do |tag| + as_array(@object['tag']).each do |tag| case tag['type'] when 'Hashtag' process_hashtag tag, status @@ -103,9 +103,9 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end def process_attachments(status) - return unless @object['attachment'].is_a?(Array) + return if @object['attachment'].nil? - @object['attachment'].each do |attachment| + as_array(@object['attachment']).each do |attachment| next if unsupported_media_type?(attachment['mediaType']) || attachment['url'].blank? href = Addressable::URI.parse(attachment['url']).normalize.to_s