From 01027d2f681e8e960f8b05a8a61eab13577d062c Mon Sep 17 00:00:00 2001 From: NovemLinguae <79697282+NovemLinguae@users.noreply.github.com> Date: Fri, 19 May 2023 07:33:47 -0700 Subject: [PATCH 1/6] block: fix extra period in {{uw-botuhblock}} edit summary (#1774) --- modules/twinkleblock.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/twinkleblock.js b/modules/twinkleblock.js index d94380e5d..4209df15e 100644 --- a/modules/twinkleblock.js +++ b/modules/twinkleblock.js @@ -1023,7 +1023,7 @@ Twinkle.block.blockPresetsInfo = { forRegisteredOnly: true, nocreate: true, reason: '{{uw-botuhblock}} ', - summary: 'You have been indefinitely blocked from editing because your username is a blatant violation of the [[WP:U|username policy]].' + summary: 'You have been indefinitely blocked from editing because your username is a blatant violation of the [[WP:U|username policy]]' }, 'uw-causeblock': { expiry: 'infinity', From 10d1f2663c4e7e977121d10908d371388c6bab6e Mon Sep 17 00:00:00 2001 From: earlt612 <58372701+earlt612@users.noreply.github.com> Date: Fri, 19 May 2023 08:39:27 -0600 Subject: [PATCH 2/6] fix edit summary for uw-wrongsummary (#1773) --- modules/twinklewarn.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/twinklewarn.js b/modules/twinklewarn.js index 92a27f99a..47b26305f 100644 --- a/modules/twinklewarn.js +++ b/modules/twinklewarn.js @@ -1104,7 +1104,7 @@ Twinkle.warn.messages = { }, 'uw-wrongsummary': { label: 'Using inaccurate or inappropriate edit summaries', - summary: 'Warning: Using inaccurate or inappropriate edit summaries' + summary: 'Notice: Using inaccurate or inappropriate edit summaries' } }, From 8f35b6ec96f17c09ee5a1ba30327a6e3ab8bb850 Mon Sep 17 00:00:00 2001 From: Red-tailed hawk <124543517+Red-tailed-Hawk@users.noreply.github.com> Date: Fri, 19 May 2023 10:47:17 -0400 Subject: [PATCH 3/6] Add welcome-copyright (#1758) * Update friendlywelcome.js Add welcome-copyright to the welcome module * Update friendlywelcome.js add comma * fix template parameters --------- Co-authored-by: NovemLinguae --- modules/friendlywelcome.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/friendlywelcome.js b/modules/friendlywelcome.js index 1d5796a36..7ec987fcf 100644 --- a/modules/friendlywelcome.js +++ b/modules/friendlywelcome.js @@ -327,6 +327,11 @@ Twinkle.welcome.templates = { description: 'welcome with additional information about images (policy and procedure)', linkedArticle: true, syntax: '{{subst:welcome-image|$USERNAME$|art=$ARTICLE$}}' + }, + 'welcome-copyright': { + description: 'for someone who has been adding copyright violations to articles', + linkedArticle: true, + syntax: '{{subst:welcome-copyright|$ARTICLE$|$USERNAME$}} ~~~~' } } }, From cb92ce7f152bca86fa4791d97e820ed834ac897e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 May 2023 07:49:05 -0700 Subject: [PATCH 4/6] build(deps-dev): bump eslint from 8.37.0 to 8.39.0 (#1772) Bumps [eslint](https://github.com/eslint/eslint) from 8.37.0 to 8.39.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.37.0...v8.39.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 49 +++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index b92f1135e..c2264ef11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "twinkle", "devDependencies": { - "eslint": "^8.37.0", + "eslint": "^8.39.0", "jest": "^27.0.6", "mock-mediawiki": "^1.3.0", "mwn": "^1.11.5" @@ -706,9 +706,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.37.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz", - "integrity": "sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", + "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -1985,15 +1985,15 @@ } }, "node_modules/eslint": { - "version": "8.37.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz", - "integrity": "sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", + "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.4.0", "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.37.0", + "@eslint/js": "8.39.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2003,7 +2003,7 @@ "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", + "eslint-scope": "^7.2.0", "eslint-visitor-keys": "^3.4.0", "espree": "^9.5.1", "esquery": "^1.4.2", @@ -2042,9 +2042,9 @@ } }, "node_modules/eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", + "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -2052,6 +2052,9 @@ }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-visitor-keys": { @@ -5601,9 +5604,9 @@ } }, "@eslint/js": { - "version": "8.37.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.37.0.tgz", - "integrity": "sha512-x5vzdtOOGgFVDCUs81QRB2+liax8rFg3+7hqM+QhBG0/G3F1ZsoYl97UrqgHgQ9KKT7G6c4V+aTUCgu/n22v1A==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.39.0.tgz", + "integrity": "sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==", "dev": true }, "@humanwhocodes/config-array": { @@ -6620,15 +6623,15 @@ } }, "eslint": { - "version": "8.37.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.37.0.tgz", - "integrity": "sha512-NU3Ps9nI05GUoVMxcZx1J8CNR6xOvUT4jAUMH5+z8lpp3aEdPVCImKw6PWG4PY+Vfkpr+jvMpxs/qoE7wq0sPw==", + "version": "8.39.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.39.0.tgz", + "integrity": "sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==", "dev": true, "requires": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.4.0", "@eslint/eslintrc": "^2.0.2", - "@eslint/js": "8.37.0", + "@eslint/js": "8.39.0", "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -6638,7 +6641,7 @@ "debug": "^4.3.2", "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.1.1", + "eslint-scope": "^7.2.0", "eslint-visitor-keys": "^3.4.0", "espree": "^9.5.1", "esquery": "^1.4.2", @@ -6728,9 +6731,9 @@ } }, "eslint-scope": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", - "integrity": "sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz", + "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==", "dev": true, "requires": { "esrecurse": "^4.3.0", diff --git a/package.json b/package.json index b29c3d087..47b13fcbe 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "deployall": "perl scripts/sync.pl --mode=deploy --all" }, "devDependencies": { - "eslint": "^8.37.0", + "eslint": "^8.39.0", "jest": "^27.0.6", "mock-mediawiki": "^1.3.0", "mwn": "^1.11.5" From ecbbbcd3568f16d442d4bac479e6c2302fdcd207 Mon Sep 17 00:00:00 2001 From: anupvs77 <96761022+anupvs77@users.noreply.github.com> Date: Fri, 19 May 2023 20:31:13 +0530 Subject: [PATCH 5/6] protect: add generic ECP option to protection module (#1762) --- modules/twinkleprotect.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/twinkleprotect.js b/modules/twinkleprotect.js index a9b4259c9..c69f01c88 100644 --- a/modules/twinkleprotect.js +++ b/modules/twinkleprotect.js @@ -712,6 +712,7 @@ Twinkle.protect.protectionTypes = [ { label: 'Extended confirmed protection', list: [ + { label: 'Generic (ECP)', value: 'pp-30-500' }, { label: 'Arbitration enforcement (ECP)', selected: true, value: 'pp-30-500-arb' }, { label: 'Persistent vandalism (ECP)', value: 'pp-30-500-vandalism' }, { label: 'Disruptive editing (ECP)', value: 'pp-30-500-disruptive' }, @@ -841,6 +842,12 @@ Twinkle.protect.protectionPresetsInfo = { reason: 'Persistent [[WP:Sock puppetry|sock puppetry]]', template: 'pp-extended' }, + 'pp-30-500': { + edit: 'extendedconfirmed', + move: 'extendedconfirmed', + reason: null, + template: 'pp-extended' + }, 'pp-semi-vandalism': { edit: 'autoconfirmed', reason: 'Persistent [[WP:Vandalism|vandalism]]', @@ -1241,6 +1248,7 @@ Twinkle.protect.callback.evaluate = function twinkleprotectCallbackEvaluate(e) { case 'pp-30-500-disruptive': case 'pp-30-500-blp': case 'pp-30-500-sock': + case 'pp-30-500': typename = 'extended confirmed protection'; break; case 'pp-semi-vandalism': From f1074a6f78710c41f4acb618087a52655acc22ad Mon Sep 17 00:00:00 2001 From: lomrjyo <58796067+lomrjyo@users.noreply.github.com> Date: Sat, 20 May 2023 03:02:54 -0600 Subject: [PATCH 6/6] warn: add uw-fringe 1-4 (#1742) * add uw-fringe1-4 * add commas * fix lint * Update twinklewarn.js del uw-fringe4 * Update twinklewarn.js rm stray comma --- modules/twinklewarn.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/twinklewarn.js b/modules/twinklewarn.js index 47b26305f..e7af258ad 100644 --- a/modules/twinklewarn.js +++ b/modules/twinklewarn.js @@ -355,6 +355,20 @@ Twinkle.warn.messages = { summary: 'Final warning: Introducing deliberate factual errors' } }, + 'uw-fringe': { + level1: { + label: 'Introducing fringe theories', + summary: 'General note: Introducing fringe theories' + }, + level2: { + label: 'Introducing fringe theories', + summary: 'Caution: Introducing fringe theories' + }, + level3: { + label: 'Introducing fringe theories', + summary: 'Warning: Introducing fringe theories' + } + }, 'uw-genre': { level1: { label: 'Frequent or mass changes to genres without consensus or references',