From 3a9de0683d577e57d7b1d092e08394ae7210bf0d Mon Sep 17 00:00:00 2001 From: earlt612 <58372701+earlt612@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:10:53 -0600 Subject: [PATCH 01/16] tag: add {{No significant coverage (sports)}} and {{No significant coverage}} (#1834) * Update friendlytag.js * lint fix + general fixes * tweak per PR Thank you to @Eejit43 for the suggestions. * fix lint * apply lint roller * update per novemlinguae * fix typo causing an undefined --------- Co-authored-by: NovemLinguae --- modules/friendlytag.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/friendlytag.js b/modules/friendlytag.js index f7154903c..9f119fda9 100644 --- a/modules/friendlytag.js +++ b/modules/friendlytag.js @@ -836,6 +836,8 @@ Twinkle.tag.article.tagList = { { tag: 'BLP sources', description: 'BLP that needs additional references or sources for verification' }, { tag: 'BLP unreferenced', description: 'BLP does not cite any sources at all (use BLP PROD instead for new articles)' }, { tag: 'More citations needed', description: 'needs additional references or sources for verification' }, + { tag: 'No significant coverage', description: 'does not cite any sources containing significant coverage' }, + { tag: 'No significant coverage (sports)', description: 'sports biography that does not cite any sources containing significant coverage' }, { tag: 'One source', description: 'relies largely or entirely on a single source' }, { tag: 'Original research', description: 'contains original research' }, { tag: 'Primary sources', description: 'relies too much on references to primary sources, and needs secondary sources' }, From ab7324980020d60b2674dc4d92903ed9ef61e192 Mon Sep 17 00:00:00 2001 From: SUDHIR KUMAR <112376748+IamSudhir-Kumar@users.noreply.github.com> Date: Fri, 6 Sep 2024 08:05:20 +0530 Subject: [PATCH 02/16] added 10 days, 6 months, 2 years in protect (#1869) * added 10 days, 6 months, 2 years in protect * 2 year -> 2 years --------- Co-authored-by: NovemLinguae --- modules/twinkleprotect.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/twinkleprotect.js b/modules/twinkleprotect.js index 54ea74694..00fc1c759 100644 --- a/modules/twinkleprotect.js +++ b/modules/twinkleprotect.js @@ -686,12 +686,15 @@ Twinkle.protect.protectionLengths = [ { label: '2 days', value: '2 days' }, { label: '3 days', value: '3 days' }, { label: '4 days', value: '4 days' }, + { label: '10 days', value: '10 days' }, { label: '1 week', value: '1 week' }, { label: '2 weeks', value: '2 weeks' }, { label: '1 month', value: '1 month' }, { label: '2 months', value: '2 months' }, { label: '3 months', value: '3 months' }, + { label: '6 months', value: '6 months' }, { label: '1 year', value: '1 year' }, + { label: '2 years', value: '2 years' }, { label: 'indefinite', value: 'infinity' }, { label: 'Custom...', value: 'custom' } ]; From 011baf94e4d807cf6d767d0dabde791594d881ef Mon Sep 17 00:00:00 2001 From: NovemLinguae <79697282+NovemLinguae@users.noreply.github.com> Date: Thu, 5 Sep 2024 20:18:21 -0700 Subject: [PATCH 03/16] build: turn off dependabot (#2006) - turn off dependabot - remove some dependabot stuff from .md file - add a sentence to a .md file fixes #1852 --- .github/dependabot.yml | 6 ------ DEVELOPER.md | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index db2f8224a..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "npm" - directory: "/" - schedule: - interval: "yearly" diff --git a/DEVELOPER.md b/DEVELOPER.md index 164dd3073..003a3b329 100644 --- a/DEVELOPER.md +++ b/DEVELOPER.md @@ -171,11 +171,12 @@ Every time: ### Dependencies -All the dependencies that Twinkle uses are JavaScript **dev** dependencies. They are not used at all on-wiki and are just used during development. Here's what they are and what they do. This may help with evaluating dependabot patches (dependabot is a GitHub bot that helps keep libraries up to date by submitting pull requests). +All the dependencies that Twinkle uses are JavaScript **dev** dependencies. They are not used at all on-wiki and are just used during development. Here's what they are and what they do. - eslint - Used by continuous integration for enforcing code linting rules. - jest - Used by continuous integration for unit testing. - jest-environment-jsdom - Needed for Jest to work. - mock-mediawiki - Used by continuous integration for unit testing. - mwn - Used when you run `npm start`. `npm start` is what enables localhost testing. -- Everything else - Dependabot will not usually try to update these unless one of the 5 above dependencies gets out of date. It is probably best to update the above dependencies instead. + +When updating dependencies, CI should take care of testing most of that. Manually testing `npm start` should be the only additional check needed. From a026d7616504680adbb654ad112fa661e20e85b2 Mon Sep 17 00:00:00 2001 From: Robert Sim Date: Fri, 6 Sep 2024 15:21:06 +0800 Subject: [PATCH 04/16] See https://en.wikipedia.org/wiki/Template_talk:Welcome-unregistered-constructive#Requested_move_29_December_2023 (#1941) --- modules/friendlywelcome.js | 40 +++++++++++++++++++------------------- modules/twinkleblock.js | 34 ++++++++++++++++---------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/modules/friendlywelcome.js b/modules/friendlywelcome.js index 4d7b3444e..086851a8a 100644 --- a/modules/friendlywelcome.js +++ b/modules/friendlywelcome.js @@ -138,7 +138,7 @@ Twinkle.welcome.callback = function friendlywelcomeCallback(uid) { event: Twinkle.welcome.populateWelcomeList, list: [ { type: 'option', value: 'standard', label: 'Standard welcomes', selected: !mw.util.isIPAddress(mw.config.get('wgRelevantUserName')) }, - { type: 'option', value: 'anonymous', label: 'IP user welcomes', selected: mw.util.isIPAddress(mw.config.get('wgRelevantUserName')) }, + { type: 'option', value: 'unregistered', label: 'IP user welcomes', selected: mw.util.isIPAddress(mw.config.get('wgRelevantUserName')) }, { type: 'option', value: 'wikiProject', label: 'WikiProject welcomes' }, { type: 'option', value: 'nonEnglish', label: 'Non-English welcomes' } ] @@ -183,7 +183,7 @@ Twinkle.welcome.populateWelcomeList = function(e) { var container = new Morebits.quickForm.element({ type: 'fragment' }); - if ((type === 'standard' || type === 'anonymous') && Twinkle.getPref('customWelcomeList').length) { + if ((type === 'standard' || type === 'unregistered') && Twinkle.getPref('customWelcomeList').length) { container.append({ type: 'header', label: 'Custom welcome templates' }); container.append({ type: 'radio', @@ -341,37 +341,37 @@ Twinkle.welcome.templates = { } }, - anonymous: { - 'Anonymous user welcome templates': { - 'welcome-anon': { - description: 'for anonymous users; encourages creating an account', + unregistered: { + 'Unregistered user welcome templates': { + 'welcome-unregistered': { + description: 'for unregistered users; encourages creating an account', linkedArticle: true, - syntax: '{{subst:welcome-anon|art=$ARTICLE$}} ~~~~' + syntax: '{{subst:welcome-unregistered|art=$ARTICLE$}} ~~~~' }, 'thanks': { - description: 'for anonymous users; short; encourages creating an account', + description: 'for unregistered users; short; encourages creating an account', linkedArticle: true, syntax: '== Welcome! ==\n{{subst:thanks|page=$ARTICLE$}} ~~~~' }, - 'welcome-anon-test': { - description: 'for anonymous users who have performed test edits', + 'welcome-unregistered-test': { + description: 'for unregistered users who have performed test edits', linkedArticle: true, - syntax: '{{subst:welcome-anon-test|$ARTICLE$|$USERNAME$}} ~~~~' + syntax: '{{subst:welcome-unregistered-test|$ARTICLE$|$USERNAME$}} ~~~~' }, - 'welcome-anon-unconstructive': { - description: 'for anonymous users who have vandalized or made unhelpful edits', + 'welcome-unregistered-unconstructive': { + description: 'for unregistered users who have vandalized or made unhelpful edits', linkedArticle: true, - syntax: '{{subst:welcome-anon-unconstructive|$ARTICLE$|$USERNAME$}}' + syntax: '{{subst:welcome-unregistered-unconstructive|$ARTICLE$|$USERNAME$}}' }, - 'welcome-anon-constructive': { - description: 'for anonymous users who fight vandalism or edit constructively', + 'welcome-unregistered-constructive': { + description: 'for unregistered users who fight vandalism or edit constructively', linkedArticle: true, - syntax: '{{subst:welcome-anon-constructive|art=$ARTICLE$}}' + syntax: '{{subst:welcome-unregistered-constructive|art=$ARTICLE$}}' }, - 'welcome-anon-delete': { - description: 'for anonymous users who have removed content from pages', + 'welcome-unregistered-delete': { + description: 'for unregistered users who have removed content from pages', linkedArticle: true, - syntax: '{{subst:welcome-anon-delete|$ARTICLE$|$USERNAME$}} ~~~~' + syntax: '{{subst:welcome-unregistered-delete|$ARTICLE$|$USERNAME$}} ~~~~' } } }, diff --git a/modules/twinkleblock.js b/modules/twinkleblock.js index 4209df15e..1a9f8f9a7 100644 --- a/modules/twinkleblock.js +++ b/modules/twinkleblock.js @@ -815,13 +815,13 @@ Twinkle.block.callback.change_action = function twinkleblockCallbackChangeAction * autoblock: * disabletalk: * expiry: - * forAnonOnly: + * forUnregisteredOnly: * forRegisteredOnly: * label: * noemail: prevent the user from sending email through Special:Emailuser * pageParam: * prependReason: - * nocreate: + * nocreate: * nonstandard: