Merge branch 'master' into glitch-soc/master

Conflicts: - `streaming/index.js`: Upstream entirely refactored it. Ported our changes to upstream's refactor. Hopefuly.
2020-08-11 19:19:27 +02:00
parent 03712799e2 ef057584fd
commit 78fa15d08f
6 changed files with 835 additions and 339 deletions
--- a/app/models/form/custom_emoji_batch.rb
+++ b/app/models/form/custom_emoji_batch.rb
@ -30,7 +30,7 @@ class Form::CustomEmojiBatch
  private

  def custom_emojis
-    CustomEmoji.where(id: custom_emoji_ids)
+    @custom_emojis ||= CustomEmoji.where(id: custom_emoji_ids)
  end

  def update!