diff options
| author | pluralcafe-docker <git@plural.cafe> | 2019-01-21 04:35:41 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2019-01-21 04:35:41 +0000 |
| commit | 657438e95054ba1f161db698acdf7f1a871d1c9c (patch) | |
| tree | a3344b6105b7771983f69c789fb2f7a0c22a8583 /app/lib/activitypub/activity/create.rb | |
| parent | d899138556513c8a5fa3397606ecc4752b7c6785 (diff) | |
| parent | b7c67605d5c2110b4a3cd3d8a7b8ef2878cbfe48 (diff) | |
Merge branch 'master' into production
Diffstat (limited to 'app/lib/activitypub/activity/create.rb')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 2b238bc88..b49657d4b 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -5,10 +5,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity CONVERTED_TYPES = %w(Image Video Article Page).freeze def perform - return if delete_arrived_first?(object_uri) || unsupported_object_type? || invalid_origin?(@object['id']) + return if unsupported_object_type? || invalid_origin?(@object['id']) + return if Tombstone.exists?(uri: @object['id']) RedisLock.acquire(lock_options) do |lock| if lock.acquired? + return if delete_arrived_first?(object_uri) + @status = find_existing_status if @status.nil? @@ -59,7 +62,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity account: @account, text: text_from_content || '', language: detected_language, - spoiler_text: text_from_summary || '', + spoiler_text: converted_object_type? ? '' : (text_from_summary || ''), created_at: @object['published'], override_timestamps: @options[:override_timestamps], reply: @object['inReplyTo'].present?, @@ -254,7 +257,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity end def text_from_content - return Formatter.instance.linkify([text_from_name, object_url || @object['id']].join(' ')) if converted_object_type? + return Formatter.instance.linkify([[text_from_name, text_from_summary.presence].compact.join("\n\n"), object_url || @object['id']].join(' ')) if converted_object_type? if @object['content'].present? @object['content'] |