Skip to content

Commit dd17add

Browse files
committed
Merge remote-tracking branch 'origin/developer' into developer
2 parents d1ffa45 + d7cf79d commit dd17add

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

discord/automod.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def __init__(self, type: AutoModActionType, **metadata):
141141
except KeyError:
142142
pass
143143
else:
144-
if len(custom_message) > 150:
144+
if custom_message and len(custom_message) > 150:
145145
raise ValueError('The maximum length of the custom message is 150 characters.')
146146
self.custom_message: Optional[str] = custom_message
147147

discord/message.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,11 @@ def __init__(self, state: ConnectionState, data: MessageInteractionPayload, guil
372372
except KeyError:
373373
self.member: Optional[Member] = None
374374
else:
375-
self.member: Optional[Member] = guild.get_member(self.user.id) or Member(data=member, state=state, guild=guild)
375+
member['user'] = data['user']
376+
if guild: # can be None when cache is not filled yet
377+
self.member: Optional[Member] = guild.get_member(self.user.id) or Member(data=member, state=state, guild=guild)
378+
else:
379+
self.member: Optional[Member] = None
376380

377381
def __repr__(self) -> str:
378382
return f'<MessageInteraction command={self.name} user={self.user} interaction_id={self.id}>'
@@ -668,13 +672,13 @@ def __init__(self, *, state: ConnectionState, channel, data: MessagePayload):
668672
self.components: List[ActionRow] = [ActionRow.from_dict(d) for d in data.get('components', [])]
669673
self.application = data.get('application') # TODO: make this a class
670674
self.activity = data.get('activity') # TODO: make this a class
675+
self.channel: Messageable = channel
671676
interaction = data.get('interaction')
672677
self.interaction: Optional[MessageInteraction] = MessageInteraction(
673678
state=state,
674679
data=interaction,
675680
guild=self.guild
676681
) if interaction else None
677-
self.channel: Messageable = channel
678682
self._edited_timestamp: datetime = utils.parse_time(data['edited_timestamp'])
679683
self.type: MessageType = try_enum(MessageType, data['type'])
680684
self.pinned: bool = data['pinned']

0 commit comments

Comments
 (0)