diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:43:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:43:13 -0400 |
| commit | 38c51309300790e0f4a3fed0ede387c1765633a6 (patch) | |
| tree | 5fc14c684d9ee4b21eb7710c491b3573df6e0034 /app/models/status.rb | |
| parent | b5d87500d2600eb8a0a56b0caeca5c7be388df19 (diff) | |
| parent | ee8af9083ae83c6c642fa00aff040fb971f13470 (diff) | |
Merge branch 'master' into master
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 |