Skip to content

Commit e16ee0b

Browse files
committed
Fix View.message being None initially
1 parent 14989c9 commit e16ee0b

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

discord/interactions.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,7 @@ async def send_message(
10301030

10311031
flags = MessageFlags(ephemeral=ephemeral)
10321032

1033-
if view is not None:
1033+
if view:
10341034
payload["components"] = view.to_components()
10351035
if view.is_components_v2():
10361036
if embeds or content:
@@ -1100,16 +1100,19 @@ async def send_message(
11001100
for file in files:
11011101
file.close()
11021102

1103-
if view is not None:
1103+
1104+
self._responded = True
1105+
await self._process_callback_response(callback_response)
1106+
if view and not view.is_finished():
11041107
if ephemeral and view.timeout is None:
11051108
view.timeout = 15 * 60.0
11061109

11071110
view.parent = self._parent
11081111
if view.is_dispatchable():
11091112
self._parent._state.store_view(view)
11101113

1111-
self._responded = True
1112-
await self._process_callback_response(callback_response)
1114+
view.message = await self._parent.original_response()
1115+
11131116
if delete_after is not None:
11141117
await self._parent.delete_original_response(delay=delete_after)
11151118
return self._parent
@@ -1268,12 +1271,13 @@ async def edit_message(
12681271
for file in files:
12691272
file.close()
12701273

1271-
if view and not view.is_finished():
1272-
view.message = msg
1273-
state.store_view(view, message_id)
12741274

12751275
self._responded = True
12761276
await self._process_callback_response(callback_response)
1277+
if view and not view.is_finished():
1278+
view.message = msg or await parent.original_response()
1279+
state.store_view(view, message_id)
1280+
12771281
if delete_after is not None:
12781282
await self._parent.delete_original_response(delay=delete_after)
12791283

0 commit comments

Comments
 (0)