@@ -41,8 +41,7 @@ def camel_to_snake(string: str) -> str:
41
41
def parse_vote_dict (d : dict ) -> dict :
42
42
data = d .copy ()
43
43
44
- query = data .get ("query" , "" ).lstrip ("?" )
45
- if query :
44
+ if query := data .get ("query" , "" ).lstrip ("?" ):
46
45
query_dict = {k : v for k , v in [pair .split ("=" ) for pair in query .split ("&" )]}
47
46
data ["query" ] = DataDict (** query_dict )
48
47
else :
@@ -55,8 +54,7 @@ def parse_vote_dict(d: dict) -> dict:
55
54
data ["guild" ] = int (data ["guild" ])
56
55
57
56
for key , value in data .copy ().items ():
58
- converted_key = camel_to_snake (key )
59
- if key != converted_key :
57
+ if key != (converted_key := camel_to_snake (key )):
60
58
del data [key ]
61
59
data [converted_key ] = value
62
60
@@ -67,20 +65,17 @@ def parse_dict(d: dict) -> dict:
67
65
data = d .copy ()
68
66
69
67
for key , value in data .copy ().items ():
70
- if "id" in key .lower ():
71
- if value == "" :
72
- value = None
73
- else :
74
- if isinstance (value , str ) and value .isdigit ():
75
- value = int (value )
76
- else :
77
- continue
78
- elif value == "" :
68
+ if value == "" :
79
69
value = None
70
+ elif "id" in key .lower ():
71
+ if isinstance (value , str ) and value .isdigit ():
72
+ value = int (value )
73
+ else :
74
+ continue
80
75
81
- converted_key = camel_to_snake (key )
82
- if key != converted_key :
76
+ if key != (converted_key := camel_to_snake (key )):
83
77
del data [key ]
78
+
84
79
data [converted_key ] = value
85
80
86
81
return data
@@ -89,13 +84,14 @@ def parse_dict(d: dict) -> dict:
89
84
def parse_bot_dict (d : dict ) -> dict :
90
85
data = parse_dict (d .copy ())
91
86
92
- if data .get ("date" ) and not isinstance (data ["date" ], datetime ):
93
- data ["date" ] = datetime .fromisoformat (data ["date" ].replace ("Z" , "+00:00" ))
87
+ if (date := data .get ("date" )) and not isinstance (date , datetime ):
88
+ data ["date" ] = datetime .fromisoformat (date .replace ("Z" , "+00:00" ))
89
+
90
+ if owners := data .get ("owners" ):
91
+ data ["owners" ] = [int (e ) for e in owners ]
94
92
95
- if data .get ("owners" ):
96
- data ["owners" ] = [int (e ) for e in data ["owners" ]]
97
- if data .get ("guilds" ):
98
- data ["guilds" ] = [int (e ) for e in data ["guilds" ]]
93
+ # TODO: remove this soon
94
+ data ["guilds" ] = []
99
95
100
96
for key , value in data .copy ().items ():
101
97
converted_key = camel_to_snake (key )
0 commit comments