Merge commit '2664bb628b7bf77b9efa4143423486cf16d17ba7' into glitch-soc/merge-upstream

2025-12-15 16:59:41 +00:00 · 2025-09-17 18:17:18 +02:00
parent 12d61e0d84 2664bb628b
commit 210786efd8
70 changed files with 414 additions and 487 deletions
--- a/app/controllers/concerns/api/interaction_policies_concern.rb
+++ b/app/controllers/concerns/api/interaction_policies_concern.rb
@@ -14,7 +14,7 @@ module Api::InteractionPoliciesConcern
    when 'nobody'
      0
    when nil
-      current_user.setting_default_quote_policy
+      Status::QUOTE_APPROVAL_POLICY_FLAGS[current_user.setting_default_quote_policy&.to_sym] << 16
    else
      # TODO: raise more useful message
      raise ActiveRecord::RecordInvalid