Fix captchas, again. #1531

CHANGELOG.md

@@ -1,3 +1,7 @@
+- Fix captcha submission:<br>
+  Captchas were reloaded the instant a post was submitted to 4chan. Unfortunately, a recent change to reCAPTCHA made it so reloading captchas invalidates the ones that loaded but not yet used. This is now fixed by only unloading the captcha, and only load new ones after the post is submitted.<br>
+  This also kills captcha caching, so the feature was removed.
+
 ### 3.19.4 - *2014-03-27*
 
 - Fix captcha not refreshing.

src/Posting/QR.captcha.coffee

@@ -1,26 +1,21 @@
 QR.captcha =
   init: ->
     return if d.cookie.indexOf('pass_enabled=1') >= 0
-    container = $.id 'captchaContainer'
+    return unless @isEnabled = !!$.id 'captchaContainer'
-    return unless @isEnabled = !!container
 
     imgContainer = $.el 'div',
       className: 'captcha-img'
       title: 'Reload reCAPTCHA'
       innerHTML: '<img>'
-      hidden: true
     input = $.el 'input',
       className: 'captcha-input field'
       title: 'Verification'
-      placeholder: 'Focus to load reCAPTCHA'
       autocomplete: 'off'
       spellcheck: false
     @nodes =
       img:   imgContainer.firstChild
       input: input
 
