Skip to content

Commit ca78fd6

Browse files
authored
Reedited http.py
Reedited and simplified http.py
1 parent c59555c commit ca78fd6

File tree

1 file changed

+18
-39
lines changed

1 file changed

+18
-39
lines changed

discord/http.py

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -553,34 +553,12 @@ def send_files(
553553
def edit_multipart_helper(
554554
self,
555555
route: Route,
556-
*,
557556
files: Sequence[File],
558-
attachments: List[Attachment] = None,
559-
suppress: bool = False,
560-
content: Optional[str] = None,
561-
embed: Optional[embed.Embed] = None,
562-
embeds: Optional[Iterable[Optional[embed.Embed]]] = None,
563-
allowed_mentions: Optional[message.AllowedMentions] = None,
564-
components: Optional[List[components.Component]] = None,
557+
*,
558+
**payload,
565559
) -> Response[message.Message]:
566560
form = []
567561

568-
payload: Dict[str, Any] = {}
569-
if attachments:
570-
payload['attachments'] = attachments
571-
if suppress:
572-
payload['suppress'] = suppress
573-
if content:
574-
payload['content'] = content
575-
if embed:
576-
payload['embeds'] = [embed]
577-
if embeds:
578-
payload['embeds'] = embeds
579-
if allowed_mentions:
580-
payload['allowed_mentions'] = allowed_mentions
581-
if components:
582-
payload['components'] = components
583-
584562
form.append({'name': 'payload_json', 'value': utils._to_json(payload)})
585563
if len(files) == 1:
586564
file = files[0]
@@ -609,27 +587,28 @@ def edit_files(
609587
self,
610588
channel_id: Snowflake,
611589
message_id: Snowflake,
612-
*,
613590
files: Sequence[File],
614-
attachments: List[Attachment] = None,
615-
suppress: bool = False,
616-
content: Optional[str] = None,
617-
embed: Optional[embed.Embed] = None,
618-
embeds: Optional[List[embed.Embed]] = None,
619-
allowed_mentions: Optional[message.AllowedMentions] = None,
620-
components: Optional[List[components.Component]] = None,
591+
*,
592+
**fields,
621593
) -> Response[message.Message]:
622594
r = Route('PATCH', f'/channels/{channel_id}/messages/{message_id}', channel_id=channel_id, message_id=message_id)
595+
payload: Dict[str, Any] = {}
596+
if 'attachments' in fields:
597+
payload['attachments'] = fields['attachments']
598+
if 'flags' in fields:
599+
payload['flags'] = fields['flags']
600+
if 'content' in fields:
601+
payload['content'] = fields['content']
602+
if 'embeds' in fields:
603+
payload['embeds'] = fields['embeds']
604+
if 'allowed_mentions' in fields:
605+
payload['allowed_mentions'] = fields['allowed_mentions']
606+
if 'components' in fields:
607+
payload['components'] = fields['components']
623608
return self.edit_multipart_helper(
624609
r,
625610
files=files,
626-
attachments=attachments,
627-
suppress=suppress,
628-
content=content,
629-
embed=embed,
630-
embeds=embeds,
631-
allowed_mentions=allowed_mentions,
632-
components=components,
611+
**payload,
633612
)
634613

635614
def delete_message(

0 commit comments

Comments
 (0)