From e53d2af9b5906d619ab8bc438347daeb0cc6149c Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 17 Nov 2017 15:02:01 -0800
Subject: [PATCH] Hard disable 'Force Noscript Captcha for v1' in GM4 for now.

---
 src/Posting/QR.coffee | 2 ++
 src/main/Main.coffee  | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 712d46f0c..901619a77 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -30,6 +30,8 @@ QR =
 
     version = if Conf[if g.VIEW is 'thread' then 'Use Recaptcha v1' else 'Use Recaptcha v1 on Index'] and (Main.jsEnabled or location.protocol is 'https:')
       noscript = location.protocol is 'https:' and (Conf['Force Noscript Captcha for v1'] or not Main.jsEnabled)
+      # XXX Frames not yet supported in GM4.
+      noscript = false if (info = GM?.info) and info.scriptHandler is 'Greasemonkey' and /^4\./.test(info.version)
       if noscript then 'noscript' else 'v1'
     else
       'v2'
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index 551207c96..35382b4e4 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -70,10 +70,6 @@ Main =
     Conf['Bottom QR Link'] = true
     Conf['Toggleable Thread Watcher'] = true
 
-    # XXX Frames not yet supported in GM4.
-    if $.engine is 'gecko' and GM?
-      Conf['Force Noscript Captcha for v1'] = false
-
     # Enforce JS whitelist
     ($.getSync or $.get) {'jsWhitelist': Conf['jsWhitelist']}, ({jsWhitelist}) ->
       $.addCSP "script-src #{jsWhitelist.replace(/^#.*$/mg, '').replace(/[\s;]+/g, ' ').trim()}"