Release 4chan X v1.9.0.7.

2014-09-01 15:09:42 -07:00 · 2014-09-01 15:09:42 -07:00 · c3ef4bd3a6
commit c3ef4bd3a6
parent db73a5f293
14 changed files with 138 additions and 42 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,9 @@
+### v1.9.0.7 
+*2014-09-01*
+
+**ccd0**
+- Work around false 404s from 4chan's JSON API by checking the catalog to confirm thread death.
+
 ### v1.9.0.6 
 *2014-08-31*

--- a/2
+++ b/2
@ -1,5 +1,5 @@
 /*
-* 4chan X - Version 1.9.0.6
+* 4chan X - Version 1.9.0.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
--- a/builds/4chan-X-beta.crx
+++ b/builds/4chan-X-beta.crx
--- a/builds/4chan-X-beta.meta.js
+++ b/builds/4chan-X-beta.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.6
+// @version      1.9.0.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
--- a/builds/4chan-X-beta.user.js
+++ b/builds/4chan-X-beta.user.js
@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.6
+// @version      1.9.0.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -24,7 +24,7 @@
 // ==/UserScript==

 /*
-* 4chan X - Version 1.9.0.6
+* 4chan X - Version 1.9.0.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -374,7 +374,7 @@
  doc = d.documentElement;

  g = {
-    VERSION: '1.9.0.6',
+    VERSION: '1.9.0.7',
    NAMESPACE: '4chan X.',
    NAME: '4chan X',
    FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -10141,7 +10141,7 @@
        return $.cb.value.call(this);
      },
      load: function(e) {
-        var klass, req, text, _ref;
+        var req;
        req = ThreadUpdater.req;
        switch (req.status) {
          case 200:
@ -10155,15 +10155,38 @@
            }
            break;
          case 404:
-            g.DEAD = true;
-            ThreadUpdater.set('status', '404', 'warning');
-            ThreadUpdater.kill();
+            $.ajax("//a.4cdn.org/" + ThreadUpdater.thread.board + "/catalog.json", {
+              onloadend: function() {
+                var confirmed, page, thread, _i, _j, _len, _len1, _ref, _ref1;
+                if (this.status === 200) {
+                  confirmed = true;
+                  _ref = this.response;
+                  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                    page = _ref[_i];
+                    _ref1 = page.threads;
+                    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+                      thread = _ref1[_j];
+                      if (thread.no === ThreadUpdater.thread.ID) {
+                        confirmed = false;
+                        break;
+                      }
+                    }
+                  }
+                } else {
+                  confirmed = false;
+                }
+                if (confirmed) {
+                  g.DEAD = true;
+                  ThreadUpdater.set('status', '404', 'warning');
+                  return ThreadUpdater.kill();
+                } else {
+                  return ThreadUpdater.error(req);
+                }
+              }
+            });
            break;
          default:
-            ThreadUpdater.outdateCount++;
-            ThreadUpdater.setInterval();
-            _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
-            ThreadUpdater.set('status', text, klass);
+            ThreadUpdater.error(req);
        }
        if (ThreadUpdater.postID) {
          return ThreadUpdater.cb.checkpost();
@ -10179,6 +10202,13 @@
        threadID: ThreadUpdater.thread.fullID
      });
    },
+    error: function(req) {
+      var klass, text, _ref;
+      ThreadUpdater.outdateCount++;
+      ThreadUpdater.setInterval();
+      _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
+      return ThreadUpdater.set('status', text, klass);
+    },
    setInterval: function() {
      var cur, i, j, limit;
      i = ThreadUpdater.interval + 1;
@ -12786,7 +12816,7 @@
        className: 'dialog'
      });
      $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.0.6</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.0.7</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
      });
      $.on($('.export', Settings.dialog), 'click', Settings["export"]);
      $.on($('.import', Settings.dialog), 'click', Settings["import"]);
--- a/builds/4chan-X-noupdate.crx
+++ b/builds/4chan-X-noupdate.crx
--- a/builds/4chan-X-noupdate.user.js
+++ b/builds/4chan-X-noupdate.user.js
@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.6
+// @version      1.9.0.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -23,7 +23,7 @@
 // ==/UserScript==

 /*
-* 4chan X - Version 1.9.0.6
+* 4chan X - Version 1.9.0.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -373,7 +373,7 @@
  doc = d.documentElement;

  g = {
-    VERSION: '1.9.0.6',
+    VERSION: '1.9.0.7',
    NAMESPACE: '4chan X.',
    NAME: '4chan X',
    FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -10140,7 +10140,7 @@
        return $.cb.value.call(this);
      },
      load: function(e) {
-        var klass, req, text, _ref;
+        var req;
        req = ThreadUpdater.req;
        switch (req.status) {
          case 200:
@ -10154,15 +10154,38 @@
            }
            break;
          case 404:
-            g.DEAD = true;
-            ThreadUpdater.set('status', '404', 'warning');
-            ThreadUpdater.kill();
+            $.ajax("//a.4cdn.org/" + ThreadUpdater.thread.board + "/catalog.json", {
+              onloadend: function() {
+                var confirmed, page, thread, _i, _j, _len, _len1, _ref, _ref1;
+                if (this.status === 200) {
+                  confirmed = true;
+                  _ref = this.response;
+                  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                    page = _ref[_i];
+                    _ref1 = page.threads;
+                    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+                      thread = _ref1[_j];
+                      if (thread.no === ThreadUpdater.thread.ID) {
+                        confirmed = false;
+                        break;
+                      }
+                    }
+                  }
+                } else {
+                  confirmed = false;
+                }
+                if (confirmed) {
+                  g.DEAD = true;
+                  ThreadUpdater.set('status', '404', 'warning');
+                  return ThreadUpdater.kill();
+                } else {
+                  return ThreadUpdater.error(req);
+                }
+              }
+            });
            break;
          default:
-            ThreadUpdater.outdateCount++;
-            ThreadUpdater.setInterval();
-            _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
-            ThreadUpdater.set('status', text, klass);
+            ThreadUpdater.error(req);
        }
        if (ThreadUpdater.postID) {
          return ThreadUpdater.cb.checkpost();
@ -10178,6 +10201,13 @@
        threadID: ThreadUpdater.thread.fullID
      });
    },
+    error: function(req) {
+      var klass, text, _ref;
+      ThreadUpdater.outdateCount++;
+      ThreadUpdater.setInterval();
+      _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
+      return ThreadUpdater.set('status', text, klass);
+    },
    setInterval: function() {
      var cur, i, j, limit;
      i = ThreadUpdater.interval + 1;
@ -12785,7 +12815,7 @@
        className: 'dialog'
      });
      $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.0.6</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.0.7</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
      });
      $.on($('.export', Settings.dialog), 'click', Settings["export"]);
      $.on($('.import', Settings.dialog), 'click', Settings["import"]);
--- a/builds/4chan-X.crx
+++ b/builds/4chan-X.crx
--- a/builds/4chan-X.meta.js
+++ b/builds/4chan-X.meta.js
@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.6
+// @version      1.9.0.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         4chan X
-// @version      1.9.0.6
+// @version      1.9.0.7
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    4chan-X
@ -24,7 +24,7 @@
 // ==/UserScript==

 /*
-* 4chan X - Version 1.9.0.6
+* 4chan X - Version 1.9.0.7
 *
 * Licensed under the MIT license.
 * https://github.com/ccd0/4chan-x/blob/master/LICENSE
@ -374,7 +374,7 @@
  doc = d.documentElement;

  g = {
-    VERSION: '1.9.0.6',
+    VERSION: '1.9.0.7',
    NAMESPACE: '4chan X.',
    NAME: '4chan X',
    FAQ: 'https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions',
@ -10141,7 +10141,7 @@
        return $.cb.value.call(this);
      },
      load: function(e) {
-        var klass, req, text, _ref;
+        var req;
        req = ThreadUpdater.req;
        switch (req.status) {
          case 200:
@ -10155,15 +10155,38 @@
            }
            break;
          case 404:
-            g.DEAD = true;
-            ThreadUpdater.set('status', '404', 'warning');
-            ThreadUpdater.kill();
+            $.ajax("//a.4cdn.org/" + ThreadUpdater.thread.board + "/catalog.json", {
+              onloadend: function() {
+                var confirmed, page, thread, _i, _j, _len, _len1, _ref, _ref1;
+                if (this.status === 200) {
+                  confirmed = true;
+                  _ref = this.response;
+                  for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+                    page = _ref[_i];
+                    _ref1 = page.threads;
+                    for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
+                      thread = _ref1[_j];
+                      if (thread.no === ThreadUpdater.thread.ID) {
+                        confirmed = false;
+                        break;
+                      }
+                    }
+                  }
+                } else {
+                  confirmed = false;
+                }
+                if (confirmed) {
+                  g.DEAD = true;
+                  ThreadUpdater.set('status', '404', 'warning');
+                  return ThreadUpdater.kill();
+                } else {
+                  return ThreadUpdater.error(req);
+                }
+              }
+            });
            break;
          default:
-            ThreadUpdater.outdateCount++;
-            ThreadUpdater.setInterval();
-            _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
-            ThreadUpdater.set('status', text, klass);
+            ThreadUpdater.error(req);
        }
        if (ThreadUpdater.postID) {
          return ThreadUpdater.cb.checkpost();
@ -10179,6 +10202,13 @@
        threadID: ThreadUpdater.thread.fullID
      });
    },
+    error: function(req) {
+      var klass, text, _ref;
+      ThreadUpdater.outdateCount++;
+      ThreadUpdater.setInterval();
+      _ref = req.status === 304 ? [null, null] : ["" + req.statusText + " (" + req.status + ")", 'warning'], text = _ref[0], klass = _ref[1];
+      return ThreadUpdater.set('status', text, klass);
+    },
    setInterval: function() {
      var cur, i, j, limit;
      i = ThreadUpdater.interval + 1;
@ -12786,7 +12816,7 @@
        className: 'dialog'
      });
      $.extend(dialog, {
-        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.0.6</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
+        innerHTML: "<nav><div class=sections-list></div><p class='imp-exp-result warning'></p><div class=credits><a class=export>Export</a>&nbsp|&nbsp<a class=import>Import</a>&nbsp|&nbsp<a class=reset>Reset Settings</a>&nbsp|&nbsp<input type=file hidden><a href='https://github.com/ccd0/4chan-x' target=_blank>4chan X</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/blob/master/CHANGELOG.md' target=_blank>1.9.0.7</a>&nbsp|&nbsp<a href='https://github.com/ccd0/4chan-x/issues' target=_blank>Issues</a>&nbsp|&nbsp<a href=javascript:; class='close fa fa-times' title=Close></a></div></nav><div class=section-container><section></section></div>"
      });
      $.on($('.export', Settings.dialog), 'click', Settings["export"]);
      $.on($('.import', Settings.dialog), 'click', Settings["import"]);
--- a/builds/4chan-X.zip
+++ b/builds/4chan-X.zip
--- a/builds/updates-beta.xml
+++ b/builds/updates-beta.xml
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
  <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.0.6' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X-beta.crx' version='1.9.0.7' />
  </app>
 </gupdate>

--- a/builds/updates.xml
+++ b/builds/updates.xml
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
  <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
-    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.0.6' />
+    <updatecheck codebase='https://ccd0.github.io/4chan-x/builds/4chan-X.crx' version='1.9.0.7' />
  </app>
 </gupdate>

--- a/package.json
+++ b/package.json
@ -3,7 +3,7 @@
  "description": "Cross-browser userscript for maximum lurking on 4chan.",
  "meta": {
    "name": "4chan X",
-    "version": "1.9.0.6",
+    "version": "1.9.0.7",
    "repo": "https://github.com/ccd0/4chan-x/",
    "page": "https://github.com/ccd0/4chan-x",
    "downloads": "https://ccd0.github.io/4chan-x/builds/",