diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:47:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:47:42 -0400 |
| commit | d6827e38a6cc7f4639991384f097f37254de15be (patch) | |
| tree | de5e1e93826fe049e0690e3ccb4ccdb3c1d20152 /app/models/status.rb | |
| parent | 0c4e9fdda051d0322608c9abdaa158529c8feacd (diff) | |
| parent | 29ed4484458fc62b423eeaef772ca0d67b27c4e4 (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 |