Commit 17c94bf7 authored by nanahira's avatar nanahira

Merge branch 'mc'

parents b4effa64 1cda131d
Pipeline #5171 failed with stages
in 52 minutes and 21 seconds
......@@ -492,9 +492,9 @@ init = () ->
badwordR.level3=new RegExp('(?:'+badwords.level3.join(')|(?:')+')','i');
setInterval ()->
moment_now = moment()
moment_now_string = moment_now.format()
moment_long_ago_string = moment().subtract(settings.modules.random_duel.hang_timeout - 19, 's').format()
moment_now = global.moment_now = moment()
moment_now_string = global.moment_now_string = moment_now.format()
moment_long_ago_string = global.moment_long_ago_string = moment().subtract(settings.modules.random_duel.hang_timeout - 19, 's').format()
return
, 500
......
......@@ -624,9 +624,9 @@
badwordR.level2 = new RegExp('(?:' + badwords.level2.join(')|(?:') + ')', 'i');
badwordR.level3 = new RegExp('(?:' + badwords.level3.join(')|(?:') + ')', 'i');
setInterval(function() {
moment_now = moment();
moment_now_string = moment_now.format();
moment_long_ago_string = moment().subtract(settings.modules.random_duel.hang_timeout - 19, 's').format();
moment_now = global.moment_now = moment();
moment_now_string = global.moment_now_string = moment_now.format();
moment_long_ago_string = global.moment_long_ago_string = moment().subtract(settings.modules.random_duel.hang_timeout - 19, 's').format();
}, 500);
if (settings.modules.max_rooms_count) {
rooms_count = 0;
......
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