Skip to content

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

Merge branch 'mc'

parents a22baf80 c2758819
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 22 deletions
ygopro-server.coffee
View file @ f11b5b10
...@@ -2086,21 +2086,21 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)-> ...@@ -2086,21 +2086,21 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return room_title.match(regexp) return room_title.match(regexp)
, room_title) , room_title)
log.warn("BAD NAME LEVEL 3", room_title, client.name, client.ip) log.warn("BAD ROOM NAME LEVEL 3", room_title, client.name, client.ip)
ygopro.stoc_die(client, "${bad_roomname_level3}") ygopro.stoc_die(client, "${bad_roomname_level3}")
return return
else if _.any(badwords.level2, (badword) -> else if _.any(badwords.level2, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return room_title.match(regexp) return room_title.match(regexp)
, room_title) , room_title)
log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip) log.warn("BAD ROOM NAME LEVEL 2", room_title, client.name, client.ip)
ygopro.stoc_die(client, "${bad_roomname_level2}") ygopro.stoc_die(client, "${bad_roomname_level2}")
return return
else if _.any(badwords.level1, (badword) -> else if _.any(badwords.level1, (badword) ->
regexp = new RegExp(badword, 'i') regexp = new RegExp(badword, 'i')
return room_title.match(regexp) return room_title.match(regexp)
, room_title) , room_title)
log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip) log.warn("BAD ROOM NAME LEVEL 1", room_title, client.name, client.ip)
ygopro.stoc_die(client, "${bad_roomname_level1}") ygopro.stoc_die(client, "${bad_roomname_level1}")
return return
room = new Room(name, options) room = new Room(name, options)
......
ygopro-server.js
View file @ f11b5b10
...@@ -2605,11 +2605,7 @@ ...@@ -2605,11 +2605,7 @@
return (checksum & 0xFF) === 0; return (checksum & 0xFF) === 0;
}; };
buffer_handle_callback = function(buffer, decrypted_buffer, match_permit) { 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, 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) { if (client.closed) {
return; return;
} }
...@@ -2652,36 +2648,24 @@ ...@@ -2652,36 +2648,24 @@
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return room_title.match(regexp); return room_title.match(regexp);
}, room_title)) { }, room_title)) {
log.warn("BAD NAME LEVEL 3", room_title, client.name, client.ip); log.warn("BAD ROOM NAME LEVEL 3", room_title, client.name, client.ip);
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level3}");
=======
ygopro.stoc_die(client, "${bad_roomname_level3}"); ygopro.stoc_die(client, "${bad_roomname_level3}");
>>>>>>> mc
return; return;
} else if (_.any(badwords.level2, function(badword) { } else if (_.any(badwords.level2, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return room_title.match(regexp); return room_title.match(regexp);
}, room_title)) { }, room_title)) {
log.warn("BAD NAME LEVEL 2", room_title, client.name, client.ip); log.warn("BAD ROOM NAME LEVEL 2", room_title, client.name, client.ip);
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level2}");
=======
ygopro.stoc_die(client, "${bad_roomname_level2}"); ygopro.stoc_die(client, "${bad_roomname_level2}");
>>>>>>> mc
return; return;
} else if (_.any(badwords.level1, function(badword) { } else if (_.any(badwords.level1, function(badword) {
var regexp; var regexp;
regexp = new RegExp(badword, 'i'); regexp = new RegExp(badword, 'i');
return room_title.match(regexp); return room_title.match(regexp);
}, room_title)) { }, room_title)) {
log.warn("BAD NAME LEVEL 1", room_title, client.name, client.ip); log.warn("BAD ROOM NAME LEVEL 1", room_title, client.name, client.ip);
<<<<<<< HEAD
ygopro.stoc_die(client, "${bad_name_level1}");
=======
ygopro.stoc_die(client, "${bad_roomname_level1}"); ygopro.stoc_die(client, "${bad_roomname_level1}");
>>>>>>> mc
return; return;
} }
room = new Room(name, options); room = new Room(name, options);
......
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