From 8b07e65eb438e0928aa8905f750259210ff84f44 Mon Sep 17 00:00:00 2001
From: Brian McSweeney <btmcsweeney@gmail.com>
Date: Fri, 15 Jun 2012 14:20:20 -0400
Subject: [PATCH] Fixed misc. problems with pull request.

---
 4chan_x.user.js | 11 ++++++-----
 Cakefile        |  1 +
 script.coffee   | 16 ++++++++--------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index b4ff07eea..2cc9ec146 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -65,6 +65,7 @@
  * Seiba - chrome quick reply focusing
  * herpaderpderp - recaptcha fixes
  * WakiMiko - recaptcha tab order http://userscripts.org/scripts/show/82657
+ * btmcsweeney - allow users to specify text for sauce links
  *
  * All the people who've taken the time to write bug reports.
  *
@@ -151,7 +152,7 @@
       filesize: [''].join('\n'),
       md5: [''].join('\n')
     },
-    sauces: ['http://iqdb.org/?url=$1', 'http://www.google.com/searchbyimage?image_url=$1', '#http://tineye.com/search?url=$1', '#http://saucenao.com/search.php?db=999&url=$1', '#http://3d.iqdb.org/?url=$1', '#http://regex.info/exif.cgi?imgurl=$2', '# uploaders:', '#http://imgur.com/upload?url=$2;show:Upload to imgur', '#http://omploader.org/upload?url1=$2;show:Upload to omploader', '# "View Same" in archives:', '#http://archive.foolz.us/search/image/$3/;show:View same on foolz', '#http://archive.foolz.us/$4/search/image/$3/;show:View same on foolz /$4/', '#https://archive.installgentoo.net/$4/image/$3;show:View same on installgentoo /$4/'].join('\n'),
+    sauces: ['http://iqdb.org/?url=$1', 'http://www.google.com/searchbyimage?image_url=$1', '#http://tineye.com/search?url=$1', '#http://saucenao.com/search.php?db=999&url=$1', '#http://3d.iqdb.org/?url=$1', '#http://regex.info/exif.cgi?imgurl=$2', '# uploaders:', '#http://imgur.com/upload?url=$2;text:Upload to imgur', '#http://omploader.org/upload?url1=$2;text:Upload to omploader', '# "View Same" in archives:', '#http://archive.foolz.us/search/image/$3/;text:View same on foolz', '#http://archive.foolz.us/$4/search/image/$3/;text:View same on foolz /$4/', '#https://archive.installgentoo.net/$4/image/$3;text:View same on installgentoo /$4/'].join('\n'),
     time: '%m/%d/%y(%a)%H:%M',
     backlink: '>>%id',
     fileInfo: '%l (%p%s, %r)',
@@ -2239,7 +2240,7 @@
   <div>\
     <div class=warning><code>Sauce</code> is disabled.</div>\
     Lines starting with a <code>#</code> will be ignored.<br>\
-	You can specify a certain display text by appending ";show:[text]" to the url.\
+    You can specify a certain display text by appending ";text:[text]" to the url.\
     <ul>These parameters will be replaced by their corresponding values:\
       <li>$1: Thumbnail url.</li>\
       <li>$2: Full image url.</li>\
@@ -2768,7 +2769,7 @@
       return Main.callbacks.push(this.node);
     },
     createSauceLink: function(link) {
-      var domain, el, href;
+      var domain, el, href, m;
       link = link.replace(/(\$\d)/g, function(parameter) {
         switch (parameter) {
           case '$1':
@@ -2781,8 +2782,8 @@
             return g.BOARD;
         }
       });
-      domain = link.match(/;show:(.+)$/) ? link.match(/;show:(.+)$/)[1] : link.match(/(\w+)\.\w+\//)[1];
-      href = link.match(/;show:(.+)$/) ? link.match(/^(.+);show:.+$/)[1] : link;
+      domain = (m = link.match(/;text:(.+)$/)) ? m[1] : link.match(/(\w+)\.\w+\//)[1];
+      href = link.replace(/;text:.+$/, '');
       href = Function('img', "return '" + href + "'");
       el = $.el('a', {
         target: '_blank',
diff --git a/Cakefile b/Cakefile
index c85c10f42..42121406a 100644
--- a/Cakefile
+++ b/Cakefile
@@ -72,6 +72,7 @@ HEADER  = """
  * Seiba - chrome quick reply focusing
  * herpaderpderp - recaptcha fixes
  * WakiMiko - recaptcha tab order http://userscripts.org/scripts/show/82657
+ * btmcsweeney - allow users to specify text for sauce links
  *
  * All the people who've taken the time to write bug reports.
  *
diff --git a/script.coffee b/script.coffee
index 517625db9..23ed42f20 100644
--- a/script.coffee
+++ b/script.coffee
@@ -107,12 +107,12 @@ Config =
     '#http://3d.iqdb.org/?url=$1'
     '#http://regex.info/exif.cgi?imgurl=$2'
     '# uploaders:'
-    '#http://imgur.com/upload?url=$2;show:Upload to imgur'
-    '#http://omploader.org/upload?url1=$2;show:Upload to omploader'
+    '#http://imgur.com/upload?url=$2;text:Upload to imgur'
+    '#http://omploader.org/upload?url1=$2;text:Upload to omploader'
     '# "View Same" in archives:'
-    '#http://archive.foolz.us/search/image/$3/;show:View same on foolz'
-    '#http://archive.foolz.us/$4/search/image/$3/;show:View same on foolz /$4/'
-    '#https://archive.installgentoo.net/$4/image/$3;show:View same on installgentoo /$4/'
+    '#http://archive.foolz.us/search/image/$3/;text:View same on foolz'
+    '#http://archive.foolz.us/$4/search/image/$3/;text:View same on foolz /$4/'
+    '#https://archive.installgentoo.net/$4/image/$3;text:View same on installgentoo /$4/'
   ].join '\n'
   time: '%m/%d/%y(%a)%H:%M'
   backlink: '>>%id'
@@ -1708,7 +1708,7 @@ Options =
   <div>
     <div class=warning><code>Sauce</code> is disabled.</div>
     Lines starting with a <code>#</code> will be ignored.<br>
-	You can specify a certain display text by appending ";show:[text]" to the url.
+    You can specify a certain display text by appending ";text:[text]" to the url.
     <ul>These parameters will be replaced by their corresponding values:
       <li>$1: Thumbnail url.</li>
       <li>$2: Full image url.</li>
@@ -2166,8 +2166,8 @@ Sauce =
           "' + encodeURIComponent(img.firstChild.dataset.md5) + '"
         when '$4'
           g.BOARD
-    domain = if link.match(/;show:(.+)$/) then link.match(/;show:(.+)$/)[1] else link.match(/(\w+)\.\w+\//)[1]
-    href = if link.match(/;show:(.+)$/) then link.match(/^(.+);show:.+$/)[1] else link
+    domain = if m = link.match(/;text:(.+)$/) then m[1] else link.match(/(\w+)\.\w+\//)[1]
+    href = link.replace /;text:.+$/, ''
     href = Function 'img', "return '#{href}'"
     el = $.el 'a',
       target: '_blank'