diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:44:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:44:40 -0400 |
| commit | abab82ec1e086e257650ceed3d03a4d881e0a12e (patch) | |
| tree | a8b7db83af6b84813c5bd951d38ca0334acb9af7 /app/models/status.rb | |
| parent | 07495cc13feb78ae979a8af69a401cce8dcd4e8d (diff) | |
| parent | f0797bf8cecd7d8537747bff66fc0363ccc59760 (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 |