Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI (settings): Add Duration default unit.

Browse Source
This commit is contained in:
Conatum
2021-09-27 10:54:48 +03:00
parent 877db72b22
commit 6b90f1af8e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bot/modules/moderation/video/admin.py
View File

@@ -107,6 +107,7 @@ class video_grace_period(settings.Duration, GuildSetting):
) )
_default = 45 _default = 45
_default_multiplier = 1
@classmethod @classmethod
def _format_data(cls, id: int, data, **kwargs): def _format_data(cls, id: int, data, **kwargs):

9
bot/settings/setting_types.py
View File

@@ -614,6 +614,10 @@ class Duration(SettingType):
_max = 60 * 60 * 24 * 365 _max = 60 * 60 * 24 * 365
_min = None _min = None
# Default multiplier when the number is provided alone
# 1 for seconds, 60 from minutes, etc
_default_multiplier = None
# Whether to allow empty durations # Whether to allow empty durations
# This is particularly useful since the duration parser will return 0 for most non-duration strings # This is particularly useful since the duration parser will return 0 for most non-duration strings
allow_zero = False allow_zero = False
@@ -642,10 +646,13 @@ class Duration(SettingType):
if userstr.lower() == "none": if userstr.lower() == "none":
return None return None
if cls._default_multiplier and userstr.isdigit():
num = int(userstr) * cls._default_multiplier
else:
num = parse_dur(userstr) num = parse_dur(userstr)
if num == 0 and not cls.allow_zero: if num == 0 and not cls.allow_zero:
raise UserInputError("The provided duration cannot be `0`!") raise UserInputError("The provided duration cannot be `0`! (Please enter in the format `1d 2h 3m 4s`.)")
if cls._max is not None and num > cls._max: if cls._max is not None and num > cls._max:
raise UserInputError("Duration cannot be longer than `{}`!".format(strfdur(cls._max))) raise UserInputError("Duration cannot be longer than `{}`!".format(strfdur(cls._max)))