Merge branch 'master' into feat/select-defaults

Author: Lulalaby

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Ask a question
     about: Ask questions and discuss with other users of the library.

CHANGELOG.md

@@ -39,6 +39,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2905](https://github.com/Pycord-Development/pycord/pull/2905))
 - `view=None` in various methods causing an AttributeError.
   ([#2915](https://github.com/Pycord-Development/pycord/pull/2915))
+- `View.message` being `None` when it had not been interacted with yet.
+  ([#2916](https://github.com/Pycord-Development/pycord/pull/2916))
 
 ### Removed
 

discord/interactions.py

@@ -613,11 +613,13 @@ async def edit_original_response(
         # The message channel types should always match
         state = _InteractionMessageState(self, self._state)
         message = InteractionMessage(state=state, channel=self.channel, data=data)  # type: ignore
-        if view and not view.is_finished():
+        if view:
+            if not view.is_finished():
+                view.refresh(message.components)
+                if view.is_dispatchable():
+                    self._state.store_view(view, message.id)
+
             view.message = message
-            view.refresh(message.components)
-            if view.is_dispatchable():
-                self._state.store_view(view, message.id)
 
         if delete_after is not None:
             await self.delete_original_response(delay=delete_after)
@@ -1030,7 +1032,7 @@ async def send_message(
 
         flags = MessageFlags(ephemeral=ephemeral)
 
-        if view is not None:
+        if view:
             payload["components"] = view.to_components()
             if view.is_components_v2():
                 if embeds or content:
@@ -1100,16 +1102,19 @@ async def send_message(
                 for file in files:
                     file.close()
 
-        if view is not None:
-            if ephemeral and view.timeout is None:
-                view.timeout = 15 * 60.0
-
-            view.parent = self._parent
-            if view.is_dispatchable():
-                self._parent._state.store_view(view)
-
         self._responded = True
         await self._process_callback_response(callback_response)
+        if view:
+            if not view.is_finished():
+                if ephemeral and view.timeout is None:
+                    view.timeout = 15 * 60.0
+
+                view.parent = self._parent
+                if view.is_dispatchable():
+                    self._parent._state.store_view(view)
+
+            view.message = await self._parent.original_response()
+
         if delete_after is not None:
             await self._parent.delete_original_response(delay=delete_after)
         return self._parent
@@ -1268,12 +1273,13 @@ async def edit_message(
                 for file in files:
                     file.close()
 
-        if view and not view.is_finished():
-            view.message = msg
-            state.store_view(view, message_id)
-
         self._responded = True
         await self._process_callback_response(callback_response)
+        if view:
+            if not view.is_finished():
+                state.store_view(view, message_id)
+            view.message = msg or await parent.original_response()
+
         if delete_after is not None:
             await self._parent.delete_original_response(delay=delete_after)