diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f7218b36..14d4f8097 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ seaweedchan: - Change ESC functionality in QR to autohide if Persistent QR is enabled +- Add /v/ and /vg/ archiving to archive.nihil-ad-rem.net, and make sure Archiver Selection settings actually switch to it MayhemYDG: - Add nyafuu archiving for /w/ @@ -8,7 +9,7 @@ MayhemYDG: seaweedchan: - Chrome doesn't get .null, so don't style it - Fix count when auto update is disabled and set updater text to "Update" -- Remove /v/ and /vg/ redirection. See https://archive.foolz.us/foolz/thread/509388/ for news and how you can donate to bring /v/ and /vg/ archiving back. +- Remove /v/ and /vg/ redirection from Foolz. - Toggle keybind for header auto-hiding MayhemYDG: diff --git a/builds/4chan-X.js b/builds/4chan-X.js index b32f45c36..59b39db1b 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -7404,6 +7404,9 @@ return "//archive.foolz.us/" + boardID + "/full_image/" + filename; case 'u': return "//nsfw.foolz.us/" + boardID + "/full_image/" + filename; + case 'v': + case 'vg': + return "//archive.nihil-ad-rem.net/" + boardID + "/full_image/" + filename; case 'po': return "//archive.thedarkcave.org/" + boardID + "/full_image/" + filename; case 'hr': @@ -7474,8 +7477,16 @@ $.set('archivers', Conf.archivers); } return (arch && (archive = this.archiver[arch]) ? Redirect.path(archive.base, archive.type, data) : data.threadID ? "//boards.4chan.org/" + boardID + "/" : null); + if (!archive.boards.contains(g.BOARD.ID)) { + return Conf['archivers'] = archive; + } }, archiver: { + 'NihilAdRem': { + base: '//archive.nihil-ad-rem.net', + boards: ['v', 'vg'], + type: 'foolfuuka' + }, 'Foolz': { base: 'https://archive.foolz.us', boards: ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vp', 'vr', 'wsg'], diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 474b0f52d..20d332160 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -7425,6 +7425,9 @@ return "//archive.foolz.us/" + boardID + "/full_image/" + filename; case 'u': return "//nsfw.foolz.us/" + boardID + "/full_image/" + filename; + case 'v': + case 'vg': + return "//archive.nihil-ad-rem.net/" + boardID + "/full_image/" + filename; case 'po': return "//archive.thedarkcave.org/" + boardID + "/full_image/" + filename; case 'hr': @@ -7495,8 +7498,16 @@ $.set('archivers', Conf.archivers); } return (arch && (archive = this.archiver[arch]) ? Redirect.path(archive.base, archive.type, data) : data.threadID ? "//boards.4chan.org/" + boardID + "/" : null); + if (!archive.boards.contains(g.BOARD.ID)) { + return Conf['archivers'] = archive; + } }, archiver: { + 'NihilAdRem': { + base: '//archive.nihil-ad-rem.net', + boards: ['v', 'vg'], + type: 'foolfuuka' + }, 'Foolz': { base: 'https://archive.foolz.us', boards: ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vp', 'vr', 'wsg'], diff --git a/builds/crx/script.js b/builds/crx/script.js index bf2eb07a6..8575cd16e 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -7409,6 +7409,9 @@ return "//archive.foolz.us/" + boardID + "/full_image/" + filename; case 'u': return "//nsfw.foolz.us/" + boardID + "/full_image/" + filename; + case 'v': + case 'vg': + return "//archive.nihil-ad-rem.net/" + boardID + "/full_image/" + filename; case 'po': return "//archive.thedarkcave.org/" + boardID + "/full_image/" + filename; case 'hr': @@ -7479,8 +7482,16 @@ $.set('archivers', Conf.archivers); } return (arch && (archive = this.archiver[arch]) ? Redirect.path(archive.base, archive.type, data) : data.threadID ? "//boards.4chan.org/" + boardID + "/" : null); + if (!archive.boards.contains(g.BOARD.ID)) { + return Conf['archivers'] = archive; + } }, archiver: { + 'NihilAdRem': { + base: '//archive.nihil-ad-rem.net', + boards: ['v', 'vg'], + type: 'foolfuuka' + }, 'Foolz': { base: 'https://archive.foolz.us', boards: ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vp', 'vr', 'wsg'], diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee index 18e6f5fe7..35444a9ce 100644 --- a/src/Archive/Redirect.coffee +++ b/src/Archive/Redirect.coffee @@ -13,6 +13,8 @@ Redirect = "//archive.foolz.us/#{boardID}/full_image/#{filename}" when 'u' "//nsfw.foolz.us/#{boardID}/full_image/#{filename}" + when 'v', 'vg' + "//archive.nihil-ad-rem.net/#{boardID}/full_image/#{filename}" when 'po' "//archive.thedarkcave.org/#{boardID}/full_image/#{filename}" when 'hr', 'tv' @@ -60,7 +62,14 @@ Redirect = else null) + unless archive.boards.contains g.BOARD.ID + Conf['archivers'] = archive + archiver: + 'NihilAdRem': + base: '//archive.nihil-ad-rem.net' + boards: ['v', 'vg'] + type: 'foolfuuka' 'Foolz': base: 'https://archive.foolz.us' boards: ['a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'vp', 'vr', 'wsg']