conduwuit-example.toml

@@ -442,9 +442,8 @@
 #registration_token_file =
 
 # The public site key for reCaptcha. If this is provided, reCaptcha
-# becomes required during registration. If both captcha *and*
-# registration token are enabled, both will be required during
-# registration.
+# becomes required during registration, **even if token registration is
+# enabled**.
 #
 # IMPORTANT: "Verify the origin of reCAPTCHA solutions" **MUST** BE
 # DISABLED IF YOU WANT THE CAPTCHA TO WORK IN 3RD PARTY CLIENTS, OR

src/core/config/check.rs

@@ -180,18 +180,11 @@ pub fn check(config: &Config) -> Result {
 		}
 	}
 
-	if config.recaptcha_site_key.is_some() && config.recaptcha_private_site_key.is_none() {
-		return Err!(Config(
-			"recaptcha_private_site_key",
-			"reCAPTCHA private site key is required when reCAPTCHA site key is set."
-		));
-	}
-
 	if config.allow_registration
 		&& !config.yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse
 		&& config.registration_token.is_none()
 		&& config.registration_token_file.is_none()
-		&& config.recaptcha_site_key.is_none()
+		&& !(config.recaptcha_site_key.is_some() && config.recaptcha_private_site_key.is_some())
 	{
 		return Err!(Config(
 			"registration_token",

src/core/config/mod.rs

@@ -557,9 +557,8 @@ pub struct Config {
 	pub registration_token_file: Option<PathBuf>,
 
 	/// The public site key for reCaptcha. If this is provided, reCaptcha
-	/// becomes required during registration. If both captcha *and*
-	/// registration token are enabled, both will be required during
-	/// registration.
+	/// becomes required during registration, **even if token registration is
+	/// enabled**.
 	///
 	/// IMPORTANT: "Verify the origin of reCAPTCHA solutions" **MUST** BE
 	/// DISABLED IF YOU WANT THE CAPTCHA TO WORK IN 3RD PARTY CLIENTS, OR

src/service/uiaa/mod.rs

@@ -192,7 +192,7 @@ pub async fn try_auth(
 			)
 			.await
 			{
-				| Ok(()) => {
+				| Ok() => {
 					uiaainfo.completed.push(AuthType::ReCaptcha);
 				},
 				| Err(e) => {