diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:41:07 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:41:07 -0400 |
commit | 9edee2e64f30667e6f848bb7e27adb82cf1f91cd (patch) | |
tree | 1eb422e98bd7aefb687fd9d0938c669e7e6783f8 /app/models/status.rb | |
parent | 30619a67168c0f021d37daa5d717e7a508cafd49 (diff) | |
parent | d7e1a282fe95fe04e918f52bdd476dedc6e97d01 (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 |