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

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.

1 files changed, 5 insertions, 0 deletions

diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index a89df86c5..6e88864e8 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -20,4 +20,9 @@ class StatusEdit < ApplicationRecord
   default_scope { order(id: :asc) }
 
   delegate :local?, to: :status
+
+  def emojis
+    return @emojis if defined?(@emojis)
+    @emojis = CustomEmoji.from_text([spoiler_text, text].join(' '), status.account.domain)
+  end
 end