diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:13:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:13:06 -0400 |
| commit | cf13c97cb2890d7bf51540f632cf725f89baefd9 (patch) | |
| tree | d58925eed77815140c011bb70667fdc4b80173c5 /app/models/status.rb | |
| parent | 65b3a2a5a6e3151cf4da89132326b796a5c0687a (diff) | |
| parent | 90a408f5927956f0cbe9b81812daca7b4a92d807 (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 |