diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/status.rb | 2 | ||||
| -rw-r--r-- | app/models/stream_entry.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 7c5cd2f8a..08b5ee75e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -46,7 +46,7 @@ class Status < ActiveRecord::Base end def title - content.truncate(80, omission: "...") + content end def reblogs_count diff --git a/app/models/stream_entry.rb b/app/models/stream_entry.rb index 0cc959a1c..68a33ccf7 100644 --- a/app/models/stream_entry.rb +++ b/app/models/stream_entry.rb @@ -4,6 +4,8 @@ class StreamEntry < ActiveRecord::Base validates :account, :activity, presence: true + scope :with_includes, -> { includes(:activity) } + def object_type orphaned? ? :activity : (targeted? ? :activity : self.activity.object_type) end |