From 9ba459ea8a1f4e0bc47f531fccb07e0339aa2000 Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Sun, 14 Jul 2013 03:58:01 -0700 Subject: [PATCH] Release 4chan X v1.2.19. --- CHANGELOG.md | 7 +++++++ LICENSE | 2 +- builds/4chan-X.js | 33 ++++++++++----------------------- builds/4chan-X.meta.js | 2 +- builds/4chan-X.user.js | 33 ++++++++++----------------------- builds/crx/manifest.json | 2 +- builds/crx/script.js | 31 +++++++++---------------------- latest.js | 2 +- package.json | 2 +- src/Archive/Redirect.coffee | 22 +++------------------- src/General/Config.coffee | 4 ++++ src/General/Settings.coffee | 3 ++- 12 files changed, 50 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7baf679b4..03048b738 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +### v1.2.19 +*2013-07-14* + +**seaweedchan**: +- Update archives. LoveIsOver is going down permanently until it can find a host, some boards were removed by archivers, and Warosu has been down for 2 days now. +- Add a new option to hide "4chan X has been updated to ____" notifications for those having issues with them. + ### v1.2.18 *2013-06-27* diff --git a/LICENSE b/LICENSE index 2a00f2c1f..11d135f7d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.18 - 2013-06-27 +* 4chan X - Version 1.2.19 - 2013-07-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.js b/builds/4chan-X.js index c1aafe2e5..696899270 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.2.18 +// @version 1.2.19 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.18 - 2013-06-27 +* 4chan X - Version 1.2.19 - 2013-07-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -133,6 +133,7 @@ 'Index Navigation': [false, 'Add buttons to navigate between threads.'], 'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'], 'Check for Updates': [true, 'Check for updated versions of 4chan X.'], + 'Show Updated Notifications': [true, 'Show notifications when 4chan X is successfully updated.'], 'Emoji': [false, 'Adds icons next to names for different emails'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], 'Remove Spoilers': [false, 'Remove all spoilers in text.'], @@ -322,7 +323,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.18', + VERSION: '1.2.19', NAMESPACE: '4chan X.', boards: {}, threads: {}, @@ -7954,7 +7955,7 @@ 'http': false, 'https': true, 'software': 'foolfuuka', - 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'], + 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'], 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] }, 'NSFW Foolz': { @@ -7988,21 +7989,13 @@ 'boards': ['c', 'w', 'wg'], 'files': ['c', 'w', 'wg'] }, - 'Love is Over': { - 'domain': 'loveisover.me', - 'http': true, - 'https': true, - 'software': 'foolfuuka', - 'boards': ['d', 'h', 'v'], - 'files': ['d', 'h', 'v'] - }, 'Foolz a Shit': { 'domain': 'archive.foolzashit.com', 'http': true, 'https': true, 'software': 'foolfuuka', - 'boards': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 'pol', 's', 's4s', 't', 'trv', 'y'], - 'files': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 's', 's4s', 't', 'trv', 'y'] + 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'], + 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] }, 'Install Gentoo': { 'domain': 'archive.installgentoo.net', @@ -8026,14 +8019,6 @@ 'software': 'fuuka', 'boards': ['an', 'fit', 'k', 'mlp', 'r9k', 'toy'], 'files': ['an', 'k', 'toy'] - }, - 'warosu': { - 'domain': 'fuuka.warosu.org', - 'http': true, - 'https': true, - 'software': 'fuuka', - 'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'], - 'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'] } }, to: function(dest, data) { @@ -9526,7 +9511,9 @@ el = $.el('span', { innerHTML: "4chan X has been updated to version " + g.VERSION + "." }); - new Notification('info', el, 30); + if (Conf['Show Updated Notifications']) { + new Notification('info', el, 30); + } } else { $.on(d, '4chanXInitFinished', Settings.open); } diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 1c74d2843..83b98d198 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.2.18 +// @version 1.2.19 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 6608afa0d..1679e1f23 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.2.18 +// @version 1.2.19 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.18 - 2013-06-27 +* 4chan X - Version 1.2.19 - 2013-07-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -133,6 +133,7 @@ 'Index Navigation': [false, 'Add buttons to navigate between threads.'], 'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'], 'Check for Updates': [true, 'Check for updated versions of 4chan X.'], + 'Show Updated Notifications': [true, 'Show notifications when 4chan X is successfully updated.'], 'Emoji': [false, 'Adds icons next to names for different emails'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], 'Remove Spoilers': [false, 'Remove all spoilers in text.'], @@ -319,7 +320,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.18', + VERSION: '1.2.19', NAMESPACE: '4chan X.', boards: {}, threads: {}, @@ -7948,7 +7949,7 @@ 'http': false, 'https': true, 'software': 'foolfuuka', - 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'], + 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'], 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] }, 'NSFW Foolz': { @@ -7982,21 +7983,13 @@ 'boards': ['c', 'w', 'wg'], 'files': ['c', 'w', 'wg'] }, - 'Love is Over': { - 'domain': 'loveisover.me', - 'http': true, - 'https': true, - 'software': 'foolfuuka', - 'boards': ['d', 'h', 'v'], - 'files': ['d', 'h', 'v'] - }, 'Foolz a Shit': { 'domain': 'archive.foolzashit.com', 'http': true, 'https': true, 'software': 'foolfuuka', - 'boards': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 'pol', 's', 's4s', 't', 'trv', 'y'], - 'files': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 's', 's4s', 't', 'trv', 'y'] + 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'], + 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] }, 'Install Gentoo': { 'domain': 'archive.installgentoo.net', @@ -8020,14 +8013,6 @@ 'software': 'fuuka', 'boards': ['an', 'fit', 'k', 'mlp', 'r9k', 'toy'], 'files': ['an', 'k', 'toy'] - }, - 'warosu': { - 'domain': 'fuuka.warosu.org', - 'http': true, - 'https': true, - 'software': 'fuuka', - 'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'], - 'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'] } }, to: function(dest, data) { @@ -9520,7 +9505,9 @@ el = $.el('span', { innerHTML: "4chan X has been updated to version " + g.VERSION + "." }); - new Notification('info', el, 30); + if (Conf['Show Updated Notifications']) { + new Notification('info', el, 30); + } } else { $.on(d, '4chanXInitFinished', Settings.open); } diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 1b9e08eff..1010522e9 100644 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.2.18", + "version": "1.2.19", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index ca985b41f..5927aa436 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.18 - 2013-06-27 +* 4chan X - Version 1.2.19 - 2013-07-14 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -113,6 +113,7 @@ 'Thread Expansion': [true, 'Add buttons to expand threads.'], 'Index Navigation': [false, 'Add buttons to navigate between threads.'], 'Reply Navigation': [false, 'Add buttons to navigate to top / bottom of thread.'], + 'Show Updated Notifications': [true, 'Show notifications when 4chan X is successfully updated.'], 'Emoji': [false, 'Adds icons next to names for different emails'], 'Color User IDs': [false, 'Assign unique colors to user IDs on boards that use them'], 'Remove Spoilers': [false, 'Remove all spoilers in text.'], @@ -299,7 +300,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.18', + VERSION: '1.2.19', NAMESPACE: '4chan X.', boards: {}, threads: {}, @@ -7935,7 +7936,7 @@ 'http': false, 'https': true, 'software': 'foolfuuka', - 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'], + 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'], 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] }, 'NSFW Foolz': { @@ -7969,21 +7970,13 @@ 'boards': ['c', 'w', 'wg'], 'files': ['c', 'w', 'wg'] }, - 'Love is Over': { - 'domain': 'loveisover.me', - 'http': true, - 'https': true, - 'software': 'foolfuuka', - 'boards': ['d', 'h', 'v'], - 'files': ['d', 'h', 'v'] - }, 'Foolz a Shit': { 'domain': 'archive.foolzashit.com', 'http': true, 'https': true, 'software': 'foolfuuka', - 'boards': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 'pol', 's', 's4s', 't', 'trv', 'y'], - 'files': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 's', 's4s', 't', 'trv', 'y'] + 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'], + 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] }, 'Install Gentoo': { 'domain': 'archive.installgentoo.net', @@ -8007,14 +8000,6 @@ 'software': 'fuuka', 'boards': ['an', 'fit', 'k', 'mlp', 'r9k', 'toy'], 'files': ['an', 'k', 'toy'] - }, - 'warosu': { - 'domain': 'fuuka.warosu.org', - 'http': true, - 'https': true, - 'software': 'fuuka', - 'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'], - 'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'] } }, to: function(dest, data) { @@ -9507,7 +9492,9 @@ el = $.el('span', { innerHTML: "4chan X has been updated to version " + g.VERSION + "." }); - new Notification('info', el, 30); + if (Conf['Show Updated Notifications']) { + new Notification('info', el, 30); + } } else { $.on(d, '4chanXInitFinished', Settings.open); } diff --git a/latest.js b/latest.js index 777847587..acc592203 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.2.18'},'*') +postMessage({version:'1.2.19'},'*') diff --git a/package.json b/package.json index 0bcf7aec8..0becab545 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.2.18", + "version": "1.2.19", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee index d4cd211d5..0718d533d 100644 --- a/src/Archive/Redirect.coffee +++ b/src/Archive/Redirect.coffee @@ -29,7 +29,7 @@ Redirect = 'http': false 'https': true 'software': 'foolfuuka' - 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'] + 'boards': ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vg', 'vp', 'vr', 'wsg'] 'files': ['a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'] 'NSFW Foolz': @@ -63,21 +63,13 @@ Redirect = 'boards': ['c', 'w', 'wg'] 'files': ['c', 'w', 'wg'] - 'Love is Over': - 'domain': 'loveisover.me' - 'http': true - 'https': true - 'software': 'foolfuuka' - 'boards': ['d', 'h', 'v'] - 'files': ['d', 'h', 'v'] - 'Foolz a Shit': 'domain': 'archive.foolzashit.com' 'http': true 'https': true 'software': 'foolfuuka' - 'boards': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 'pol', 's', 's4s', 't', 'trv', 'y'] - 'files': ['adv', 'asp', 'cm', 'e', 'i', 'lgbt', 'n', 'o', 'p', 's', 's4s', 't', 'trv', 'y'] + 'boards': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] + 'files': ['adv', 'asp', 'cm', 'i', 'lgbt', 'n', 'o', 'p', 's4s', 't', 'trv'] 'Install Gentoo': 'domain': 'archive.installgentoo.net' @@ -102,14 +94,6 @@ Redirect = 'boards': ['an', 'fit', 'k', 'mlp', 'r9k', 'toy'] 'files': ['an', 'k', 'toy'] - 'warosu': - 'domain': 'fuuka.warosu.org' - 'http': true - 'https': true - 'software': 'fuuka' - 'boards': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'] - 'files': ['3', 'cgl', 'ck', 'fa', 'ic', 'jp', 'lit', 'q', 'tg', 'vr'] - to: (dest, data) -> archive = (if dest is 'search' then Redirect.thread else Redirect[dest])[data.boardID] return '' unless archive diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 48d9a4407..6775061d7 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -59,6 +59,10 @@ Config = 'Check for updated versions of <%= meta.name %>.' ] <% } %> + 'Show Updated Notifications': [ + true + 'Show notifications when 4chan X is successfully updated.' + ] 'Emoji': [ false 'Adds icons next to names for different emails' diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index 8f27bf2ed..790294ce3 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -16,7 +16,8 @@ Settings = changelog = '<%= meta.repo %>blob/<%= meta.mainBranch %>/CHANGELOG.md' el = $.el 'span', innerHTML: "<%= meta.name %> has been updated to version #{g.VERSION}." - new Notification 'info', el, 30 + if Conf['Show Updated Notifications'] + new Notification 'info', el, 30 else $.on d, '4chanXInitFinished', Settings.open $.set