From 49fdf9a8d37af67488566e95b5a790c4c84ee6c6 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sun, 17 Jun 2012 01:34:04 +0200
Subject: [PATCH 1/6] Nitpicking.

---
 4chan_x.user.js | 4 ++--
 script.coffee   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index f4a4d4092..02f88d21c 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2243,7 +2243,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 ";text:[text]" to the url.\
+    You can specify a certain display text by appending <code>;text:[text]</code> to the url.\
     <ul>These parameters will be replaced by their corresponding values:\
       <li>$1: Thumbnail url.</li>\
       <li>$2: Full image url.</li>\
@@ -2456,7 +2456,7 @@
     </li>\
     <li>\
       Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).<br>\
-      For example: <code>stub:yes;</code> or <code>stub:no;</code>\
+      For example: <code>stub:yes;</code> or <code>stub:no;</code>.\
     </li>\
     <li>\
       Highlight instead of hiding. You can specify a class name to use with a userstyle.<br>\
diff --git a/script.coffee b/script.coffee
index aeebcbe5e..d4a4a0d01 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1710,7 +1710,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 ";text:[text]" to the url.
+    You can specify a certain display text by appending <code>;text:[text]</code> to the url.
     <ul>These parameters will be replaced by their corresponding values:
       <li>$1: Thumbnail url.</li>
       <li>$2: Full image url.</li>
