Merge branch 'bstable'

2021-07-08 09:49:55 -07:00 · 2021-07-08 09:49:55 -07:00 · e6c1f5502b
commit e6c1f5502b
parent f0c7afeded e81913a07c
16 changed files with 35 additions and 21 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,10 @@

 ### v1.14.21

+**v1.14.21.7** *(2021-07-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.7/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.7/builds/4chan-X-noupdate.crx)]
+- Don't warn on posting without captcha when "Verification not required."
+- Fix error reported in #3124.
+
 **v1.14.21.6** *(2021-07-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.6/builds/4chan-X-noupdate.crx)]
 - Captcha related bugfixes.

--- a/builds/4chan-X-beta.crx
+++ b/builds/4chan-X-beta.crx
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.14.21.6
+// @version      1.14.21.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X beta
-// @version      1.14.21.6
+// @version      1.14.21.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -218,7 +218,7 @@ docSet = function() {
 };

 g = {
-  VERSION:   '1.14.21.6',
+  VERSION:   '1.14.21.7',
  NAMESPACE: '4chan X.',
  sites:     Object.create(null),
  boards:    Object.create(null)
@ -23816,7 +23816,7 @@ Captcha = {};
      }
    },
    getOne: function() {
-      var i, key, len, ref, response;
+      var el, i, key, len, ref, response;
      response = {};
      if (this.nodes.container) {
        ref = ['t-response', 't-challenge'];
@ -23825,12 +23825,15 @@ Captcha = {};
          response[key] = $("[name='" + key + "']", this.nodes.container).value;
        }
      }
-      if (!response['t-response']) {
+      if (!response['t-response'] && !((el = $('#t-msg')) && /Verification not required/i.test(el.textContent))) {
        response = null;
      }
      return response;
    },
    setUsed: function() {
+      if (!this.isEnabled) {
+        return;
+      }
      if (this.nodes.container) {
        return $.global(function() {
          return window.TCaptcha.clearChallenge();
--- a/builds/4chan-X-noupdate.crx
+++ b/builds/4chan-X-noupdate.crx
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.14.21.6
+// @version      1.14.21.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -218,7 +218,7 @@ docSet = function() {
 };

 g = {
-  VERSION:   '1.14.21.6',
+  VERSION:   '1.14.21.7',
  NAMESPACE: '4chan X.',
  sites:     Object.create(null),
  boards:    Object.create(null)
@ -23816,7 +23816,7 @@ Captcha = {};
      }
    },
    getOne: function() {
-      var i, key, len, ref, response;
+      var el, i, key, len, ref, response;
      response = {};
      if (this.nodes.container) {
        ref = ['t-response', 't-challenge'];
@ -23825,12 +23825,15 @@ Captcha = {};
          response[key] = $("[name='" + key + "']", this.nodes.container).value;
        }
      }
-      if (!response['t-response']) {
+      if (!response['t-response'] && !((el = $('#t-msg')) && /Verification not required/i.test(el.textContent))) {
        response = null;
      }
      return response;
    },
    setUsed: function() {
+      if (!this.isEnabled) {
+        return;
+      }
      if (this.nodes.container) {
        return $.global(function() {
          return window.TCaptcha.clearChallenge();
--- a/builds/4chan-X.crx
+++ b/builds/4chan-X.crx
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.14.21.6
+// @version      1.14.21.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.14.21.6
+// @version      1.14.21.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -218,7 +218,7 @@ docSet = function() {
 };

 g = {
-  VERSION:   '1.14.21.6',
+  VERSION:   '1.14.21.7',
  NAMESPACE: '4chan X.',
  sites:     Object.create(null),
  boards:    Object.create(null)
@ -23816,7 +23816,7 @@ Captcha = {};
      }
    },
    getOne: function() {
-      var i, key, len, ref, response;
+      var el, i, key, len, ref, response;
      response = {};
      if (this.nodes.container) {
        ref = ['t-response', 't-challenge'];
@ -23825,12 +23825,15 @@ Captcha = {};
          response[key] = $("[name='" + key + "']", this.nodes.container).value;
        }
      }
-      if (!response['t-response']) {
+      if (!response['t-response'] && !((el = $('#t-msg')) && /Verification not required/i.test(el.textContent))) {
        response = null;
      }
      return response;
    },
    setUsed: function() {
+      if (!this.isEnabled) {
+        return;
+      }
      if (this.nodes.container) {
        return $.global(function() {
          return window.TCaptcha.clearChallenge();
--- a/builds/4chan-X.zip
+++ b/builds/4chan-X.zip
--- a/builds/updates-beta.json
+++ b/builds/updates-beta.json
@ -3,7 +3,7 @@
    "4chan-x@4chan-x.net": {
      "updates": [
        {
-          "version": "1.14.21.6",
+          "version": "1.14.21.7",
          "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
        }
      ]
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
  <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.21.6' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.21.7' />
  </app>
 </gupdate>

--- a/builds/updates.json
+++ b/builds/updates.json
@ -3,7 +3,7 @@
    "4chan-x@4chan-x.net": {
      "updates": [
        {
-          "version": "1.14.21.6",
+          "version": "1.14.21.7",
          "update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
        }
      ]
--- a/builds/updates.xml
+++ b/builds/updates.xml
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
  <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.21.6' />
+    <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.21.7' />
  </app>
 </gupdate>

--- a/src/Posting/Captcha.t.coffee
+++ b/src/Posting/Captcha.t.coffee
@ -60,11 +60,12 @@ Captcha.t =
    if @nodes.container
      for key in ['t-response', 't-challenge']
        response[key] = $("[name='#{key}']", @nodes.container).value
-    if !response['t-response']
+    if !response['t-response'] and !((el = $('#t-msg')) and /Verification not required/i.test(el.textContent))
      response = null
    response

  setUsed: ->
+    return unless @isEnabled
    if @nodes.container
      $.global ->
        window.TCaptcha.clearChallenge()
--- a/version.json
+++ b/version.json
@ -1,4 +1,4 @@
 {
-  "version": "1.14.21.6",
-  "date": "2021-07-08T03:54:56.178Z"
+  "version": "1.14.21.7",
+  "date": "2021-07-08T16:47:58.291Z"
 }