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.400. Add support for follower-only chat mode. Dark theme CSS tweaks for the dashboard and chat settings menu. Remove the uptime correction for the dashboard since Twitch fixed their formatting.

Browse source
This commit is contained in:
SirStendec 2016-12-16 14:31:23 -05:00
parent 48f2f331b7
commit c12d240fbd
7 changed files with 42 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/utils.js
View file

@ -965,11 +965,11 @@ module.exports = FFZ.utils = {
return (days||'') + ((!no_hours || days || hours) ? ((days && hours < 10 ? "0" : "") + hours + ':') : '') + (minutes < 10 ? "0" : "") + minutes + (no_seconds ? "" : (":" + (seconds < 10 ? "0" : "") + seconds));
},
duration_string: function(val, no_purge) {
duration_string: function(val, no_purge, full_names) {
if ( ! no_purge && val === 1 )
return 'Purge';
if ( DURATIONS[val] )
if ( ! full_names && DURATIONS[val] )
return DURATIONS[val];
var weeks, days, hours, minutes, seconds;
@ -986,12 +986,16 @@ module.exports = FFZ.utils = {
minutes = Math.floor(seconds / 60);
seconds %= 60;
var out = DURATIONS[val] = (weeks ? weeks + 'w' : '') +
(days ? days + 'd' : '') +
(hours ? hours + 'h' : '') +
(minutes ? minutes + 'm' : '') +
(seconds ? seconds + 's' : '');
var out = (weeks ? weeks + (full_names ? ' week' + pluralize(weeks) + ', ' : 'w') : '') +
(days ? days + (full_names ? ' day' + pluralize(days) + ', ' : 'd') : '') +
(hours ? hours + (full_names ? ' hour' + pluralize(hours) + ', ' : 'h') : '') +
(minutes ? minutes + (full_names ? ' minute' + pluralize(minutes) + ', ' : 'm') : '') +
(seconds ? seconds + (full_names ? ' second' + pluralize(seconds) + ', ' : 's') : '');
if ( full_names )
return out.substr(0, out.length - 2);
DURATIONS[val] = out;
return out;
},