From 658ebb26c092622b0482fd26ec26cc4532372cf8 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sat, 11 Feb 2012 20:25:23 +0100
Subject: [PATCH] Use closures for sauces, small improvement for image spoiler
 revealer, fix sauces using thumbnails in case of spoiled image.

---
 4chan_x.user.js | 61 ++++++++++++++++++++++++++-----------------------
 changelog       |  1 +
 script.coffee   | 45 +++++++++++++++++++-----------------
 3 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 97164bf0a..a8847ce44 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2629,40 +2629,46 @@
 
   sauce = {
     init: function() {
-      var domain, fc, link, links, _i, _len;
-      links = conf['sauces'].match(/^[^#].+$/gm);
-      if (!links.length) return;
+      var link, _i, _len, _ref;
       this.links = [];
-      for (_i = 0, _len = links.length; _i < _len; _i++) {
-        link = links[_i];
-        domain = link.match(/(\w+)\.\w+\//)[1];
-        fc = link.replace(/\$\d/, function(fragment) {
-          switch (fragment) {
-            case '$1':
-              return "' + img.src + '";
-            case '$2':
-              return "' + img.parentNode.href + '";
-            case '$3':
-              return "' + img.getAttribute('md5').replace(/\=*$/, '') + '";
-          }
-        });
-        this.links.push([Function('img', "return '" + fc + "'"), domain]);
+      _ref = conf['sauces'].match(/^[^#].+$/gm);
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        link = _ref[_i];
+        this.links.push(this.funk(link));
       }
+      if (!this.links.length) return;
       return g.callbacks.push(this.node);
     },
+    funk: function(link) {
+      var domain, href;
+      domain = link.match(/(\w+)\.\w+\//)[1];
+      href = link.replace(/(\$\d)/, function(fragment) {
+        switch (fragment) {
+          case '$1':
+            return "http://thumbs.4chan.org' + img.parentNode.pathname.replace(/src(\\/\\d+).+$/, 'thumb$1s.jpg') + '";
+          case '$2':
+            return "' + img.parentNode.href + '";
+          case '$3':
+            return "' + img.getAttribute('md5').replace(/\=*$/, '') + '";
+        }
+      });
+      href = Function('img', "return '" + href + "'");
+      return function(img) {
+        return $.el('a', {
+          href: href(img),
+          target: '_blank',
+          textContent: domain
+        });
+      };
+    },
     node: function(root) {
-      var a, img, link, span, _i, _len, _ref;
+      var img, link, span, _i, _len, _ref;
       if (root.className === 'inline' || !(span = $('.filesize', root))) return;
       img = $('img', root);
       _ref = sauce.links;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         link = _ref[_i];
-        a = $.el('a', {
-          href: link[0](img),
-          target: '_blank',
-          textContent: link[1]
-        });
-        $.add(span, $.tn(' '), a);
+        $.add(span, $.tn(' '), link(img));
       }
     }
   };
@@ -2672,14 +2678,13 @@
       return g.callbacks.push(this.node);
     },
     node: function(root) {
-      var board, img, imgID, _, _ref;
-      if (!(img = $('img[alt^=Spoiler]', root)) || root.className === 'inline') {
+      var img;
+      if (!(img = $('img[alt^=Spoil]', root)) || root.className === 'inline') {
         return;
       }
       img.removeAttribute('height');
       img.removeAttribute('width');
-      _ref = img.parentNode.href.match(/(\w+)\/src\/(\d+)/), _ = _ref[0], board = _ref[1], imgID = _ref[2];
-      return img.src = "http://0.thumbs.4chan.org/" + board + "/thumb/" + imgID + "s.jpg";
+      return img.src = "http://thumbs.4chan.org" + (img.parentNode.pathname.replace(/src(\/\d+).+$/, 'thumb$1s.jpg'));
     }
   };
 
diff --git a/changelog b/changelog
index 7c67a7b62..3117095ce 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,7 @@
 master
 - Mayhem
   You can now drag replies in the dump list to reorder them.
+  Fix sauce links for spoiler thumbnails.
 
 2.26.0
 - desuwa
diff --git a/script.coffee b/script.coffee
index e6ff14ed2..a85f4fb95 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2085,41 +2085,44 @@ anonymize =
 
 sauce =
   init: ->
-    links = conf['sauces'].match /^[^#].+$/gm
-    return unless links.length
     @links = []
-    for link in links
-      domain = link.match(/(\w+)\.\w+\//)[1]
-      fc = link.replace /\$\d/, (fragment) ->
-        switch fragment
-          when '$1'
-            "' + img.src + '"
-          when '$2'
-            "' + img.parentNode.href + '"
-          when '$3'
-            "' + img.getAttribute('md5').replace(/\=*$/, '') + '"
-      @links.push [Function('img', "return '#{fc}'"), domain]
+    for link in conf['sauces'].match /^[^#].+$/gm
+      @links.push @funk link
+    return unless @links.length
     g.callbacks.push @node
+
+  funk: (link) ->
+    domain = link.match(/(\w+)\.\w+\//)[1]
+    href   = link.replace /(\$\d)/, (fragment) ->
+      switch fragment
+        when '$1'
+          "http://thumbs.4chan.org' + img.parentNode.pathname.replace(/src(\\/\\d+).+$/, 'thumb$1s.jpg') + '"
+        when '$2'
+          "' + img.parentNode.href + '"
+        when '$3'
+          "' + img.getAttribute('md5').replace(/\=*$/, '') + '"
+    href = Function 'img', "return '#{href}'"
+    (img) ->
+      $.el 'a',
+        href: href img
+        target: '_blank'
+        textContent: domain
+
   node: (root) ->
     return if root.className is 'inline' or not span = $ '.filesize', root
     img = $ 'img', root
     for link in sauce.links
-      a = $.el 'a',
-        href: link[0] img
-        target: '_blank'
-        textContent: link[1]
-      $.add span, $.tn(' '), a
+      $.add span, $.tn(' '), link img
     return
 
 revealSpoilers =
   init: ->
     g.callbacks.push @node
   node: (root) ->
-    return if not (img = $ 'img[alt^=Spoiler]', root) or root.className is 'inline'
+    return if not (img = $ 'img[alt^=Spoil]', root) or root.className is 'inline'
     img.removeAttribute 'height'
     img.removeAttribute 'width'
-    [_, board, imgID] = img.parentNode.href.match /(\w+)\/src\/(\d+)/
-    img.src = "http://0.thumbs.4chan.org/#{board}/thumb/#{imgID}s.jpg"
+    img.src = "http://thumbs.4chan.org#{img.parentNode.pathname.replace(/src(\/\d+).+$/, 'thumb$1s.jpg')}"
 
 Time =
   init: ->