diff options
| author | M Somerville <dracos@users.noreply.github.com> | 2018-08-25 12:27:34 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-08-25 13:27:34 +0200 |
| commit | 95bd0d4528cae7d8b01c82cfaf3b74bef4864c11 (patch) | |
| tree | 37eed1d0ff278a88414c834ad3c8194437db35ea | |
| parent | 2bba6e582d4e8dcf119177e36f1e7fcf3873aeb6 (diff) | |
| download | mastodon-95bd0d4528cae7d8b01c82cfaf3b74bef4864c11.tar mastodon-95bd0d4528cae7d8b01c82cfaf3b74bef4864c11.tar.gz mastodon-95bd0d4528cae7d8b01c82cfaf3b74bef4864c11.tar.bz2 mastodon-95bd0d4528cae7d8b01c82cfaf3b74bef4864c11.zip | |
Support ActivityStreams’ summaryMap. (#8422)
In the same way as contentMap and nameMap.
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 16 |
1 files changed, 15 insertions, 1 deletions
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 |