Ensure that reblogs and favs always refer to the original status rather than a reblog...

diff --git a/app/models/favourite.rb b/app/models/favourite.rb
index 541ca08314bfe7c71a7f9a94385a9bdee6e56537..2fc3d18cde785248f1bd591ab1da560a01f0bbb4 100644 (file)
--- a/app/models/favourite.rb
+++ b/app/models/favourite.rb
@@ -28,4 +28,8 @@ class Favourite < ApplicationRecord
   def target
     thread
   end
+
+  before_validation do
+    self.status = status.reblog if status.reblog?
+  end
 end

diff --git a/app/models/status.rb b/app/models/status.rb
index e87828e328b83b12d2ada71505dd667de67595fe..76ada52275bd95856f63f153f63e24e73bc504ad 100644 (file)
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -160,6 +160,7 @@ class Status < ApplicationRecord
 
   before_validation do
     text.strip!
+    self.reblog = reblog.reblog if reblog? && reblog.reblog?
     self.in_reply_to_account_id = thread.account_id if reply?
   end
 end