Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unnecessary redirects to their targets #38

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix unnecessary redirects to their targets #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d66b85
ditto
aaronliu0130 Jul 17, 2023
a878ca3
Update redirect template redirect
aaronliu0130 Jul 17, 2023
e138d88
Same for merges
aaronliu0130 Jul 17, 2023
7a17e82
old afd multi to old xfd multi
aaronliu0130 Jul 17, 2023
b36a3c1
copy old old tfd fixing that got lost in github shenanigans
aaronliu0130 Jul 17, 2023
01b5dd6
Merge branch 'master' into master
NovemLinguae Jun 2, 2024
609ec95
fix pt 1 of tests
aaronliu0130 Jun 3, 2024
6fe5590
[skip ci] find and replace
aaronliu0130 Jun 4, 2024
e229ca0
Merge branch 'wikimedia-gadgets:master' into master
aaronliu0130 Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/testTaskAddOldXfd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ describe("AddBeingDeleted", function() {
it("makes old xfd wikitext", function() {
assert.deepStrictEqual(
task.makeOldxfdWikitext(),
"{{oldtfdfull|date= 18 March 2020 |result=merge |disc=Foo and bar}}\n"
"{{old tfd|date= 18 March 2020 |result=merge |disc=Foo and bar}}\n"
);
});
it("makes new wikitext (no page content)", function() {
Expand All @@ -105,7 +105,7 @@ describe("AddBeingDeleted", function() {
"|Wikipedia:Templates for discussion/Log/2019 June 18#Template:Foo}}";
assert.strictEqual(
task.makeNewWikitext(wikitext, "Template talk:Foo"),
"{{Old AfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
"{{Old XfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
" |date2=18 March 2020 |result2='''Merge''' |page2=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}\n"
);
});
Expand All @@ -116,26 +116,26 @@ describe("AddBeingDeleted", function() {
"|Wikipedia:Templates for discussion/Log/2019 June 18#Template:Foo}}";
assert.strictEqual(
task.makeNewWikitext(wikitext, "Template talk:Foo"),
"{{Old AfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
"{{Old XfD multi |date1=18 June 2019 |result1='''Keep''' |page1=" +page1 +
" |date2=18 March 2020 |result2='''Merge''' |page2=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}\nLoremipsum"
);
});
it("makes new wikitext (Old Afd multi)", function() {
const wikitext = "{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}";
it("makes new wikitext (Old XfD multi)", function() {
const wikitext = "{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}";
assert.strictEqual(
task.makeNewWikitext(wikitext, "Template talk:Foo"),
"{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
"{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
" |date2=18 March 2020 |result2='''Merge''' |page2=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}"
);
});
it("makes new wikitext (Old Afd multi and old TFD banner)", function() {
const wikitext = "{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}\n{{Old TfD|date=2019 June 18|result=keep}}\nLoremipsum";
it("makes new wikitext (Old XfD multi and old TFD banner)", function() {
const wikitext = "{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}}}\n{{Old TfD|date=2019 June 18|result=keep}}\nLoremipsum";
const page2 = "{{subst:#ifexist:Wikipedia:Templates for deletion/Log/2019 June 18"+
"|Wikipedia:Templates for deletion/Log/2019 June 18#Template:Foo"+
"|Wikipedia:Templates for discussion/Log/2019 June 18#Template:Foo}}";
assert.strictEqual(
task.makeNewWikitext(wikitext, "Template talk:Foo"),
"{{Old AfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
"{{Old XfD multi |date1=2010 February 26 |result1='''Redirect to [[Template:Abbr]]''' |link1={{canonicalurl:Wikipedia:Templates for discussion/Log/2010 February 26#Template:Tooltip}}"+
" |date2=18 June 2019 |result2='''Keep''' |page2=" + page2 +
" |date3=18 March 2020 |result3='''Merge''' |page3=Wikipedia:Templates for discussion/2020 March 18#Foo and bar}}\nLoremipsum"
);
Expand Down Expand Up @@ -172,4 +172,4 @@ describe("AddBeingDeleted", function() {
redirect: false,
});
});
});
});
4 changes: 2 additions & 2 deletions xfdcloser-src/Controllers/Tasks/AddOldXfd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default class AddOldXfdTask extends TaskItemController {
const titleObject = mw.Title.newFromText(pageTitle);
const PAGENAME = titleObject.getMain();
const SUBJECTPAGENAME = titleObject.getSubjectPage().getNamespacePrefix() + PAGENAME;
let oldafdmulti = "{{Old AfD multi";
let oldafdmulti = "{{Old XfD multi";
let count = 0;
let oldAfdTemplate;

Expand Down Expand Up @@ -222,4 +222,4 @@ export default class AddOldXfdTask extends TaskItemController {
);
}
}
// </nowiki>
// </nowiki>
8 changes: 4 additions & 4 deletions xfdcloser-src/Venue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ Venue.Mfd = () => new Venue("mfd", {
closeBottom: "{{subst:Mfd bottom}}",
oldXfd: "{{Old MfD |date=__DATE__ |result='''__RESULT__''' |page=__SUBPAGE__}}"+
"\n",
mergeFrom: "{{mfd-mergefrom|__NOMINATED__|__DEBATE__|__DATE__}}\n",
mergeTo: "{{mfd-mergeto|__TARGET__|__DEBATE__|__DATE__|__TARGETTALK__}}\n",
mergeFrom: "{{mfd-merge from|__NOMINATED__|__DEBATE__|__DATE__}}\n",
mergeTo: "{{mfd-merge to|__TARGET__|__DEBATE__|__DATE__|__TARGETTALK__}}\n",
alreadyClosed: "{{#ifeq:{{FULLPAGENAME}}|Wikipedia:Miscellany for deletion|"+
"{{collapse bottom}}|}}"
},
Expand Down Expand Up @@ -194,7 +194,7 @@ Venue.Tfd = () => {
wikitext: {
closeTop: "{{subst:Tfd top|'''__RESULT__'''}}__TO_TARGET____RATIONALE__ __SIG__",
closeBottom: "{{subst:Tfd bottom}}",
oldXfd: "{{oldtfdfull|date= __DATE__ |result=__RESULT__ |disc=__SECTION__}}\n",
oldXfd: "{{old tfd|date= __DATE__ |result=__RESULT__ |disc=__SECTION__}}\n",
pagelinks: "* {{tfd links|__PAGE__}}\n",
relistReplace: "Wikipedia:Templates for discussion/Log/__TODAY__#",
alreadyClosed: "<!-- Tfd top -->"
Expand Down Expand Up @@ -369,4 +369,4 @@ Venue.newFromPageName = function(pageName) {
};

export default Venue;
// </nowiki>
// </nowiki>
2 changes: 1 addition & 1 deletion xfdcloser-src/data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ const rcats = [
"R from fictional character",
"R from fictional element",
"R from fictional location",
"R to TV episode list entry"
"R from television episode"
]
},
{
Expand Down
Loading