diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:59:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:59:21 -0400 |
| commit | 4c05f0e630aacad594e7b21147340e2c0a0ac8ad (patch) | |
| tree | 4ef28c2f42dd8e4cdfd9815dd6550b5bd2601f36 /app/models/status.rb | |
| parent | 96812a6c792c8b048ed8d4a50351d9696dcf0f77 (diff) | |
| parent | d438eab67301e767bdd040c6f9bd831c92214656 (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 |