diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:33:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:33:40 -0400 |
| commit | d7d165db5b1b7b1959a36e1f0e3da875befc2574 (patch) | |
| tree | 5be0ded23cf8a3190a3173bd5b16f4c4af77207f /app/models/status.rb | |
| parent | 73b8e67f4b103fc3400064d153807d6d88f758d4 (diff) | |
| parent | d7f4300ee3ff44a42453ea8042034d651a9789da (diff) | |
Merge branch 'master' into add-infinimatix.net-instance
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 6 |
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 |