diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:02:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:02:26 -0400 |
commit | 9f43e3b428c0adea4af75fc4e340799954e42221 (patch) | |
tree | ab2b6bb407ca6310d63b84af6f64ab4dca90a2dc /app/models/status.rb | |
parent | 8989569dd42aabd9c768927f0975401af89bceb3 (diff) | |
parent | 4a40b40324aa50ec0c42d574f78bb45835dfe295 (diff) |
Merge branch 'master' into patch-4
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 |