Fix more circular imports

discord/audit_logs.py

@@ -758,7 +758,6 @@ class AuditLogEntry(Hashable):
         return self._automod_rules.get(target_id) or Object(target_id, type=AutoModRule)
 
     def _convert_target_webhook(self, target_id: int) -> Union[Webhook, Object]:
-        # circular import
+        from .webhook import Webhook  # Circular import
-        from .webhook import Webhook
 
         return self._webhooks.get(target_id) or Object(target_id, type=Webhook)

discord/channel.py

@@ -67,7 +67,7 @@ from .errors import ClientException, DiscordException
 from .stage_instance import StageInstance
 from .threads import Thread
 from .partial_emoji import _EmojiTag, PartialEmoji
-from .flags import ChannelFlags
+from .flags import ChannelFlags, MessageFlags
 from .http import handle_message_parameters
 from .invite import Invite
 from .voice_client import VoiceClient
@@ -2884,8 +2884,6 @@ class ForumChannel(discord.abc.GuildChannel, Hashable):
             sticker_ids: SnowflakeList = [s.id for s in stickers]
 
         if suppress_embeds:
-            from .message import MessageFlags  # circular import
-
             flags = MessageFlags._from_value(4)
         else:
             flags = MISSING
@@ -2914,12 +2912,9 @@ class ForumChannel(discord.abc.GuildChannel, Hashable):
             flags=flags,
             channel_payload=channel_payload,
         ) as params:
-            # Circular import
-            from .message import Message
-
             data = await state.http.start_thread_in_forum(self.id, params=params, reason=reason)
             thread = Thread(guild=self.guild, state=self._state, data=data)
-            message = Message(state=self._state, channel=thread, data=data['message'])
+            message = state.create_message(channel=thread, data=data['message'])
 
             return ThreadWithMessage(thread=thread, message=message)
 

discord/settings.py

@@ -1222,7 +1222,7 @@ class GuildFolder:
         return self
 
     def _get_guild(self, id, /) -> Union[Guild, Object]:
-        from .guild import Guild  # circular import
+        from .guild import Guild  # Circular import
 
         id = int(id)
         return self._state._get_or_create_unavailable_guild(id) if self._state else Object(id=id, type=Guild)

discord/utils.py

@@ -941,7 +941,7 @@ def resolve_invite(invite: Union[Invite, str]) -> ResolvedInvite:
     :class:`.ResolvedInvite`
         A data class containing the invite code and the event ID.
     """
-    from .invite import Invite  # circular import
+    from .invite import Invite  # Circular import
 
     if isinstance(invite, Invite):
         return ResolvedInvite(invite.code, invite.scheduled_event_id)
@@ -974,7 +974,7 @@ def resolve_template(code: Union[Template, str]) -> str:
     :class:`str`
         The template code.
     """
-    from .template import Template  # circular import
+    from .template import Template  # Circular import
 
     if isinstance(code, Template):
         return code.code
@@ -1002,7 +1002,7 @@ def resolve_gift(code: Union[Gift, str]) -> str:
     :class:`str`
         The gift code.
     """
-    from .entitlements import Gift  # circular import
+    from .entitlements import Gift  # Circular import
 
     if isinstance(code, Gift):
         return code.code