diff --git a/builds/appchan-x.meta.js b/builds/appchan-x.meta.js index c7460098f..017f0bcfe 100644 --- a/builds/appchan-x.meta.js +++ b/builds/appchan-x.meta.js @@ -11,7 +11,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* -// @match *://www.google.com/recaptcha/api/fallback?k=6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs +// @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @exclude *://blog.4chan.org/* // @exclude *://dis.4chan.org/* // @grant GM_getValue diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 86ef225bd..b87bb063d 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -12,7 +12,7 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* -// @match *://www.google.com/recaptcha/api/fallback?k=6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs +// @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc // @exclude *://blog.4chan.org/* // @exclude *://dis.4chan.org/* // @grant GM_getValue @@ -8787,7 +8787,7 @@ Captcha.noscript = { lifetime: 2 * $.MINUTE, - iframeURL: '//www.google.com/recaptcha/api/fallback?k=6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs', + iframeURL: '//www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc', init: function() { var container, input; if (d.cookie.indexOf('pass_enabled=1') >= 0) { @@ -9218,7 +9218,7 @@ childList: true, subtree: true }); - return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs\',\n theme: document.documentElement.classList.contains(\'tomorrow\') ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); + return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); }, afterSetup: function(mutations) { var iframe, mutation, node, textarea, _i, _j, _len, _len1, _ref; diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 273a054a5..d0751854c 100644 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -10,7 +10,7 @@ }, "content_scripts": [{ "js": ["script.js"], - "matches": ["*://*.4chan.org/*","*://boards.4chan.org/*","*://sys.4chan.org/*","*://a.4cdn.org/*","*://i.4cdn.org/*","*://www.google.com/recaptcha/api/fallback?k=6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs"], + "matches": ["*://*.4chan.org/*","*://boards.4chan.org/*","*://sys.4chan.org/*","*://a.4cdn.org/*","*://i.4cdn.org/*","*://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc"], "all_frames": true, "run_at": "document_start" }], diff --git a/builds/crx/script.js b/builds/crx/script.js index d2af1ff02..d4e450b1b 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -8828,7 +8828,7 @@ Captcha.noscript = { lifetime: 2 * $.MINUTE, - iframeURL: '//www.google.com/recaptcha/api/fallback?k=6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs', + iframeURL: '//www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc', init: function() { var container, input; if (d.cookie.indexOf('pass_enabled=1') >= 0) { @@ -9259,7 +9259,7 @@ childList: true, subtree: true }); - return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs\',\n theme: document.documentElement.classList.contains(\'tomorrow\') ? \'dark\' : \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); + return $.globalEval('(function() {\n function render() {\n var container = document.querySelector("#qr .captcha-container");\n container.dataset.widgetID = window.grecaptcha.render(container, {\n sitekey: \'6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc\',\n theme: \'light\',\n callback: function(response) {\n window.dispatchEvent(new CustomEvent("captcha:success", {detail: response}));\n }\n });\n }\n if (window.grecaptcha) {\n render();\n } else {\n var cbNative = window.onRecaptchaLoaded;\n window.onRecaptchaLoaded = function() {\n render();\n cbNative();\n }\n }\n})();'); }, afterSetup: function(mutations) { var iframe, mutation, node, textarea, _i, _j, _len, _len1, _ref; diff --git a/package.json b/package.json index a60c6ca8d..0e1038629 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "repo": "https://github.com/zixaphir/appchan-x/", "page": "http://zixaphir.github.com/appchan-x/", "faq": "https://github.com/zixaphir/appchan-x/wiki/Frequently-Asked-Questions", - "recaptchaKey": "6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs", + "recaptchaKey": "6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc", "youtubeAPIKey": "AIzaSyCrvwsT3ub8sDl3S5APhok2eY-OzRcCK5U", "buildsPath": "builds/", "mainBranch": "master", @@ -18,7 +18,7 @@ "*://sys.4chan.org/*", "*://a.4cdn.org/*", "*://i.4cdn.org/*", - "*://www.google.com/recaptcha/api/fallback?k=6Ld9lQATAAAAAN6ZHhqB_oOjm7jat0swNdi0mmCs" + "*://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc" ], "excludes": [ "*://blog.4chan.org/*", diff --git a/src/Posting/Captcha.v2.coffee b/src/Posting/Captcha.v2.coffee index f2cb19c63..6ec3842c6 100644 --- a/src/Posting/Captcha.v2.coffee +++ b/src/Posting/Captcha.v2.coffee @@ -76,7 +76,7 @@ Captcha.v2 = var container = document.querySelector("#qr .captcha-container"); container.dataset.widgetID = window.grecaptcha.render(container, { sitekey: '<%= meta.recaptchaKey %>', - theme: document.documentElement.classList.contains('tomorrow') ? 'dark' : 'light', + theme: 'light', callback: function(response) { window.dispatchEvent(new CustomEvent("captcha:success", {detail: response})); }