Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions modules/friendlywelcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ Twinkle.welcome.normal = function() {
}
}
}
if (Morebits.relevantUserName() && !mw.util.isIPAddress(Morebits.relevantUserName())) {
if (Morebits.relevantUserName()) {
Twinkle.addPortletLink(function() {
Twinkle.welcome.callback(Morebits.relevantUserName());
Twinkle.welcome.callback(Morebits.relevantUserName() && !mw.util.isIPAddress(Morebits.relevantUserName()));
}, conv({ hans: '欢迎', hant: '歡迎' }), 'friendly-welcome', conv({ hans: '欢迎用户', hant: '歡迎使用者' }));
}
};
Expand Down Expand Up @@ -279,7 +279,7 @@ Twinkle.welcome.templates = {
}
}
};

/* eslint-enable quote-props */

Twinkle.welcome.getTemplateWikitext = function(type, template, article) {
// the iteration is required as the type=standard has two groups
Expand Down
2 changes: 1 addition & 1 deletion modules/twinklearv.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var conv = require('ext.gadget.HanAssist').conv;

Twinkle.arv = function twinklearv() {
var username = Morebits.relevantUserName(true);
// no report of IPs to protect TA's privacy issues, range not affected
// disable report of IP addresses, range is ok
if (!username || mw.util.isIPAddress(username)) {
return;
}
Expand Down
4 changes: 2 additions & 2 deletions modules/twinkleblock.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ Twinkle.block.callback = function twinkleblockCallback() {
tooltip: conv({ hans: '如果执行封禁的管理员忘记发出封禁模板,或你封禁了用户而没有给其发出模板,则你可以用此来发出合适的模板。勾选部分封禁以使用部分封禁模板。', hant: '如果執行封鎖的管理員忘記發出封鎖模板,或你封鎖了使用者而沒有給其發出模板,則你可以用此來發出合適的模板。勾選部分封鎖以使用部分封鎖模板。' }),
// Disallow when viewing the block dialog on an IP range
hidden: !Morebits.userIsSysop,
checked: Morebits.userIsSysop && !Morebits.ip.isRange(relevantUserName),
disabled: Morebits.ip.isRange(relevantUserName)
checked: Morebits.userIsSysop && !Morebits.ip.isRange(relevantUserName) && !mw.util.isIPAddress(relevantUserName, false),
disabled: Morebits.ip.isRange(relevantUserName) || mw.util.isIPAddress(relevantUserName, false)
},
{
label: conv({ hans: '标记用户页', hant: '標記使用者頁面' }),
Expand Down
3 changes: 2 additions & 1 deletion modules/twinklecopyvio.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ Twinkle.copyvio.callback = function twinklecopyvioCallback() {
value: 'notify',
name: 'notify',
tooltip: conv({ hans: '在页面创建者讨论页上放置一通知模板。', hant: '在頁面建立者討論頁上放置一通知模板。' }),
checked: true
checked: !mw.util.isIPAddress(Morebits.relevantUserName()),
disabled: mw.util.isIPAddress(Morebits.relevantUserName())
}
]
});
Expand Down
3 changes: 2 additions & 1 deletion modules/twinkleimage.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ Twinkle.image.callback = function twinkleimageCallback() {
value: 'notify',
name: 'notify',
tooltip: conv({ hans: '如果您在标记同一用户的很多文件,请取消此复选框以避免发送过多消息。CSD F6永远不会通知。', hant: '如果您在標記同一使用者的很多檔案,請取消此核取方塊以避免發送過多訊息。CSD F6永遠不會通知。' }),
checked: Twinkle.getPref('notifyUserOnDeli')
checked: Twinkle.getPref('notifyUserOnDeli') && !mw.util.isIPAddress(Morebits.relevantUserName()),
disabled: mw.util.isIPAddress(Morebits.relevantUserName())
}
]
}
Expand Down
7 changes: 4 additions & 3 deletions modules/twinklespeedy.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ Twinkle.speedy.initDialog = function twinklespeedyInitDialog(callbackfunc) {
cForm.openusertalk.checked = false;

// enable/disable notify checkbox
cForm.notify.disabled = !cChecked;
cForm.notify.checked = cChecked;
cForm.notify.disabled = !cChecked || mw.util.isIPAddress(Morebits.relevantUserName());
cForm.notify.checked = cChecked && !mw.util.isIPAddress(Morebits.relevantUserName());
// enable/disable multiple
cForm.multiple.disabled = !cChecked;
cForm.multiple.checked = false;
Expand Down Expand Up @@ -226,7 +226,8 @@ Twinkle.speedy.initDialog = function twinklespeedyInitDialog(callbackfunc) {
value: 'notify',
name: 'notify',
tooltip: conv({ hans: '一个通知模板将会被加入创建者的讨论页,如果您启用了该理据的通知。', hant: '一個通知模板將會被加入建立者的討論頁,如果您啟用了該理據的通知。' }),
checked: !Morebits.userIsSysop || !(Twinkle.speedy.hasCSD || Twinkle.getPref('deleteSysopDefaultToDelete')),
checked: !Morebits.userIsSysop || !(Twinkle.speedy.hasCSD || Twinkle.getPref('deleteSysopDefaultToDelete') || mw.util.isIPAddress(Morebits.relevantUserName())),
disabled: mw.util.isIPAddress(Morebits.relevantUserName()),
event: function(event) {
event.stopPropagation();
}
Expand Down
7 changes: 4 additions & 3 deletions modules/twinklexfd.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ Twinkle.xfd.callback = function twinklexfdCallback() {
value: 'notify',
name: 'notify',
tooltip: conv({ hans: '在页面创建者讨论页上放置一通知模板。', hant: '在頁面建立者討論頁上放置一通知模板。' }),
checked: true
checked: !mw.util.isIPAddress(Morebits.relevantUserName()),
disabled: mw.util.isIPAddress(Morebits.relevantUserName())
}
]
}
Expand Down Expand Up @@ -252,8 +253,8 @@ Twinkle.xfd.callback.change_category = function twinklexfdCallbackChangeCategory
}

// Return to checked state when switching
form.notify.checked = true;
form.notify.disabled = false;
form.notify.checked = !mw.util.isIPAddress(Morebits.relevantUserName());
form.notify.disabled = mw.util.isIPAddress(Morebits.relevantUserName());
};

Twinkle.xfd.getAfdBatchReason = function twinklexfdGetAfdBatchReason() {
Expand Down
8 changes: 0 additions & 8 deletions morebits.js
Original file line number Diff line number Diff line change
Expand Up @@ -2839,14 +2839,6 @@ Morebits.wiki.page = function(pageName, status) {
}
}

// do not edit legacy ip user talk pages, but csd request ok
if (new mw.Title(ctx.pageName).namespace === 3) {
if (mw.util.isIPAddress(new mw.Title(ctx.pageName).getMainText()) && !/[请請]求(\[\[WP:CSD\|)?快速[删刪]除/.test(ctx.editSummary)) {
ctx.statusElement.info(conv({ hans: '旧式IP的用户讨论页,跳过。', hant: '舊式IP的使用者討論頁,跳過。' }));
return;
}
}

// shouldn't happen if canUseMwUserToken === true
if (ctx.fullyProtected && !ctx.suppressProtectWarning &&
!confirm(
Expand Down
Loading