From b5baa3a67b0f99064034542fccab9f250e74bf02 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Wed, 5 Sep 2012 20:17:32 +0200 Subject: [PATCH 01/37] MOOOOOOOT --- 4chan_x.user.js | 7 +++---- changelog | 2 ++ script.coffee | 7 +++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 8bec9e11a..82b13957d 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2541,7 +2541,7 @@ Options = { init: function() { var a, el, settings, _i, _len, _ref; - _ref = ['navtopr', 'navbotr']; + _ref = ['navtopright', 'navbotright']; for (_i = 0, _len = _ref.length; _i < _len; _i++) { settings = _ref[_i]; a = $.el('a', { @@ -2551,8 +2551,7 @@ }); $.on(a, 'click', Options.dialog); el = $.id(settings).firstElementChild; - el.hidden = true; - $.before(el, a); + $.before(el, [a, $.tn('] ')]); } if (!$.get('firstrun')) { if (!Favicon.el) { @@ -5086,7 +5085,7 @@ } return; } - if (!$.id('navtopr')) { + if (!$.id('navtopright')) { return; } $.addClass(d.body, $.engine); diff --git a/changelog b/changelog index 487c03dab..239fabe6b 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master +- Mayhem + Fix 4chan X. Blame moot. 2.34.9 - Mayhem diff --git a/script.coffee b/script.coffee index 151cdf1ec..341aa7bc2 100644 --- a/script.coffee +++ b/script.coffee @@ -1995,15 +1995,14 @@ QR = Options = init: -> - for settings in ['navtopr', 'navbotr'] + for settings in ['navtopright', 'navbotright'] a = $.el 'a', href: 'javascript:;' className: 'settingsWindowLink' textContent: '4chan X Settings' $.on a, 'click', Options.dialog el = $.id(settings).firstElementChild - el.hidden = true - $.before el, a + $.before el, [a, $.tn('] ')] unless $.get 'firstrun' # Prevent race conditions Favicon.init() unless Favicon.el @@ -3981,7 +3980,7 @@ Main = 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' + unless $.id 'navtopright' return $.addClass d.body, $.engine $.addClass d.body, 'fourchan_x' From f2b1c25848414840505c56630a13e7df3be94b68 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Wed, 5 Sep 2012 20:17:52 +0200 Subject: [PATCH 02/37] Release 2.34.10. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 2 ++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 82b13957d..9995cf96a 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.34.9 +// @version 2.34.10 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -23,7 +23,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.34.9 + * 4chan X 2.34.10 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -5284,7 +5284,7 @@ return $.globalEval(("(" + code + ")()").replace('_id_', bq.id)); }, namespace: '4chan_x.', - version: '2.34.9', + version: '2.34.10', callbacks: [], css: '\ /* dialog styling */\ diff --git a/Cakefile b/Cakefile index 8b7d81e0e..e7c0ee80e 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.34.9' +VERSION = '2.34.10' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index 239fabe6b..bb5cac57a 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master + +2.34.10 - Mayhem Fix 4chan X. Blame moot. diff --git a/latest.js b/latest.js index 0335ecfb8..d90eff7b7 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.34.9'},'*') \ No newline at end of file +postMessage({version:'2.34.10'},'*') \ No newline at end of file diff --git a/script.coffee b/script.coffee index 341aa7bc2..6c9a6fa1e 100644 --- a/script.coffee +++ b/script.coffee @@ -4124,7 +4124,7 @@ Main = $.globalEval "(#{code})()".replace '_id_', bq.id namespace: '4chan_x.' - version: '2.34.9' + version: '2.34.10' callbacks: [] css: ' /* dialog styling */ From ad95f332c26808df955f04a11dadde13f90800bb Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Wed, 5 Sep 2012 21:36:14 +0200 Subject: [PATCH 03/37] Tiny fix. Don't cut off the [ on Settings. --- 4chan_x.user.js | 5 ++--- script.coffee | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 9995cf96a..1ec1c1bfc 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2540,7 +2540,7 @@ Options = { init: function() { - var a, el, settings, _i, _len, _ref; + var a, settings, _i, _len, _ref; _ref = ['navtopright', 'navbotright']; for (_i = 0, _len = _ref.length; _i < _len; _i++) { settings = _ref[_i]; @@ -2550,8 +2550,7 @@ textContent: '4chan X Settings' }); $.on(a, 'click', Options.dialog); - el = $.id(settings).firstElementChild; - $.before(el, [a, $.tn('] ')]); + $.prepend($.id(settings), [$.tn('['), a, $.tn('] ')]); } if (!$.get('firstrun')) { if (!Favicon.el) { diff --git a/script.coffee b/script.coffee index 6c9a6fa1e..49fbf2ab6 100644 --- a/script.coffee +++ b/script.coffee @@ -2001,8 +2001,7 @@ Options = className: 'settingsWindowLink' textContent: '4chan X Settings' $.on a, 'click', Options.dialog - el = $.id(settings).firstElementChild - $.before el, [a, $.tn('] ')] + $.prepend $.id(settings), [$.tn('['), a, $.tn('] ')] unless $.get 'firstrun' # Prevent race conditions Favicon.init() unless Favicon.el From 9805572fe0ff93c481ef2e5d91544000971fdcc2 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Thu, 6 Sep 2012 17:00:37 +0200 Subject: [PATCH 04/37] Fix regression: don't stop auto-posting because of a captcha error. --- 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 1ec1c1bfc..6a3487b9c 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2485,7 +2485,7 @@ err = 'Connection error with sys.4chan.org.'; } if (err) { - if (/captcha|verification/i.test(err) || err === 'Connection error with sys.4chan.org.') { + if (/captcha|verification/i.test(err.textContent) || err === 'Connection error with sys.4chan.org.') { QR.cooldown.auto = !!$.get('captchas', []).length; QR.cooldown.set(2); } else { diff --git a/script.coffee b/script.coffee index 49fbf2ab6..8f8a34812 100644 --- a/script.coffee +++ b/script.coffee @@ -1940,7 +1940,7 @@ QR = err = 'Connection error with sys.4chan.org.' if err - if /captcha|verification/i.test(err) or err is 'Connection error with sys.4chan.org.' + if /captcha|verification/i.test(err.textContent) or err is 'Connection error with sys.4chan.org.' # Enable auto-post if we have some cached captchas. QR.cooldown.auto = !!$.get('captchas', []).length # Too many frequent mistyped captchas will auto-ban you! From 44f25dea0ccbd880945b5dbf39bf7da4701ddb97 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 18:47:06 +0200 Subject: [PATCH 05/37] Fetch posts using 4chan's API for Quote Previewing and Quote Inlining --- 4chan_x.user.js | 407 ++++++++++++++++++++++------------------- script.coffee | 467 +++++++++++++++++++++++++++++------------------- 2 files changed, 508 insertions(+), 366 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 6a3487b9c..a5f5f3455 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -77,7 +77,7 @@ */ (function() { - var $, $$, Anonymize, ArchiveLink, AutoGif, Conf, Config, DeleteLink, DownloadLink, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Menu, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportLink, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base; + var $, $$, Anonymize, ArchiveLink, AutoGif, Build, Conf, Config, DeleteLink, DownloadLink, ExpandComment, ExpandThread, Favicon, FileInfo, Filter, Get, ImageExpand, ImageHover, Keybinds, Main, Menu, Nav, Options, QR, QuoteBacklink, QuoteCT, QuoteInline, QuoteOP, QuotePreview, Quotify, Redirect, ReplyHiding, ReportLink, RevealSpoilers, Sauce, StrikethroughQuotes, ThreadHiding, ThreadStats, Time, TitlePost, UI, Unread, Updater, Watcher, d, g, _base; Config = { main: { @@ -487,15 +487,6 @@ $.add(d.head, script); return $.rm(script); }, - shortenFilename: function(filename, isOP) { - var threshold; - threshold = 30 + 10 * isOP; - if (filename.replace(/\.\w+$/, '').length > threshold) { - return "" + filename.slice(0, threshold - 5) + "(...)" + (filename.match(/\.\w+$/)); - } else { - return filename; - } - }, bytesToString: function(size) { var unit; unit = 0; @@ -3398,7 +3389,7 @@ unit: alt.match(/\w+$/)[0], resolution: node.textContent.match(/\d+x\d+|PDF/)[0], fullname: filename, - shortname: $.shortenFilename(filename, post.ID === post.threadID) + shortname: Build.shortFilename(filename, post.ID === post.threadID) }; node.setAttribute('data-filename', filename); return node.innerHTML = FileInfo.funk(FileInfo); @@ -3490,7 +3481,7 @@ } root.textContent = "Loading post No." + postID + "..."; if (threadID) { - return $.cache("/" + board + "/res/" + threadID, function() { + return $.cache("//api.4chan.org/" + board + "/res/" + threadID + ".json", function() { return Get.parsePost(this, board, threadID, postID, root, cb); }); } else if (url = Redirect.post(board, postID)) { @@ -3500,7 +3491,7 @@ } }, parsePost: function(req, board, threadID, postID, root, cb) { - var doc, href, link, pc, quote, status, url, _i, _len, _ref; + var post, posts, status, url, _i, _len; status = req.status; if (status !== 200) { if (url = Redirect.post(board, postID)) { @@ -3508,166 +3499,44 @@ return Get.parseArchivedPost(this, board, postID, root, cb); }); } else { + $.addClass(root, 'warning'); root.textContent = status === 404 ? "Thread No." + threadID + " has not been found." : "Error " + req.status + ": " + req.statusText + "."; } return; } - doc = d.implementation.createHTMLDocument(''); - doc.documentElement.innerHTML = req.response; - if (!(pc = doc.getElementById("pc" + postID))) { - if (url = Redirect.post(board, postID)) { - $.cache(url, function() { - return Get.parseArchivedPost(this, board, postID, root, cb); - }); - } else { - root.textContent = "Post No." + postID + " has not been found."; + posts = JSON.parse(req.response).posts; + postID = +postID; + for (_i = 0, _len = posts.length; _i < _len; _i++) { + post = posts[_i]; + if (post.no === postID) { + break; } - return; - } - pc = Get.cleanPost(d.importNode(pc, true)); - _ref = $$('.quotelink', pc); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - quote = _ref[_i]; - href = quote.getAttribute('href'); - if (href[0] === '/') { - continue; + if (post.no > postID) { + if (url = Redirect.post(board, postID)) { + $.cache(url, function() { + return Get.parseArchivedPost(this, board, postID, root, cb); + }); + } else { + $.addClass(root, 'warning'); + root.textContent = "Post No." + postID + " has not been found."; + } + return; } - quote.href = "/" + board + "/res/" + href; } - link = $('a[title="Highlight this post"]', pc); - link.href = "/" + board + "/res/" + threadID + "#p" + postID; - link.nextSibling.href = "/" + board + "/res/" + threadID + "#q" + postID; - $.replace(root.firstChild, pc); + $.replace(root.firstChild, Get.cleanPost(Build.postFromObject(post, board))); if (cb) { return cb(); } }, parseArchivedPost: function(req, board, postID, root, cb) { - var bq, br, capcode, data, email, file, filename, filesize, isOP, name, nameBlock, pc, pi, piM, span, spoiler, subject, threadID, thumb_src, timestamp, trip, userID; + var bq, comment, data, o; data = JSON.parse(req.response); - $.addClass(root, 'archivedPost'); if (data.error) { + $.addClass(root, 'warning'); root.textContent = data.error; return; } - threadID = data.thread_num; - isOP = postID === threadID; - name = data.name, trip = data.trip, timestamp = data.timestamp; - subject = data.title; - userID = data.poster_hash; - piM = $.el('div', { - id: "pim" + postID, - className: 'postInfoM mobile', - innerHTML: "
" + data.fourchan_date + "
No." + postID + "" - }); - $('.name', piM).textContent = name; - $('.subject', piM).textContent = subject; - br = $('br', piM); - if (trip) { - $.before(br, [ - $.tn(' '), $.el('span', { - className: 'postertrip', - textContent: trip - }) - ]); - } - capcode = data.capcode; - if (capcode !== 'N') { - $.addClass(br.parentNode, capcode === 'A' ? 'capcodeAdmin' : 'capcodeMod'); - $.before(br, [ - $.tn(' '), $.el('strong', { - className: 'capcode', - textContent: capcode === 'A' ? '## Admin' : '## Mod' - }), $.tn(' '), $.el('img', { - src: capcode === 'A' ? '//static.4chan.org/image/adminicon.gif' : '//static.4chan.org/image/modicon.gif', - alt: capcode === 'A' ? 'This user is the 4chan Administrator.' : 'This user is a 4chan Moderator.', - title: capcode === 'A' ? 'This user is the 4chan Administrator.' : 'This user is a 4chan Moderator.', - className: 'identityIcon' - }) - ]); - } - pi = $.el('div', { - id: "pi" + postID, - className: 'postInfo desktop', - innerHTML: " data.fourchan_date No." + postID + "" - }); - $('.subject', pi).textContent = subject; - nameBlock = $('.nameBlock', pi); - if (data.email) { - email = $.el('a', { - className: 'useremail', - href: "mailto:" + data.email - }); - $.add(nameBlock, email); - nameBlock = email; - } - $.add(nameBlock, $.el('span', { - className: 'name', - textContent: data.name - })); - if (userID) { - $.add(nameBlock, [ - $.tn(' '), $.el('span', { - className: "posteruid id_" + userID, - innerHTML: "(ID: " + userID + ")" - }) - ]); - } - if (trip) { - $.add(nameBlock, [ - $.tn(' '), $.el('span', { - className: 'postertrip', - textContent: trip - }) - ]); - } - nameBlock = $('.nameBlock', pi); - switch (capcode) { - case 'A': - $.addClass(nameBlock, 'capcodeAdmin'); - $.add(nameBlock, [ - $.tn(' '), $.el('strong', { - className: 'capcode', - textContent: '## Admin' - }), $.tn(' '), $.el('img', { - src: '//static.4chan.org/image/adminicon.gif', - alt: 'This user is the 4chan Administrator.', - title: 'This user is the 4chan Administrator.', - className: 'identityIcon' - }) - ]); - break; - case 'M': - $.addClass(nameBlock, 'capcodeMod'); - $.add(nameBlock, [ - $.tn(' '), $.el('strong', { - className: 'capcode', - textContent: '## Mod' - }), $.tn(' '), $.el('img', { - src: '//static.4chan.org/image/modicon.gif', - alt: 'This user is a 4chan Moderator.', - title: 'This user is a 4chan Moderator.', - className: 'identityIcon' - }) - ]); - break; - case 'D': - $.addClass(nameBlock, 'capcodeDeveloper'); - $.add(nameBlock, [ - $.tn(' '), $.el('strong', { - className: 'capcode', - textContent: '## Developer' - }), $.tn(' '), $.el('img', { - src: '//static.4chan.org/image/developericon.gif', - alt: 'This user is a 4chan Developer.', - title: 'title="This user is a 4chan Developer.', - className: 'identityIcon' - }) - ]); - } bq = $.el('blockquote', { - id: "m" + postID, - className: 'postMessage', textContent: data.comment }); bq.innerHTML = bq.innerHTML.replace(/\n|\[\/?b\]|\[\/?spoiler\]|\[\/?code\]|\[\/?moot\]|\[\/?banned\]/g, function(text) { @@ -3696,37 +3565,47 @@ return ''; } }); - bq.innerHTML = bq.innerHTML.replace(/(^|>)(>[^<$]+)(<|$)/g, '$1$2$3'); - pc = $.el('div', { - id: "pc" + postID, - className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: "
" - }); - $.add(pc.firstChild, [piM, pi, bq]); - if (filename = data.media_filename) { - file = $.el('div', { - id: "f" + postID, - className: 'file' - }); - spoiler = data.spoiler === '1'; - filesize = $.bytesToString(data.media_size); - $.add(file, $.el('div', { - className: 'fileInfo', - innerHTML: "File: " + data.media_orig + "-(" + (spoiler ? 'Spoiler Image, ' : '') + filesize + ", " + data.media_w + "x" + data.media_h + ", )" - })); - span = $('span[title]', file); - span.title = filename; - span.textContent = $.shortenFilename(filename, isOP); - thumb_src = data.media_status === 'available' ? "src=" + data.thumb_link : ''; - $.add(file, $.el('a', { - className: spoiler ? 'fileThumb imgspoiler' : 'fileThumb', - href: data.media_link || data.remote_media_link, - target: '_blank', - innerHTML: "" + (data.media_status !== " - })); - $.after((isOP ? piM : pi), file); + comment = bq.innerHTML.replace(/(^|>)(>[^<$]+)(<|$)/g, '$1$2$3'); + o = { + postID: postID, + threadID: data.thread_num, + board: board, + name: data.name_processed, + capcode: (function() { + switch (data.capcode) { + case 'M': + return 'mod'; + case 'A': + return 'admin'; + case 'D': + return 'developer'; + } + })(), + tripcode: data.trip, + uniqueID: data.poster_hash, + email: encodeURIComponent(data.email), + subject: data.title_processed, + flagCode: data.poster_country, + date: data.fourchan_date, + dateUTC: data.timestamp, + comment: comment + }; + if (data.media_filename) { + o.file = { + name: data.media_filename_processed, + timestamp: data.media_orig, + url: data.media_link || data.remote_media_link, + height: data.media_h, + width: data.media_w, + MD5: data.media_hash, + size: data.media_size, + turl: data.thumb_link || ("//thumbs.4chan.org/" + board + "/thumb/" + data.preview_orig), + theight: data.preview_h, + twidth: data.preview_w, + isSpoiler: data.spoiler === '1' + }; } - $.replace(root.firstChild, Get.cleanPost(pc)); + $.replace(root.firstChild, Get.cleanPost(Build.post(o, true))); if (cb) { return cb(); } @@ -3782,6 +3661,164 @@ } }; + Build = { + shortFilename: function(filename, isOP) { + var threshold; + threshold = isOP ? 40 : 30; + if (filename.length - 4 > threshold) { + return "" + filename.slice(0, threshold - 5) + "(...)." + filename.slice(-3); + } else { + return filename; + } + }, + postFromObject: function(data, board) { + var o; + o = { + postID: data.no, + threadID: data.resto || data.no, + board: board, + name: data.name, + capcode: data.capcode, + tripcode: data.trip, + uniqueID: data.id, + email: data.email.replace(/\s/g, '%20'), + subject: data.sub, + flagCode: data.country, + flagName: data.country_name, + date: data.now, + dateUTC: data.time, + comment: data.com + }; + if (data.ext) { + o.file = { + name: data.filename + data.ext, + timestamp: "" + data.tim + data.ext, + url: "//images.4chan.org/" + board + "/src/" + data.tim + data.ext, + height: data.h, + width: data.w, + MD5: data.md5, + size: data.fsize, + turl: "//thumbs.4chan.org/" + board + "/thumb/" + data.tim + "s.jpg", + theight: data.tn_h, + twidth: data.tn_w, + isSpoiler: !!data.spoiler, + isDeleted: !!data.filedeleted + }; + } + return Build.post(o); + }, + post: function(o, isArchived) { + /* + This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS). + @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE + */ + + var board, capcode, capcodeClass, capcodeStart, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, flag, flagCode, flagName, href, imgSrc, isOP, name, postID, quote, staticPath, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; + postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, comment = o.comment, file = o.file; + isOP = postID === threadID; + staticPath = '//static.4chan.org'; + if (email) { + emailStart = ''; + emailEnd = ''; + } else { + emailStart = ''; + emailEnd = ''; + } + userID = !capcode && uniqueID ? (" (ID: ") + ("" + uniqueID + ") ") : ''; + switch (capcode) { + case 'admin': + case 'admin_highlight': + capcodeClass = " capcodeAdmin"; + capcodeStart = " ## Admin"; + capcode = (" "; + break; + case 'mod': + capcodeClass = " capcodeMod"; + capcodeStart = " ## Moderator"; + capcode = (" "; + break; + case 'developer': + capcodeClass = " capcodeDeveloper"; + capcodeStart = " ## Developer"; + capcode = (" "; + break; + default: + capcodeClass = ''; + capcodeStart = ''; + capcode = ''; + } + flag = flagCode ? (" + flagCode + ") : ''; + if (file != null ? file.isDeleted : void 0) { + fileHTML = isOP ? ("
") + ("File deleted.") + "
" : ("
") + ("File deleted.") + "
"; + } else if (file) { + ext = file.name.slice(-3); + if (!file.twidth && !file.theight && ext === 'gif') { + file.twidth = file.width; + file.theight = file.height; + } + fileSize = $.bytesToString(file.size); + fileThumb = file.turl; + if (file.isSpoiler) { + fileSize = "Spoiler Image, " + fileSize; + if (!isArchived) { + fileThumb = '//thumbs.4chan.org/image/spoiler'; + fileThumb += (function() { + switch (board) { + case 'a': + return '-a'; + case 'co': + return '-co'; + case 'jp': + return '-jp'; + case 'lit': + return 'lit'; + case 'm': + return '-m2'; + case 'mlp': + return '-mlp'; + case 'tg': + return '-tg2'; + case 'tv': + return '-tv5'; + case 'v': + case 'vg': + return '-v'; + case 'vp': + return '-vp'; + default: + return ''; + } + })(); + fileThumb += '.png'; + file.twidth = file.theight = 100; + } + } + imgSrc = ("") + ("" + fileSize + ""); + fileDims = ext === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height; + fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + (Build.shortFilename(file.name)) + "'")) + ")"; + fileHTML = "
" + fileInfo + "
" + imgSrc + "
"; + } else { + fileHTML = ''; + } + tripcode = tripcode ? " " + tripcode + "" : ''; + container = $.el('div', { + className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", + id: "pc" + postID, + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + }); + _ref = $$('.quotelink', container); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + quote = _ref[_i]; + href = quote.getAttribute('href'); + if (href[0] === '/') { + continue; + } + quote.href = "/" + board + "/res/" + href; + } + return container; + } + }; + TitlePost = { init: function() { return d.title = Get.title(); diff --git a/script.coffee b/script.coffee index 8f8a34812..2be1f4181 100644 --- a/script.coffee +++ b/script.coffee @@ -368,15 +368,6 @@ $.extend $, script = $.el 'script', textContent: code $.add d.head, script $.rm script - shortenFilename: (filename, isOP) -> - # FILENAME SHORTENING SCIENCE: - # OPs have a +10 characters threshold. - # The file extension is not taken into account. - threshold = 30 + 10 * isOP - if filename.replace(/\.\w+$/, '').length > threshold - "#{filename[...threshold - 5]}(...)#{filename.match(/\.\w+$/)}" - else - filename bytesToString: (size) -> unit = 0 # Bytes while size >= 1024 @@ -1977,7 +1968,7 @@ QR = # Enable auto-posting if we have stuff to post, disable it otherwise. QR.cooldown.auto = QR.replies.length > 1 QR.cooldown.set if g.BOARD is 'q' or /sage/i.test reply.email then 60 else 30 - if Conf['Open Reply in New Tab'] && !g.REPLY && !QR.cooldown.auto + if Conf['Open Reply in New Tab'] and !g.REPLY and !QR.cooldown.auto $.open "//boards.4chan.org/#{g.BOARD}/res/#{threadID}#p#{postID}" if Conf['Persistent QR'] or QR.cooldown.auto @@ -2410,7 +2401,7 @@ Updater = Updater.unsuccessfulFetchCount = 0 Updater.set 'timer', -Updater.getInterval() - scroll = Conf['Scrolling'] && Updater.scrollBG() && + scroll = Conf['Scrolling'] and Updater.scrollBG() and lastPost.getBoundingClientRect().bottom - d.documentElement.clientHeight < 25 $.add Updater.thread, nodes.reverse() if scroll @@ -2689,7 +2680,7 @@ FileInfo = unit: alt.match(/\w+$/)[0] resolution: node.textContent.match(/\d+x\d+|PDF/)[0] fullname: filename - shortname: $.shortenFilename filename, post.ID is post.threadID + shortname: Build.shortFilename filename, post.ID is post.threadID # XXX GM/Scriptish node.setAttribute 'data-filename', filename node.innerHTML = FileInfo.funk FileInfo @@ -2738,7 +2729,7 @@ Get = root.textContent = "Loading post No.#{postID}..." if threadID - $.cache "/#{board}/res/#{threadID}", -> + $.cache "//api.4chan.org/#{board}/res/#{threadID}.json", -> Get.parsePost @, board, threadID, postID, root, cb else if url = Redirect.post board, postID $.cache url, -> @@ -2751,6 +2742,7 @@ Get = $.cache url, -> Get.parseArchivedPost @, board, postID, root, cb else + $.addClass root, 'warning' root.textContent = if status is 404 "Thread No.#{threadID} has not been found." @@ -2758,153 +2750,31 @@ Get = "Error #{req.status}: #{req.statusText}." return - doc = d.implementation.createHTMLDocument '' - doc.documentElement.innerHTML = req.response + posts = JSON.parse(req.response).posts + postID = +postID + for post in posts + break if post.no is postID # we found it! + if post.no > postID + # The post can be deleted by the time we check a quote. + if url = Redirect.post board, postID + $.cache url, -> + Get.parseArchivedPost @, board, postID, root, cb + else + $.addClass root, 'warning' + root.textContent = "Post No.#{postID} has not been found." + return - unless pc = doc.getElementById "pc#{postID}" - # The post can be deleted by the time we check a quote. - if url = Redirect.post board, postID - $.cache url, -> - Get.parseArchivedPost @, board, postID, root, cb - else - root.textContent = "Post No.#{postID} has not been found." - return - pc = Get.cleanPost d.importNode pc, true - - for quote in $$ '.quotelink', pc - href = quote.getAttribute 'href' - continue if href[0] is '/' # Cross-board quote, or board link - quote.href = "/#{board}/res/#{href}" # Fix pathnames - link = $ 'a[title="Highlight this post"]', pc - link.href = "/#{board}/res/#{threadID}#p#{postID}" - link.nextSibling.href = "/#{board}/res/#{threadID}#q#{postID}" - - $.replace root.firstChild, pc + $.replace root.firstChild, Get.cleanPost Build.postFromObject post, board cb() if cb parseArchivedPost: (req, board, postID, root, cb) -> data = JSON.parse req.response - $.addClass root, 'archivedPost' if data.error + $.addClass root, 'warning' root.textContent = data.error return - threadID = data.thread_num - isOP = postID is threadID - {name, trip, timestamp} = data - subject = data.title - userID = data.poster_hash - - # post info (mobile) - piM = $.el 'div', - id: "pim#{postID}" - className: 'postInfoM mobile' - innerHTML: "
#{data.fourchan_date}
No.#{postID}" - $('.name', piM).textContent = name - $('.subject', piM).textContent = subject - br = $ 'br', piM - if trip - $.before br, [$.tn(' '), $.el 'span', - className: 'postertrip' - textContent: trip - ] - {capcode} = data - if capcode isnt 'N' # 'A'dmin or 'M'od - $.addClass br.parentNode, if capcode is 'A' then 'capcodeAdmin' else 'capcodeMod' - $.before br, [ - $.tn(' '), - $.el('strong', - className: 'capcode', - textContent: if capcode is 'A' then '## Admin' else '## Mod' - ), - $.tn(' '), - $.el('img', - src: if capcode is 'A' then '//static.4chan.org/image/adminicon.gif' else '//static.4chan.org/image/modicon.gif', - alt: if capcode is 'A' then 'This user is the 4chan Administrator.' else 'This user is a 4chan Moderator.', - title: if capcode is 'A' then 'This user is the 4chan Administrator.' else 'This user is a 4chan Moderator.', - className: 'identityIcon' - ) - ] - - # post info - pi = $.el 'div', - id: "pi#{postID}" - className: 'postInfo desktop' - innerHTML: " data.fourchan_date No.#{postID}" - # subject - $('.subject', pi).textContent = subject - nameBlock = $ '.nameBlock', pi - if data.email - email = $.el 'a', - className: 'useremail' - href: "mailto:#{data.email}" - $.add nameBlock, email - nameBlock = email - $.add nameBlock, $.el 'span', - className: 'name' - textContent: data.name - if userID - $.add nameBlock, [$.tn(' '), $.el('span', - className: "posteruid id_#{userID}" - innerHTML: "(ID: #{userID})" - )] - if trip - $.add nameBlock, [$.tn(' '), $.el('span', className: 'postertrip', textContent: trip)] - nameBlock = $ '.nameBlock', pi - switch capcode # 'A'dmin or 'M'od or 'D'eveloper - when 'A' - $.addClass nameBlock, 'capcodeAdmin' - $.add nameBlock, [ - $.tn(' '), - $.el('strong', - className: 'capcode' - textContent: '## Admin' - ), - $.tn(' '), - $.el('img', - src: '//static.4chan.org/image/adminicon.gif' - alt: 'This user is the 4chan Administrator.' - title: 'This user is the 4chan Administrator.' - className: 'identityIcon' - ) - ] - when 'M' - $.addClass nameBlock, 'capcodeMod' - $.add nameBlock, [ - $.tn(' '), - $.el('strong', - className: 'capcode' - textContent: '## Mod' - ), - $.tn(' '), - $.el('img', - src: '//static.4chan.org/image/modicon.gif' - alt: 'This user is a 4chan Moderator.' - title: 'This user is a 4chan Moderator.' - className: 'identityIcon' - ) - ] - when 'D' - $.addClass nameBlock, 'capcodeDeveloper' - $.add nameBlock, [ - $.tn(' '), - $.el('strong', - className: 'capcode' - textContent: '## Developer' - ), - $.tn(' '), - $.el('img', - src: '//static.4chan.org/image/developericon.gif' - alt: 'This user is a 4chan Developer.' - title: 'title="This user is a 4chan Developer.' - className: 'identityIcon' - ) - ] - - # comment - bq = $.el 'blockquote', - id: "m#{postID}" - className: 'postMessage' - textContent: data.comment # set this first to convert text to HTML entities + # convert comment to html + bq = $.el 'blockquote', textContent: data.comment # set this first to convert text to HTML entities # https://github.com/eksopl/fuuka/blob/master/Board/Yotsuba.pm#L413-452 # https://github.com/eksopl/asagi/blob/master/src/main/java/net/easymodo/asagi/Yotsuba.java#L109-138 bq.innerHTML = bq.innerHTML.replace /// @@ -2939,37 +2809,44 @@ Get = when '[/banned]' '' # greentext - bq.innerHTML = bq.innerHTML.replace /(^|>)(>[^<$]+)(<|$)/g, '$1$2$3' + comment = bq.innerHTML.replace /(^|>)(>[^<$]+)(<|$)/g, '$1$2$3' - # post container - pc = $.el 'div', - id: "pc#{postID}" - className: "postContainer #{if isOP then 'op' else 'reply'}Container" - innerHTML: "
" - $.add pc.firstChild, [piM, pi, bq] + o = + # id + postID: postID + threadID: data.thread_num + board: board + # info + name: data.name_processed + capcode: switch data.capcode + when 'M' then 'mod' + when 'A' then 'admin' + when 'D' then 'developer' + tripcode: data.trip + uniqueID: data.poster_hash + email: encodeURIComponent data.email + subject: data.title_processed + flagCode: data.poster_country + # XXX flagName: data.???_processed + date: data.fourchan_date + dateUTC: data.timestamp + comment: comment + # file + if data.media_filename + o.file = + name: data.media_filename_processed + timestamp: data.media_orig + url: data.media_link or data.remote_media_link + height: data.media_h + width: data.media_w + MD5: data.media_hash + size: data.media_size + turl: data.thumb_link or "//thumbs.4chan.org/#{board}/thumb/#{data.preview_orig}" + theight: data.preview_h + twidth: data.preview_w + isSpoiler: data.spoiler is '1' - # file - if filename = data.media_filename - file = $.el 'div', - id: "f#{postID}" - className: 'file' - spoiler = data.spoiler is '1' - filesize = $.bytesToString data.media_size - $.add file, $.el 'div', - className: 'fileInfo' - innerHTML: "File: #{data.media_orig}-(#{if spoiler then 'Spoiler Image, ' else ''}#{filesize}, #{data.media_w}x#{data.media_h}, )" - span = $ 'span[title]', file - span.title = filename - span.textContent = $.shortenFilename filename, isOP - thumb_src = if data.media_status is 'available' then "src=#{data.thumb_link}" else '' - $.add file, $.el 'a', - className: if spoiler then 'fileThumb imgspoiler' else 'fileThumb' - href: data.media_link or data.remote_media_link - target: '_blank' - innerHTML: "#{if data.media_status isnt " - $.after (if isOP then piM else pi), file - - $.replace root.firstChild, Get.cleanPost pc + $.replace root.firstChild, Get.cleanPost Build.post o, true cb() if cb cleanPost: (root) -> post = $ '.post', root @@ -3006,6 +2883,234 @@ Get = span = $.el 'span', innerHTML: el.innerHTML.replace /
/g, ' ' "/#{g.BOARD}/ - #{span.textContent.trim()}" +Build = + shortFilename: (filename, isOP) -> + # FILENAME SHORTENING SCIENCE: + # OPs have a +10 characters threshold. + # The file extension is not taken into account. + threshold = if isOP then 40 else 30 + if filename.length - 4 > threshold + "#{filename[...threshold - 5]}(...).#{filename[-3..]}" + else + filename + postFromObject: (data, board) -> + o = + # id + postID: data.no + threadID: data.resto or data.no + board: board + # info + name: data.name + capcode: data.capcode + tripcode: data.trip + uniqueID: data.id + email: data.email.replace /\s/g, '%20' # UGH + subject: data.sub + flagCode: data.country + flagName: data.country_name + date: data.now + dateUTC: data.time + comment: data.com + # file + if data.ext + o.file = + name: data.filename + data.ext + timestamp: "#{data.tim}#{data.ext}" + url: "//images.4chan.org/#{board}/src/#{data.tim}#{data.ext}" + height: data.h + width: data.w + MD5: data.md5 + size: data.fsize + turl: "//thumbs.4chan.org/#{board}/thumb/#{data.tim}s.jpg" + theight: data.tn_h + twidth: data.tn_w + isSpoiler: !!data.spoiler + isDeleted: !!data.filedeleted + Build.post o + post: (o, isArchived) -> + ### + This function contains code from 4chan-JS (https://github.com/4chan/4chan-JS). + @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE + ### + { + postID, threadID, board + name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC + comment + file + } = o + isOP = postID is threadID + + staticPath = '//static.4chan.org' + + if email + emailStart = '' + emailEnd = '' + else + emailStart = '' + emailEnd = '' + + userID = + if !capcode and uniqueID + " (ID: " + + "#{uniqueID}) " + else + '' + + switch capcode + when 'admin', 'admin_highlight' + capcodeClass = " capcodeAdmin" + capcodeStart = " ## Admin" + capcode = " " + when 'mod' + capcodeClass = " capcodeMod" + capcodeStart = " ## Moderator" + capcode = " " + when 'developer' + capcodeClass = " capcodeDeveloper" + capcodeStart = " ## Developer" + capcode = " " + else + capcodeClass = '' + capcodeStart = '' + capcode = '' + + flag = + if flagCode + " #{flagCode}" + else + '' + + if file?.isDeleted + fileHTML = + if isOP + "
" + + "File deleted." + + "
" + else + "
" + + "File deleted." + + "
" + else if file + ext = file.name[-3..] + if !file.twidth and !file.theight and ext is 'gif' # wtf ? + file.twidth = file.width + file.theight = file.height + + fileSize = $.bytesToString file.size + + fileThumb = file.turl + if file.isSpoiler + fileSize = "Spoiler Image, #{fileSize}" + unless isArchived + fileThumb = '//thumbs.4chan.org/image/spoiler' + fileThumb += switch board + # UGGH, I can't wait to maintain this crap. + # Sup desuwa? + when 'a' then '-a' + when 'co' then '-co' + when 'jp' then '-jp' + when 'lit' then 'lit' + when 'm' then '-m2' + when 'mlp' then '-mlp' + when 'tg' then '-tg2' + when 'tv' then '-tv5' + when 'v', 'vg' then '-v' + when 'vp' then '-vp' + else '' + fileThumb += '.png' + file.twidth = file.theight = 100 + + imgSrc = "" + + "#{fileSize}" + + fileDims = if ext is 'pdf' then 'PDF' else "#{file.width}x#{file.height}" + fileInfo = "File: #{file.timestamp}" + + "-(#{fileSize}, #{fileDims}#{ + if file.isSpoiler + '' + else + ", #{Build.shortFilename file.name}'" + }" + ")" + + fileHTML = "
#{fileInfo}
#{imgSrc}
" + else + fileHTML = '' + + tripcode = + if tripcode + " #{tripcode}" + else + '' + + container = $.el 'div', + className: "postContainer #{if isOP then 'op' else 'reply'}Container" + id: "pc#{postID}" + innerHTML: \ + (if isOP then '' else "
>>
") + + "
" + + + "
" + + "" + + emailStart + + "#{name}" + tripcode + + emailEnd + capcodeStart + capcode + userID + flag + + "
#{subject}" + + "#{date}" + + '
' + + "No." + + "#{postID}" + + '' + + '
' + + + (if isOP then fileHTML else '') + + + "
" + + " " + + "#{subject or ''} " + + "" + + emailStart + + "#{name}" + tripcode + + emailEnd + capcodeStart + capcode + userID + flag + + ' ' + + "#{date} " + + "" + + "No." + + "#{postID}" + + '' + + '
' + + + (if isOP then '' else fileHTML) + + + "
#{comment}
" + + + '
' + + for quote in $$ '.quotelink', container + href = quote.getAttribute 'href' + continue if href[0] is '/' # Cross-board quote, or board link + quote.href = "/#{board}/res/#{href}" # Fix pathnames + + container TitlePost = init: -> d.title = Get.title() From 8d1a1ca6dddfdc62ffc86e4c47e4a217931d91e9 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 18:48:59 +0200 Subject: [PATCH 06/37] Changelog --- changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog b/changelog index bb5cac57a..168492998 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,8 @@ master +- Mayhem + Use 4chan's API to fetch posts for: + - Quote Inlining. + - Quote Previewing. 2.34.10 - Mayhem From fe2a6641687f8680c02d40b4cb8e05e680af7b0e Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 18:51:19 +0200 Subject: [PATCH 07/37] Don't strike-through deadlinks. --- 4chan_x.user.js | 3 +++ script.coffee | 3 +++ 2 files changed, 6 insertions(+) diff --git a/4chan_x.user.js b/4chan_x.user.js index a5f5f3455..842e70a71 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -5766,6 +5766,9 @@ body.unscroll {\ .qphl {\ outline: 2px solid rgba(216, 94, 49, .7);\ }\ +.quotelink.deadlink {\ + text-decoration: underline !important;\ +}\ .inlined {\ opacity: .5;\ }\ diff --git a/script.coffee b/script.coffee index 2be1f4181..99763ca6a 100644 --- a/script.coffee +++ b/script.coffee @@ -4674,6 +4674,9 @@ body.unscroll { .qphl { outline: 2px solid rgba(216, 94, 49, .7); } +.quotelink.deadlink { + text-decoration: underline !important; +} .inlined { opacity: .5; } From 946daebac9aca6d2161edac56d5c3b184db5a1dc Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 20:20:48 +0200 Subject: [PATCH 08/37] Fix for deleted files. --- 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 842e70a71..03f854597 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3689,7 +3689,7 @@ dateUTC: data.time, comment: data.com }; - if (data.ext) { + if (data.ext || data.filedeleted) { o.file = { name: data.filename + data.ext, timestamp: "" + data.tim + data.ext, @@ -3802,8 +3802,8 @@ } tripcode = tripcode ? " " + tripcode + "" : ''; container = $.el('div', { - className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", id: "pc" + postID, + className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' }); _ref = $$('.quotelink', container); diff --git a/script.coffee b/script.coffee index 99763ca6a..f0d1e0c71 100644 --- a/script.coffee +++ b/script.coffee @@ -2912,7 +2912,7 @@ Build = dateUTC: data.time comment: data.com # file - if data.ext + if data.ext or data.filedeleted o.file = name: data.filename + data.ext timestamp: "#{data.tim}#{data.ext}" @@ -3053,8 +3053,8 @@ Build = '' container = $.el 'div', - className: "postContainer #{if isOP then 'op' else 'reply'}Container" id: "pc#{postID}" + className: "postContainer #{if isOP then 'op' else 'reply'}Container" innerHTML: \ (if isOP then '' else "
>>
") + "
" + From 37933050a9634296daa4a9adca8d3108d6fd1dfb Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 20:31:26 +0200 Subject: [PATCH 09/37] Add sticky and closed. --- 4chan_x.user.js | 12 ++++++++---- script.coffee | 19 +++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 03f854597..c1fb119eb 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3687,7 +3687,9 @@ flagName: data.country_name, date: data.now, dateUTC: data.time, - comment: data.com + comment: data.com, + isSticky: !!data.sticky, + isClosed: !!data.closed }; if (data.ext || data.filedeleted) { o.file = { @@ -3713,8 +3715,8 @@ @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var board, capcode, capcodeClass, capcodeStart, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, flag, flagCode, flagName, href, imgSrc, isOP, name, postID, quote, staticPath, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; - postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, comment = o.comment, file = o.file; + var board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, flag, flagCode, flagName, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; + postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file; isOP = postID === threadID; staticPath = '//static.4chan.org'; if (email) { @@ -3801,10 +3803,12 @@ fileHTML = ''; } tripcode = tripcode ? " " + tripcode + "" : ''; + sticky = isSticky ? ' Sticky' : ''; + closed = isClosed ? ' Closed' : ''; container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index f0d1e0c71..43b986ebf 100644 --- a/script.coffee +++ b/script.coffee @@ -2911,6 +2911,9 @@ Build = date: data.now dateUTC: data.time comment: data.com + # thread status + isSticky: !!data.sticky + isClosed: !!data.closed # file if data.ext or data.filedeleted o.file = @@ -2935,6 +2938,7 @@ Build = { postID, threadID, board name, capcode, tripcode, uniqueID, email, subject, flagCode, flagName, date, dateUTC + isSticky, isClosed comment file } = o @@ -3052,6 +3056,17 @@ Build = else '' + sticky = + if isSticky + ' Sticky' + else + '' + closed = + if isClosed + ' Closed' + else + '' + container = $.el 'div', id: "pc#{postID}" className: "postContainer #{if isOP then 'op' else 'reply'}Container" @@ -3063,7 +3078,7 @@ Build = "" + emailStart + "#{name}" + tripcode + - emailEnd + capcodeStart + capcode + userID + flag + + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + "
#{subject}" + "#{date}" + '
' + @@ -3085,7 +3100,7 @@ Build = "" + emailStart + "#{name}" + tripcode + - emailEnd + capcodeStart + capcode + userID + flag + + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ' ' + "#{date} " + "" + From c7bfdecb2e47643207961b3a181069eea48ed816 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 20:33:12 +0200 Subject: [PATCH 10/37] Add admin_highlight hl class. --- 4chan_x.user.js | 8 ++++++-- script.coffee | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index c1fb119eb..fe33c44e4 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3715,7 +3715,7 @@ @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, flag, flagCode, flagName, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; + var board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, flag, flagCode, flagName, highlight, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file; isOP = postID === threadID; staticPath = '//static.4chan.org'; @@ -3730,6 +3730,9 @@ switch (capcode) { case 'admin': case 'admin_highlight': + if (capcode === 'admin_highlight') { + highlight = ' highlightPost'; + } capcodeClass = " capcodeAdmin"; capcodeStart = " ## Admin"; capcode = (" "; @@ -3745,6 +3748,7 @@ capcode = (" "; break; default: + highlight = ''; capcodeClass = ''; capcodeStart = ''; capcode = ''; @@ -3808,7 +3812,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index 43b986ebf..c40851dd7 100644 --- a/script.coffee +++ b/script.coffee @@ -2962,6 +2962,7 @@ Build = switch capcode when 'admin', 'admin_highlight' + highlight = ' highlightPost' if capcode is 'admin_highlight' capcodeClass = " capcodeAdmin" capcodeStart = " ## Admin" @@ -2983,6 +2984,7 @@ Build = "alt='This user is a 4chan Developer.' " + "title='This user is a 4chan Developer.' class=identityIcon>" else + highlight = '' capcodeClass = '' capcodeStart = '' capcode = '' @@ -3072,7 +3074,7 @@ Build = className: "postContainer #{if isOP then 'op' else 'reply'}Container" innerHTML: \ (if isOP then '' else "
>>
") + - "
" + + "
" + "
" + "" + From 123752246dd6fec938e6cda8a50d4195d3a1aba1 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 20:35:15 +0200 Subject: [PATCH 11/37] rm email from mobile postinfo, fix position of mail end in desktop postinfo. --- 4chan_x.user.js | 2 +- script.coffee | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index fe33c44e4..89668854e 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3812,7 +3812,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index c40851dd7..1b4b2aecd 100644 --- a/script.coffee +++ b/script.coffee @@ -3078,9 +3078,8 @@ Build = "
" + "" + - emailStart + "#{name}" + tripcode + - emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + + capcodeStart + capcode + userID + flag + sticky + closed + "
#{subject}" + "#{date}" + '
' + @@ -3102,7 +3101,7 @@ Build = "" + emailStart + "#{name}" + tripcode + - emailEnd + capcodeStart + capcode + userID + flag + sticky + closed + + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + "#{date} " + "" + From b7ecec510415630f03f27a47d82ad6ef04dd70ba Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 20:52:20 +0200 Subject: [PATCH 12/37] Fix filename title for spoiler images. Fix filenames in general. --- 4chan_x.user.js | 12 ++++++++++-- script.coffee | 17 +++++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 89668854e..c257af51a 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3715,7 +3715,7 @@ @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, flag, flagCode, flagName, highlight, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; + var a, board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, highlight, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, shortFilename, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file; isOP = postID === threadID; staticPath = '//static.4chan.org'; @@ -3800,8 +3800,16 @@ } } imgSrc = ("") + ("" + fileSize + ""); + a = $.el('a', { + innerHTML: file.name + }); + filename = a.textContent.replace(/%22/g, '"'); + a.textContent = Build.shortname(filename); + shortFilename = a.innerHTML; + a.textContent = filename; + filename = a.innerHTML; fileDims = ext === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height; - fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + (Build.shortFilename(file.name)) + "'")) + ")"; + fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + filename + "'")) + ")"; fileHTML = "
" + fileInfo + "
" + imgSrc + "
"; } else { fileHTML = ''; diff --git a/script.coffee b/script.coffee index 1b4b2aecd..8f022a1dc 100644 --- a/script.coffee +++ b/script.coffee @@ -3039,13 +3039,26 @@ Build = imgSrc = "" + "#{fileSize}" + # Ha Ha filenames. + # html -> text, translate WebKit's %22s into "s + a = $.el 'a', innerHTML: file.name + filename = a.textContent.replace /%22/g, '"' + + # shorten filename, get html + a.textContent = Build.shortname filename + shortFilename = a.innerHTML + + # get html + a.textContent = filename + filename = a.innerHTML + fileDims = if ext is 'pdf' then 'PDF' else "#{file.width}x#{file.height}" - fileInfo = "File: #{file.timestamp}" + + fileInfo = "File: #{file.timestamp}" + "-(#{fileSize}, #{fileDims}#{ if file.isSpoiler '' else - ", #{Build.shortFilename file.name}'" + ", #{filename}'" }" + ")" fileHTML = "
#{fileInfo}
#{imgSrc}
" From 8063fe76dbccfaab604cc07c2a3aac3e55f9227c Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 20:55:27 +0200 Subject: [PATCH 13/37] Oopsies. --- 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 c257af51a..acfd8985e 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3767,7 +3767,7 @@ if (file.isSpoiler) { fileSize = "Spoiler Image, " + fileSize; if (!isArchived) { - fileThumb = '//thumbs.4chan.org/image/spoiler'; + fileThumb = '//static.4chan.org/image/spoiler'; fileThumb += (function() { switch (board) { case 'a': @@ -3804,7 +3804,7 @@ innerHTML: file.name }); filename = a.textContent.replace(/%22/g, '"'); - a.textContent = Build.shortname(filename); + a.textContent = Build.shortFilename(filename); shortFilename = a.innerHTML; a.textContent = filename; filename = a.innerHTML; diff --git a/script.coffee b/script.coffee index 8f022a1dc..78c896990 100644 --- a/script.coffee +++ b/script.coffee @@ -3018,7 +3018,7 @@ Build = if file.isSpoiler fileSize = "Spoiler Image, #{fileSize}" unless isArchived - fileThumb = '//thumbs.4chan.org/image/spoiler' + fileThumb = '//static.4chan.org/image/spoiler' fileThumb += switch board # UGGH, I can't wait to maintain this crap. # Sup desuwa? @@ -3045,7 +3045,7 @@ Build = filename = a.textContent.replace /%22/g, '"' # shorten filename, get html - a.textContent = Build.shortname filename + a.textContent = Build.shortFilename filename shortFilename = a.innerHTML # get html From fddbd989b3297e4270b8b3155489c5455f057062 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 22:02:27 +0200 Subject: [PATCH 14/37] Use 4chan's API for the Thread Updater. Can't test right now but it should be working. --- 4chan_x.user.js | 109 +++++++++++++++++++++++++----------------------- changelog | 1 + script.coffee | 98 +++++++++++++++++++++---------------------- 3 files changed, 107 insertions(+), 101 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index acfd8985e..04e3726c5 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2933,71 +2933,76 @@ return !(d.hidden || d.oHidden || d.mozHidden || d.webkitHidden); }; }, - update: function() { - var count, doc, id, lastPost, nodes, reply, scroll, _i, _len, _ref, _ref1, _ref2; - if (this.status === 404) { - Updater.set('timer', ''); - Updater.set('count', 404); - Updater.count.className = 'warning'; - clearTimeout(Updater.timeoutID); - g.dead = true; - if (Conf['Unread Count']) { - Unread.title = Unread.title.match(/^.+-/)[0] + ' 404'; - } else { - d.title = d.title.match(/^.+-/)[0] + ' 404'; - } - Unread.update(true); - QR.abort(); - return; - } - if ((_ref = this.status) !== 0 && _ref !== 200 && _ref !== 304) { - if (Conf['Verbose']) { - Updater.set('count', this.statusText); + load: function() { + switch (this.status) { + case 404: + Updater.set('timer', ''); + Updater.set('count', 404); Updater.count.className = 'warning'; - } - Updater.unsuccessfulFetchCount++; - return; - } - Updater.unsuccessfulFetchCount++; - Updater.set('timer', -Updater.getInterval()); - /* - Status Code 304: Not modified - By sending the `If-Modified-Since` header we get a proper status code, and no response. - This saves bandwidth for both the user and the servers, avoid unnecessary computation, - and won't load images and scripts when parsing the response. - */ + clearTimeout(Updater.timeoutID); + g.dead = true; + if (Conf['Unread Count']) { + Unread.title = Unread.title.match(/^.+-/)[0] + ' 404'; + } else { + d.title = d.title.match(/^.+-/)[0] + ' 404'; + } + Unread.update(true); + QR.abort(); + break; + case 0: + case 304: + /* + Status Code 304: Not modified + By sending the `If-Modified-Since` header we get a proper status code, and no response. + This saves bandwidth for both the user and the servers and avoid unnecessary computation. + */ - if ((_ref1 = this.status) === 0 || _ref1 === 304) { - if (Conf['Verbose']) { - Updater.set('count', '+0'); - Updater.count.className = null; - } - return; + Updater.unsuccessfulFetchCount++; + Updater.set('timer', -Updater.getInterval()); + if (Conf['Verbose']) { + Updater.set('count', '+0'); + Updater.count.className = null; + } + break; + case 200: + Updater.lastModified = this.getResponseHeader('Last-Modified'); + Updater.cb.update(JSON.parse(this.response).posts); + Updater.set('timer', -Updater.getInterval()); + break; + default: + Updater.unsuccessfulFetchCount++; + Updater.set('timer', -Updater.getInterval()); + if (Conf['Verbose']) { + Updater.set('count', this.statusText); + Updater.count.className = 'warning'; + } } - Updater.lastModified = this.getResponseHeader('Last-Modified'); - doc = d.implementation.createHTMLDocument(''); - doc.documentElement.innerHTML = this.response; + return delete Updater.request; + }, + update: function(posts) { + var count, id, lastPost, nodes, post, scroll, _i, _len, _ref; lastPost = Updater.thread.lastElementChild; - id = lastPost.id.slice(2); + id = +lastPost.id.slice(2); nodes = []; - _ref2 = $$('.replyContainer', doc).reverse(); - for (_i = 0, _len = _ref2.length; _i < _len; _i++) { - reply = _ref2[_i]; - if (reply.id.slice(2) <= id) { + _ref = posts.reverse(); + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + post = _ref[_i]; + if (post.no <= id) { break; } - nodes.push(reply); + nodes.push(Build.postFromObject(post)); } count = nodes.length; if (Conf['Verbose']) { Updater.set('count', "+" + count); Updater.count.className = count ? 'new' : null; } - if (!count) { + if (count) { + Updater.unsuccessfulFetchCount = 0; + } else { + Updater.unsuccessfulFetchCount++; return; } - Updater.unsuccessfulFetchCount = 0; - Updater.set('timer', -Updater.getInterval()); scroll = Conf['Scrolling'] && Updater.scrollBG() && lastPost.getBoundingClientRect().bottom - d.documentElement.clientHeight < 25; $.add(Updater.thread, nodes.reverse()); if (scroll) { @@ -3044,9 +3049,9 @@ if ((_ref = Updater.request) != null) { _ref.abort(); } - url = location.pathname + '?' + Date.now(); + url = "//api.4chan.org/" + g.BOARD + "/res/" + g.THREAD_ID + ".json"; return Updater.request = $.ajax(url, { - onload: Updater.cb.update + onload: Updater.cb.load }, { headers: { 'If-Modified-Since': Updater.lastModified diff --git a/changelog b/changelog index 168492998..e16c8f27b 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ master - Mayhem Use 4chan's API to fetch posts for: + - Thread Updater. - Quote Inlining. - Quote Previewing. diff --git a/script.coffee b/script.coffee index 78c896990..c0878345d 100644 --- a/script.coffee +++ b/script.coffee @@ -2343,64 +2343,62 @@ Updater = -> true else -> !(d.hidden or d.oHidden or d.mozHidden or d.webkitHidden) - update: -> - if @status is 404 - Updater.set 'timer', '' - Updater.set 'count', 404 - Updater.count.className = 'warning' - clearTimeout Updater.timeoutID - g.dead = true - if Conf['Unread Count'] - Unread.title = Unread.title.match(/^.+-/)[0] + ' 404' - else - d.title = d.title.match(/^.+-/)[0] + ' 404' - Unread.update true - QR.abort() - return - unless @status in [0, 200, 304] - # XXX 304 -> 0 in Opera - if Conf['Verbose'] - Updater.set 'count', @statusText + load: -> + switch @status + when 404 + Updater.set 'timer', '' + Updater.set 'count', 404 Updater.count.className = 'warning' - Updater.unsuccessfulFetchCount++ - return - - Updater.unsuccessfulFetchCount++ - Updater.set 'timer', -Updater.getInterval() - - ### - Status Code 304: Not modified - By sending the `If-Modified-Since` header we get a proper status code, and no response. - This saves bandwidth for both the user and the servers, avoid unnecessary computation, - and won't load images and scripts when parsing the response. - ### - if @status in [0, 304] + clearTimeout Updater.timeoutID + g.dead = true + if Conf['Unread Count'] + Unread.title = Unread.title.match(/^.+-/)[0] + ' 404' + else + d.title = d.title.match(/^.+-/)[0] + ' 404' + Unread.update true + QR.abort() # XXX 304 -> 0 in Opera - if Conf['Verbose'] - Updater.set 'count', '+0' - Updater.count.className = null - return - Updater.lastModified = @getResponseHeader 'Last-Modified' - - doc = d.implementation.createHTMLDocument '' - doc.documentElement.innerHTML = @response - + when 0, 304 + ### + Status Code 304: Not modified + By sending the `If-Modified-Since` header we get a proper status code, and no response. + This saves bandwidth for both the user and the servers and avoid unnecessary computation. + ### + Updater.unsuccessfulFetchCount++ + Updater.set 'timer', -Updater.getInterval() + if Conf['Verbose'] + Updater.set 'count', '+0' + Updater.count.className = null + when 200 + Updater.lastModified = @getResponseHeader 'Last-Modified' + Updater.cb.update JSON.parse(@response).posts + Updater.set 'timer', -Updater.getInterval() + else + Updater.unsuccessfulFetchCount++ + Updater.set 'timer', -Updater.getInterval() + if Conf['Verbose'] + Updater.set 'count', @statusText + Updater.count.className = 'warning' + delete Updater.request + update: (posts) -> lastPost = Updater.thread.lastElementChild - id = lastPost.id[2..] + id = +lastPost.id[2..] nodes = [] - for reply in $$('.replyContainer', doc).reverse() - break if reply.id[2..] <= id #make sure to not insert older posts - nodes.push reply + for post in posts.reverse() + break if post.no <= id # Make sure to not insert older posts. + nodes.push Build.postFromObject post count = nodes.length if Conf['Verbose'] Updater.set 'count', "+#{count}" Updater.count.className = if count then 'new' else null - return unless count + if count + Updater.unsuccessfulFetchCount = 0 + else + Updater.unsuccessfulFetchCount++ + return - Updater.unsuccessfulFetchCount = 0 - Updater.set 'timer', -Updater.getInterval() scroll = Conf['Scrolling'] and Updater.scrollBG() and lastPost.getBoundingClientRect().bottom - d.documentElement.clientHeight < 25 $.add Updater.thread, nodes.reverse() @@ -2442,8 +2440,10 @@ Updater = Updater.set 'timer', 0 Updater.request?.abort() # Fool the cache. - url = location.pathname + '?' + Date.now() - Updater.request = $.ajax url, onload: Updater.cb.update, + # XXX is fooling the cache still necessary? + # url = "//api.4chan.org/#{g.BOARD}/res/#{g.THREAD_ID}.json?{Date.now()}" + url = "//api.4chan.org/#{g.BOARD}/res/#{g.THREAD_ID}.json" + Updater.request = $.ajax url, onload: Updater.cb.load, headers: 'If-Modified-Since': Updater.lastModified Watcher = From b95dc1d9a22180d9b9b27cf3cc45a14d2e6bca10 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 22:10:59 +0200 Subject: [PATCH 15/37] Fix. --- 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 04e3726c5..4b04b0d60 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2990,7 +2990,7 @@ if (post.no <= id) { break; } - nodes.push(Build.postFromObject(post)); + nodes.push(Build.postFromObject(post, g.BOARD)); } count = nodes.length; if (Conf['Verbose']) { diff --git a/script.coffee b/script.coffee index c0878345d..6867e9db9 100644 --- a/script.coffee +++ b/script.coffee @@ -2386,7 +2386,7 @@ Updater = nodes = [] for post in posts.reverse() break if post.no <= id # Make sure to not insert older posts. - nodes.push Build.postFromObject post + nodes.push Build.postFromObject post, g.BOARD count = nodes.length if Conf['Verbose'] From 063ea136ba8a10f422cdfde04fb82d09b77d1993 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 22:20:26 +0200 Subject: [PATCH 16/37] Network tweak: get the Last-Modified header when we open the thread via a HEAD request. --- 4chan_x.user.js | 9 +++++++++ script.coffee | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4b04b0d60..81c515f77 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2851,6 +2851,15 @@ this.thread = $.id("t" + g.THREAD_ID); this.unsuccessfulFetchCount = 0; this.lastModified = '0'; + $.ajax("//api.4chan.org/" + g.BOARD + "/res/" + g.THREAD_ID + ".json", { + type: 'head', + onload: function() { + if (this.status !== 200) { + return; + } + return Updater.lastModified = this.getResponseHeader('Last-Modified'); + } + }); _ref = $$('input', dialog); for (_i = 0, _len = _ref.length; _i < _len; _i++) { input = _ref[_i]; diff --git a/script.coffee b/script.coffee index 6867e9db9..fec950281 100644 --- a/script.coffee +++ b/script.coffee @@ -2281,6 +2281,11 @@ Updater = @unsuccessfulFetchCount = 0 @lastModified = '0' + $.ajax "//api.4chan.org/#{g.BOARD}/res/#{g.THREAD_ID}.json", + type: 'head' + onload: -> + return if @status isnt 200 + Updater.lastModified = @getResponseHeader 'Last-Modified' for input in $$ 'input', dialog if input.type is 'checkbox' From d846449d19bcf12846579a3d53a75db5e0cb9c39 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 22:22:58 +0200 Subject: [PATCH 17/37] Fix previous tweak. --- 4chan_x.user.js | 3 ++- script.coffee | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 81c515f77..86808f414 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2852,13 +2852,14 @@ this.unsuccessfulFetchCount = 0; this.lastModified = '0'; $.ajax("//api.4chan.org/" + g.BOARD + "/res/" + g.THREAD_ID + ".json", { - type: 'head', onload: function() { if (this.status !== 200) { return; } return Updater.lastModified = this.getResponseHeader('Last-Modified'); } + }, { + type: 'head' }); _ref = $$('input', dialog); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index fec950281..d29f6f128 100644 --- a/script.coffee +++ b/script.coffee @@ -2281,11 +2281,11 @@ Updater = @unsuccessfulFetchCount = 0 @lastModified = '0' - $.ajax "//api.4chan.org/#{g.BOARD}/res/#{g.THREAD_ID}.json", - type: 'head' + $.ajax "//api.4chan.org/#{g.BOARD}/res/#{g.THREAD_ID}.json", { onload: -> return if @status isnt 200 Updater.lastModified = @getResponseHeader 'Last-Modified' + }, type: 'head' for input in $$ 'input', dialog if input.type is 'checkbox' From d94d09ebaa376ebfd4b47ffb2ce86b87fb880008 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 22:59:02 +0200 Subject: [PATCH 18/37] Use 4chan's API for comment expansion. --- 4chan_x.user.js | 34 ++++++++++++++++++++++------------ changelog | 1 + script.coffee | 25 ++++++++++++++----------- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 86808f414..0ea4fc9fd 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -858,24 +858,35 @@ var a, replyID, threadID, _, _ref; e.preventDefault(); _ref = this.href.match(/(\d+)#p(\d+)/), _ = _ref[0], threadID = _ref[1], replyID = _ref[2]; - this.textContent = "Loading " + replyID + "..."; + this.textContent = "Loading No." + replyID + "..."; a = this; - return $.cache(this.pathname, function() { + return $.cache("//api.4chan.org" + this.pathname + ".json", function() { return ExpandComment.parse(this, a, threadID, replyID); }); }, parse: function(req, a, threadID, replyID) { - var doc, href, node, post, quote, quotes, _i, _len; + var bq, href, post, posts, quote, quotes, _i, _j, _len, _len1; if (req.status !== 200) { a.textContent = "" + req.status + " " + req.statusText; return; } - doc = d.implementation.createHTMLDocument(''); - doc.documentElement.innerHTML = req.response; - node = d.importNode(doc.getElementById("m" + replyID), true); - quotes = node.getElementsByClassName('quotelink'); - for (_i = 0, _len = quotes.length; _i < _len; _i++) { - quote = quotes[_i]; + posts = JSON.parse(req.response).posts; + replyID = +replyID; + for (_i = 0, _len = posts.length; _i < _len; _i++) { + post = posts[_i]; + if (post.no === replyID) { + break; + } + } + if (post.no !== replyID) { + a.textContent = 'No.#{replyID} not found.'; + return; + } + bq = $.id("m" + replyID); + bq.innerHTML = post.com; + quotes = bq.getElementsByClassName('quotelink'); + for (_j = 0, _len1 = quotes.length; _j < _len1; _j++) { + quote = quotes[_j]; href = quote.getAttribute('href'); if (href[0] === '/') { continue; @@ -883,7 +894,7 @@ quote.href = "res/" + href; } post = { - blockquote: node, + blockquote: bq, threadID: threadID, quotes: quotes, backlinks: [] @@ -903,8 +914,7 @@ if (Conf['Indicate Cross-thread Quotes']) { QuoteCT.node(post); } - $.replace(a.parentNode.parentNode, node); - return Main.prettify(node); + return Main.prettify(bq); } }; diff --git a/changelog b/changelog index e16c8f27b..c046ad4ce 100644 --- a/changelog +++ b/changelog @@ -4,6 +4,7 @@ master - Thread Updater. - Quote Inlining. - Quote Previewing. + - Comment Expansion. 2.34.10 - Mayhem diff --git a/script.coffee b/script.coffee index d29f6f128..63709ca3e 100644 --- a/script.coffee +++ b/script.coffee @@ -706,28 +706,32 @@ ExpandComment = expand: (e) -> e.preventDefault() [_, threadID, replyID] = @href.match /(\d+)#p(\d+)/ - @textContent = "Loading #{replyID}..." + @textContent = "Loading No.#{replyID}..." a = @ - $.cache @pathname, -> ExpandComment.parse @, a, threadID, replyID + $.cache "//api.4chan.org#{@pathname}.json", -> ExpandComment.parse @, a, threadID, replyID parse: (req, a, threadID, replyID) -> if req.status isnt 200 a.textContent = "#{req.status} #{req.statusText}" return - doc = d.implementation.createHTMLDocument '' - doc.documentElement.innerHTML = req.response + posts = JSON.parse(req.response).posts + replyID = +replyID - # Import the node to fix quote.hashes - # as they're empty when in a different document. - node = d.importNode doc.getElementById("m#{replyID}"), true + for post in posts + break if post.no is replyID + if post.no isnt replyID + a.textContent = 'No.#{replyID} not found.' + return - quotes = node.getElementsByClassName 'quotelink' + bq = $.id "m#{replyID}" + bq.innerHTML = post.com + quotes = bq.getElementsByClassName 'quotelink' for quote in quotes href = quote.getAttribute 'href' continue if href[0] is '/' # Cross-board quote quote.href = "res/#{href}" # Fix pathnames post = - blockquote: node + blockquote: bq threadID: threadID quotes: quotes backlinks: [] @@ -741,8 +745,7 @@ ExpandComment = QuoteOP.node post if Conf['Indicate Cross-thread Quotes'] QuoteCT.node post - $.replace a.parentNode.parentNode, node - Main.prettify node + Main.prettify bq ExpandThread = init: -> From 0fcddef30ff963ef89906841641afd6e397f4761 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Fri, 7 Sep 2012 23:12:37 +0200 Subject: [PATCH 19/37] Use 4chan's API for thread expansion. --- 4chan_x.user.js | 47 ++++++++++++++++++----------------------------- changelog | 1 + script.coffee | 25 ++++++++++--------------- 3 files changed, 29 insertions(+), 44 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 0ea4fc9fd..cdff1c306 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -938,19 +938,19 @@ return _results; }, toggle: function(thread) { - var a, num, pathname, replies, reply, _i, _len; - pathname = "/" + g.BOARD + "/res/" + thread.id.slice(1); + var a, num, replies, reply, url, _i, _len; + url = "//api.4chan.org/" + g.BOARD + "/res/" + thread.id.slice(1) + ".json"; a = $('.summary', thread); switch (a.textContent[0]) { case '+': a.textContent = a.textContent.replace('+', '× Loading...'); - $.cache(pathname, function() { + $.cache(url, function() { return ExpandThread.parse(this, thread, a); }); break; case '×': a.textContent = a.textContent.replace('× Loading...', '+'); - $.cache.requests[pathname].abort(); + $.cache.requests[url].abort(); break; case '-': a.textContent = a.textContent.replace('-', '+'); @@ -975,44 +975,33 @@ } }, parse: function(req, thread, a) { - var backlink, doc, href, id, link, nodes, post, quote, reply, threadID, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref, _ref1, _ref2, _ref3; + var backlink, id, link, nodes, post, replies, reply, threadID, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; if (req.status !== 200) { a.textContent = "" + req.status + " " + req.statusText; $.off(a, 'click', ExpandThread.cb.toggle); return; } a.textContent = a.textContent.replace('× Loading...', '-'); - doc = d.implementation.createHTMLDocument(''); - doc.documentElement.innerHTML = req.response; + replies = JSON.parse(req.response).posts.slice(1); threadID = thread.id.slice(1); nodes = []; - _ref = $$('.replyContainer', doc); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - reply = _ref[_i]; - reply = d.importNode(reply, true); - _ref1 = $$('.quotelink', reply); - for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) { - quote = _ref1[_j]; - href = quote.getAttribute('href'); - if (href[0] === '/') { - continue; - } - quote.href = "res/" + href; - } - id = reply.id.slice(2); - link = $('a[title="Highlight this post"]', reply); + for (_i = 0, _len = replies.length; _i < _len; _i++) { + reply = replies[_i]; + post = Build.postFromObject(reply, g.BOARD); + id = reply.no; + link = $('a[title="Highlight this post"]', post); link.href = "res/" + threadID + "#p" + id; link.nextSibling.href = "res/" + threadID + "#q" + id; - nodes.push(reply); + nodes.push(post); } - _ref2 = $$('.summary ~ .replyContainer', a.parentNode); - for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) { - post = _ref2[_k]; + _ref = $$('.summary ~ .replyContainer', a.parentNode); + for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) { + post = _ref[_j]; $.rm(post); } - _ref3 = $$('.backlink', a.previousElementSibling); - for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) { - backlink = _ref3[_l]; + _ref1 = $$('.backlink', a.previousElementSibling); + for (_k = 0, _len2 = _ref1.length; _k < _len2; _k++) { + backlink = _ref1[_k]; if (!$.id(backlink.hash.slice(1))) { $.rm(backlink); } diff --git a/changelog b/changelog index c046ad4ce..28052ec4d 100644 --- a/changelog +++ b/changelog @@ -4,6 +4,7 @@ master - Thread Updater. - Quote Inlining. - Quote Previewing. + - Thread Expansion. - Comment Expansion. 2.34.10 diff --git a/script.coffee b/script.coffee index 63709ca3e..93289e06a 100644 --- a/script.coffee +++ b/script.coffee @@ -758,17 +758,17 @@ ExpandThread = $.replace span, a toggle: (thread) -> - pathname = "/#{g.BOARD}/res/#{thread.id[1..]}" - a = $ '.summary', thread + url = "//api.4chan.org/#{g.BOARD}/res/#{thread.id[1..]}.json" + a = $ '.summary', thread switch a.textContent[0] when '+' a.textContent = a.textContent.replace '+', '× Loading...' - $.cache pathname, -> ExpandThread.parse @, thread, a + $.cache url, -> ExpandThread.parse @, thread, a when '×' a.textContent = a.textContent.replace '× Loading...', '+' - $.cache.requests[pathname].abort() + $.cache.requests[url].abort() when '-' a.textContent = a.textContent.replace '-', '+' @@ -791,22 +791,17 @@ ExpandThread = a.textContent = a.textContent.replace '× Loading...', '-' - doc = d.implementation.createHTMLDocument '' - doc.documentElement.innerHTML = req.response + replies = JSON.parse(req.response).posts[1..] threadID = thread.id[1..] nodes = [] - for reply in $$ '.replyContainer', doc - reply = d.importNode reply, true - for quote in $$ '.quotelink', reply - href = quote.getAttribute 'href' - continue if href[0] is '/' # Cross-board quote - quote.href = "res/#{href}" # Fix pathnames - id = reply.id[2..] - link = $ 'a[title="Highlight this post"]', reply + for reply in replies + post = Build.postFromObject reply, g.BOARD + id = reply.no + link = $ 'a[title="Highlight this post"]', post link.href = "res/#{threadID}#p#{id}" link.nextSibling.href = "res/#{threadID}#q#{id}" - nodes.push reply + nodes.push post # eat everything, then replace with fresh full posts for post in $$ '.summary ~ .replyContainer', a.parentNode $.rm post From 4ee145672c9ca6cf9b0b845551bb7a5c5bea07cc Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 00:36:34 +0200 Subject: [PATCH 20/37] Fix 'undefined' highlight class for admin capcode. --- 4chan_x.user.js | 8 ++------ script.coffee | 9 ++++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index cdff1c306..89dfbe5b5 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3729,7 +3729,7 @@ @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var a, board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, highlight, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, shortFilename, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; + var a, board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, shortFilename, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file; isOP = postID === threadID; staticPath = '//static.4chan.org'; @@ -3744,9 +3744,6 @@ switch (capcode) { case 'admin': case 'admin_highlight': - if (capcode === 'admin_highlight') { - highlight = ' highlightPost'; - } capcodeClass = " capcodeAdmin"; capcodeStart = " ## Admin"; capcode = (" "; @@ -3762,7 +3759,6 @@ capcode = (" "; break; default: - highlight = ''; capcodeClass = ''; capcodeStart = ''; capcode = ''; @@ -3834,7 +3830,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index 93289e06a..162bbc92b 100644 --- a/script.coffee +++ b/script.coffee @@ -2965,7 +2965,6 @@ Build = switch capcode when 'admin', 'admin_highlight' - highlight = ' highlightPost' if capcode is 'admin_highlight' capcodeClass = " capcodeAdmin" capcodeStart = " ## Admin" @@ -2987,7 +2986,6 @@ Build = "alt='This user is a 4chan Developer.' " + "title='This user is a 4chan Developer.' class=identityIcon>" else - highlight = '' capcodeClass = '' capcodeStart = '' capcode = '' @@ -3090,7 +3088,12 @@ Build = className: "postContainer #{if isOP then 'op' else 'reply'}Container" innerHTML: \ (if isOP then '' else "
>>
") + - "
" + + "
" + "
" + "" + From f3d0b83728535493b0ab664e08c277997e91acdb Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 01:01:27 +0200 Subject: [PATCH 21/37] Fix missing `else ''`. --- 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 89dfbe5b5..94053c805 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3819,7 +3819,7 @@ a.textContent = filename; filename = a.innerHTML; fileDims = ext === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height; - fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + filename + "'")) + ")"; + fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + filename + "'")) + ")"; fileHTML = "
" + fileInfo + "
" + imgSrc + "
"; } else { fileHTML = ''; diff --git a/script.coffee b/script.coffee index 162bbc92b..8722e7a8e 100644 --- a/script.coffee +++ b/script.coffee @@ -3054,7 +3054,7 @@ Build = filename = a.innerHTML fileDims = if ext is 'pdf' then 'PDF' else "#{file.width}x#{file.height}" - fileInfo = "File: #{file.timestamp}" + + fileInfo = "File: #{file.timestamp}" + "-(#{fileSize}, #{fileDims}#{ if file.isSpoiler '' From 71b89622d9faef814537eb02541a11d72b1e1553 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 01:06:51 +0200 Subject: [PATCH 22/37] Revert network tweak. It breaks updating if you reopen a page that doesn't have the latest posts cached. --- 4chan_x.user.js | 10 ---------- script.coffee | 5 ----- 2 files changed, 15 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 94053c805..20763776e 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2850,16 +2850,6 @@ this.thread = $.id("t" + g.THREAD_ID); this.unsuccessfulFetchCount = 0; this.lastModified = '0'; - $.ajax("//api.4chan.org/" + g.BOARD + "/res/" + g.THREAD_ID + ".json", { - onload: function() { - if (this.status !== 200) { - return; - } - return Updater.lastModified = this.getResponseHeader('Last-Modified'); - } - }, { - type: 'head' - }); _ref = $$('input', dialog); for (_i = 0, _len = _ref.length; _i < _len; _i++) { input = _ref[_i]; diff --git a/script.coffee b/script.coffee index 8722e7a8e..53737cd06 100644 --- a/script.coffee +++ b/script.coffee @@ -2279,11 +2279,6 @@ Updater = @unsuccessfulFetchCount = 0 @lastModified = '0' - $.ajax "//api.4chan.org/#{g.BOARD}/res/#{g.THREAD_ID}.json", { - onload: -> - return if @status isnt 200 - Updater.lastModified = @getResponseHeader 'Last-Modified' - }, type: 'head' for input in $$ 'input', dialog if input.type is 'checkbox' From cdd12e2ecdc1e66dff5b9808a87a1c99fb4218f0 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 02:27:38 +0200 Subject: [PATCH 23/37] Fix filenames. wtf am I doing. --- 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 20763776e..253b76e53 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3807,9 +3807,9 @@ a.textContent = Build.shortFilename(filename); shortFilename = a.innerHTML; a.textContent = filename; - filename = a.innerHTML; + filename = a.innerHTML.replace(/'/g, '''); fileDims = ext === 'pdf' ? 'PDF' : "" + file.width + "x" + file.height; - fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + filename + "'")) + ")"; + fileInfo = ("File: " + file.timestamp + "") + ("-(" + fileSize + ", " + fileDims + (file.isSpoiler ? '' : ", " + shortFilename + "")) + ")"; fileHTML = "
" + fileInfo + "
" + imgSrc + "
"; } else { fileHTML = ''; diff --git a/script.coffee b/script.coffee index 53737cd06..b6fc241b4 100644 --- a/script.coffee +++ b/script.coffee @@ -3046,7 +3046,7 @@ Build = # get html a.textContent = filename - filename = a.innerHTML + filename = a.innerHTML.replace /'/g, ''' fileDims = if ext is 'pdf' then 'PDF' else "#{file.width}x#{file.height}" fileInfo = "File: #{file.timestamp}" + @@ -3054,7 +3054,7 @@ Build = if file.isSpoiler '' else - ", #{filename}'" + ", #{shortFilename}" }" + ")" fileHTML = "
#{fileInfo}
#{imgSrc}
" From 359babd914a02839b786dbbb4896b03626bc2fa9 Mon Sep 17 00:00:00 2001 From: jizzyjugs Date: Fri, 7 Sep 2012 20:28:15 -0700 Subject: [PATCH 24/37] Update script.coffee Disables the 4chan built-in extension on first run --- script.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/script.coffee b/script.coffee index 8f8a34812..b15acea03 100644 --- a/script.coffee +++ b/script.coffee @@ -2007,6 +2007,7 @@ Options = Favicon.init() unless Favicon.el $.set 'firstrun', true Options.dialog() + localStorage.setItem '4chan-settings', '{"disableAll":true}' dialog: -> dialog = $.el 'div' From 5469bdf6640c313d6bf5c8910a6b23baf22da34d Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 17:22:15 +0200 Subject: [PATCH 25/37] Actually disable 4chan's inline extension on first-run before it had the time to execute. --- 4chan_x.user.js | 22 ++++++++++++++-------- script.coffee | 18 +++++++++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 6a3487b9c..a77833e17 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2540,6 +2540,19 @@ Options = { init: function() { + if (!$.get('firstrun')) { + $.set('firstrun', true); + localStorage.setItem('4chan-settings', '{"disableAll":true}'); + $.ready(function() { + if (!Favicon.el) { + Favicon.init(); + } + return Options.dialog(); + }); + } + return $.ready(Options.initReady); + }, + initReady: function() { var a, settings, _i, _len, _ref; _ref = ['navtopright', 'navbotright']; for (_i = 0, _len = _ref.length; _i < _len; _i++) { @@ -2552,13 +2565,6 @@ $.on(a, 'click', Options.dialog); $.prepend($.id(settings), [$.tn('['), a, $.tn('] ')]); } - if (!$.get('firstrun')) { - if (!Favicon.el) { - Favicon.init(); - } - $.set('firstrun', true); - return Options.dialog(); - } }, dialog: function() { var arr, back, checked, description, dialog, favicon, fileInfo, filter, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, sauce, time, tr, ul, _i, _len, _ref, _ref1, _ref2; @@ -4972,7 +4978,7 @@ }); return; } - $.ready(Options.init); + Options.init(); if (Conf['Quick Reply'] && Conf['Hide Original Post Form']) { Main.css += '#postForm { display: none; }'; } diff --git a/script.coffee b/script.coffee index b15acea03..9aba6b73a 100644 --- a/script.coffee +++ b/script.coffee @@ -1995,6 +1995,15 @@ QR = Options = init: -> + unless $.get 'firstrun' + $.set 'firstrun', true + localStorage.setItem '4chan-settings', '{"disableAll":true}' + $.ready -> + # Prevent race conditions + Favicon.init() unless Favicon.el + Options.dialog() + $.ready Options.initReady + initReady: -> for settings in ['navtopright', 'navbotright'] a = $.el 'a', href: 'javascript:;' @@ -2002,12 +2011,7 @@ Options = textContent: '4chan X Settings' $.on a, 'click', Options.dialog $.prepend $.id(settings), [$.tn('['), a, $.tn('] ')] - unless $.get 'firstrun' - # Prevent race conditions - Favicon.init() unless Favicon.el - $.set 'firstrun', true - Options.dialog() - localStorage.setItem '4chan-settings', '{"disableAll":true}' + return dialog: -> dialog = $.el 'div' @@ -3872,7 +3876,7 @@ Main = location.href = url if url return - $.ready Options.init + Options.init() if Conf['Quick Reply'] and Conf['Hide Original Post Form'] Main.css += '#postForm { display: none; }' From 09563c9a710c9d33f2afea0858bd70d4d21a2f03 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 22:44:20 +0200 Subject: [PATCH 26/37] Use base64'd @icon, fix Scriptish's updater. --- 4chan_x.user.js | 2 +- Cakefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index a77833e17..8fb052401 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -15,7 +15,7 @@ // @run-at document-start // @updateURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js // @downloadURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js -// @icon http://mayhemydg.github.com/4chan-x/favicon.gif +// @icon data:image/gif;base64,R0lGODlhEAAQAKECAAAAAGbMM////////yH5BAEKAAIALAAAAAAQABAAAAIxlI+pq+D9DAgUoFkPDlbs7lGiI2bSVnKglnJMOL6omczxVZK3dH/41AG6Lh7i6qUoAAA7 // ==/UserScript== /* LICENSE diff --git a/Cakefile b/Cakefile index e7c0ee80e..e8cbd6239 100644 --- a/Cakefile +++ b/Cakefile @@ -22,7 +22,7 @@ HEADER = """ // @run-at document-start // @updateURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js // @downloadURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js -// @icon http://mayhemydg.github.com/4chan-x/favicon.gif +// @icon data:image/gif;base64,R0lGODlhEAAQAKECAAAAAGbMM////////yH5BAEKAAIALAAAAAAQABAAAAIxlI+pq+D9DAgUoFkPDlbs7lGiI2bSVnKglnJMOL6omczxVZK3dH/41AG6Lh7i6qUoAAA7 // ==/UserScript== /* LICENSE From a110410f5cb737e022661c7fc92ff62315a6aba2 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 22:55:55 +0200 Subject: [PATCH 27/37] Add @grants. --- 4chan_x.user.js | 4 ++++ Cakefile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/4chan_x.user.js b/4chan_x.user.js index 8fb052401..8d007e76a 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -12,6 +12,10 @@ // @include https://images.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @grant GM_getValue +// @grant GM_setValue +// @grant GM_deleteValue +// @grant GM_openInTab // @run-at document-start // @updateURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js // @downloadURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js diff --git a/Cakefile b/Cakefile index e8cbd6239..156919d1f 100644 --- a/Cakefile +++ b/Cakefile @@ -19,6 +19,10 @@ HEADER = """ // @include https://images.4chan.org/* // @include http://sys.4chan.org/* // @include https://sys.4chan.org/* +// @grant GM_getValue +// @grant GM_setValue +// @grant GM_deleteValue +// @grant GM_openInTab // @run-at document-start // @updateURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js // @downloadURL https://github.com/MayhemYDG/4chan-x/raw/stable/4chan_x.user.js From e12c9a9f7ae08902f253a624e616678837badd58 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 8 Sep 2012 22:56:39 +0200 Subject: [PATCH 28/37] Changelog. --- changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/changelog b/changelog index bb5cac57a..c0fa5084e 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master +- Mayhem + Fix compatibility with Scriptish's auto-udpater. 2.34.10 - Mayhem From d71577896fc7dbb123f5d976ac869b55f935b47d Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 03:42:47 +0200 Subject: [PATCH 29/37] Randomize spoiler images. --- 4chan_x.user.js | 60 +++++++++++++++++++++---------------------------- script.coffee | 34 ++++++++++++++-------------- 2 files changed, 42 insertions(+), 52 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 01ca7b651..fd5d87c78 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -869,12 +869,15 @@ }); }, parse: function(req, a, threadID, replyID) { - var bq, href, post, posts, quote, quotes, _i, _j, _len, _len1; + var bq, href, post, posts, quote, quotes, spoilerRange, _i, _j, _len, _len1; if (req.status !== 200) { a.textContent = "" + req.status + " " + req.statusText; return; } posts = JSON.parse(req.response).posts; + if (spoilerRange = posts[0].custom_spoiler) { + Build.spoilerRange[g.BOARD] = spoilerRange; + } replyID = +replyID; for (_i = 0, _len = posts.length; _i < _len; _i++) { post = posts[_i]; @@ -979,14 +982,18 @@ } }, parse: function(req, thread, a) { - var backlink, id, link, nodes, post, replies, reply, threadID, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; + var backlink, id, link, nodes, post, posts, replies, reply, spoilerRange, threadID, _i, _j, _k, _len, _len1, _len2, _ref, _ref1; if (req.status !== 200) { a.textContent = "" + req.status + " " + req.statusText; $.off(a, 'click', ExpandThread.cb.toggle); return; } a.textContent = a.textContent.replace('× Loading...', '-'); - replies = JSON.parse(req.response).posts.slice(1); + posts = JSON.parse(req.response).posts; + if (spoilerRange = posts[0].custom_spoiler) { + Build.spoilerRange[g.BOARD] = spoilerRange; + } + replies = posts.slice(1); threadID = thread.id.slice(1); nodes = []; for (_i = 0, _len = replies.length; _i < _len; _i++) { @@ -2989,7 +2996,10 @@ return delete Updater.request; }, update: function(posts) { - var count, id, lastPost, nodes, post, scroll, _i, _len, _ref; + var count, id, lastPost, nodes, post, scroll, spoilerRange, _i, _len, _ref; + if (spoilerRange = posts[0].custom_spoiler) { + Build.spoilerRange[g.BOARD] = spoilerRange; + } lastPost = Updater.thread.lastElementChild; id = +lastPost.id.slice(2); nodes = []; @@ -3505,7 +3515,7 @@ } }, parsePost: function(req, board, threadID, postID, root, cb) { - var post, posts, status, url, _i, _len; + var post, posts, spoilerRange, status, url, _i, _len; status = req.status; if (status !== 200) { if (url = Redirect.post(board, postID)) { @@ -3514,11 +3524,14 @@ }); } else { $.addClass(root, 'warning'); - root.textContent = status === 404 ? "Thread No." + threadID + " has not been found." : "Error " + req.status + ": " + req.statusText + "."; + root.textContent = status === 404 ? "Thread No." + threadID + " 404'd." : "Error " + req.status + ": " + req.statusText + "."; } return; } posts = JSON.parse(req.response).posts; + if (spoilerRange = posts[0].custom_spoiler) { + Build.spoilerRange[g.BOARD] = spoilerRange; + } postID = +postID; for (_i = 0, _len = posts.length; _i < _len; _i++) { post = posts[_i]; @@ -3532,7 +3545,7 @@ }); } else { $.addClass(root, 'warning'); - root.textContent = "Post No." + postID + " has not been found."; + root.textContent = "Post No." + postID + " was not found."; } return; } @@ -3676,6 +3689,7 @@ }; Build = { + spoilerRange: {}, shortFilename: function(filename, isOP) { var threshold; threshold = isOP ? 40 : 30; @@ -3729,7 +3743,7 @@ @license: https://github.com/4chan/4chan-JS/blob/master/LICENSE */ - var a, board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, shortFilename, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; + var a, board, capcode, capcodeClass, capcodeStart, closed, comment, container, date, dateUTC, email, emailEnd, emailStart, ext, file, fileDims, fileHTML, fileInfo, fileSize, fileThumb, filename, flag, flagCode, flagName, href, imgSrc, isClosed, isOP, isSticky, name, postID, quote, shortFilename, spoilerRange, staticPath, sticky, subject, threadID, tripcode, uniqueID, userID, _i, _len, _ref; postID = o.postID, threadID = o.threadID, board = o.board, name = o.name, capcode = o.capcode, tripcode = o.tripcode, uniqueID = o.uniqueID, email = o.email, subject = o.subject, flagCode = o.flagCode, flagName = o.flagName, date = o.date, dateUTC = o.dateUTC, isSticky = o.isSticky, isClosed = o.isClosed, comment = o.comment, file = o.file; isOP = postID === threadID; staticPath = '//static.4chan.org'; @@ -3778,33 +3792,9 @@ fileSize = "Spoiler Image, " + fileSize; if (!isArchived) { fileThumb = '//static.4chan.org/image/spoiler'; - fileThumb += (function() { - switch (board) { - case 'a': - return '-a'; - case 'co': - return '-co'; - case 'jp': - return '-jp'; - case 'lit': - return 'lit'; - case 'm': - return '-m2'; - case 'mlp': - return '-mlp'; - case 'tg': - return '-tg2'; - case 'tv': - return '-tv5'; - case 'v': - case 'vg': - return '-v'; - case 'vp': - return '-vp'; - default: - return ''; - } - })(); + if (spoilerRange = Build.spoilerRange[board]) { + fileThumb += ("-" + board) + Math.floor(1 + spoilerRange * Math.random()); + } fileThumb += '.png'; file.twidth = file.theight = 100; } diff --git a/script.coffee b/script.coffee index 8d1cf98cb..7a8dbe321 100644 --- a/script.coffee +++ b/script.coffee @@ -715,6 +715,8 @@ ExpandComment = return posts = JSON.parse(req.response).posts + if spoilerRange = posts[0].custom_spoiler + Build.spoilerRange[g.BOARD] = spoilerRange replyID = +replyID for post in posts @@ -791,8 +793,11 @@ ExpandThread = a.textContent = a.textContent.replace '× Loading...', '-' - replies = JSON.parse(req.response).posts[1..] + posts = JSON.parse(req.response).posts + if spoilerRange = posts[0].custom_spoiler + Build.spoilerRange[g.BOARD] = spoilerRange + replies = posts[1..] threadID = thread.id[1..] nodes = [] for reply in replies @@ -2384,6 +2389,9 @@ Updater = Updater.count.className = 'warning' delete Updater.request update: (posts) -> + if spoilerRange = posts[0].custom_spoiler + Build.spoilerRange[g.BOARD] = spoilerRange + lastPost = Updater.thread.lastElementChild id = +lastPost.id[2..] nodes = [] @@ -2748,12 +2756,14 @@ Get = $.addClass root, 'warning' root.textContent = if status is 404 - "Thread No.#{threadID} has not been found." + "Thread No.#{threadID} 404'd." else "Error #{req.status}: #{req.statusText}." return posts = JSON.parse(req.response).posts + if spoilerRange = posts[0].custom_spoiler + Build.spoilerRange[g.BOARD] = spoilerRange postID = +postID for post in posts break if post.no is postID # we found it! @@ -2764,7 +2774,7 @@ Get = Get.parseArchivedPost @, board, postID, root, cb else $.addClass root, 'warning' - root.textContent = "Post No.#{postID} has not been found." + root.textContent = "Post No.#{postID} was not found." return $.replace root.firstChild, Get.cleanPost Build.postFromObject post, board @@ -2887,6 +2897,7 @@ Get = "/#{g.BOARD}/ - #{span.textContent.trim()}" Build = + spoilerRange: {} shortFilename: (filename, isOP) -> # FILENAME SHORTENING SCIENCE: # OPs have a +10 characters threshold. @@ -3020,20 +3031,9 @@ Build = fileSize = "Spoiler Image, #{fileSize}" unless isArchived fileThumb = '//static.4chan.org/image/spoiler' - fileThumb += switch board - # UGGH, I can't wait to maintain this crap. - # Sup desuwa? - when 'a' then '-a' - when 'co' then '-co' - when 'jp' then '-jp' - when 'lit' then 'lit' - when 'm' then '-m2' - when 'mlp' then '-mlp' - when 'tg' then '-tg2' - when 'tv' then '-tv5' - when 'v', 'vg' then '-v' - when 'vp' then '-vp' - else '' + if spoilerRange = Build.spoilerRange[board] + # Randomize the spoiler image. + fileThumb += "-#{board}" + Math.floor 1 + spoilerRange * Math.random() fileThumb += '.png' file.twidth = file.theight = 100 From 09d8ecb482374ca0cb89f8a27069f6bf9475e4a3 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 17:31:12 +0200 Subject: [PATCH 30/37] Disable 4chan's inline extension by default. --- 4chan_x.user.js | 21 +++++++++++---------- changelog | 1 + script.coffee | 17 +++++++++-------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 8d007e76a..b33a029ec 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -86,6 +86,7 @@ Config = { main: { Enhancing: { + 'Disable 4chan\'s extension': [true, 'Avoid conflicts between 4chan X and 4chan\'s inline extension.'], '404 Redirect': [true, 'Redirect dead threads and images'], 'Keybinds': [true, 'Binds actions to keys'], 'Time Formatting': [true, 'Arbitrarily formatted timestamps, using your local time'], @@ -2544,16 +2545,6 @@ Options = { init: function() { - if (!$.get('firstrun')) { - $.set('firstrun', true); - localStorage.setItem('4chan-settings', '{"disableAll":true}'); - $.ready(function() { - if (!Favicon.el) { - Favicon.init(); - } - return Options.dialog(); - }); - } return $.ready(Options.initReady); }, initReady: function() { @@ -2569,6 +2560,13 @@ $.on(a, 'click', Options.dialog); $.prepend($.id(settings), [$.tn('['), a, $.tn('] ')]); } + if (!$.get('firstrun')) { + $.set('firstrun', true); + if (!Favicon.el) { + Favicon.init(); + } + return Options.dialog(); + } }, dialog: function() { var arr, back, checked, description, dialog, favicon, fileInfo, filter, hiddenNum, hiddenThreads, indicator, indicators, input, key, li, obj, overlay, sauce, time, tr, ul, _i, _len, _ref, _ref1, _ref2; @@ -4982,6 +4980,9 @@ }); return; } + if (Conf['Disable 4chan\'s extension']) { + localStorage.setItem('4chan-settings', '{"disableAll":true}'); + } Options.init(); if (Conf['Quick Reply'] && Conf['Hide Original Post Form']) { Main.css += '#postForm { display: none; }'; diff --git a/changelog b/changelog index c0fa5084e..289350675 100644 --- a/changelog +++ b/changelog @@ -1,5 +1,6 @@ master - Mayhem + Add an option to disable 4chan's inline extension. Enabled by default. Fix compatibility with Scriptish's auto-udpater. 2.34.10 diff --git a/script.coffee b/script.coffee index 9aba6b73a..4d80584e1 100644 --- a/script.coffee +++ b/script.coffee @@ -1,6 +1,7 @@ Config = main: Enhancing: + 'Disable 4chan\'s extension': [true, 'Avoid conflicts between 4chan X and 4chan\'s inline extension.'] '404 Redirect': [true, 'Redirect dead threads and images'] 'Keybinds': [true, 'Binds actions to keys'] 'Time Formatting': [true, 'Arbitrarily formatted timestamps, using your local time'] @@ -1995,13 +1996,6 @@ QR = Options = init: -> - unless $.get 'firstrun' - $.set 'firstrun', true - localStorage.setItem '4chan-settings', '{"disableAll":true}' - $.ready -> - # Prevent race conditions - Favicon.init() unless Favicon.el - Options.dialog() $.ready Options.initReady initReady: -> for settings in ['navtopright', 'navbotright'] @@ -2011,7 +2005,11 @@ Options = textContent: '4chan X Settings' $.on a, 'click', Options.dialog $.prepend $.id(settings), [$.tn('['), a, $.tn('] ')] - return + unless $.get 'firstrun' + $.set 'firstrun', true + # Prevent race conditions + Favicon.init() unless Favicon.el + Options.dialog() dialog: -> dialog = $.el 'div' @@ -3876,6 +3874,9 @@ Main = location.href = url if url return + if Conf['Disable 4chan\'s extension'] + localStorage.setItem '4chan-settings', '{"disableAll":true}' + Options.init() if Conf['Quick Reply'] and Conf['Hide Original Post Form'] From 4564d3de8779639e8b0d74ab45c846c16bc95aa1 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 17:33:13 +0200 Subject: [PATCH 31/37] Additional changelog. --- changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog b/changelog index 94bc2acf4..225d6385e 100644 --- a/changelog +++ b/changelog @@ -6,6 +6,7 @@ master - Quote Previewing. - Thread Expansion. - Comment Expansion. + This will make fetching faster, and reduce bandwidth usage. Add an option to disable 4chan's inline extension. Enabled by default. Fix compatibility with Scriptish's auto-udpater. From e603f40925048aee22e4b07b09f9ba013b0c7c24 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 17:40:32 +0200 Subject: [PATCH 32/37] Don't create the subject element when it's empty. --- 4chan_x.user.js | 9 +++++++-- script.coffee | 14 +++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 202d8f359..c42d21a9d 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -703,7 +703,11 @@ return false; }, subject: function(post) { - return $('.postInfo .subject', post.el).textContent || false; + var subject; + if (subject = $('.postInfo .subject', post.el)) { + return subject.textContent; + } + return false; }, comment: function(post) { var data, i, nodes, text, _i, _ref; @@ -3752,6 +3756,7 @@ emailStart = ''; emailEnd = ''; } + subject = subject ? "" + subject + "" : ''; userID = !capcode && uniqueID ? (" (ID: ") + ("" + uniqueID + ") ") : ''; switch (capcode) { case 'admin': @@ -3818,7 +3823,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject + "") + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + (subject || '') + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index bb4bff7ed..a0f1fd855 100644 --- a/script.coffee +++ b/script.coffee @@ -557,7 +557,9 @@ Filter = return decodeURIComponent mail.href[7..] false subject: (post) -> - $('.postInfo .subject', post.el).textContent or false + if subject = $ '.postInfo .subject', post.el + return subject.textContent + false comment: (post) -> text = [] # XPathResult.ORDERED_NODE_SNAPSHOT_TYPE is 7 @@ -2965,6 +2967,12 @@ Build = emailStart = '' emailEnd = '' + subject = + if subject + "#{subject}" + else + '' + userID = if !capcode and uniqueID " (ID: " + @@ -3097,7 +3105,7 @@ Build = "" + "#{name}" + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + - "
#{subject}" + + "
#{subject}" + "#{date}" + '
' + "No." + @@ -3114,7 +3122,7 @@ Build = "
" + " " + - "#{subject or ''} " + + "#{subject} " + "" + emailStart + "#{name}" + tripcode + From 040b3146892a7ef191067179ecc52f24209cffa1 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 17:46:07 +0200 Subject: [PATCH 33/37] Don't break linkifying when expanding comments. --- 4chan_x.user.js | 12 +++++++----- script.coffee | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index c42d21a9d..ebc698a77 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -874,7 +874,7 @@ }); }, parse: function(req, a, threadID, replyID) { - var bq, href, post, posts, quote, quotes, spoilerRange, _i, _j, _len, _len1; + var bq, clone, href, post, posts, quote, quotes, spoilerRange, _i, _j, _len, _len1; if (req.status !== 200) { a.textContent = "" + req.status + " " + req.statusText; return; @@ -895,8 +895,9 @@ return; } bq = $.id("m" + replyID); - bq.innerHTML = post.com; - quotes = bq.getElementsByClassName('quotelink'); + clone = bq.cloneNode(false); + clone.innerHTML = post.com; + quotes = clone.getElementsByClassName('quotelink'); for (_j = 0, _len1 = quotes.length; _j < _len1; _j++) { quote = quotes[_j]; href = quote.getAttribute('href'); @@ -906,7 +907,7 @@ quote.href = "res/" + href; } post = { - blockquote: bq, + blockquote: clone, threadID: threadID, quotes: quotes, backlinks: [] @@ -926,7 +927,8 @@ if (Conf['Indicate Cross-thread Quotes']) { QuoteCT.node(post); } - return Main.prettify(bq); + $.replace(bq, clone); + return Main.prettify(clone); } }; diff --git a/script.coffee b/script.coffee index a0f1fd855..4e88ac2b6 100644 --- a/script.coffee +++ b/script.coffee @@ -729,14 +729,15 @@ ExpandComment = return bq = $.id "m#{replyID}" - bq.innerHTML = post.com - quotes = bq.getElementsByClassName 'quotelink' + clone = bq.cloneNode false + clone.innerHTML = post.com + quotes = clone.getElementsByClassName 'quotelink' for quote in quotes href = quote.getAttribute 'href' continue if href[0] is '/' # Cross-board quote quote.href = "res/#{href}" # Fix pathnames post = - blockquote: bq + blockquote: clone threadID: threadID quotes: quotes backlinks: [] @@ -750,7 +751,8 @@ ExpandComment = QuoteOP.node post if Conf['Indicate Cross-thread Quotes'] QuoteCT.node post - Main.prettify bq + $.replace bq, clone + Main.prettify clone ExpandThread = init: -> From 34ff1972ca98b507ff683adfa40fa5345ded9acf Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 18:33:00 +0200 Subject: [PATCH 34/37] Comment fallback. --- 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 ebc698a77..d0fb8fd4b 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3825,7 +3825,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + comment + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index 4e88ac2b6..71e0c49ce 100644 --- a/script.coffee +++ b/script.coffee @@ -3144,7 +3144,7 @@ Build = (if isOP then '' else fileHTML) + - "
#{comment}
" + + "
#{comment or ''}
" + '
' From 0a633707c6c4e559c17628f8ea0fa0c3a8cee8ff Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 20:54:48 +0200 Subject: [PATCH 35/37] Add flag titles from archived posts --- 4chan_x.user.js | 1 + script.coffee | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index d0fb8fd4b..4b46af2b9 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3617,6 +3617,7 @@ email: encodeURIComponent(data.email), subject: data.title_processed, flagCode: data.poster_country, + flagName: data.poster_country_name_processed, date: data.fourchan_date, dateUTC: data.timestamp, comment: comment diff --git a/script.coffee b/script.coffee index 71e0c49ce..c59b8ad2d 100644 --- a/script.coffee +++ b/script.coffee @@ -2842,7 +2842,7 @@ Get = email: encodeURIComponent data.email subject: data.title_processed flagCode: data.poster_country - # XXX flagName: data.???_processed + flagName: data.poster_country_name_processed date: data.fourchan_date dateUTC: data.timestamp comment: comment From 2f234bbe36925869b1f6a2d7c2145440969b6f61 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Mon, 10 Sep 2012 20:55:32 +0200 Subject: [PATCH 36/37] Name fallback. --- 4chan_x.user.js | 2 +- script.coffee | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 4b46af2b9..eceb937a6 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3826,7 +3826,7 @@ container = $.el('div', { id: "pc" + postID, className: "postContainer " + (isOP ? 'op' : 'reply') + "Container", - innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + name + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + name + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + "
") + '
' + innerHTML: (isOP ? '' : "
>>
") + ("
") + ("
") + ("") + ("" + (name || '') + "") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("
" + subject) + ("" + date) + '
' + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? fileHTML : '') + ("
") + (" ") + ("" + subject + " ") + ("") + emailStart + ("" + (name || '') + "") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + ("" + date + " ") + "" + ("No.") + ("" + postID + "") + '' + '
' + (isOP ? '' : fileHTML) + ("
" + (comment || '') + "
") + '
' }); _ref = $$('.quotelink', container); for (_i = 0, _len = _ref.length; _i < _len; _i++) { diff --git a/script.coffee b/script.coffee index c59b8ad2d..4d9c4821e 100644 --- a/script.coffee +++ b/script.coffee @@ -3105,7 +3105,7 @@ Build = "
" + "" + - "#{name}" + tripcode + + "#{name or ''}" + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + "
#{subject}" + "#{date}" + @@ -3127,7 +3127,7 @@ Build = "#{subject} " + "" + emailStart + - "#{name}" + tripcode + + "#{name or ''}" + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' ' + "#{date} " + From 4e76800037303b5738b188f4998bb5ed07975210 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 11 Sep 2012 01:44:42 +0200 Subject: [PATCH 37/37] Fix emails, fix /pol/ flags in cross-board requests. --- 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 eceb937a6..e68bc5037 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -3714,7 +3714,7 @@ capcode: data.capcode, tripcode: data.trip, uniqueID: data.id, - email: data.email.replace(/\s/g, '%20'), + email: data.email ? encodeURIComponent(data.email) : '', subject: data.sub, flagCode: data.country, flagName: data.country_name, @@ -3783,7 +3783,7 @@ capcodeStart = ''; capcode = ''; } - flag = flagCode ? (" + flagCode + ") : ''; + flag = flagCode ? (" + flagCode + ") : ''; if (file != null ? file.isDeleted : void 0) { fileHTML = isOP ? ("
") + ("File deleted.") + "
" : ("
") + ("File deleted.") + "
"; } else if (file) { diff --git a/script.coffee b/script.coffee index 4d9c4821e..334cfbc75 100644 --- a/script.coffee +++ b/script.coffee @@ -2920,7 +2920,7 @@ Build = capcode: data.capcode tripcode: data.trip uniqueID: data.id - email: data.email.replace /\s/g, '%20' # UGH + email: if data.email then encodeURIComponent data.email else '' subject: data.sub flagCode: data.country flagName: data.country_name @@ -3011,7 +3011,7 @@ Build = flag = if flagCode - " #{flagCode}" else ''