oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-06-28 15:27:43 +00:00
Code Wiki Activity

3.5.330. Refactor timeout and ban notices. Add the ability to click the name of banned users in timeout notices. Fix logviewer dynamic updates. Reformat logviewer ban notices to match the rest of FFZ. Fix a memory leak in room. Fix an infinite loop in notifications.

Browse source
This commit is contained in:
SirStendec 2016-10-14 20:43:34 -04:00
parent 13efe21492
commit 36f0b33d04
13 changed files with 389 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/utils.js
View file

@ -70,6 +70,8 @@ var createElement = function(tag, className, content) {
return num + "th";
},
lv_duration_regex = / ?(\d+) ?(\w+)/g,
date_regex = /^(\d{4}|\+\d{6})(?:-?(\d{2})(?:-?(\d{2})(?:T(\d{2})(?::?(\d{2})(?::?(\d{2})(?:(?:\.|,)(\d{1,}))?)?)?(Z|([\-+])(\d{2})(?::?(\d{2}))?)?)?)?)?$/,
parse_date = function(str) {
@ -873,10 +875,33 @@ module.exports = FFZ.utils = {
minutes = Math.floor(seconds / 60);
seconds %= 60;
var out = DURATIONS[val] = (weeks ? weeks + 'w' : '') + ((days || (weeks && (hours || minutes || seconds))) ? days + 'd' : '') + ((hours || ((weeks || days) && (minutes || seconds))) ? hours + 'h' : '') + ((minutes || ((weeks || days || hours) && seconds)) ? minutes + 'm' : '') + (seconds ? seconds + 's' : '');
var out = DURATIONS[val] = (weeks ? weeks + 'w' : '') +
(days ? days + 'd' : '') +
(hours ? hours + 'h' : '') +
(minutes ? minutes + 'm' : '') +
(seconds ? seconds + 's' : '');
return out;
},
parse_lv_duration: function(input) {
var match, value = 0;
while(match = lv_duration_regex.exec(input)) {
var mod = match[2],
val = parseInt(match[1]);
if ( mod === 'd' )
value += val * 86400;
else if ( mod === 'hrs' )
value += val * 3600;
else if ( mod === 'min' )
value += val * 60;
else if ( mod === 'sec' )
value += val;
}
return value;
},
format_unread: function(count) {
if ( count < 1 )
return "";