@@ -1909,7 +1909,7 @@ Options =
     </li>
     <li>
       Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`).<br>
-      For example: <code>stub:yes;</code> or <code>stub:no;</code>
+      For example: <code>stub:yes;</code> or <code>stub:no;</code>.
     </li>
     <li>
       Highlight instead of hiding. You can specify a class name to use with a userstyle.<br>

From 4d61057eb4ebef04bd12e54b886fb9881a53f223 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sun, 17 Jun 2012 14:17:06 +0200
Subject: [PATCH 2/6] Foolz does not archive images from /co/.

---
 4chan_x.user.js | 1 -
 script.coffee   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 02f88d21c..160e744e3 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3767,7 +3767,6 @@
       }
       switch (board) {
         case 'a':
-        case 'co':
         case 'jp':
         case 'm':
         case 'tg':
diff --git a/script.coffee b/script.coffee
index d4a4a0d01..9d36f741d 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2891,7 +2891,7 @@ Redirect =
     # Do not use g.BOARD, the image url can originate from a cross-quote.
     return unless Conf['404 Redirect']
     switch board
-      when 'a', 'co', 'jp', 'm', 'tg', 'u', 'vg'
+      when 'a', 'jp', 'm', 'tg', 'u', 'vg'
         "http://archive.foolz.us/#{board}/full_image/#{filename}"
       # these will work whenever https://github.com/eksopl/fuuka/issues/23 is done
       # when 'cgl', 'g', 'w'

From fc7bda2d4c8770186871bdaef09b0d08b896828a Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sun, 17 Jun 2012 16:08:28 +0200
Subject: [PATCH 3/6] Enable all file types in the open file dialog for Opera.

---
 4chan_x.user.js | 4 +++-
 script.coffee   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 160e744e3..d2aa2d40b 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1961,7 +1961,9 @@
       QR.mimeTypes.push('');
       fileInput = $('input[type=file]', QR.el);
       fileInput.max = $('input[name=MAX_FILE_SIZE]').value;
-      fileInput.accept = mimeTypes;
+      if ($.engine !== 'presto') {
+        fileInput.accept = mimeTypes;
+      }
       QR.spoiler = !!$('input[name=spoiler]');
       spoiler = $('#spoilerLabel', QR.el);
       spoiler.hidden = !QR.spoiler;
diff --git a/script.coffee b/script.coffee
index 9d36f741d..44dae30e0 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1460,7 +1460,7 @@ QR =
     QR.mimeTypes.push ''
     fileInput        = $ 'input[type=file]', QR.el
     fileInput.max    = $('input[name=MAX_FILE_SIZE]').value
-    fileInput.accept = mimeTypes
+    fileInput.accept = mimeTypes if $.engine isnt 'presto' # Opera's accept attribute is fucked up
 
     QR.spoiler     = !!$ 'input[name=spoiler]'
     spoiler        = $ '#spoilerLabel', QR.el

From 0dece34676715224d3012d5cad1543d24bc20928 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sun, 17 Jun 2012 16:58:03 +0200
Subject: [PATCH 4/6] Fix #520

---
 4chan_x.user.js | 2 +-
 script.coffee   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index d2aa2d40b..1355a3c8a 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -4634,7 +4634,7 @@ textarea.field {\
   min-height: 120px;\
 }\
 #qr .field:only-child {\
-  display: block;\
+  display: -webkit-box;\
   min-width: 100%;\
 }\
 .captcha {\
diff --git a/script.coffee b/script.coffee
index 44dae30e0..f8736d3e7 100644
--- a/script.coffee
+++ b/script.coffee
@@ -3573,7 +3573,7 @@ textarea.field {
   min-height: 120px;
 }
 #qr .field:only-child {
-  display: block;
+  display: -webkit-box;
   min-width: 100%;
 }
 .captcha {

From be7b1574bd75b1928e3e8ae88ed67484750402f3 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sun, 17 Jun 2012 18:39:48 +0200
Subject: [PATCH 5/6] Small refactor and changes in archive redirections. Add
 hash to the url when possible. Use http when on http and https when on https
 when the archiver offers this possibility.

---
 4chan_x.user.js | 87 ++++++++++++++++++++++++++++---------------------
 script.coffee   | 65 +++++++++++++++++++++---------------
 2 files changed, 89 insertions(+), 63 deletions(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 1355a3c8a..1861f04ae 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3487,7 +3487,7 @@
             a.className = 'quotelink';
             a.setAttribute('onclick', "replyhl('" + id + "');");
           } else {
-            a.href = Redirect.thread(board, id, 'post');
+            a.href = Redirect.thread(board, 0, id);
             a.className = 'deadlink';
             a.target = '_blank';
           }
@@ -3756,17 +3756,7 @@
   };
 
   Redirect = {
-    init: function() {
-      var path, url;
-      url = location.hostname === 'images.4chan.org' ? (path = location.pathname.split('/'), this.image(path[1], path[3])) : /^\d+$/.test(g.THREAD_ID) ? this.thread() : void 0;
-      if (url) {
-        return location.href = url;
-      }
-    },
     image: function(board, filename) {
-      if (!Conf['404 Redirect']) {
-        return;
-      }
       switch (board) {
         case 'a':
         case 'jp':
@@ -3774,22 +3764,15 @@
         case 'tg':
         case 'u':
         case 'vg':
-          return "http://archive.foolz.us/" + board + "/full_image/" + filename;
+          return "//archive.foolz.us/" + board + "/full_image/" + filename;
       }
     },
-    thread: function(board, id, mode) {
-      if (board == null) {
-        board = g.BOARD;
-      }
-      if (id == null) {
-        id = g.THREAD_ID;
-      }
-      if (mode == null) {
-        mode = 'thread';
-      }
-      if (!(Conf['404 Redirect'] || mode === 'post')) {
-        return;
+    thread: function(board, threadID, postID) {
+      var path, url;
+      if (postID) {
+        postID = postID.match(/\d+/)[0];
       }
+      path = threadID ? "" + board + "/thread/" + threadID : "" + board + "/post/" + postID;
       switch (board) {
         case 'a':
         case 'co':
@@ -3800,31 +3783,54 @@
         case 'u':
         case 'v':
         case 'vg':
-          return "http://archive.foolz.us/" + board + "/" + mode + "/" + id + "/";
+          url = "//archive.foolz.us/" + path + "/";
+          if (threadID && postID) {
+            url += "#" + postID;
+          }
+          break;
         case 'lit':
-          return "http://fuuka.warosu.org/" + board + "/" + mode + "/" + id;
+          url = "//fuuka.warosu.org/" + path;
+          if (threadID && postID) {
+            url += "#p" + postID;
+          }
+          break;
         case 'diy':
         case 'g':
         case 'k':
         case 'sci':
-          return "https://archive.installgentoo.net/" + board + "/" + mode + "/" + id;
+          url = "//archive.installgentoo.net/" + path;
+          if (threadID && postID) {
+            url += "#p" + postID;
+          }
+          break;
         case 'cgl':
         case 'mu':
         case 'w':
-          return "http://archive.rebeccablacktech.com/" + board + "/" + mode + "/" + id;
+          url = "//archive.rebeccablacktech.com/" + path;
+          if (threadID && postID) {
+            url += "#p" + postID;
+          }
+          break;
         case 'an':
         case 'toy':
         case 'x':
-          return "http://archive.xfiles.to/" + board + "/" + mode + "/" + id;
+          url = "http://archive.xfiles.to/" + path;
+          if (threadID && postID) {
+            url += "#p" + postID;
+          }
+          break;
         case 'e':
-          return "https://md401.homelinux.net/4chan/cgi-board.pl/" + board + "/" + mode + "/" + id;
+          url = "https://md401.homelinux.net/4chan/cgi-board.pl/" + path;
+          if (threadID && postID) {
+            url += "#p" + postID;
+          }
+          break;
         default:
-          if (mode === 'thread') {
-            return "//boards.4chan.org/" + board + "/";
-          } else {
-            return null;
+          if (threadID) {
+            url = "//boards.4chan.org/" + board + "/";
           }
       }
+      return url || null;
     }
   };
 
@@ -4128,8 +4134,13 @@
           return;
         case 'images.4chan.org':
           $.ready(function() {
-            if (d.title === '4chan - 404') {
-              return Redirect.init();
+            var url;
+            if (d.title === '4chan - 404' && Conf['404 Redirect']) {
+              path = location.pathname.split('/');
+              url = Redirect.image(path[1], path[3]);
+              if (url) {
+                return location.href = url;
+              }
             }
           });
           return;
@@ -4229,7 +4240,9 @@
     ready: function() {
       var MutationObserver, a, board, nav, node, nodes, observer, _i, _j, _len, _len1, _ref, _ref1;
       if (d.title === '4chan - 404') {
-        Redirect.init();
+        if (Conf['404 Redirect'] && /^\d+$/.test(g.THREAD_ID)) {
+          location.href = Redirect.thread(g.BOARD, g.THREAD_ID, location.hash);
+        }
         return;
       }
       if (!$.id('navtopr')) {
diff --git a/script.coffee b/script.coffee
index f8736d3e7..264900a93 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2658,7 +2658,7 @@ Quotify =
           a.className = 'quotelink'
           a.setAttribute 'onclick', "replyhl('#{id}');"
         else
-          a.href      = Redirect.thread board, id, 'post'
+          a.href      = Redirect.thread board, 0, id
           a.className = 'deadlink'
           a.target    = '_blank'
 
@@ -2879,47 +2879,55 @@ Favicon =
   dead: 'data:image/gif;base64,R0lGODlhEAAQAKECAAAAAP8AAP///////yH5BAEKAAIALAAAAAAQABAAAAIvlI+pq+D9DAgUoFkPDlbs7lFZKIJOJJ3MyraoB14jFpOcVMpzrnF3OKlZYsMWowAAOw=='
 
 Redirect =
-  init: ->
-    url =
-      if location.hostname is 'images.4chan.org'
-        path = location.pathname.split '/'
-        @image path[1], path[3]
-      else if /^\d+$/.test g.THREAD_ID
-        @thread()
-    location.href = url if url
   image: (board, filename) ->
     # Do not use g.BOARD, the image url can originate from a cross-quote.
-    return unless Conf['404 Redirect']
     switch board
       when 'a', 'jp', 'm', 'tg', 'u', 'vg'
-        "http://archive.foolz.us/#{board}/full_image/#{filename}"
+        "//archive.foolz.us/#{board}/full_image/#{filename}"
       # these will work whenever https://github.com/eksopl/fuuka/issues/23 is done
       # when 'cgl', 'g', 'w'
-      #   "http://archive.rebeccablacktech.com/#{board}/full_image/#{filename}"
+      #   "//archive.rebeccablacktech.com/#{board}/full_image/#{filename}"
       # when 'an', 'toy', 'x'
       #   "http://archive.xfiles.to/#{board}/full_image/#{filename}"
       # when 'e'
       #   "https://md401.homelinux.net/4chan/cgi-board.pl/#{board}/full_image/#{filename}"
-  thread: (board=g.BOARD, id=g.THREAD_ID, mode='thread') ->
-    return unless Conf['404 Redirect'] or mode is 'post'
+  thread: (board, threadID, postID) ->
+    # keep the number only if the location.hash was sent f.e.
+    postID = postID.match(/\d+/)[0] if postID
+    path   =
+      if threadID
+        "#{board}/thread/#{threadID}"
+      else
+        "#{board}/post/#{postID}"
     switch board
       when 'a', 'co', 'jp', 'm', 'tg', 'tv', 'u', 'v', 'vg'
-        "http://archive.foolz.us/#{board}/#{mode}/#{id}/"
+        url = "//archive.foolz.us/#{path}/"
+        if threadID and postID
+          url += "##{postID}"
       when 'lit'
-        "http://fuuka.warosu.org/#{board}/#{mode}/#{id}"
+        url = "//fuuka.warosu.org/#{path}"
+        if threadID and postID
+          url += "#p#{postID}"
       when 'diy', 'g', 'k', 'sci'
-        "https://archive.installgentoo.net/#{board}/#{mode}/#{id}"
+        url = "//archive.installgentoo.net/#{path}"
+        if threadID and postID
+          url += "#p#{postID}"
       when 'cgl', 'mu', 'w'
-        "http://archive.rebeccablacktech.com/#{board}/#{mode}/#{id}"
+        url = "//archive.rebeccablacktech.com/#{path}"
+        if threadID and postID
+          url += "#p#{postID}"
       when 'an', 'toy', 'x'
-        "http://archive.xfiles.to/#{board}/#{mode}/#{id}"
+        url = "http://archive.xfiles.to/#{path}"
+        if threadID and postID
+          url += "#p#{postID}"
       when 'e'
-        "https://md401.homelinux.net/4chan/cgi-board.pl/#{board}/#{mode}/#{id}"
+        url = "https://md401.homelinux.net/4chan/cgi-board.pl/#{path}"
+        if threadID and postID
+          url += "#p#{postID}"
       else
-        if mode is 'thread'
-          "//boards.4chan.org/#{board}/"
-        else
-          null
+        if threadID
+          url = "//boards.4chan.org/#{board}/"
+    url or null
 
 ImageHover =
   init: ->
@@ -3130,7 +3138,11 @@ Main =
               window.location = 'javascript:Recaptcha.reload()' if e.keyCode is 8 and not e.target.value
         return
       when 'images.4chan.org'
-        $.ready -> Redirect.init() if d.title is '4chan - 404'
+        $.ready ->
+          if d.title is '4chan - 404' and Conf['404 Redirect']
+            path = location.pathname.split '/'
+            url  = Redirect.image path[1], path[3]
+            location.href = url if url
         return
 
     $.ready Options.init
@@ -3224,7 +3236,8 @@ Main =
 
   ready: ->
     if d.title is '4chan - 404'
-      Redirect.init()
+      if Conf['404 Redirect'] and /^\d+$/.test g.THREAD_ID
+        location.href = Redirect.thread g.BOARD, g.THREAD_ID, location.hash
       return
     unless $.id 'navtopr'
       return

From 2bcf1b67194bfc129aea931009f6285b4a2935c5 Mon Sep 17 00:00:00 2001
From: Nicolas Stepien <stepien.nicolas@gmail.com>
Date: Sun, 17 Jun 2012 18:42:46 +0200
Subject: [PATCH 6/6] Add /dev/, /foolz/ and /kuku/ to archive 'redirections'.

---
 4chan_x.user.js | 3 +++
 script.coffee   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/4chan_x.user.js b/4chan_x.user.js
index 1861f04ae..e78c153ac 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3783,6 +3783,9 @@
         case 'u':
         case 'v':
         case 'vg':
+        case 'dev':
+        case 'foolz':
+        case 'kuku':
           url = "//archive.foolz.us/" + path + "/";
           if (threadID && postID) {
             url += "#" + postID;
diff --git a/script.coffee b/script.coffee
index 264900a93..c98669edf 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2900,7 +2900,7 @@ Redirect =
       else
         "#{board}/post/#{postID}"
     switch board
-      when 'a', 'co', 'jp', 'm', 'tg', 'tv', 'u', 'v', 'vg'
+      when 'a', 'co', 'jp', 'm', 'tg', 'tv', 'u', 'v', 'vg', 'dev', 'foolz', 'kuku'
         url = "//archive.foolz.us/#{path}/"
         if threadID and postID
           url += "##{postID}"