refactor: remove more naff

Author: LordOfPolls

interactions/__init__.py

@@ -214,7 +214,7 @@
     ModalCommand,
     ModalContext,
     MODEL_TO_CONVERTER,
-    NaffUser,
+    ClientUser,
     NoArgumentConverter,
     NSFWLevel,
     open_file,
@@ -536,7 +536,7 @@
     "ModalCommand",
     "ModalContext",
     "MODEL_TO_CONVERTER",
-    "NaffUser",
+    "ClientUser",
     "NoArgumentConverter",
     "NSFWLevel",
     "open_file",

interactions/api/events/processors/_template.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING, Callable, Coroutine
 
 from interactions.client.const import Absent, MISSING, AsyncCallable
-from interactions.models.discord.user import NaffUser
+from interactions.models.discord.user import ClientUser
 
 if TYPE_CHECKING:
     from interactions.client.smart_cache import GlobalCache
@@ -43,7 +43,7 @@ class EventMixinTemplate:
     dispatch: Callable[["BaseEvent"], None]
     _init_interactions: Callable[[], Coroutine]
     synchronise_interactions: Callable[[], Coroutine]
-    _user: NaffUser
+    _user: ClientUser
     _guild_event: asyncio.Event
 
     def __init__(self) -> None:

interactions/api/gateway/state.py

@@ -9,7 +9,7 @@
 import interactions
 from interactions.api import events
 from interactions.client.const import Absent, MISSING, get_logger
-from interactions.client.errors import NaffException, WebSocketClosed
+from interactions.client.errors import LibraryException, WebSocketClosed
 from interactions.models.discord.activity import Activity
 from interactions.models.discord.enums import Intents, Status, ActivityType
 from .gateway import GatewayClient
@@ -116,11 +116,11 @@ async def _ws_connect(self) -> None:
 
         except WebSocketClosed as ex:
             if ex.code == 4011:
-                raise NaffException("Your bot is too large, you must use shards") from None
+                raise LibraryException("Your bot is too large, you must use shards") from None
             if ex.code == 4013:
-                raise NaffException(f"Invalid Intents have been passed: {self.intents}") from None
+                raise LibraryException(f"Invalid Intents have been passed: {self.intents}") from None
             if ex.code == 4014:
-                raise NaffException(
+                raise LibraryException(
                     "You have requested privileged intents that have not been enabled or approved. Check the developer dashboard"
                 ) from None
             raise

interactions/client/auto_shard_client.py

@@ -218,7 +218,7 @@ async def login(self, token: str | None = None) -> None:
         Login to discord via http.
 
         !!! note
-            You will need to run Naff.start_gateway() before you start receiving gateway events.
+            You will need to run Client.start_gateway() before you start receiving gateway events.
 
         Args:
             token str: Your bot's token

interactions/client/client.py

@@ -63,7 +63,7 @@
     GuildTemplate,
     Message,
     Extension,
-    NaffUser,
+    ClientUser,
     User,
     Member,
     Modal,
@@ -370,7 +370,7 @@ def __init__(
         else:
             self._activity: Activity = activity
 
-        self._user: Absent[NaffUser] = MISSING
+        self._user: Absent[ClientUser] = MISSING
         self._app: Absent[Application] = MISSING
 
         # collections
@@ -459,7 +459,7 @@ def gateway_started(self) -> bool:
         return self._connection_state.gateway_started.is_set()
 
     @property
-    def user(self) -> NaffUser:
+    def user(self) -> ClientUser:
         """Returns the bot's user."""
         return self._user
 
@@ -636,7 +636,7 @@ async def on_command_error(self, event: events.CommandError) -> None:
                 ctx=event.ctx,
             )
         )
