about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorvalerauko <vale@valerauko.net>2018-11-26 00:35:21 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-11-25 16:35:21 +0100
commitdb9aea34dead1b230e44b4235ff8af8100108b7f (patch)
treeeb88e37c6ff1af9074878c4428e1c8e87224a3e9 /app
parent180ae0472a3ff2c0c4a59733f78c87cb6e2004d7 (diff)
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
Diffstat (limited to 'app')
-rw-r--r--app/models/status.rb2
1 files changed, 2 insertions, 0 deletions
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?