Merge branch 'main' into glitch-soc/merge-upstream

2022-03-02 18:02:48 +01:00
parent 0b8fe020b5 462a6f7d72
commit 425a6c90c4
189 changed files with 2586 additions and 1444 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -238,6 +238,10 @@ class Status < ApplicationRecord
    media_attachments.any?
  end

+  def with_preview_card?
+    preview_cards.any?
+  end
+
  def non_sensitive_with_media?
    !sensitive? && with_media?
  end