diff --git a/src/bot/database/entity/cooldown.ts b/src/bot/database/entity/cooldown.ts index 198b5d4debd..d4be4bb2a92 100644 --- a/src/bot/database/entity/cooldown.ts +++ b/src/bot/database/entity/cooldown.ts @@ -3,9 +3,12 @@ import { ColumnNumericTransformer } from './_transformer'; export interface CooldownInterface { id?: string; - name: string; + value: string[]; miliseconds: number; + usageLimit: number; type: 'global' | 'user'; + pool: 'per-item' | 'shared'; + wipeType: 'full' | 'full-last' | 'gradual'; timestamp?: number; isErrorMsgQuiet: boolean; isEnabled: boolean; @@ -27,7 +30,7 @@ export const Cooldown = new EntitySchema>>( name: 'cooldown', columns: { id: { type: 'uuid', primary: true, generated: 'uuid' }, - name: { type: String }, + value: { type: 'simple-json' }, miliseconds: { type: Number }, type: { type: 'varchar', length: 10 }, timestamp: { type: 'bigint', transformer: new ColumnNumericTransformer(), default: 0 }, diff --git a/src/bot/message.ts b/src/bot/message.ts index 489ae3518e7..9b179c72368 100644 --- a/src/bot/message.ts +++ b/src/bot/message.ts @@ -614,8 +614,9 @@ class Message { })).sort().join(', '); case 'cooldown': listOutput = _.map(cooldowns, function (o, k) { - const time = o.miliseconds; - return o.name + ': ' + (time / 1000) + 's'; + // const time = o.miliseconds; + // return o.name + ': ' + (time / 1000) + 's'; + return ''; }).sort().join(', '); return listOutput.length > 0 ? listOutput : ' '; case 'price': diff --git a/src/panel/views/managers/cooldowns/components/global-permission-to-apply.vue b/src/panel/views/managers/cooldowns/components/global-permission-to-apply.vue new file mode 100644 index 00000000000..aebcb6c3bb8 --- /dev/null +++ b/src/panel/views/managers/cooldowns/components/global-permission-to-apply.vue @@ -0,0 +1,58 @@ + + + diff --git a/src/panel/views/managers/cooldowns/components/name.vue b/src/panel/views/managers/cooldowns/components/name.vue new file mode 100644 index 00000000000..c9eab8a6b73 --- /dev/null +++ b/src/panel/views/managers/cooldowns/components/name.vue @@ -0,0 +1,65 @@ + + + diff --git a/src/panel/views/managers/cooldowns/cooldowns-edit.vue b/src/panel/views/managers/cooldowns/cooldowns-edit.vue new file mode 100644 index 00000000000..5eaf817cabc --- /dev/null +++ b/src/panel/views/managers/cooldowns/cooldowns-edit.vue @@ -0,0 +1,267 @@ + + \ No newline at end of file diff --git a/src/panel/views/managers/cooldowns/cooldowns-list.vue b/src/panel/views/managers/cooldowns/cooldowns-list.vue new file mode 100644 index 00000000000..a8df0e44135 --- /dev/null +++ b/src/panel/views/managers/cooldowns/cooldowns-list.vue @@ -0,0 +1,145 @@ + + + \ No newline at end of file