disoauth · Arcader717 · Nov 19, 2023 · Nov 19, 2023 · Nov 19, 2023 · Nov 19, 2023
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.replit
diff --git a/README.md b/README.md
@@ -28,15 +28,15 @@ It also makes bot auth url's
       <details>
       <summary>User Functions</summary>
 
-      - [ ] Get User - v2.1
-      - [ ] Modify Current User - v2.1
-      - [ ] Get Current Guild Members - v2.1
-      - [ ] Leave Guild - v2.1
-      - [ ] Create DM - v2.1
-      - [ ] Create Group DM - v2.1
-      - [ ] Get Current User Connections - v2.1
-      - [ ] Get Current User Application Role Connection - v2.1
-      - [ ] Update Current User Application Role Connection - v2.1
+      - [x] Get User - v2.1
+      - [x] Modify Current User - v2.1
+      - [ ] Get Current Guild Member - v2.3
+      - [x] Leave Guild - v2.1
+      - [x] Create DM - v2.1
+      - [x] Create Group DM - v2.1
+      - [x] Get Current User Connections - v2.1
+      - [x] Get Current User Application Role Connection - v2.1
+      - [x] Update Current User Application Role Connection - v2.1
   - [ ] Guild
     - [ ] Functions
       <details>

diff --git a/docs/CHANGELOG.rst b/docs/CHANGELOG.rst
@@ -7,6 +7,25 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog <https://keepachangelog.com/en/1.0.0/>`_,
 and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0.html>`_.
 
+[`Unreleased`_]
+===============
+
+Added
+-----
+
+* Get User Function, using a user id, added to the :meth:`discord.user.fetch` method of the :class:`discord.user` class
+* Modify Current User
+* Get Current Guild Member
+* Leave Guild
+* Create DM
+* Create Guild DM
+
+Fixed
+-----
+
+* The documentation in the :doc:`permissions` page
+* The documentation in the :doc:`migration` page
+
 [`2.0.0`_] - November 13, 2023
 ==============================
 
@@ -244,6 +263,7 @@ Added
 * The AuthUrl class, that would return the auth url
   * Added a function to make the state for the auth url
 
+.. _Unreleased: https://github.com/disoauth/DiscoAuth/compare/v2.0.0...add/Arcader717-User-functions
 .. _Diff: https://github.com/disoauth/DiscoAuth/compare/v1.4.0...v2.0.0
 .. _2.0.0: https://github.com/disoauth/DiscoAuth/compare/v2.0.0-rc.1...v2.0.0
 .. _2.0.0-rc.1: https://github.com/disoauth/DiscoAuth/compare/v1.4.0...v2.0.0-rc.1

diff --git a/docs/api.rst b/docs/api.rst
@@ -1,7 +1,14 @@
 API
 ===
 
+Welcome to the API!
+If you are here to check out the general reference head over to :doc:`reference`.
+If you want to check out the permissions reference, visit the :doc:`permissions` documentation.
+
 .. toctree::
+  :maxdepth: 0
+  :hidden:
+
   reference
   permissions
   cliAPI

diff --git a/docs/conf.py b/docs/conf.py
@@ -1,8 +1,8 @@
 project = 'DiscoAuth'
 copyright = '2023, Arcader717'
 author = 'Arcader717'
-version = '2.0'
-release = '2.0.0'
+version = '2.1'
+release = '2.1.0'
 extensions = [
   'sphinx.ext.autodoc',
   'sphinx.ext.autosummary'

diff --git a/docs/index.rst b/docs/index.rst
@@ -7,7 +7,7 @@ Welcome to DisOAuth's documentation!
 ===================================
 
 
-**DisOAuth** (AKA Discord OAuth) is a python package to help create a oauth process for your Discord Application and/or your Discord Bot, using a *simple* api
+**DiscoAuth** (AKA Discord OAuth) is a python package to help create a oauth process for your Discord Application and/or your Discord Bot, using a *simple* api
 
 To setup DisOAuth, you'll need to go to the :doc:`quickstart` page to get started, and see how to :ref:`install <installation>` it 
 

diff --git a/docs/migration.rst b/docs/migration.rst
@@ -24,20 +24,20 @@ We can use
     :language: python
     :linenos:
 
-    from DisOAuth import auth, discord, bot, permissions
+    from discoauth import auth, discord, bot, permissions
 
 I highly suggest using the :code:`ctrl + F` shortcut, to find the old names and replace it with the new names
 
 The following list shows what classes and methods are replaced with what name
 
-* :code:`AuthUrl` --> :code:`auth`
-* :code:`discordApi` --> :code:`discord`
-* :code:`makeUrl` --> :code:`url`
-* :code:`accessToken` --> :code:`token`
-* :code:`User` --> :code:`user`
-* :code:`get_current_user` --> :code:`fetch`
-* :code:`get_user_guilds` --> :code:`guilds`
-* :code:`get_guild` --> :code:`fetch`
+* :code:`AuthUrl` --> :class:`auth`
+* :code:`discordApi` --> :class:`discord`
+* :code:`makeUrl` --> :meth:`auth.url`
+* :code:`accessToken` --> :meth:`discord.token`
+* :code:`User` --> :class:`user`
+* :code:`get_current_user` --> :meth:`discord.user.fetch`
+* :code:`get_user_guilds` --> :meth:`discord.user.guilds`
+* :code:`get_guild` --> :meth:`discord.guild.fetch`
 
 Special Cases
 =============

diff --git a/docs/permissions.rst b/docs/permissions.rst
@@ -12,7 +12,7 @@ The permissions is imported using the :class:`permissions` class
   :linenos:
   :caption: perms.py
 
-  from DisOAuth import permissions
+  from discoauth import permissions
 
 Permissions
 -----------
@@ -23,7 +23,7 @@ To set multiple permission with the names when the :class:`permissions` class is
   :lineno-start: 3
   :caption: Multiple perms, init, name
 
-  perms = permissions(["kick_members", "ban_members"]
+  perms = permissions(["kick_members", "ban_members"])
 
 .. code-block:: python
   :lineno-start: 3
@@ -54,7 +54,7 @@ To set multiple permission with the names when the :class:`permissions` class is
 +-------------------------------------+--------+
 | stream                              | 9      |
 +-------------------------------------+--------+
-| view_channe;                        | 10     |
+| view_channel                        | 10     |
 +-------------------------------------+--------+
 | send_messages                       | 11     |
 +-------------------------------------+--------+

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -58,10 +58,9 @@ Now, we need a new variable, ``client_secret``. Which is your app's client secre
 using the other three variables and ``client_secret`` we can use :class:`discord`. ::
 
   api = discord(client_id, client_secret, scope, redirect_uri)
-  r = await api.token(code)
-  token = r['access_token']
+  token = await api.token(code)
 
-Now, ``token`` is your access token. Save this somewhere safe.
+Now, ``token`` is the response, which can contain a new token. Save this somewhere safe.
 
 Remember, :func:`token` returns a dictionary, containing the entire response, so you can still get the ``refresh_token``
 

diff --git a/docs/reference.rst b/docs/reference.rst
@@ -82,6 +82,65 @@ API Reference
       .. versionchanged:: 2.0
         Renamed to :meth:`discord.user.guilds` from the previous :meth:`discordApi.User.get_user_guilds`
 
+    .. py:method:: modify(username)
+      :async:
+
+      Changes the username or avatar url of the user
+
+      :param username: The username of the user that you would like to modify, this is NOT the user's display name. Defaults to none, and uses the access token as the user
+      :type username: str | None
+      :return: The json returned by Discord API
+
+      .. versionadded:: 2.1
+
+    .. py:method:: leaveGuild(guild)
+      :async:
+
+      Makes a user leave a guild
+
+      :param guild: The id of the guild
+      :type guild: str | int
+      :return: Whether the user had left. Returns true if successful, and false if not
+      :rtype: bool
+
+      .. versionadded:: 2.1
+
+    .. py:method:: dm(id, tokens, nicks)
+      :async:
+
+      DM a user or group of users
+
+      :param id: The id of the user you want to DM. This does not apply to group DM's
+      :param tokens: The access tokens of the users you would like to DM. This does not apply to DMing a single user
+      :param nicks: The nicks of the users. This does not apply to DMing a single user
+      :type id: str | None = None
+      :type tokens: List[str] | None = None
+      :type nicks: Dict[str, str] | None = None
+      :return: The json response returned by Discord API
+
+      .. versionadded:: 2.1
+
+    .. py:method:: connections(id)
+      :async:
+
+      Can get a user's regular and application connections. Must use the ``connections`` scope for regular connections, and ``role_connections.write`` for application connections
+
+      :param id: The id of the application connected to a user
+      :type: str | None = None
+      :return: The json response returned by Discord API
+
+      .. versionadded:: 2.1
+
+    .. py:method:: modifyConnections(id)
+      :async:
+
+      Modifies a user's application connections
+
+      :param id: The id of the application
+      :return: The json response returned by Discord API
+
+      .. versionadded:: 2.1
+
   .. py:class:: guild(token)
 
     Provides access to the guild links in the Discord API

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "discoauth"
-version = "2.1.0"
+version = "2.1.0-alpha"
-version = "2.1.0-alpha"
+version = "2.1.0"
-version = "2.1.0-alpha"
+version = "2.1.0"
 
 description = "Discord OAuth, and Discord API, in one package"
 readme = "README.md"

diff --git a/src/discoauth/exceptions.py b/src/discoauth/exceptions.py
@@ -10,3 +10,13 @@ def __init__(self,
             super().__init__("The permission number you passed is invalid")
         elif permissionInt is not None:
             super().__init__(f"The permission number you passed, {permissionInt}, is invalid")
+
+class DiscordException(Exception):
+    """Raised when something unusual happens with the Discord API. Raise with the error message
+
+    Attributes:
+      message -- The error message returned by discord api
+      """
+    def __init__(self, message: str):
+        super().__init__(f"The following error was raised by Discord API\n\n{message}")
+