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

feat: Add timezone parsing to msgeditor.

Browse Source
This commit is contained in:
Interitio
2024-08-31 08:40:11 +10:00
parent 3e45310095
commit 0377695d3c
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/utils/ui/msgeditor.py
View File

@@ -54,7 +54,10 @@ class MsgEditor(MessageUI):
By default, uses the provided `formatter` callback (if provided). By default, uses the provided `formatter` callback (if provided).
""" """
if self._formatter is not None: if self._formatter is not None:
await self._formatter(data) return await self._formatter(data)
else:
return data
def copy_data(self): def copy_data(self):
return copy.deepcopy(self.history[-1]) return copy.deepcopy(self.history[-1])
@@ -64,15 +67,8 @@ class MsgEditor(MessageUI):
async def push_change(self, new_data): async def push_change(self, new_data):
# Cleanup the data # Cleanup the data
if 'embed' in new_data: if (embed_data := new_data.get('embed', None)) is not None and not embed_data:
pop_embed = True new_data.pop('embed')
embed_data = new_data['embed']
for key, value in embed_data.items():
if value:
pop_embed = False
break
if pop_embed:
new_data.pop('embed')
t = self.bot.translator.t t = self.bot.translator.t
if 'embed' not in new_data and not new_data.get('content', None): if 'embed' not in new_data and not new_data.get('content', None):
@@ -85,7 +81,8 @@ class MsgEditor(MessageUI):
if 'embed' in new_data: if 'embed' in new_data:
try: try:
discord.Embed.from_dict(new_data['embed']) formatted_data = copy.deepcopy(new_data)
discord.Embed.from_dict(await self.format_data(formatted_data['embed']))
except Exception as e: except Exception as e:
raise UserInputError( raise UserInputError(
t(_p( t(_p(
@@ -261,7 +258,7 @@ class MsgEditor(MessageUI):
default=str(discord.Colour(value=embed_data['color'])) if 'color' in embed_data else '', default=str(discord.Colour(value=embed_data['color'])) if 'color' in embed_data else '',
placeholder=str(discord.Colour.orange()), placeholder=str(discord.Colour.orange()),
max_length=7, max_length=7,
min_length=0 min_length=7
) )
modal = MsgEditorInput( modal = MsgEditorInput(
@@ -452,8 +449,17 @@ class MsgEditor(MessageUI):
embed_data.pop('footer', None) embed_data.pop('footer', None)
if (ts := timestamp_field.value): if (ts := timestamp_field.value):
if ts.isdigit():
# Treat as UTC timestamp
timestamp = dt.datetime.fromtimestamp(int(ts), dt.timezone.utc)
ts = timestamp.isoformat()
to_validate = ts
elif self._formatter:
to_validate = await self._formatter(ts)
else:
to_validate = ts
try: try:
dt.datetime.fromisoformat(ts) dt.datetime.fromisoformat(to_validate)
except ValueError: except ValueError:
raise UserInputError( raise UserInputError(
t(_p( t(_p(