diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:53:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:53:42 -0400 |
| commit | 3c5b0c55cb0dacc8471bcab98147dc86d5df12ed (patch) | |
| tree | d9debdce95dec993c4e69bf966876c3775db59ea /app/models/status.rb | |
| parent | 8a4ff30ceb4a81a215c1aebf404dd8776fde3c02 (diff) | |
| parent | 0dcf3c6abebfab4619f8c47785e821abe339dba1 (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 |