-    $.on input, 'focus', @setup
-
     <% if (type === 'userscript') { %>
     # XXX Firefox lacks focusin/focusout support.
     $.on input, 'blur',  QR.focusout
@@ -30,9 +25,16 @@ QR.captcha =
     $.addClass QR.nodes.el, 'has-captcha'
     $.after QR.nodes.com.parentNode, [imgContainer, input]
 
-    @setupObserver = new MutationObserver @afterSetup
+    @beforeSetup()
-    @setupObserver.observe container, childList: true
     @afterSetup() # reCAPTCHA might have loaded before the QR.
+  beforeSetup: ->
+    {img, input} = @nodes
+    img.parentNode.hidden = true
+    input.value = ''
+    input.placeholder = 'Focus to load reCAPTCHA'
+    $.on input, 'focus', @setup
+    @setupObserver = new MutationObserver @afterSetup
+    @setupObserver.observe $.id('captchaContainer'), childList: true
   setup: ->
     $.globalEval 'loadRecaptcha()'
   afterSetup: ->
@@ -40,82 +42,37 @@ QR.captcha =
     QR.captcha.setupObserver.disconnect()
     delete QR.captcha.setupObserver
 
-    setLifetime = (e) -> QR.captcha.lifetime = e.detail
-    $.on  window, 'captcha:timeout', setLifetime
-    $.globalEval 'window.dispatchEvent(new CustomEvent("captcha:timeout", {detail: RecaptchaState.timeout}))'
-    $.off window, 'captcha:timeout', setLifetime
-
     {img, input} = QR.captcha.nodes
     img.parentNode.hidden = false
-    $.off input,         'focus',  QR.captcha.setup
+    input.placeholder = 'Verification'
+    $.off input,         'focus',   QR.captcha.setup
     $.on input,          'keydown', QR.captcha.keydown.bind QR.captcha
     $.on img.parentNode, 'click',   QR.captcha.reload.bind  QR.captcha
 
-    $.get 'captchas', [], ({captchas}) ->
-      QR.captcha.sync captchas
-    $.sync 'captchas', QR.captcha.sync
-
     QR.captcha.nodes.challenge = challenge
     new MutationObserver(QR.captcha.load.bind QR.captcha).observe challenge,
       childList: true
       subtree: true
       attributes: true
     QR.captcha.load()
-  sync: (captchas) ->
+  destroy: ->
-    QR.captcha.captchas = captchas
+    $.globalEval 'Recaptcha.destroy()'
-    QR.captcha.count()
+    @beforeSetup()
   getOne: ->
-    @clear()
+    challenge = @nodes.img.alt
-    if captcha = @captchas.shift()
+    response  = @nodes.input.value.trim()
-      {challenge, response} = captcha
+    if response and !/\s/.test response
-      @count()
-      $.set 'captchas', @captchas
-    else
-      challenge   = @nodes.img.alt
-      if response = @nodes.input.value then @reload()
-    if response
-      response = response.trim()
       # one-word-captcha:
       # If there's only one word, duplicate it.
-      response = "#{response} #{response}" unless /\s/.test response
+      response = "#{response} #{response}"
     {challenge, response}
-  save: ->
-    return unless response = @nodes.input.value.trim()
-    @captchas.push
-      challenge: @nodes.img.alt
-      response:  response
-      timeout:   @timeout
-    @count()
-    @reload()
-    $.set 'captchas', @captchas
-  clear: ->
-    return unless @captchas # not loaded yet.
-    now = Date.now()
-    for captcha, i in @captchas
-      break if captcha.timeout > now
-    return unless i
-    @captchas = @captchas[i..]
-    @count()
-    $.set 'captchas', @captchas
   load: ->
     return unless @nodes.challenge.firstChild
     # -1 minute to give upload some time.
-    @timeout  = Date.now() + @lifetime * $.SECOND - $.MINUTE
     challenge = @nodes.challenge.firstChild.value
     @nodes.img.alt = challenge
     @nodes.img.src = "//www.google.com/recaptcha/api/image?c=#{challenge}"
     @nodes.input.value = null
-    @clear()
-  count: ->
-    count = if @captchas then @captchas.length else 0
-    @nodes.input.placeholder = switch count
-      when 0
-        'Verification (Shift + Enter to cache)'
-      when 1
-        'Verification (1 cached captcha)'
-      else
-        "Verification (#{count} cached captchas)"
-    @nodes.input.alt = count # For XTRM RICE.
   reload: (focus) ->
     # the 't' argument prevents the input from being focused
     $.globalEval 'Recaptcha.reload("t")'
@@ -124,8 +81,6 @@ QR.captcha =
   keydown: (e) ->
     if e.keyCode is 8 and not @nodes.input.value
       @reload()
-    else if e.keyCode is 13 and e.shiftKey
-      @save()
     else
       return
     e.preventDefault()

src/Posting/QR.coffee

@@ -478,6 +478,9 @@ QR =
         # Connection error, or
         # www.4chan.org/banned
         delete QR.req
+        if QR.captcha.isEnabled
+          QR.captcha.destroy()
+          QR.captcha.setup()
         post.unlock()
         QR.cooldown.auto = false
         QR.status()
@@ -511,6 +514,7 @@ QR =
     {req} = QR
     delete QR.req
 
+    QR.captcha.destroy() if QR.captcha.isEnabled
     post = QR.posts[0]
     post.unlock()
 
@@ -540,23 +544,12 @@ QR =
         # Remove the obnoxious 4chan Pass ad.
         if /mistyped/i.test err.textContent
           err = 'You seem to have mistyped the CAPTCHA.'
-        # Enable auto-post if we have some cached captchas.
+        QR.cooldown.auto = false
-        QR.cooldown.auto = if QR.captcha.isEnabled
-          !!QR.captcha.captchas.length
-        else if err is 'Connection error with sys.4chan.org.'
-          true
-        else
-          # Something must've gone terribly wrong if you get captcha errors without captchas.
-          # Don't auto-post indefinitely in that case.
-          false
         # Too many frequent mistyped captchas will auto-ban you!
         # On connection error, the post most likely didn't go through.
         QR.cooldown.set delay: 2
       else if err.textContent and m = err.textContent.match /wait\s+(\d+)\s+second/i
-        QR.cooldown.auto = if QR.captcha.isEnabled
+        QR.cooldown.auto = !QR.captcha.isEnabled
-          !!QR.captcha.captchas.length
-        else
-          true
         QR.cooldown.set delay: m[1]
       else # stop auto-posting
         QR.cooldown.auto = false
@@ -592,18 +585,6 @@ QR =
     # Enable auto-posting if we have stuff left to post, disable it otherwise.
     postsCount = QR.posts.length - 1
     QR.cooldown.auto = postsCount and isReply
-    if QR.cooldown.auto and QR.captcha.isEnabled and (captchasCount = QR.captcha.captchas.length) < 3 and captchasCount < postsCount
-      notif = new Notification 'Quick reply warning',
-        body: "You are running low on cached captchas. Cache count: #{captchasCount}."
-        icon: Favicon.logo
-      notif.onclick = ->
-        QR.open()
-        QR.captcha.nodes.input.focus()
-        window.focus()
-      notif.onshow = ->
-        setTimeout ->
-          notif.close()
-        , 7 * $.SECOND
 
     unless Conf['Persistent QR'] or QR.cooldown.auto
       QR.close()

src/Posting/QR.post.coffee

@@ -89,6 +89,8 @@ QR.post = class
     for name in ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag']
       continue unless node = QR.nodes[name]
       node.disabled = lock
+    if QR.captcha.isEnabled
+      QR.captcha.nodes.input.disabled = lock
     @nodes.rm.style.visibility = if lock then 'hidden' else ''
     (if lock then $.off else $.on) QR.nodes.filename.previousElementSibling, 'click', QR.openFileInput
     @nodes.spoiler.disabled = lock