diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:05:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:05:38 -0400 |
| commit | e51b6bba9482376dd53669e8d3bb331143ed74fa (patch) | |
| tree | 66175f9fae1f587dc0d1868c5d3ca95898adc88b /app/models/status.rb | |
| parent | b38bd58921317459ba5bc5cb00a6f18c1875d574 (diff) | |
| parent | 7f393a0b68dc919f618556747c77b82a45b13f0e (diff) | |
Merge branch 'master' into patch-1
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 |