From 97b18d10b42bb61baeec4a5612036e170af33874 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Wed, 23 Oct 2024 10:25:43 -0400
Subject: [PATCH] Move hcaptcha service config to `config_for` yml (#30662)

---
 app/controllers/concerns/auth/captcha_concern.rb | 2 +-
 app/helpers/admin/settings_helper.rb             | 2 +-
 config/application.rb                            | 1 +
 config/captcha.yml                               | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 config/captcha.yml

diff --git a/app/controllers/concerns/auth/captcha_concern.rb b/app/controllers/concerns/auth/captcha_concern.rb
index cfd93978c..c01da2124 100644
--- a/app/controllers/concerns/auth/captcha_concern.rb
+++ b/app/controllers/concerns/auth/captcha_concern.rb
@@ -10,7 +10,7 @@ module Auth::CaptchaConcern
   end
 
   def captcha_available?
-    ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present?
+    Rails.configuration.x.captcha.secret_key.present? && Rails.configuration.x.captcha.site_key.present?
   end
 
   def captcha_enabled?
diff --git a/app/helpers/admin/settings_helper.rb b/app/helpers/admin/settings_helper.rb
index 6937331e1..9b950d5a6 100644
--- a/app/helpers/admin/settings_helper.rb
+++ b/app/helpers/admin/settings_helper.rb
@@ -2,7 +2,7 @@
 
 module Admin::SettingsHelper
   def captcha_available?
-    ENV['HCAPTCHA_SECRET_KEY'].present? && ENV['HCAPTCHA_SITE_KEY'].present?
+    Rails.configuration.x.captcha.secret_key.present? && Rails.configuration.x.captcha.site_key.present?
   end
 
   def login_activity_title(activity)
diff --git a/config/application.rb b/config/application.rb
index 064111398..f94366d36 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -109,6 +109,7 @@ module Mastodon
       end
     end
 
+    config.x.captcha = config_for(:captcha)
     config.x.translation = config_for(:translation)
 
     config.to_prepare do
diff --git a/config/captcha.yml b/config/captcha.yml
new file mode 100644
index 000000000..a9f54588c
--- /dev/null
+++ b/config/captcha.yml
@@ -0,0 +1,3 @@
+shared:
+  secret_key: <%= ENV.fetch('HCAPTCHA_SECRET_KEY', nil) %>
+  site_key: <%= ENV.fetch('HCAPTCHA_SITE_KEY', nil) %>