diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d79af8d5..159bb4cde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ ### v1.14.6 +**v1.14.6.4** *(2019-04-02)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.6.4/builds/4chan-X-noupdate.crx)] +- Merge v1.14.5.16: Remove score/perks message. Fix Posting Success Notifications. +- Merge v1.14.5.16: Remove like buttons. Continue to show like counts and scores where given in API. +- Bugfix: Account for posts added by thread expansion when marking read from index. + **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 diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index df4016042..80a6fbde2 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 53f08ab9d..e18a3bfeb 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.3 +// @version 1.14.6.4 // @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 7a8061c30..efb8d2d58 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.3 +// @version 1.14.6.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.3', + VERSION: '1.14.6.4', NAMESPACE: '4chan X.', boards: {} }; @@ -9442,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) + "" : "") + ((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]" : "") + "
" + 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.xa19l && o.isReply) ? " Like! ×" + E(o.xa19l) + "" : "") + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" }; /* File Info */ @@ -21490,16 +21490,12 @@ UnreadIndex = (function() { markRead: function() { var lastPost, thread; thread = Get.threadFromNode(this); - if (Index.enabled) { - lastPost = Index.lastPost(thread.ID); - } else { - lastPost = 0; - thread.posts.forEach(function(post) { - if (post.ID > lastPost && !post.isFetchedQuote) { - return lastPost = post.ID; - } - }); - } + lastPost = Index.enabled ? Index.lastPost(thread.ID) : 0; + thread.posts.forEach(function(post) { + if (post.ID > lastPost && !post.isFetchedQuote) { + return lastPost = post.ID; + } + }); UnreadIndex.lastReadPost[thread.fullID] = lastPost; UnreadIndex.db.set({ boardID: thread.board.ID, @@ -23127,7 +23123,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, textContent, threadID, timeout, xa19; + var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, threadID; if (this !== QR.req) { return; } @@ -23214,13 +23210,7 @@ QR = (function() { } QR.cleanNotifications(); if (Conf['Posting Success Notifications']) { - 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.notifications.push(new Notice('success', h1.textContent, 5)); } 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 7d83ce296..4f14fdc97 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 aa02d7f7b..f77183ddc 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.3 +// @version 1.14.6.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.3', + VERSION: '1.14.6.4', NAMESPACE: '4chan X.', boards: {} }; @@ -9442,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) + "" : "") + ((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]" : "") + "
" + 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.xa19l && o.isReply) ? " Like! ×" + E(o.xa19l) + "" : "") + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" }; /* File Info */ @@ -21490,16 +21490,12 @@ UnreadIndex = (function() { markRead: function() { var lastPost, thread; thread = Get.threadFromNode(this); - if (Index.enabled) { - lastPost = Index.lastPost(thread.ID); - } else { - lastPost = 0; - thread.posts.forEach(function(post) { - if (post.ID > lastPost && !post.isFetchedQuote) { - return lastPost = post.ID; - } - }); - } + lastPost = Index.enabled ? Index.lastPost(thread.ID) : 0; + thread.posts.forEach(function(post) { + if (post.ID > lastPost && !post.isFetchedQuote) { + return lastPost = post.ID; + } + }); UnreadIndex.lastReadPost[thread.fullID] = lastPost; UnreadIndex.db.set({ boardID: thread.board.ID, @@ -23127,7 +23123,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, textContent, threadID, timeout, xa19; + var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, threadID; if (this !== QR.req) { return; } @@ -23214,13 +23210,7 @@ QR = (function() { } QR.cleanNotifications(); if (Conf['Posting Success Notifications']) { - 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.notifications.push(new Notice('success', h1.textContent, 5)); } 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 376822a89..5b9e1dbca 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 a648af8af..8c12ad017 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.3 +// @version 1.14.6.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 211e43706..a8b010a94 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.3 +// @version 1.14.6.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -198,7 +198,7 @@ docSet = function() { }; g = { - VERSION: '1.14.6.3', + VERSION: '1.14.6.4', NAMESPACE: '4chan X.', boards: {} }; @@ -9442,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) + "" : "") + ((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]" : "") + "
" + 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.xa19l && o.isReply) ? " Like! ×" + E(o.xa19l) + "" : "") + ((o.isSticky) ? " \"Sticky\"" : "") + ((o.isClosed && !o.isArchived) ? " \"Closed\"" : "") + ((o.isArchived) ? " \"Archived\"" : "") + ((!o.isReply && g.VIEW === "index") ? "   [Reply]" : "") + "
" }; /* File Info */ @@ -21490,16 +21490,12 @@ UnreadIndex = (function() { markRead: function() { var lastPost, thread; thread = Get.threadFromNode(this); - if (Index.enabled) { - lastPost = Index.lastPost(thread.ID); - } else { - lastPost = 0; - thread.posts.forEach(function(post) { - if (post.ID > lastPost && !post.isFetchedQuote) { - return lastPost = post.ID; - } - }); - } + lastPost = Index.enabled ? Index.lastPost(thread.ID) : 0; + thread.posts.forEach(function(post) { + if (post.ID > lastPost && !post.isFetchedQuote) { + return lastPost = post.ID; + } + }); UnreadIndex.lastReadPost[thread.fullID] = lastPost; UnreadIndex.db.set({ boardID: thread.board.ID, @@ -23127,7 +23123,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, textContent, threadID, timeout, xa19; + var URL, _, connErr, err, h1, isReply, lastPostToThread, m, open, post, postID, postsCount, ref, ref1, ref2, ref3, seconds, threadID; if (this !== QR.req) { return; } @@ -23214,13 +23210,7 @@ QR = (function() { } QR.cleanNotifications(); if (Conf['Posting Success Notifications']) { - 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.notifications.push(new Notice('success', h1.textContent, 5)); } 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 5087dd3ae..ec0a41bec 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 331ef00d1..634a4f746 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.3", + "version": "1.14.6.4", "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 ad837e2b6..2c0e40b54 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 cc2885de4..7c2367961 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.6.3", + "version": "1.14.6.4", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 1e7f526c4..25ae4eaba 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index a53fac444..9eeda9400 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.6.3", - "date": "2019-04-01T06:04:49.930Z" + "version": "1.14.6.4", + "date": "2019-04-02T13:16:33.368Z" } \ No newline at end of file