From 39b07aad85c0abd897f37860f5c9da854dcf523d Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Mon, 21 Sep 2020 02:22:56 -0500 Subject: Drop Monsterfork v2 thread permissions; simplify feed filters --- app/lib/activitypub/activity/create.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'app/lib/activitypub/activity/create.rb') diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 9d03e5247..6dbd8769c 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -437,18 +437,13 @@ class ActivityPub::Activity::Create < ActivityPub::Activity conversation = Conversation.find_by(uri: uri) if conversation.blank? if @object['inReplyTo'].blank? && replied_to_status.blank? - params = { - uri: uri, - root: object_uri, - account: @account, - }.freeze if conversation.blank? - conversation = Conversation.create!(params) + conversation = Conversation.create!(uri: uri, root: object_uri) elsif conversation.root.blank? - conversation.update!(params) + conversation.update!(uri: uri, root: object_uri) end elsif conversation.blank? - conversation = Conversation.create!(uri: uri, account_id: nil) + conversation = Conversation.create!(uri: uri) end conversation -- cgit