diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-28 20:36:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-28 20:36:55 +0100 |
| commit | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (patch) | |
| tree | 770029d865518400da31e9cdb55fc9c584e5a90b /app/models/status.rb | |
| parent | ee1f1a2ec97604ed364a5944bd300be0771ba7d7 (diff) | |
| parent | b00f60f1d3d5415b5fd536191a7ee183ae910d03 (diff) | |
Merge pull request #794 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/status.rb')
| -rw-r--r-- | app/models/status.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index 438863589..f67a05b3c 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -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 |