diff --git a/package.json b/package.json index 44f504fa..78a3bd4e 100755 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ { "name": "frankerfacez", "author": "Dan Salvato LLC", - "version": "4.20.77", + "version": "4.20.78", "description": "FrankerFaceZ is a Twitch enhancement suite.", + "private": true, "license": "Apache-2.0", "scripts": { "start": "webpack-dev-server --config webpack.web.dev.js", diff --git a/src/addons.js b/src/addons.js index bab92d9e..d405bb70 100644 --- a/src/addons.js +++ b/src/addons.js @@ -173,6 +173,12 @@ export default class AddonManager extends Module { addon.requires = addon.requires || []; addon.required_by = Array.isArray(old) ? old : old && old.required_by || []; + if ( addon.updated ) + addon.updated = new Date(addon.updated); + + if ( addon.created ) + addon.created = new Date(addon.created); + addon._search = addon.search_terms; for(const id of addon.requires) { diff --git a/src/modules/main_menu/components/addon-list.vue b/src/modules/main_menu/components/addon-list.vue index 535a2890..de213704 100644 --- a/src/modules/main_menu/components/addon-list.vue +++ b/src/modules/main_menu/components/addon-list.vue @@ -18,8 +18,20 @@ -
-
+
+
+ + +
@@ -106,6 +121,7 @@ export default { ready: this.item.isReady(), reload: this.item.isReloadRequired(), unlisted: [], + filter_enabled: false, sort_by: 0, unlisted_open: false } @@ -123,6 +139,10 @@ export default { if ( this.sort_by === 1 ) { if ( a.updated > b.updated ) return -1; if ( b.updated > a.updated ) return 1; + + } else if ( this.sort_by === 2 ) { + if ( a.created > b.created ) return -1; + if ( b.created > a.created ) return 1; } if ( a.sort < b.sort ) return -1; @@ -179,7 +199,11 @@ export default { shouldShow(addon) { // If an add-on is unlisted, don't list it. - if ( addon.unlisted && ! this.item.isAddonEnabled(addon.id) && ! this.unlisted.includes(addon.id) ) + const enabled = this.item.isAddonEnabled(addon.id); + if ( addon.unlisted && ! enabled && ! this.unlisted.includes(addon.id) ) + return false; + + if ( this.filter_enabled && ! enabled ) return false; if ( ! this.filter || ! this.filter.length ) diff --git a/src/modules/main_menu/components/addon.vue b/src/modules/main_menu/components/addon.vue index e6133ac0..06baae09 100644 --- a/src/modules/main_menu/components/addon.vue +++ b/src/modules/main_menu/components/addon.vue @@ -42,12 +42,19 @@ {{ t('addon.version', 'Version {version}', {version}) }} {{ t('addon.updated', 'Updated: {when,humantime}', {when: addon.updated}) }} + + {{ t('addon.created', 'Created: {when,date}', {when: addon.created}) }} +