From 95bd0d4528cae7d8b01c82cfaf3b74bef4864c11 Mon Sep 17 00:00:00 2001
From: M Somerville <dracos@users.noreply.github.com>
Date: Sat, 25 Aug 2018 12:27:34 +0100
Subject: [PATCH] =?UTF-8?q?Support=20ActivityStreams=E2=80=99=20summaryMap?=
=?UTF-8?q?.=20(#8422)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In the same way as contentMap and nameMap.
---
app/lib/activitypub/activity/create.rb | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index 79efc95d3..f40e1fa3e 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -48,7 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
account: @account,
text: text_from_content || '',
language: detected_language,
- spoiler_text: @object['summary'] || '',
+ spoiler_text: text_from_summary || '',
created_at: @object['published'],
override_timestamps: @options[:override_timestamps],
reply: @object['inReplyTo'].present?,
@@ -193,6 +193,14 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
end
+ def text_from_summary
+ if @object['summary'].present?
+ @object['summary']
+ elsif summary_language_map?
+ @object['summaryMap'].values.first
+ end
+ end
+
def text_from_name
if @object['name'].present?
@object['name']
@@ -206,6 +214,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
@object['contentMap'].keys.first
elsif name_language_map?
@object['nameMap'].keys.first
+ elsif summary_language_map?
+ @object['summaryMap'].keys.first
elsif supported_object_type?
LanguageDetector.instance.detect(text_from_content, @account)
end
@@ -223,6 +233,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end
end
+ def summary_language_map?
+ @object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty?
+ end
+
def content_language_map?
@object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty?
end