Merge branch 'kb_development' into upstream-20231021

2023-10-22 14:42:08 +09:00 · 2023-10-22 14:42:08 +09:00 · b992e673c7
commit b992e673c7
parent f9eaaec4e7 bcb3acdccd
25 changed files with 667 additions and 114 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -399,6 +399,7 @@ class Account < ApplicationRecord

  def allow_emoji_reaction?(account)
    return false if account.nil?
+    return true unless local? || account.local?

    show_emoji_reaction?(account)
  end