From 0cb329f63a292598ef9ed1af6b8f8b56658e7984 Mon Sep 17 00:00:00 2001
From: puckipedia <puck@puckipedia.com>
Date: Fri, 27 Oct 2017 16:10:36 +0200
Subject: [PATCH] Allow ActivityPub Note's tag and attachment to be single
objects (#5534)
---
app/helpers/jsonld_helper.rb | 4 ++++
app/lib/activitypub/activity/create.rb | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
index c23a2e095..a3441e6f9 100644
--- 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
index d6e9bc1de..376684c00 100644
--- 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