Merge pull request #798 from ihavenoface/pull-request

Add Archivers submenu.

4chan_x.user.js

@@ -4295,7 +4295,11 @@
             a.href = "#p" + id;
             a.className = 'quotelink';
           } else {
-            a.href = Redirect.thread(board, 0, id);
+            a.href = Redirect.to({
+              board: board,
+              threadID: 0,
+              postID: id
+            });
             a.className = 'deadlink';
             a.target = '_blank';
             if (Redirect.post(board, id)) {
@@ -4500,24 +4504,65 @@
 
   ArchiveLink = {
     init: function() {
-      var a;
+      var div, entry, type, _i, _len, _ref;
-      a = $.el('a', {
+      div = $.el('div', {
-        className: 'archive_link',
+        textContent: 'Archive'
-        target: '_blank',
-        textContent: 'Archived post'
       });
-      return Menu.addEntry({
+      entry = {
-        el: a,
+        el: div,
         open: function(post) {
-          var href, path;
+          var path;
           path = $('a[title="Highlight this post"]', post.el).pathname.split('/');
-          if ((href = Redirect.thread(path[1], path[3], post.ID)) === ("//boards.4chan.org/" + path[1] + "/")) {
+          if ((Redirect.to({
+            board: path[1],
+            threadID: path[3],
+            postID: post.ID
+          })) === ("//boards.4chan.org/" + path[1] + "/")) {
             return false;
           }
-          a.href = href;
+          post.info = [path[1], path[3]];
+          return true;
+        },
+        children: []
+      };
+      _ref = [['Post', 'apost'], ['Name', 'name'], ['Tripcode', 'tripcode'], ['E-mail', 'email'], ['Subject', 'subject'], ['Filename', 'filename'], ['Image MD5', 'md5']];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        type = _ref[_i];
+        entry.children.push(this.createSubEntry(type[0], type[1]));
+      }
+      return Menu.addEntry(entry);
+    },
+    createSubEntry: function(text, type) {
+      var el, open;
+      el = $.el('a', {
+        textContent: text,
+        target: '_blank'
+      });
+      open = function(post) {
+        var value;
+        if (type === 'apost') {
+          el.href = Redirect.to({
+            board: post.info[0],
+            threadID: post.info[1],
+            postID: post.ID
+          });
           return true;
         }
+        value = Filter[type](post);
+        if (!value) {
+          return false;
+        }
+        return el.href = Redirect.to({
+          board: post.info[0],
+          type: type,
+          value: value,
+          isSearch: true
         });
+      };
+      return {
+        el: el,
+        open: open
+      };
     }
   };
 
@@ -4737,12 +4782,12 @@
           return "//nsfw.foolz.us/_/api/chan/post/?board=" + board + "&num=" + postID;
       }
     },
-    thread: function(board, threadID, postID) {
+    to: function(data) {
-      var path, url;
+      var board, threadID, url;
-      if (postID) {
+      if (!data.isSearch) {
-        postID = postID.match(/\d+/)[0];
+        threadID = data.threadID;
       }
-      path = threadID ? "" + board + "/thread/" + threadID : "" + board + "/post/" + postID;
+      board = data.board;
       switch (board) {
         case 'a':
         case 'co':
@@ -4757,41 +4802,26 @@
         case 'wsg':
         case 'dev':
         case 'foolz':
-          url = "//archive.foolz.us/" + path + "/";
+          url = Redirect.path('//archive.foolz.us', 'foolfuuka', data);
-          if (threadID && postID) {
-            url += "#" + postID;
-          }
           break;
         case 'u':
         case 'kuku':
-          url = "//nsfw.foolz.us/" + path + "/";
+          url = Redirect.path("//nsfw.foolz.us", 'foolfuuka', data);
-          if (threadID && postID) {
-            url += "#" + postID;
-          }
           break;
         case 'ck':
         case 'lit':
-          url = "//fuuka.warosu.org/" + path;
+          url = Redirect.path("//fuuka.warosu.org", 'fuuka', data);
-          if (threadID && postID) {
-            url += "#p" + postID;
-          }
           break;
         case 'diy':
         case 'g':
         case 'sci':
-          url = "//archive.installgentoo.net/" + path;
+          url = Redirect.path("//archive.installgentoo.net", 'fuuka', data);
-          if (threadID && postID) {
-            url += "#p" + postID;
-          }
           break;
         case 'cgl':
         case 'mu':
         case 'soc':
         case 'w':
-          url = "//archive.rebeccablacktech.com/" + path;
+          url = Redirect.path("//archive.rebeccablacktech.com", 'fuuka', data);
-          if (threadID && postID) {
-            url += "#p" + postID;
-          }
           break;
         case 'an':
         case 'fit':
@@ -4800,16 +4830,7 @@
         case 'r9k':
         case 'toy':
         case 'x':
-          url = "http://archive.heinessen.com/" + path;
+          url = Redirect.path("http://archive.heinessen.com", 'fuuka', data);
-          if (threadID && postID) {
-            url += "#p" + postID;
-          }
-          break;
-        case 'e':
-          url = "https://www.cliché.net/4chan/cgi-board.pl/" + path;
-          if (threadID && postID) {
-            url += "#p" + postID;
-          }
           break;
         default:
           if (threadID) {
@@ -4817,6 +4838,30 @@
           }
       }
       return url || null;
+    },
+    path: function(base, archiver, data) {
+      var board, path, postID, threadID, type, value;
+      if (data.isSearch) {
+        board = data.board, type = data.type, value = data.value;
+        type = type === 'name' ? 'username' : type === 'md5' ? 'image' : type;
+        value = encodeURIComponent(value);
+        if (archiver === 'foolfuuka') {
+          return "" + base + "/" + board + "/search/" + type + "/" + value;
+        } else if (type === 'image') {
+          return "" + base + "/" + board + "/?task=search2&search_media_hash=" + value;
+        } else {
+          return "" + base + "/" + board + "/?task=search2&search_" + type + "=" + value;
+        }
+      }
+      board = data.board, threadID = data.threadID, postID = data.postID;
+      if (postID) {
+        postID = postID.match(/\d+/)[0];
+      }
+      path = threadID ? "" + board + "/thread/" + threadID : "" + board + "/post/" + postID;
+      if (threadID && postID) {
+        path += archiver === 'foolfuuka' ? "#" + postID : "#p" + postID;
+      }
+      return "" + base + "/" + path;
     }
   };
 
@@ -5262,7 +5307,11 @@
       var MutationObserver, a, board, nav, node, nodes, observer, _i, _j, _len, _len1, _ref, _ref1;
       if (/^4chan - 404/.test(d.title)) {
         if (Conf['404 Redirect'] && /^\d+$/.test(g.THREAD_ID)) {
-          location.href = Redirect.thread(g.BOARD, g.THREAD_ID, location.hash);
+          location.href = Redirect.to({
+            board: g.BOARD,
+            threadID: g.THREAD_ID,
+            postID: location.hash
+          });
         }
         return;
       }

changelog

@@ -1,4 +1,6 @@
 master
+- noface
+  The Menu now has search links for Archivers.
 
 2.36.0
 - Mayhem

script.coffee

@@ -3522,7 +3522,11 @@ Quotify =
           a.href      = "#p#{id}"
           a.className = 'quotelink'
         else
-          a.href      = Redirect.thread board, 0, id
+          a.href =
+            Redirect.to
+              board:    board
+              threadID: 0
+              postID:   id
           a.className = 'deadlink'
           a.target    = '_blank'
           if Redirect.post board, id
@@ -3696,18 +3700,58 @@ DownloadLink =
 
 ArchiveLink =
   init: ->
-    a = $.el 'a',
+    div = $.el 'div',
-      className:   'archive_link'
+      textContent: 'Archive'
-      target:      '_blank'
+
-      textContent: 'Archived post'
+    entry =
-    Menu.addEntry
+      el: div
-      el: a
       open: (post) ->
         path = $('a[title="Highlight this post"]', post.el).pathname.split '/'
-        if (href = Redirect.thread path[1], path[3], post.ID) is "//boards.4chan.org/#{path[1]}/"
+        if (Redirect.to {board: path[1], threadID: path[3], postID: post.ID}) is "//boards.4chan.org/#{path[1]}/"
           return false
-        a.href = href
+        post.info = [path[1], path[3]]
         true
+      children: []
+
+    for type in [
+      ['Post',      'apost']
+      ['Name',      'name']
+      ['Tripcode',  'tripcode']
+      ['E-mail',    'email']
+      ['Subject',   'subject']
+      ['Filename',  'filename']
+      ['Image MD5', 'md5']
+    ]
+      # Add a sub entry for each type.
+      entry.children.push @createSubEntry type[0], type[1]
+
+    Menu.addEntry entry
+
+  createSubEntry: (text, type) ->
+
+    el = $.el 'a',
+      textContent: text
+      target: '_blank'
+
+    open = (post) ->
+      if type is 'apost'
+        el.href =
+          Redirect.to 
+            board:    post.info[0]
+            threadID: post.info[1]
+            postID:   post.ID
+        return true
+      value = Filter[type] post
+      # We want to parse the exact same stuff as Filter does already.
+      return false unless value
+      el.href =
+        Redirect.to
+          board:    post.info[0]
+          type:     type
+          value:    value
+          isSearch: true
+
+    return el: el, open: open
 
 ThreadStats =
   init: ->
@@ -3865,15 +3909,53 @@ Redirect =
         "//archive.rebeccablacktech.com/#{board}/full_image/#{filename}"
       when 'an', 'k', 'toy', 'x'
         "http://archive.heinessen.com/#{board}/full_image/#{filename}"
-      # when 'e'
-      #   "https://www.cliché.net/4chan/cgi-board.pl/#{board}/full_image/#{filename}"
   post: (board, postID) ->
     switch board
       when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg', 'dev', 'foolz'
         "//archive.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
       when 'u', 'kuku'
         "//nsfw.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
-  thread: (board, threadID, postID) ->
+  to: (data) ->
+    unless data.isSearch
+      {threadID} = data
+    {board} = data
+    switch board
+      when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg', 'dev', 'foolz'
+        url = Redirect.path '//archive.foolz.us', 'foolfuuka', data
+      when 'u', 'kuku'
+        url = Redirect.path "//nsfw.foolz.us", 'foolfuuka', data
+      when 'ck', 'lit'
+        url = Redirect.path "//fuuka.warosu.org", 'fuuka', data
+      when 'diy', 'g', 'sci'
+        url = Redirect.path "//archive.installgentoo.net", 'fuuka', data
+      when 'cgl', 'mu', 'soc', 'w'
+        url = Redirect.path "//archive.rebeccablacktech.com", 'fuuka', data
+      when 'an', 'fit', 'k', 'mlp', 'r9k', 'toy', 'x'
+        url = Redirect.path "http://archive.heinessen.com", 'fuuka', data
+      else
+        if threadID
+          url = "//boards.4chan.org/#{board}/"
+    url or null
+
+  path: (base, archiver, data) ->
+    if data.isSearch
+      {board, type, value} = data
+      type =
+        if type is 'name'
+          'username'
+        else if type is 'md5'
+          'image'
+        else
+          type
+      value = encodeURIComponent value
+      return if archiver is 'foolfuuka'
+          "#{base}/#{board}/search/#{type}/#{value}"
+        else if type is 'image'
+          "#{base}/#{board}/?task=search2&search_media_hash=#{value}"
+        else
+          "#{base}/#{board}/?task=search2&search_#{type}=#{value}"
+
+    {board, threadID, postID} = data
     # keep the number only if the location.hash was sent f.e.
     postID = postID.match(/\d+/)[0] if postID
     path =
@@ -3881,39 +3963,13 @@ Redirect =
         "#{board}/thread/#{threadID}"
       else
         "#{board}/post/#{postID}"
-    switch board
-      when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg', 'dev', 'foolz'
-        url = "//archive.foolz.us/#{path}/"
     if threadID and postID
-          url += "##{postID}"
+      path +=
-      when 'u', 'kuku'
+        if archiver is 'foolfuuka'
-        url = "//nsfw.foolz.us/#{path}/"
+          "##{postID}"
-        if threadID and postID
-          url += "##{postID}"
-      when 'ck', 'lit'
-        url = "//fuuka.warosu.org/#{path}"
-        if threadID and postID
-          url += "#p#{postID}"
-      when 'diy', 'g', 'sci'
-        url = "//archive.installgentoo.net/#{path}"
-        if threadID and postID
-          url += "#p#{postID}"
-      when 'cgl', 'mu', 'soc', 'w'
-        url = "//archive.rebeccablacktech.com/#{path}"
-        if threadID and postID
-          url += "#p#{postID}"
-      when 'an', 'fit', 'k', 'mlp', 'r9k', 'toy', 'x'
-        url = "http://archive.heinessen.com/#{path}"
-        if threadID and postID
-          url += "#p#{postID}"
-      when 'e'
-        url = "https://www.cliché.net/4chan/cgi-board.pl/#{path}"
-        if threadID and postID
-          url += "#p#{postID}"
         else
-        if threadID
+          "#p#{postID}"
-          url = "//boards.4chan.org/#{board}/"
+    "#{base}/#{path}"
-    url or null
 
 ImageHover =
   init: ->
@@ -4245,7 +4301,11 @@ Main =
   ready: ->
     if /^4chan - 404/.test d.title
       if Conf['404 Redirect'] and /^\d+$/.test g.THREAD_ID
-        location.href = Redirect.thread g.BOARD, g.THREAD_ID, location.hash
+        location.href =
+          Redirect.to
+            board:    g.BOARD
+            threadID: g.THREAD_ID
+            postID:   location.hash
       return
     unless $.id 'navtopright'
       return