From fcd6ffa8bb3c40d5168ba66f557124ce12189f69 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Mon, 13 Jun 2016 03:02:17 -0700
Subject: [PATCH] Drop complaint and IRC links from captchas. #904

---
 src/Miscellaneous/Report.coffee  | 17 -----------------
 src/Posting/Captcha.fixes.coffee | 11 -----------
 src/Posting/QR.coffee            |  3 +--
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/src/Miscellaneous/Report.coffee b/src/Miscellaneous/Report.coffee
index 6daba588a..026699bb0 100644
--- a/src/Miscellaneous/Report.coffee
+++ b/src/Miscellaneous/Report.coffee
@@ -10,23 +10,6 @@ Report =
 
     Report.archive() if Conf['Archive Report']
 
-    if (passAd = $ 'a[href="https://www.4chan.org/pass"]')
-      $.extend passAd,
-        textContent: 'Complain'
-        href:        'https://www.4chan.org/feedback'
-        tabIndex:    -1
-      passAd.parentNode.normalize()
-      if (prev = passAd.previousSibling)?.nodeType is Node.TEXT_NODE
-        prev.nodeValue = prev.nodeValue.replace /4chan Pass[^\.]*\./i, 'reCAPTCHA malfunctioning?'
-      $.after passAd, [
-        $.tn '] ['
-        $.el 'a',
-          href:        'irc://irc.rizon.net/4chan'
-          textContent: '4chan IRC'
-          target:      '_blank'
-          tabIndex:    -1
-      ]
-
     if not Conf['Use Recaptcha v1 in Reports'] and not Conf['Force Noscript Captcha'] and Main.jsEnabled
       new MutationObserver(->
         Report.fit 'iframe[src^="https://www.google.com/recaptcha/api2/frame"]'
diff --git a/src/Posting/Captcha.fixes.coffee b/src/Posting/Captcha.fixes.coffee
index e2298d721..60e52f5ab 100644
--- a/src/Posting/Captcha.fixes.coffee
+++ b/src/Posting/Captcha.fixes.coffee
@@ -94,17 +94,6 @@ Captcha.fixes =
       @addTooltips @images
     else
       @addTooltips16 @images
-    @complaintLinks()
-
-  complaintLinks: ->
-    for errmsg in $$ '.rc-imageselect-incorrect-response, .rc-imageselect-error-select-one, .rc-imageselect-error-select-more, .rc-imageselect-error-dynamic-more'
-      unless $ 'a', errmsg
-        link = $.el 'a',
-          href: 'https://www.4chan.org/feedback'
-          target: '_blank'
-          textContent: '[complain]'
-        $.add errmsg, [$.tn(' '), link]
-    return
 
   addLabels: ->
     imageSelect = $ '.fbc-payload-imageselect'
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index e38abf672..a742d8ee3 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -721,8 +721,7 @@ QR =
       if /captcha|verification/i.test(err.textContent) or err is 'Connection error with sys.4chan.org.'
         # Remove the obnoxious 4chan Pass ad.
         if /mistyped/i.test err.textContent
-          err = $.el 'span',
-            <%= html('You mistyped the CAPTCHA, or the CAPTCHA malfunctioned [<a href="https://www.4chan.org/feedback" target="_blank">complain here</a>].') %>
+          err = 'You mistyped the CAPTCHA, or the CAPTCHA malfunctioned.'
         else if /expired/i.test err.textContent
           err = 'This CAPTCHA is no longer valid because it has expired.'
         # Something must've gone terribly wrong if you get captcha errors without captchas.