diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-07 22:28:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:28:15 +0200 |
| commit | 32748c0f718b44bcdb4d19526bc9931c325acb63 (patch) | |
| tree | 3568cd8b5283cc1e0fd994354a002eda04044d45 /app/models/status.rb | |
| parent | 37a36b0bec1f27508926a420de05e6aa3c96fd10 (diff) | |
| parent | d4c94fa004117fdb7226b1b846a12d12dc0542d9 (diff) | |
Merge pull request #1184 from thoughtbot/extract-proper-status
DRY up reblog vs original status check
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 |