-        with contextlib.suppress(errors.NaffException):
+        with contextlib.suppress(errors.LibraryException):
             if isinstance(event.error, errors.CommandOnCooldown):
                 await event.ctx.send(
                     embeds=Embed(
@@ -857,7 +857,7 @@ async def login(self, token: str | None = None) -> None:
         Login to discord via http.
 
         !!! note
-            You will need to run Naff.start_gateway() before you start receiving gateway events.
+            You will need to run Client.start_gateway() before you start receiving gateway events.
 
         Args:
             token str: Your bot's token
@@ -876,7 +876,7 @@ async def login(self, token: str | None = None) -> None:
 
         self.logger.debug("Attempting to login")
         me = await self.http.login(self.token)
-        self._user = NaffUser.from_dict(me, self)
+        self._user = ClientUser.from_dict(me, self)
         self.cache.place_user_data(me)
         self._app = Application.from_dict(await self.http.get_current_bot_information(), self)
         self._mention_reg = re.compile(rf"^(<@!?{self.user.id}*>\s)")
@@ -1118,7 +1118,7 @@ def command(self, *args, **kwargs) -> Callable:
 
     def listen(self, event_name: Absent[str] = MISSING) -> Callable[[AsyncCallable], Listener]:
         """
-        A decorator to be used in situations that Naff can't automatically hook your listeners. Ideally, the standard listen decorator should be used, not this.
+        A decorator to be used in situations that the library can't automatically hook your listeners. Ideally, the standard listen decorator should be used, not this.
 
         Args:
             event_name: The event name to use, if not the coroutine name

interactions/client/errors.py

@@ -12,7 +12,7 @@
     from interactions.models.discord.snowflake import Snowflake_Type
 
 __all__ = (
-    "NaffException",
+    "LibraryException",
     "BotException",
     "GatewayNotFound",
     "LoginError",
@@ -50,15 +50,15 @@
 )
 
 
-class NaffException(Exception):
-    """Base Exception of Naff."""
+class LibraryException(Exception):
+    """Base Exception of i.py."""
 
 
-class BotException(NaffException):
+class BotException(LibraryException):
     """An issue occurred in the client, likely user error."""
 
 
-class GatewayNotFound(NaffException):
+class GatewayNotFound(LibraryException):
     """An exception that is raised when the gateway for Discord could not be found."""
 
     def __init__(self) -> None:
@@ -69,7 +69,7 @@ class LoginError(BotException):
     """The bot failed to login, check your token."""
 
 
-class HTTPException(NaffException):
+class HTTPException(LibraryException):
     """
     A HTTP request resulted in an exception.
 
@@ -193,11 +193,11 @@ class RateLimited(HTTPException):
     """Discord is rate limiting this application."""
 
 
-class TooManyChanges(NaffException):
+class TooManyChanges(LibraryException):
     """You have changed something too frequently."""
 
 
-class WebSocketClosed(NaffException):
+class WebSocketClosed(LibraryException):
     """The websocket was closed."""
 
     code: int = 0
@@ -224,7 +224,7 @@ def __init__(self, code: int) -> None:
         super().__init__(f"The Websocket closed with code: {code} - {self.codes.get(code, 'Unknown Error')}")
 
 
-class VoiceWebSocketClosed(NaffException):
+class VoiceWebSocketClosed(LibraryException):
     """The voice websocket was closed."""
 
     code: int = 0
@@ -251,7 +251,7 @@ def __init__(self, code: int) -> None:
         super().__init__(f"The Websocket closed with code: {code} - {self.codes.get(code, 'Unknown Error')}")
 
 
-class WebSocketRestart(NaffException):
+class WebSocketRestart(LibraryException):
     """The websocket closed, and is safe to restart."""
 
     resume: bool = False
@@ -394,7 +394,7 @@ class AlreadyResponded(AlreadyDeferred):
     """An interaction was already responded to, and you attempted to defer it"""
 
 
-class ForeignWebhookException(NaffException):
+class ForeignWebhookException(LibraryException):
     """Raised when you attempt to send using a webhook you did not create."""
 
 
@@ -416,7 +416,7 @@ def __init__(self) -> None:
         super().__init__("Bot is not connected to any voice channels in given guild")
 
 
-class VoiceConnectionTimeout(NaffException):
+class VoiceConnectionTimeout(LibraryException):
     """Raised when the bot fails to connect to a voice channel."""
 
     def __init__(self) -> None:

interactions/models/__init__.py

@@ -102,7 +102,7 @@
     MessageType,
     MFALevel,
     Modal,
-    NaffUser,
+    ClientUser,
     NSFWLevel,
     open_file,
     OverwriteType,
@@ -466,7 +466,7 @@
     "ModalCommand",
     "ModalContext",
     "MODEL_TO_CONVERTER",
-    "NaffUser",
+    "ClientUser",
     "NoArgumentConverter",
     "NSFWLevel",
     "open_file",

interactions/models/discord/__init__.py

@@ -161,7 +161,7 @@
 from .team import Team, TeamMember
 from .thread import ThreadList, ThreadMember, ThreadTag
 from .timestamp import Timestamp, TimestampStyles
-from .user import BaseUser, Member, NaffUser, User
+from .user import BaseUser, Member, User, ClientUser
 from .voice_state import VoiceRegion, VoiceState
 
 __all__ = (
@@ -268,7 +268,7 @@
     "MessageType",
     "MFALevel",
     "Modal",
-    "NaffUser",
+    "ClientUser",
     "NSFWLevel",
     "open_file",
     "OverwriteType",

interactions/models/discord/user.pyi

@@ -79,7 +79,7 @@ class FakeUserMixin(FakeBaseUserMixin):
 class User(FakeUserMixin, BaseUser): ...
 
 @attrs.define(eq=False, order=False, hash=False, kw_only=True)
-class NaffUser(User):
+class ClientUser(User):
     verified: bool
     mfa_enabled: bool
     email: Optional[str]

mkdocs.yml

@@ -56,14 +56,11 @@ watch:
 extra:
   social:
     - icon: fontawesome/brands/discord
-      link: https://discord.gg/hpfNhH8BsY
+      link: https://discord.gg/interactions
       name: Discord Server
     - icon: fontawesome/brands/github
-      link: https://github.com/Discord-Snake-Pit/naff
+      link: https://github.com/interactions-py/interactions.py
       name: Github Repository
-    - icon: fontawesome/brands/trello
-      link: https://trello.com/b/LVjnmYKt/dev-board
-      name: Trello Board
   analytics:
     provider: google
     property: G-817ZC2FC56
@@ -100,10 +97,6 @@ plugins:
   - search
   - awesome-pages
   - autorefs
-  #  - git-committers:
-  #        repository: NAFTeam/NAFF
-  #        branch: docs-refresh
-  #        token: !ENV [GH_TOKEN]
   - git-revision-date-localized:
       fallback_to_build_date: true
   - mkdocstrings: