Skip to content

S
srvpro
Commit e42fcc36 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'mc'

parents dc731dad 65159308
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 7 deletions
data/i18n.json
View file @ e42fcc36
......@@ -47,6 +47,9 @@
"bad_name_level3": "Your ID contains illegal words.",
"bad_name_level2": "Your ID contains illegal words.",
"bad_name_level1": "Your ID contains inappropriate words.",
"bad_roomname_level3": "Your room name contains illegal words.",
"bad_roomname_level2": "Your room name contains illegal words.",
"bad_roomname_level1": "Your room name contains inappropriate words.",
"invalid_password_room": "Password incorrect",
"outdated_client": "You are currently using an outdated client, unknown errors may occur, please update.",
"watch_join": "joined as spectator.",
......@@ -386,6 +389,9 @@
"bad_name_level3": "您的用户名存在不适当的内容",
"bad_name_level2": "您的用户名存在不适当的内容",
"bad_name_level1": "您的用户名存在不适当的内容，请注意更改",
"bad_roomname_level3": "您的房间名存在不适当的内容",
"bad_roomname_level2": "您的房间名存在不适当的内容",
"bad_roomname_level1": "您的房间名存在不适当的内容，请注意更改",
"invalid_password_room": "房间密码不正确",
"outdated_client": "您的版本号过低，可能出现未知问题，请升级版本",
"watch_join": "加入了观战",
......
ygopro-server.coffee
View file @ e42fcc36
......@@ -2087,21 +2087,29 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
return room_title.match(regexp)
, room_title)
log.warn("BAD NAME LEVEL 3", room_title, client.name, client.ip)
ygopro.stoc_die(client, "${bad_name_level3}")
ygopro.stoc_die(client, "${bad_roomname_level3}")
return
else if _.any(badwords.level2, (badword) ->
regexp = new RegExp(badword, 'i')
return room_title.match(regexp)
, room_title)
log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip)
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level2}")
=======
ygopro.stoc_die(client, "${bad_roomname_level2}")
>>>>>>> mc
return
else if _.any(badwords.level1, (badword) ->
regexp = new RegExp(badword, 'i')
return room_title.match(regexp)
, room_title)
log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip)
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level1}")
=======
ygopro.stoc_die(client, "${bad_roomname_level1}")
>>>>>>> mc
return
room = new Room(name, options)
if room
......@@ -2345,21 +2353,21 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
log.warn("BANNED IP LOGIN", client.name, client.ip)
ygopro.stoc_die(client, "${banned_ip_login}")
else if _.any(badwords.level3, (badword) ->
else if !settings.modules.tournament_mode.enabled and !settings.modules.challonge.enabled and _.any(badwords.level3, (badword) ->
regexp = new RegExp(badword, 'i')
return name.match(regexp)
, name = client.name)
log.warn("BAD NAME LEVEL 3", client.name, client.ip)
ygopro.stoc_die(client, "${bad_name_level3}")
else if _.any(badwords.level2, (badword) ->
else if !settings.modules.tournament_mode.enabled and !settings.modules.challonge.enabled and _.any(badwords.level2, (badword) ->
regexp = new RegExp(badword, 'i')
return name.match(regexp)
, name = client.name)
log.warn("BAD NAME LEVEL 2", client.name, client.ip)
ygopro.stoc_die(client, "${bad_name_level2}")
else if _.any(badwords.level1, (badword) ->
else if !settings.modules.tournament_mode.enabled and !settings.modules.challonge.enabled and _.any(badwords.level1, (badword) ->
regexp = new RegExp(badword, 'i')
return name.match(regexp)
, name = client.name)
......
ygopro-server.js
View file @ e42fcc36
......@@ -2605,7 +2605,11 @@
return (checksum & 0xFF) === 0;
};
buffer_handle_callback = function(buffer, decrypted_buffer, match_permit) {
<<<<<<< HEAD
var action, len2, len3, len4, len5, line, m, n, name, o, opt1, opt2, opt3, options, p, player, ref3, ref4, ref5, ref6, room, room_title, title;
=======
var action, len2, len3, m, n, name, opt1, opt2, opt3, options, player, ref2, ref3, room, room_title, title;
>>>>>>> mc
if (client.closed) {
return;
}
......@@ -2649,7 +2653,11 @@
return room_title.match(regexp);
}, room_title)) {
log.warn("BAD NAME LEVEL 3", room_title, client.name, client.ip);
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level3}");
=======
ygopro.stoc_die(client, "${bad_roomname_level3}");
>>>>>>> mc
return;
} else if (_.any(badwords.level2, function(badword) {
var regexp;
......@@ -2657,7 +2665,11 @@
return room_title.match(regexp);
}, room_title)) {
log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip);
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level2}");
=======
ygopro.stoc_die(client, "${bad_roomname_level2}");
>>>>>>> mc
return;
} else if (_.any(badwords.level1, function(badword) {
var regexp;
......@@ -2665,7 +2677,11 @@
return room_title.match(regexp);
}, room_title)) {
log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip);
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level1}");
=======
ygopro.stoc_die(client, "${bad_roomname_level1}");
>>>>>>> mc
return;
}
room = new Room(name, options);
......@@ -2975,21 +2991,21 @@
} else if (_.indexOf(settings.ban.banned_ip, client.ip) > -1) {
log.warn("BANNED IP LOGIN", client.name, client.ip);
ygopro.stoc_die(client, "${banned_ip_login}");
} else if (_.any(badwords.level3, function(badword) {
} else if (!settings.modules.tournament_mode.enabled && !settings.modules.challonge.enabled && _.any(badwords.level3, function(badword) {
var regexp;
regexp = new RegExp(badword, 'i');
return name.match(regexp);
}, name = client.name)) {
log.warn("BAD NAME LEVEL 3", client.name, client.ip);
ygopro.stoc_die(client, "${bad_name_level3}");
} else if (_.any(badwords.level2, function(badword) {
} else if (!settings.modules.tournament_mode.enabled && !settings.modules.challonge.enabled && _.any(badwords.level2, function(badword) {
var regexp;
regexp = new RegExp(badword, 'i');
return name.match(regexp);
}, name = client.name)) {
log.warn("BAD NAME LEVEL 2", client.name, client.ip);
ygopro.stoc_die(client, "${bad_name_level2}");
} else if (_.any(badwords.level1, function(badword) {
} else if (!settings.modules.tournament_mode.enabled && !settings.modules.challonge.enabled && _.any(badwords.level1, function(badword) {
var regexp;
regexp = new RegExp(badword, 'i');
return name.match(regexp);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment