From deb79587979209c811329802bacfbaf78c157892 Mon Sep 17 00:00:00 2001
From: Josh <josh.ja.butt@gmail.com>
Date: Mon, 4 Apr 2022 21:22:21 +1000
Subject: [PATCH] Add new on_thread_create event

---
 discord/flags.py         |  6 ++++++
 discord/state.py         |  5 ++++-
 discord/types/threads.py |  1 +
 docs/api.rst             | 15 +++++++++++++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/discord/flags.py b/discord/flags.py
index beddb1f12..d2cc8d148 100644
--- a/discord/flags.py
+++ b/discord/flags.py
@@ -552,6 +552,10 @@ class Intents(BaseFlags):
         - :func:`on_guild_channel_create`
         - :func:`on_guild_channel_delete`
         - :func:`on_guild_channel_pins_update`
+        - :func:`on_thread_create`
+        - :func:`on_thread_join`
+        - :func:`on_thread_update`
+        - :func:`on_thread_delete`
 
         This also corresponds to the following attributes and classes in terms of cache:
 
@@ -574,6 +578,8 @@ class Intents(BaseFlags):
         - :func:`on_member_remove`
         - :func:`on_member_update`
         - :func:`on_user_update`
+        - :func:`on_thread_member_join`
+        - :func:`on_thread_member_remove`
 
         This also corresponds to the following attributes and classes in terms of cache:
 
diff --git a/discord/state.py b/discord/state.py
index f1c899263..6e542adb2 100644
--- a/discord/state.py
+++ b/discord/state.py
@@ -850,7 +850,10 @@ class ConnectionState:
         has_thread = guild.get_thread(thread.id)
         guild._add_thread(thread)
         if not has_thread:
-            self.dispatch('thread_join', thread)
+            if data.get('newly_created'):
+                self.dispatch('thread_create', thread)
+            else:
+                self.dispatch('thread_join', thread)
 
     def parse_thread_update(self, data: gw.ThreadUpdateEvent) -> None:
         guild_id = int(data['guild_id'])
diff --git a/discord/types/threads.py b/discord/types/threads.py
index ee7ac35e6..802354f3e 100644
--- a/discord/types/threads.py
+++ b/discord/types/threads.py
@@ -64,6 +64,7 @@ class Thread(TypedDict):
     member: NotRequired[ThreadMember]
     last_message_id: NotRequired[Optional[Snowflake]]
     last_pin_timestamp: NotRequired[Optional[Snowflake]]
+    newly_created: NotRequired[bool]
 
 
 class ThreadPaginationPayload(TypedDict):
diff --git a/docs/api.rst b/docs/api.rst
index ae9542de1..a215e3c8a 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -1096,11 +1096,22 @@ Stages
 Threads
 ~~~~~~~~
 
+.. function:: on_thread_create(thread)
+
+    Called whenever a thread is created.
+
+    Note that you can get the guild from :attr:`Thread.guild`.
+
+    This requires :attr:`Intents.guilds` to be enabled.
+
+    .. versionadded:: 2.0
+
+    :param thread: The thread that was created.
+    :type thread: :class:`Thread`
 
 .. function:: on_thread_join(thread)
 
-    Called whenever a thread is joined or created. Note that from the API's perspective there is no way to
-    differentiate between a thread being created or the bot joining a thread.
+    Called whenever a thread is joined.
 
     Note that you can get the guild from :attr:`Thread.guild`.