diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:42:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:42:10 -0400 |
| commit | 065defefac7f1e7e05190f7853699dae9ecbf37a (patch) | |
| tree | 5fff3fb0e831c54989604c8ef5f085e13f76a323 /app/models/status.rb | |
| parent | 9a534d1df639ccd462d0c1f0b2faee0734daab8d (diff) | |
| parent | 6bfe0689047644743061cfc217a7a64e46c36a87 (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 |