Skip to content

Update autowelcomer #184

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

Merged
mbch331 merged 4 commits into from
Feb 1, 2026
Merged

Update autowelcomer #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f1be01
Update autowelcomer
ItsNyoty Jan 31, 2026
7cb46d1
Uitleg subst:
ItsNyoty Jan 31, 2026
721c03b
Fix voor melding
ItsNyoty Feb 1, 2026
6b21637
Merge branch 'master' into master
mbch331 Feb 1, 2026
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
19 changes: 12 additions & 7 deletions modules/friendlywelcome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ Twinkle.welcome = function friendlywelcome() {

Twinkle.welcome.auto = function () {
// Use wgArticleId to check if the page exists
if (mw.config.get('wgArticleId') !== 0) {
/* if (mw.config.get('wgArticleId') !== 0) {
return;
}
} */

Twinkle.welcome.welcomeUser();
};
Expand All @@ -59,10 +59,10 @@ Twinkle.welcome.normal = function () {
const $oldDiffUsernameLine = $('#mw-diff-otitle2');
const $newDiffUsernameLine = $('#mw-diff-ntitle2');
const $oldDiffHasRedlinkedTalkPage = $oldDiffUsernameLine
.find('span.mw-usertoollinks a.new:contains(overleg)')
.find('span.mw-usertoollinks a:contains(overleg)')
.first();
const $newDiffHasRedlinkedTalkPage = $newDiffUsernameLine
.find('span.mw-usertoollinks a.new:contains(overleg)')
.find('span.mw-usertoollinks a:contains(overleg)')
.first();

if (
Expand Down Expand Up @@ -168,6 +168,11 @@ Twinkle.welcome.welcomeUser = function welcomeUser() {
mode: 'auto'
};

// If the page exists, force top placement
if (mw.config.get('wgArticleId') !== 0) {
params.top = true;
}

var userTalkPage =
mw.config.get('wgFormattedNamespaces')[3] +
':' +
Expand Down Expand Up @@ -509,22 +514,22 @@ Twinkle.welcome.callbacks = {
var text = pageobj.getPageText();

// abort if mode is auto and form is not empty
if (pageobj.exists() && params.mode === 'auto') {
/* if (pageobj.exists() && params.mode === 'auto') {
Morebits.status.info(
'Waarschuwing',
'Overlegpagina is niet leeg, sjabloon plaatsen afgebroken'
);
Morebits.wiki.actionCompleted.event();
return;
}
} */

var welcomeText = Twinkle.welcome.getTemplateWikitext(
params.type,
params.template,
params.article
);

if (Twinkle.getPref('topWelcomes')) {
if (Twinkle.getPref('topWelcomes') || params.top) {
text = welcomeText + '\n\n' + text;
} else {
text += '\n' + welcomeText;
Expand Down
2 changes: 1 addition & 1 deletion modules/twinkleconfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ Twinkle.config.sections = [
{
name: 'quickWelcomeTemplate',
label: 'Sjabloon dat gebruikt wordt bij automatische verwelkoming',
helptip: 'Geef de sjabloonpaginanaam, zonder accolades. Een link naar de pagina zal automatisch toegevoegd worden.',
helptip: 'Geef de sjabloonpaginanaam, zonder accolades. Een link naar de pagina zal automatisch toegevoegd worden. Als het sjabloon gesubstitueerd moet worden, plaatst er dan <code>subst:</code> voor.',
type: 'string'
},
{
Expand Down
8 changes: 2 additions & 6 deletions modules/twinklespeedy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,9 +1290,7 @@ Twinkle.speedy.callback.evaluateSysop = function twinklespeedyCallbackEvaluateSy
}
});

var warnusertalk = form.warnusertalk.checked && normalizeds.some(function (norm) {
return Twinkle.getPref('warnUserOnSpeedyDelete').indexOf(norm) !== -1;
});
var warnusertalk = form.warnusertalk.checked;

var welcomeuser = warnusertalk && normalizeds.some(function (norm) {
return Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1;
Expand Down Expand Up @@ -1353,9 +1351,7 @@ Twinkle.speedy.callback.evaluateUser = function twinklespeedyCallbackEvaluateUse
return Twinkle.getPref('watchSpeedyPages').indexOf(csdCriteria) !== -1;
}) && Twinkle.getPref('watchSpeedyExpiry');

var notifyuser = form.notify.checked && normalizeds.some(function(norm) {
return Twinkle.getPref('notifyUserOnSpeedyDeletionNomination').indexOf(norm) !== -1;
});
var notifyuser = form.notify.checked;
var welcomeuser = notifyuser && normalizeds.some(function(norm) {
return Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1;
});
Expand Down
1 change: 1 addition & 0 deletions modules/twinklexfd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,7 @@ Twinkle.xfd.callback.evaluate = function(e) {
var form = e.target;

var params = Morebits.quickForm.getInputData(form);
params.notifycreator = form.notifycreator.checked;

Morebits.simpleWindow.setButtonsEnabled(false);
Morebits.status.init(form);
Expand Down