Merge pull request #923 from interactions-py/unstable

chore: Merge unstable into stable

Author: FayeDel

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,7 +8,7 @@ This pull request is about (X), which does (Y).
 - [ ] I've checked to make sure the change(s) work on `3.8.6` and higher.
 - [ ] This fixes/solves an [Issue](https://github.com/goverfl0w/discord-interactions/issues).
   - (If existent):
-- [ ] I've made this pull request for/as: (check all that apply)
+- I've made this pull request for/as: (check all that apply)
   - [ ] Documentation
   - [ ] Breaking change
   - [ ] New feature/enhancement

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
     - id: requirements-txt-fixer
       name: Requirements
@@ -29,7 +29,7 @@ repos:
     - id: check-merge-conflict
       name: Merge Conflicts
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
     - id: black
       name: Black Formatting

README.rst

@@ -11,7 +11,7 @@ interactions.py
 
 .. image:: https://img.shields.io/pypi/v/discord-py-interactions.svg
 
-.. image:: https://readthedocs.org/projects/discord-interactions/badge/?version=latest
+.. image:: https://readthedocs.org/projects/interactionspy/badge/?version=latest
 
 .. image:: https://discord.com/api/guilds/789032594456576001/embed.png
 
@@ -87,7 +87,7 @@ I think I'm all ready!
 ^^^^^^^^^^^^^^^^^^^^^^
 Feel free to begin making `Pull Requests`_ and `Issues`_ on our GitHub!
 
-.. _quickstart guide: https://discord-interactions.rtfd.io/en/latest/quickstart.html
+.. _quickstart guide: https://interactionspy.rtfd.io/en/latest/quickstart.html
 .. _contribution requirements: https://github.com/interactions-py/library/blob/stable/CONTRIBUTING.rst
 .. _MIT License: https://github.com/goverfl0w/interactions-py/library/blob/stable/LICENSE
 .. _Pull Requests: https://github.com/interactions-py/library/pulls

docs/api.gateway.rst

@@ -6,3 +6,11 @@ Gateway
 .. automodule:: interactions.api.gateway
     :members:
     :noindex:
+
+.. automodule:: interactions.api.gateway.client
+    :members:
+    :noindex:
+
+.. automodule:: interactions.api.gateway.heartbeat
+    :members:
+    :noindex:

docs/api.http.rst

@@ -19,50 +19,50 @@ HTTP
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.channel._ChannelRequest
+.. autoclass:: interactions.api.http.channel.ChannelRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.emoji._EmojiRequest
+.. autoclass:: interactions.api.http.emoji.EmojiRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.guild._GuildRequest
+.. autoclass:: interactions.api.http.guild.GuildRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.interaction._InteractionRequest
+.. autoclass:: interactions.api.http.interaction.InteractionRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.member._MemberRequest
+.. autoclass:: interactions.api.http.member.MemberRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.message._MessageRequest
+.. autoclass:: interactions.api.http.message.MessageRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.reaction._ReactionRequest
+.. autoclass:: interactions.api.http.reaction.ReactionRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.scheduledEvent._ScheduledEventRequest
+.. autoclass:: interactions.api.http.scheduledEvent.ScheduledEventRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.sticker._StickerRequest
+.. autoclass:: interactions.api.http.sticker.StickerRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.thread._ThreadRequest
+.. autoclass:: interactions.api.http.thread.ThreadRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.user._UserRequest
+.. autoclass:: interactions.api.http.user.UserRequest
     :members:
     :noindex:
 
-.. autoclass:: interactions.api.http.webhook._WebhookRequest
+.. autoclass:: interactions.api.http.webhook.WebhookRequest
     :members:
     :noindex:

docs/api.models.rst

@@ -17,3 +17,4 @@ Model Objects
     api.models.role.rst
     api.models.team.rst
     api.models.user.rst
+    api.models.webhook.rst

docs/api.models.webhook.rst

@@ -0,0 +1,8 @@
+.. currentmodule:: interactions
+
+Webhook Models
+==============
+
+.. automodule:: interactions.api.models.webhook
+    :members:
+    :noindex:

docs/api.rst

@@ -20,6 +20,7 @@ Interactions
 
     ext.rst
     context.rst
+    get.rst
 
 .. toctree::
     :maxdepth: 2

docs/client.rst

@@ -3,6 +3,6 @@
 Bot Client
 ==========
 
-.. automodule:: interactions.client
+.. automodule:: interactions.client.bot
     :members:
     :noindex:

docs/conf.py

@@ -39,6 +39,7 @@
     "sphinx.ext.autosectionlabel",
     "hoverxref.extension",
     "karma_sphinx_theme",
+    "sphinx_search.extension",
 ]
 
 # Stackoverflow said that this is gonna cure my LaTeX errors for ref handling.
@@ -57,7 +58,11 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = "de"
+
+# Language is commented out because of PR reviews. In a RTD-hosted case,
+# the variable seems to be skipped.
+# language = "de"
+
 locale_dirs = ["locale/"]
 gettext_compact = True
 
@@ -66,8 +71,9 @@
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ["_build"]
 
-# This should fix wrong sort
-autodoc_member_order = "bysource"
+# This autodocs private attrs and also fixes wrong sort
+autodoc_default_options = {"member-order": "bysource", "private-members": True}
+
 
 # -- Options for HTML output -------------------------------------------------