diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:15:55 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:15:55 -0400 |
commit | 1b42f717f2c44bb0c85dfc8e8b40790b12d45993 (patch) | |
tree | 852b1ccaeb7c5eeae530c66eb1a97462b2dd7831 /app/models/status.rb | |
parent | eb98c99924ab810eea8a97040a82308f68c805cc (diff) | |
parent | 7004c692040d9372c187a13a21f1215f07d3a8ff (diff) |
Merge branch 'master' into master
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 |