From db9aea34dead1b230e44b4235ff8af8100108b7f Mon Sep 17 00:00:00 2001
From: valerauko <vale@valerauko.net>
Date: Mon, 26 Nov 2018 00:35:21 +0900
Subject: Ensure replied-to is a status not a boost (#9129)

* Ensure replied-to is a status not a boost

* Consider case of not a reply

* Add test case for replying to boost

* Move reblog-reply resolution to model

* Remove unnecessary comment
---
 app/models/status.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'app')

diff --git a/app/models/status.rb b/app/models/status.rb
index 0449d33e1..2e894a6f1 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -445,6 +445,8 @@ class Status < ApplicationRecord
   end
 
   def set_conversation
+    self.thread = thread.reblog if thread&.reblog?
+
     self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply
 
     if reply? && !thread.nil?
-- 
cgit