Merge branch 'master' into glitch-soc/merge-upstream
This commit is contained in:
@@ -94,6 +94,7 @@ class Status < ApplicationRecord
|
||||
:conversation,
|
||||
:status_stat,
|
||||
:tags,
|
||||
:preview_cards,
|
||||
:stream_entry,
|
||||
active_mentions: :account,
|
||||
reblog: [
|
||||
@@ -101,6 +102,7 @@ class Status < ApplicationRecord
|
||||
:application,
|
||||
:stream_entry,
|
||||
:tags,
|
||||
:preview_cards,
|
||||
:media_attachments,
|
||||
:conversation,
|
||||
:status_stat,
|
||||
@@ -168,6 +170,10 @@ class Status < ApplicationRecord
|
||||
reblog
|
||||
end
|
||||
|
||||
def preview_card
|
||||
preview_cards.first
|
||||
end
|
||||
|
||||
def title
|
||||
if destroyed?
|
||||
"#{account.acct} deleted status"
|
||||
@@ -241,10 +247,6 @@ class Status < ApplicationRecord
|
||||
before_validation :set_local
|
||||
|
||||
class << self
|
||||
def cache_ids
|
||||
left_outer_joins(:status_stat).select('statuses.id, greatest(statuses.updated_at, status_stats.updated_at) AS updated_at')
|
||||
end
|
||||
|
||||
def selectable_visibilities
|
||||
visibilities.keys - %w(direct limited)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user