From 670e8931e9f84db7e29897bf3cd049477a3f541d Mon Sep 17 00:00:00 2001 From: NovemLinguae Date: Tue, 25 Jul 2023 01:12:43 -0700 Subject: [PATCH 1/3] fix merge conflict --- modules/friendlytag.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/friendlytag.js b/modules/friendlytag.js index 70fed9266..c4cd010b9 100644 --- a/modules/friendlytag.js +++ b/modules/friendlytag.js @@ -56,7 +56,12 @@ Twinkle.tag.callback = function friendlytagCallback() { // figure out whether the article is marked as reviewed in PageTriage var isReviewed = false; var isOldPage = response.pagetriagelist.result !== 'success' || response.pagetriagelist.pages.length === 0; - var isMarkedAsReviewed = response.pagetriagelist.pages[0].patrol_status > 0; + // Recent articles will have a patrol_status that we can read. + // For articles that have been out of the new pages feed for awhile, pages[0] will be undefined. + var isMarkedAsReviewed = response.pagetriagelist.pages[0] ? + response.pagetriagelist.pages[0].patrol_status > 0 : + true; + if (isOldPage || isMarkedAsReviewed) { isReviewed = true; } From d5786f68108c4538b09d063b78033d48f87ee895 Mon Sep 17 00:00:00 2001 From: NovemLinguae Date: Tue, 25 Jul 2023 01:17:34 -0700 Subject: [PATCH 2/3] simplify --- modules/friendlytag.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/friendlytag.js b/modules/friendlytag.js index c4cd010b9..b815af70d 100644 --- a/modules/friendlytag.js +++ b/modules/friendlytag.js @@ -54,18 +54,12 @@ Twinkle.tag.callback = function friendlytagCallback() { page_id: mw.config.get('wgArticleId') }).then(function(response) { // figure out whether the article is marked as reviewed in PageTriage - var isReviewed = false; - var isOldPage = response.pagetriagelist.result !== 'success' || response.pagetriagelist.pages.length === 0; // Recent articles will have a patrol_status that we can read. // For articles that have been out of the new pages feed for awhile, pages[0] will be undefined. - var isMarkedAsReviewed = response.pagetriagelist.pages[0] ? + var isReviewed = response.pagetriagelist.pages[0] ? response.pagetriagelist.pages[0].patrol_status > 0 : true; - if (isOldPage || isMarkedAsReviewed) { - isReviewed = true; - } - // if article is not marked as reviewed, show the "mark as reviewed" check box if (!isReviewed) { // Quickform is probably already rendered. Instead of using form.append(), we need to make an element and then append it using JQuery. From 52e413c1a70548e9a51057b654227f59a49e6f08 Mon Sep 17 00:00:00 2001 From: NovemLinguae Date: Tue, 25 Jul 2023 01:22:57 -0700 Subject: [PATCH 3/3] ce --- modules/friendlytag.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/friendlytag.js b/modules/friendlytag.js index b815af70d..aaf7f6f23 100644 --- a/modules/friendlytag.js +++ b/modules/friendlytag.js @@ -53,7 +53,7 @@ Twinkle.tag.callback = function friendlytagCallback() { format: 'json', page_id: mw.config.get('wgArticleId') }).then(function(response) { - // figure out whether the article is marked as reviewed in PageTriage + // Figure out whether the article is marked as reviewed in PageTriage. // Recent articles will have a patrol_status that we can read. // For articles that have been out of the new pages feed for awhile, pages[0] will be undefined. var isReviewed = response.pagetriagelist.pages[0] ?