diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:54:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:54:25 -0400 |
| commit | 971c4de18c35bcfe24e92d40b657950b19dfa62a (patch) | |
| tree | 90118f965cd5770911e1daa8cc684746ece1e321 /app/models/status.rb | |
| parent | 4b08b7c50274bbfdd527a17eddd1242d21fc8cae (diff) | |
| parent | 394c8ef6801a82fab0bb3b75fbef1e6b6100d28a (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 |