diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:08:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 23:08:41 -0400 |
| commit | 315ff648c8ab9f3bb34e2b6b1f77453159e260c4 (patch) | |
| tree | b3793cec5458e83ad0d7053d7f85a174d05a5523 /app/models/status.rb | |
| parent | 94536af96d9884e2acb2c34d0cf8948b1de7dd5d (diff) | |
| parent | 41923d1c6ba28df6652aefd9619acc33a5cf467a (diff) | |
Merge branch 'master' into list-oulipo-social
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 |