diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-28 17:30:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 17:30:12 +0200 |
| commit | 75f7f9930eb2a6f5c4041ec44fe0aa795c9ec449 (patch) | |
| tree | 446b7fa050fa9e4c624a46eef874c5bd4441137e /app/lib | |
| parent | cfb2ed78231758a79af038a964ab7f7b7b35274e (diff) | |
Remove conversation URI (#11423)
It is not part of ActivityPub and will free up a lot of space
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/activity/create.rb | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 000b77df5..eb7b09e44 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -67,7 +67,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity sensitive: @object['sensitive'] || false, visibility: visibility_from_audience, thread: replied_to_status, - conversation: conversation_from_uri(@object['conversation']), media_attachment_ids: process_attachments.take(4).map(&:id), poll: process_poll, } @@ -262,16 +261,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity ActivityPub::FetchRepliesWorker.perform_async(status.id, uri) unless uri.nil? end - def conversation_from_uri(uri) - return nil if uri.nil? - return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri) - begin - Conversation.find_or_create_by!(uri: uri) - rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique - retry - end - end - def visibility_from_audience if equals_or_includes?(@object['to'], ActivityPub::TagManager::COLLECTIONS[:public]) :public |