tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Support ActivityStreams’ summaryMap. (#8422)

Browse Source 
In the same way as contentMap and nameMap.
This commit is contained in:
M Somerville 2018-08-25 12:27:34 +01:00 committed by Eugen Rochko
parent 2bba6e582d
commit 95bd0d4528
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/lib/activitypub/activity/create.rb
View File

@ -48,7 +48,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
account: @account, account: @account,
text: text_from_content || '', text: text_from_content || '',
language: detected_language, language: detected_language,
spoiler_text: @object['summary'] || '', spoiler_text: text_from_summary || '',
created_at: @object['published'], created_at: @object['published'],
override_timestamps: @options[:override_timestamps], override_timestamps: @options[:override_timestamps],
reply: @object['inReplyTo'].present?, reply: @object['inReplyTo'].present?,
@ -193,6 +193,14 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end end
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 def text_from_name
if @object['name'].present? if @object['name'].present?
@object['name'] @object['name']
@ -206,6 +214,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
@object['contentMap'].keys.first @object['contentMap'].keys.first
elsif name_language_map? elsif name_language_map?
@object['nameMap'].keys.first @object['nameMap'].keys.first
elsif summary_language_map?
@object['summaryMap'].keys.first
elsif supported_object_type? elsif supported_object_type?
LanguageDetector.instance.detect(text_from_content, @account) LanguageDetector.instance.detect(text_from_content, @account)
end end
@ -223,6 +233,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
end end
end end
def summary_language_map?
@object['summaryMap'].is_a?(Hash) && !@object['summaryMap'].empty?
end
def content_language_map? def content_language_map?
@object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty? @object['contentMap'].is_a?(Hash) && !@object['contentMap'].empty?
end end