about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorShel R <Yiskah.Raphen@gmail.com>2017-04-07 22:38:37 -0400
committerGitHub <noreply@github.com>2017-04-07 22:38:37 -0400
commit7826b5e93d1937ac409c6499940fd83af2c12cd1 (patch)
tree1eaf1cc62022ca9fd46a057b8f76c00d3e099939 /app/models/status.rb
parent0209b7d1b52a2c44cf055c7d7a5209e98ffe04f8 (diff)
parentfc7b8307190b8f472b526d99bc10db58153850d5 (diff)
Merge branch 'master' into patch-1
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 6948ad77c..7e3dd3e28 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -62,8 +62,12 @@ class Status < ApplicationRecord
     reply? ? :comment : :note
   end
 
+  def proper
+    reblog? ? reblog : self
+  end
+
   def content
-    reblog? ? reblog.text : text
+    proper.text
   end
 
   def target