Skip to content

Commit 37a4110

Browse files
authored
Do not modify legacy IP user talk page (#368)
1 parent 9723c0b commit 37a4110

6 files changed

Lines changed: 16 additions & 7 deletions

File tree

modules/friendlytalkback.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var conv = require('ext.gadget.HanAssist').conv;
1717

1818
Twinkle.talkback = function() {
1919

20-
if (!Morebits.relevantUserName()) {
20+
if (!Morebits.relevantUserName() || mw.util.isIPAddress(Morebits.relevantUserName())) {
2121
return;
2222
}
2323

modules/friendlywelcome.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Twinkle.welcome.normal = function() {
8686
}
8787
}
8888
}
89-
if (Morebits.relevantUserName()) {
89+
if (Morebits.relevantUserName() && !mw.util.isIPAddress(Morebits.relevantUserName())) {
9090
Twinkle.addPortletLink(function() {
9191
Twinkle.welcome.callback(Morebits.relevantUserName());
9292
}, conv({ hans: '欢迎', hant: '歡迎' }), 'friendly-welcome', conv({ hans: '欢迎用户', hant: '歡迎使用者' }));
@@ -279,7 +279,7 @@ Twinkle.welcome.templates = {
279279
}
280280
}
281281
};
282-
/* eslint-enable quote-props */
282+
283283

284284
Twinkle.welcome.getTemplateWikitext = function(type, template, article) {
285285
// the iteration is required as the type=standard has two groups

modules/twinklearv.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ var conv = require('ext.gadget.HanAssist').conv;
1616

1717
Twinkle.arv = function twinklearv() {
1818
var username = Morebits.relevantUserName(true);
19-
if (!username) {
19+
// no report of IPs to protect TA's privacy issues, range not affected
20+
if (!username || mw.util.isIPAddress(username)) {
2021
return;
2122
}
2223

modules/twinkleblock.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ Twinkle.block.callback = function twinkleblockCallback() {
103103
tooltip: conv({ hans: '如果执行封禁的管理员忘记发出封禁模板,或你封禁了用户而没有给其发出模板,则你可以用此来发出合适的模板。勾选部分封禁以使用部分封禁模板。', hant: '如果執行封鎖的管理員忘記發出封鎖模板,或你封鎖了使用者而沒有給其發出模板,則你可以用此來發出合適的模板。勾選部分封鎖以使用部分封鎖模板。' }),
104104
// Disallow when viewing the block dialog on an IP range
105105
hidden: !Morebits.userIsSysop,
106-
checked: Morebits.userIsSysop && !Morebits.ip.isRange(relevantUserName) && !mw.util.isIPAddress(relevantUserName, false),
107-
disabled: Morebits.ip.isRange(relevantUserName) || mw.util.isIPAddress(relevantUserName, false)
106+
checked: Morebits.userIsSysop && !Morebits.ip.isRange(relevantUserName),
107+
disabled: Morebits.ip.isRange(relevantUserName)
108108
},
109109
{
110110
label: conv({ hans: '标记用户页', hant: '標記使用者頁面' }),

modules/twinklewarn.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var conv = require('ext.gadget.HanAssist').conv, initialBlockId, initialBlockInf
1717

1818
Twinkle.warn = function twinklewarn() {
1919

20-
if (Morebits.relevantUserName()) {
20+
if (Morebits.relevantUserName() && !mw.util.isIPAddress(Morebits.relevantUserName())) {
2121
Twinkle.addPortletLink(Twinkle.warn.callback, '警告', 'tw-warn', conv({ hans: '警告或提醒用户', hant: '警告或提醒使用者' }));
2222
if (Twinkle.getPref('autoMenuAfterRollback') &&
2323
mw.config.get('wgNamespaceNumber') === 3 &&

morebits.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2839,6 +2839,14 @@ Morebits.wiki.page = function(pageName, status) {
28392839
}
28402840
}
28412841

2842+
// do not edit legacy ip user talk pages
2843+
if (new mw.Title(ctx.pageName).namespace === 3) {
2844+
if (mw.util.isIPAddress(new mw.Title(ctx.pageName).getMainText())) {
2845+
ctx.statusElement.info(conv({ hans: '旧式IP的用户讨论页,跳过。', hant: '舊式IP的使用者討論頁,跳過。' }));
2846+
return;
2847+
}
2848+
}
2849+
28422850
// shouldn't happen if canUseMwUserToken === true
28432851
if (ctx.fullyProtected && !ctx.suppressProtectWarning &&
28442852
!confirm(

0 commit comments

Comments
 (0)