diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:34:45 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:34:45 -0400 |
commit | cf03634e74364af3a703ea09073ab0a58448d460 (patch) | |
tree | d4454c7feaa75a99532d4a5cd9bfdff8b4c8bf09 /app/models/status.rb | |
parent | 83530f0eef8f6cf04321b61c917da08ab0f4e323 (diff) | |
parent | 698d74a15fe8db61de057b8876e9967e9e9c7330 (diff) |
Merge branch 'master' into add-elao-com-instance
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 |