diff --git a/CHANGELOG.md b/CHANGELOG.md index 23f06d684..65a0c6ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ### v1.14.6 +**v1.14.6.3** *(2019-04-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.3/builds/4chan-X-noupdate.crx)] +- Merge v1.14.5.15: Show info relating to April 2019 event. #2266 + **v1.14.6.2** *(2019-03-31)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.2/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.2/builds/4chan-X-noupdate.crx)] - Support filters that apply to multiple post fields joined by newline characters. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 9096e1e87..df4016042 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index c5debe96b..53f08ab9d 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.6.2 +// @version 1.14.6.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index 105f70804..7a8061c30 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.6.2 +// @version 1.14.6.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.2', + VERSION: '1.14.6.3', NAMESPACE: '4chan X.', boards: {} }; @@ -9336,7 +9336,7 @@ Build = (function() { } }, parseJSON: function(data, boardID) { - var o; + var key, o; o = { ID: data.no, threadID: data.resto || data.no, @@ -9345,8 +9345,7 @@ Build = (function() { isSticky: !!data.sticky, isClosed: !!data.closed, isArchived: !!data.archived, - fileDeleted: !!data.filedeleted, - xa18: data.xa18 + fileDeleted: !!data.filedeleted }; o.info = { subject: Build.unescape(data.sub), @@ -9390,6 +9389,11 @@ Build = (function() { o.file.dimensions = o.file.width + "x" + o.file.height; } } + for (key in data) { + if (key[0] === 'x') { + o[key] = data[key]; + } + } return o; }, parseComment: function(html) { @@ -9438,7 +9442,7 @@ Build = (function() { postLink = Build.postURL(boardID, threadID, ID); quoteLink = Build.sameThread(boardID, threadID) ? "javascript:quote('" + (+ID) + "');" : "/" + boardID + "/thread/" + threadID + "#q" + ID; postInfo = { - innerHTML: "
" + ((!o.isReply || boardID === "f" || subject) ? "" + E(subject || "") + " " : "") + "" + ((email) ? "" : "") + "" + E(name) + "" + ((tripcode) ? " " + E(tripcode) + "" : "") + ((pass) ? " " : "") + ((capcode) ? " ## " + E(capcode) + "" : "") + ((!capcode && typeof o.xa18 !== "undefined") ? " " : "") + ((email) ? "" : "") + ((boardID === "f" && !o.isReply || capcodeDescription) ? "" : " ") + ((capcodeDescription) ? " \""" : "") + ((uniqueID && !capcode) ? " (ID: " + E(uniqueID) + ")" : "") + ((flagCode) ? " " : "") + ((flagCodeTroll) ? " \""" : "") + " " + E(dateText) + " No." + E(ID) + "" + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" + innerHTML: "
" + ((!o.isReply || boardID === "f" || subject) ? "" + E(subject || "") + " " : "") + "" + ((email) ? "" : "") + "" + E(name) + "" + ((tripcode) ? " " + E(tripcode) + "" : "") + ((o.xa19s) ? "" + E(o.xa19s) + "" : "") + ((pass) ? " " : "") + ((capcode) ? " ## " + E(capcode) + "" : "") + ((email) ? "" : "") + ((boardID === "f" && !o.isReply || capcodeDescription) ? "" : " ") + ((capcodeDescription) ? " \""" : "") + ((uniqueID && !capcode) ? " (ID: " + E(uniqueID) + ")" : "") + ((flagCode) ? " " : "") + ((flagCodeTroll) ? " \""" : "") + " " + E(dateText) + " No." + E(ID) + "" + ((o.isReply) ? "Like!" + ((o.xa19l) ? " ×" + E(o.xa19l) : "") + "" : "") + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" }; /* File Info */ @@ -23123,7 +23127,7 @@ QR = (function() { return QR.status(); }, response: function() { - var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, threadID; + var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, textContent, threadID, timeout, xa19; if (this !== QR.req) { return; } @@ -23210,7 +23214,13 @@ QR = (function() { } QR.cleanNotifications(); if (Conf['Posting Success Notifications']) { - QR.notifications.push(new Notice('success', h1.textContent, 5)); + textContent = h1.textContent; + timeout = 5; + if ((xa19 = this.response.firstChild.textContent.match(/xa19:(.*):xa19/))) { + textContent += " (score/perks: " + xa19[1] + ")"; + timeout = 20; + } + QR.notifications.push(new Notice('success', textContent, timeout)); } QR.cooldown.add(threadID, postID); URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : threadID !== g.THREADID && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 7ad00a86b..7d83ce296 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 3cad14873..aa02d7f7b 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.6.2 +// @version 1.14.6.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.2', + VERSION: '1.14.6.3', NAMESPACE: '4chan X.', boards: {} }; @@ -9336,7 +9336,7 @@ Build = (function() { } }, parseJSON: function(data, boardID) { - var o; + var key, o; o = { ID: data.no, threadID: data.resto || data.no, @@ -9345,8 +9345,7 @@ Build = (function() { isSticky: !!data.sticky, isClosed: !!data.closed, isArchived: !!data.archived, - fileDeleted: !!data.filedeleted, - xa18: data.xa18 + fileDeleted: !!data.filedeleted }; o.info = { subject: Build.unescape(data.sub), @@ -9390,6 +9389,11 @@ Build = (function() { o.file.dimensions = o.file.width + "x" + o.file.height; } } + for (key in data) { + if (key[0] === 'x') { + o[key] = data[key]; + } + } return o; }, parseComment: function(html) { @@ -9438,7 +9442,7 @@ Build = (function() { postLink = Build.postURL(boardID, threadID, ID); quoteLink = Build.sameThread(boardID, threadID) ? "javascript:quote('" + (+ID) + "');" : "/" + boardID + "/thread/" + threadID + "#q" + ID; postInfo = { - innerHTML: "
" + ((!o.isReply || boardID === "f" || subject) ? "" + E(subject || "") + " " : "") + "" + ((email) ? "" : "") + "" + E(name) + "" + ((tripcode) ? " " + E(tripcode) + "" : "") + ((pass) ? " " : "") + ((capcode) ? " ## " + E(capcode) + "" : "") + ((!capcode && typeof o.xa18 !== "undefined") ? " " : "") + ((email) ? "" : "") + ((boardID === "f" && !o.isReply || capcodeDescription) ? "" : " ") + ((capcodeDescription) ? " \""" : "") + ((uniqueID && !capcode) ? " (ID: " + E(uniqueID) + ")" : "") + ((flagCode) ? " " : "") + ((flagCodeTroll) ? " \""" : "") + " " + E(dateText) + " No." + E(ID) + "" + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" + innerHTML: "
" + ((!o.isReply || boardID === "f" || subject) ? "" + E(subject || "") + " " : "") + "" + ((email) ? "" : "") + "" + E(name) + "" + ((tripcode) ? " " + E(tripcode) + "" : "") + ((o.xa19s) ? "" + E(o.xa19s) + "" : "") + ((pass) ? " " : "") + ((capcode) ? " ## " + E(capcode) + "" : "") + ((email) ? "" : "") + ((boardID === "f" && !o.isReply || capcodeDescription) ? "" : " ") + ((capcodeDescription) ? " \""" : "") + ((uniqueID && !capcode) ? " (ID: " + E(uniqueID) + ")" : "") + ((flagCode) ? " " : "") + ((flagCodeTroll) ? " \""" : "") + " " + E(dateText) + " No." + E(ID) + "" + ((o.isReply) ? "Like!" + ((o.xa19l) ? " ×" + E(o.xa19l) : "") + "" : "") + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" }; /* File Info */ @@ -23123,7 +23127,7 @@ QR = (function() { return QR.status(); }, response: function() { - var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, threadID; + var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, textContent, threadID, timeout, xa19; if (this !== QR.req) { return; } @@ -23210,7 +23214,13 @@ QR = (function() { } QR.cleanNotifications(); if (Conf['Posting Success Notifications']) { - QR.notifications.push(new Notice('success', h1.textContent, 5)); + textContent = h1.textContent; + timeout = 5; + if ((xa19 = this.response.firstChild.textContent.match(/xa19:(.*):xa19/))) { + textContent += " (score/perks: " + xa19[1] + ")"; + timeout = 20; + } + QR.notifications.push(new Notice('success', textContent, timeout)); } QR.cooldown.add(threadID, postID); URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : threadID !== g.THREADID && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 293135387..376822a89 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 6ca776f27..a648af8af 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.6.2 +// @version 1.14.6.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 9bebe5c1c..211e43706 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.6.2 +// @version 1.14.6.3 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.2', + VERSION: '1.14.6.3', NAMESPACE: '4chan X.', boards: {} }; @@ -9336,7 +9336,7 @@ Build = (function() { } }, parseJSON: function(data, boardID) { - var o; + var key, o; o = { ID: data.no, threadID: data.resto || data.no, @@ -9345,8 +9345,7 @@ Build = (function() { isSticky: !!data.sticky, isClosed: !!data.closed, isArchived: !!data.archived, - fileDeleted: !!data.filedeleted, - xa18: data.xa18 + fileDeleted: !!data.filedeleted }; o.info = { subject: Build.unescape(data.sub), @@ -9390,6 +9389,11 @@ Build = (function() { o.file.dimensions = o.file.width + "x" + o.file.height; } } + for (key in data) { + if (key[0] === 'x') { + o[key] = data[key]; + } + } return o; }, parseComment: function(html) { @@ -9438,7 +9442,7 @@ Build = (function() { postLink = Build.postURL(boardID, threadID, ID); quoteLink = Build.sameThread(boardID, threadID) ? "javascript:quote('" + (+ID) + "');" : "/" + boardID + "/thread/" + threadID + "#q" + ID; postInfo = { - innerHTML: "
" + ((!o.isReply || boardID === "f" || subject) ? "" + E(subject || "") + " " : "") + "" + ((email) ? "" : "") + "" + E(name) + "" + ((tripcode) ? " " + E(tripcode) + "" : "") + ((pass) ? " " : "") + ((capcode) ? " ## " + E(capcode) + "" : "") + ((!capcode && typeof o.xa18 !== "undefined") ? " " : "") + ((email) ? "" : "") + ((boardID === "f" && !o.isReply || capcodeDescription) ? "" : " ") + ((capcodeDescription) ? " \""" : "") + ((uniqueID && !capcode) ? " (ID: " + E(uniqueID) + ")" : "") + ((flagCode) ? " " : "") + ((flagCodeTroll) ? " \""" : "") + " " + E(dateText) + " No." + E(ID) + "" + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" + innerHTML: "
" + ((!o.isReply || boardID === "f" || subject) ? "" + E(subject || "") + " " : "") + "" + ((email) ? "" : "") + "" + E(name) + "" + ((tripcode) ? " " + E(tripcode) + "" : "") + ((o.xa19s) ? "" + E(o.xa19s) + "" : "") + ((pass) ? " " : "") + ((capcode) ? " ## " + E(capcode) + "" : "") + ((email) ? "" : "") + ((boardID === "f" && !o.isReply || capcodeDescription) ? "" : " ") + ((capcodeDescription) ? " \""" : "") + ((uniqueID && !capcode) ? " (ID: " + E(uniqueID) + ")" : "") + ((flagCode) ? " " : "") + ((flagCodeTroll) ? " \""" : "") + " " + E(dateText) + " No." + E(ID) + "" + ((o.isReply) ? "Like!" + ((o.xa19l) ? " ×" + E(o.xa19l) : "") + "" : "") + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" }; /* File Info */ @@ -23123,7 +23127,7 @@ QR = (function() { return QR.status(); }, response: function() { - var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, threadID; + var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, textContent, threadID, timeout, xa19; if (this !== QR.req) { return; } @@ -23210,7 +23214,13 @@ QR = (function() { } QR.cleanNotifications(); if (Conf['Posting Success Notifications']) { - QR.notifications.push(new Notice('success', h1.textContent, 5)); + textContent = h1.textContent; + timeout = 5; + if ((xa19 = this.response.firstChild.textContent.match(/xa19:(.*):xa19/))) { + textContent += " (score/perks: " + xa19[1] + ")"; + timeout = 20; + } + QR.notifications.push(new Notice('success', textContent, timeout)); } QR.cooldown.add(threadID, postID); URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : threadID !== g.THREADID && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index ea2a20419..5087dd3ae 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.json b/builds/updates-beta.json index f17ba62b3..331ef00d1 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.6.2", + "version": "1.14.6.3", "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx" } ] diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index d8e45c1bf..ad837e2b6 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.json b/builds/updates.json index e434a0857..cc2885de4 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.6.2", + "version": "1.14.6.3", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 8e3303f21..1e7f526c4 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 658a4b64e..a53fac444 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.6.2", - "date": "2019-03-31T07:55:25.631Z" + "version": "1.14.6.3", + "date": "2019-04-01T06:04:49.930Z" } \ No newline at end of file