From 37235b328f6a7e9bf3b15e4e307390debdc96d51 Mon Sep 17 00:00:00 2001 From: sogehige Date: Mon, 7 Dec 2020 16:14:49 +0100 Subject: [PATCH] fix(viewers): add safeguard before viewers are saved (#4417) Fixes https://community.sogebot.xyz/t/ui-manage-viewers-set-huge-amount-of-points-if-points-are-empty/211 --- src/bot/helpers/dayjs.ts | 2 + src/panel/index.ts | 5 +- src/panel/views/managers/viewers.vue | 1057 +++++++++++++++++ .../views/managers/viewers/viewers-edit.vue | 607 ---------- .../views/managers/viewers/viewers-list.vue | 360 ------ 5 files changed, 1062 insertions(+), 969 deletions(-) create mode 100644 src/panel/views/managers/viewers.vue delete mode 100644 src/panel/views/managers/viewers/viewers-edit.vue delete mode 100644 src/panel/views/managers/viewers/viewers-list.vue diff --git a/src/bot/helpers/dayjs.ts b/src/bot/helpers/dayjs.ts index 2eeedf74d72..68f3a1db1e4 100644 --- a/src/bot/helpers/dayjs.ts +++ b/src/bot/helpers/dayjs.ts @@ -2,11 +2,13 @@ import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import relativeTime from 'dayjs/plugin/relativeTime'; import localizedFormat from 'dayjs/plugin/localizedFormat'; +import customParseFormat from 'dayjs/plugin/customParseFormat'; import { default as tz } from 'dayjs/plugin/timezone'; dayjs.extend(utc); dayjs.extend(tz); dayjs.extend(relativeTime); dayjs.extend(localizedFormat); +dayjs.extend(customParseFormat); require('dayjs/locale/cs'); require('dayjs/locale/de'); diff --git a/src/panel/index.ts b/src/panel/index.ts index 0dcdf393214..ec55bba1684 100644 --- a/src/panel/index.ts +++ b/src/panel/index.ts @@ -137,8 +137,9 @@ const main = async () => { { path: '/manage/spotify/bannedsongs', name: 'spotifyManagerBannedsongs', component: () => import('./views/managers/spotify/spotify-bannedsongs.vue') }, { path: '/manage/timers/list', name: 'TimersManagerList', component: () => import('./views/managers/timers/timers-list.vue') }, { path: '/manage/timers/edit/:id?', name: 'TimersManagerEdit', component: () => import('./views/managers/timers/timers-edit.vue') }, - { path: '/manage/viewers/list', name: 'viewersManagerList', component: () => import('./views/managers/viewers/viewers-list.vue') }, - { path: '/manage/viewers/edit/:id?', name: 'viewersManagerEdit', component: () => import('./views/managers/viewers/viewers-edit.vue') }, + { path: '/manage/viewers/', redirect: '/manage/viewers/list' }, + { path: '/manage/viewers/list', name: 'viewersManagerList', component: () => import('./views/managers/viewers.vue') }, + { path: '/manage/viewers/edit/:id?', name: 'viewersManagerEdit', component: () => import('./views/managers/viewers.vue') }, { path: '/settings/permissions/:id?', name: 'PermissionsSettings', component: () => import('./views/settings/permissions.vue') }, { path: '/settings/translations', name: 'TranslationsSettings', component: () => import('./views/settings/translations.vue') }, diff --git a/src/panel/views/managers/viewers.vue b/src/panel/views/managers/viewers.vue new file mode 100644 index 00000000000..983fcce429b --- /dev/null +++ b/src/panel/views/managers/viewers.vue @@ -0,0 +1,1057 @@ + + + diff --git a/src/panel/views/managers/viewers/viewers-edit.vue b/src/panel/views/managers/viewers/viewers-edit.vue deleted file mode 100644 index 1de89e1c320..00000000000 --- a/src/panel/views/managers/viewers/viewers-edit.vue +++ /dev/null @@ -1,607 +0,0 @@ - - - \ No newline at end of file diff --git a/src/panel/views/managers/viewers/viewers-list.vue b/src/panel/views/managers/viewers/viewers-list.vue deleted file mode 100644 index 6893a13dcf8..00000000000 --- a/src/panel/views/managers/viewers/viewers-list.vue +++ /dev/null @@ -1,360 +0,0 @@ - - -