From 4041419a3d1b450510658d744aa87a8ac4caa767 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 3 Jan 2012 22:46:56 +0100 Subject: [PATCH 1/3] Revert "Whoa, what? Fix mime-type acceptance." Dunno why I got it wrong while testing. This reverts commit ea945cc4b7a7361dad5177572b3aee53aac2b122. --- 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 d8f980701..393a0200e 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1502,7 +1502,7 @@ $.on($('#recaptcha_challenge_field_holder'), 'DOMNodeInserted', qr.captchaNode); qr.captchaTime = Date.now(); qr.spoiler = $('.postarea label') ? '' : ''; - qr.acceptFiles = $('.rules').textContent.match(/: (.+)/)[1].replace(/\w+/g, function(type) { + qr.acceptFiles = $('.rules').textContent.match(/: (.+) /)[1].replace(/\w+/g, function(type) { switch (type) { case 'JPG': return 'image/JPEG'; diff --git a/script.coffee b/script.coffee index 2175ab9c1..72c427c9a 100644 --- a/script.coffee +++ b/script.coffee @@ -1127,7 +1127,7 @@ qr = qr.captchaTime = Date.now() qr.spoiler = if $('.postarea label') then '' else '' - qr.acceptFiles = $('.rules').textContent.match(/: (.+)/)[1].replace /\w+/g, (type) -> + qr.acceptFiles = $('.rules').textContent.match(/: (.+) /)[1].replace /\w+/g, (type) -> switch type when 'JPG' 'image/JPEG' From 58505f693dadf7d0993b7f1677f33ef8cb8f1550 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 3 Jan 2012 22:54:22 +0100 Subject: [PATCH 2/3] Set up archived image redirection link. --- 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 393a0200e..ebb3db410 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -2846,7 +2846,7 @@ case 'tg': case 'tv': case 'u': - return "http://archivethumb.foolz.us/board/" + board + "/img/" + filename; + return "http://archive.foolz.us/" + board + "/full_image/" + filename; } }, thread: function() { diff --git a/script.coffee b/script.coffee index 72c427c9a..46c5afbf9 100644 --- a/script.coffee +++ b/script.coffee @@ -2235,7 +2235,7 @@ redirect = image: (board, filename) -> #board must be given, the image can originate from a cross-quote switch board when 'a', 'jp', 'm', 'tg', 'tv', 'u' - "http://archivethumb.foolz.us/board/#{board}/img/#{filename}" + "http://archive.foolz.us/#{board}/full_image/#{filename}" thread: -> switch g.BOARD when 'a', 'jp', 'm', 'tg', 'tv', 'u' From ed1184c9a1e5656d28c56bc8f10c380d96f2d102 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 3 Jan 2012 22:57:43 +0100 Subject: [PATCH 3/3] Release 2.24.0. --- 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 ebb3db410..0406f56bd 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.23.7 +// @version 2.24.0 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -17,7 +17,7 @@ * * Copyright (c) 2009-2011 James Campos * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.23.7 + * 4chan X 2.24.0 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -199,7 +199,7 @@ NAMESPACE = '4chan_x.'; - VERSION = '2.23.7'; + VERSION = '2.24.0'; SECOND = 1000; diff --git a/Cakefile b/Cakefile index 195cbb959..ec093746a 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.23.7' +VERSION = '2.24.0' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index f3b39266d..f4c9d5f14 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master + +2.24.0 - mayhem redirect 404'd pictures to archives when possible new keybind to open the options: ctrl+o diff --git a/latest.js b/latest.js index 37736fe93..7a8079fdf 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.23.7'},'*'); +postMessage({version:'2.24.0'},'*'); diff --git a/script.coffee b/script.coffee index 46c5afbf9..42609e1f0 100644 --- a/script.coffee +++ b/script.coffee @@ -121,7 +121,7 @@ conf = {} ) null, config NAMESPACE = '4chan_x.' -VERSION = '2.23.7' +VERSION = '2.24.0' SECOND = 1000 MINUTE = 60*SECOND HOUR = 60*MINUTE