diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:46:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:46:36 -0400 |
| commit | e7d7a99fbc78c7dbf763279aa4262580cabd8e1f (patch) | |
| tree | 6f1fce572c176a73aeacffa948c51ca3bf797596 /app/models/status.rb | |
| parent | f0d1107c530d43432f2e19a2c74aff6cdfbd2b83 (diff) | |
| parent | 8d27de32b31f1093ab7c6eb177dfb9b866a1203e (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 |