diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:39:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:39:59 -0400 |
| commit | c890b86ef6843bb794d895121383e1dec9ce3256 (patch) | |
| tree | 155cba19e20c12450930e3b2735034c08e1ed628 /app/models/status.rb | |
| parent | eadac4e7f4ed44e868131f8b969a7f3dbc297e92 (diff) | |
| parent | ceba26d5276b18d0de29fc989ef7c343e6a85962 (diff) | |
Merge branch 'master' into patch-2
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 |