diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 23:03:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 23:03:07 -0400 |
| commit | ae9d2f4a32f07362e4d0ed18f0885f3b81eb801d (patch) | |
| tree | 04006f15ff50da8cf8772f30fe7f59e9d5df2deb /app/models/status.rb | |
| parent | 8e7d0bda403d912d2992e53eaa949fd0bdaf464f (diff) | |
| parent | a25a384af3d08a05bc0907261f76410da36cbb10 (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 |