Skip to content

Commit 6050fac

Browse files
authored
Merge pull request #923 from interactions-py/unstable
chore: Merge unstable into stable
2 parents 16ae28e + 044813d commit 6050fac

File tree

393 files changed

+67286
-23867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+67286
-23867
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This pull request is about (X), which does (Y).
88
- [ ] I've checked to make sure the change(s) work on `3.8.6` and higher.
99
- [ ] This fixes/solves an [Issue](https://github.com/goverfl0w/discord-interactions/issues).
1010
- (If existent):
11-
- [ ] I've made this pull request for/as: (check all that apply)
11+
- I've made this pull request for/as: (check all that apply)
1212
- [ ] Documentation
1313
- [ ] Breaking change
1414
- [ ] New feature/enhancement

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.2.0
3+
rev: v4.3.0
44
hooks:
55
- id: requirements-txt-fixer
66
name: Requirements
@@ -29,7 +29,7 @@ repos:
2929
- id: check-merge-conflict
3030
name: Merge Conflicts
3131
- repo: https://github.com/psf/black
32-
rev: 22.3.0
32+
rev: 22.6.0
3333
hooks:
3434
- id: black
3535
name: Black Formatting

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interactions.py
1111

1212
.. image:: https://img.shields.io/pypi/v/discord-py-interactions.svg
1313

14-
.. image:: https://readthedocs.org/projects/discord-interactions/badge/?version=latest
14+
.. image:: https://readthedocs.org/projects/interactionspy/badge/?version=latest
1515

1616
.. image:: https://discord.com/api/guilds/789032594456576001/embed.png
1717

@@ -87,7 +87,7 @@ I think I'm all ready!
8787
^^^^^^^^^^^^^^^^^^^^^^
8888
Feel free to begin making `Pull Requests`_ and `Issues`_ on our GitHub!
8989

90-
.. _quickstart guide: https://discord-interactions.rtfd.io/en/latest/quickstart.html
90+
.. _quickstart guide: https://interactionspy.rtfd.io/en/latest/quickstart.html
9191
.. _contribution requirements: https://github.com/interactions-py/library/blob/stable/CONTRIBUTING.rst
9292
.. _MIT License: https://github.com/goverfl0w/interactions-py/library/blob/stable/LICENSE
9393
.. _Pull Requests: https://github.com/interactions-py/library/pulls

docs/api.gateway.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@ Gateway
66
.. automodule:: interactions.api.gateway
77
:members:
88
:noindex:
9+
10+
.. automodule:: interactions.api.gateway.client
11+
:members:
12+
:noindex:
13+
14+
.. automodule:: interactions.api.gateway.heartbeat
15+
:members:
16+
:noindex:

docs/api.http.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,50 +19,50 @@ HTTP
1919
:members:
2020
:noindex:
2121

22-
.. autoclass:: interactions.api.http.channel._ChannelRequest
22+
.. autoclass:: interactions.api.http.channel.ChannelRequest
2323
:members:
2424
:noindex:
2525

26-
.. autoclass:: interactions.api.http.emoji._EmojiRequest
26+
.. autoclass:: interactions.api.http.emoji.EmojiRequest
2727
:members:
2828
:noindex:
2929

30-
.. autoclass:: interactions.api.http.guild._GuildRequest
30+
.. autoclass:: interactions.api.http.guild.GuildRequest
3131
:members:
3232
:noindex:
3333

34-
.. autoclass:: interactions.api.http.interaction._InteractionRequest
34+
.. autoclass:: interactions.api.http.interaction.InteractionRequest
3535
:members:
3636
:noindex:
3737

38-
.. autoclass:: interactions.api.http.member._MemberRequest
38+
.. autoclass:: interactions.api.http.member.MemberRequest
3939
:members:
4040
:noindex:
4141

42-
.. autoclass:: interactions.api.http.message._MessageRequest
42+
.. autoclass:: interactions.api.http.message.MessageRequest
4343
:members:
4444
:noindex:
4545

46-
.. autoclass:: interactions.api.http.reaction._ReactionRequest
46+
.. autoclass:: interactions.api.http.reaction.ReactionRequest
4747
:members:
4848
:noindex:
4949

50-
.. autoclass:: interactions.api.http.scheduledEvent._ScheduledEventRequest
50+
.. autoclass:: interactions.api.http.scheduledEvent.ScheduledEventRequest
5151
:members:
5252
:noindex:
5353

54-
.. autoclass:: interactions.api.http.sticker._StickerRequest
54+
.. autoclass:: interactions.api.http.sticker.StickerRequest
5555
:members:
5656
:noindex:
5757

58-
.. autoclass:: interactions.api.http.thread._ThreadRequest
58+
.. autoclass:: interactions.api.http.thread.ThreadRequest
5959
:members:
6060
:noindex:
6161

62-
.. autoclass:: interactions.api.http.user._UserRequest
62+
.. autoclass:: interactions.api.http.user.UserRequest
6363
:members:
6464
:noindex:
6565

66-
.. autoclass:: interactions.api.http.webhook._WebhookRequest
66+
.. autoclass:: interactions.api.http.webhook.WebhookRequest
6767
:members:
6868
:noindex:

docs/api.models.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ Model Objects
1717
api.models.role.rst
1818
api.models.team.rst
1919
api.models.user.rst
20+
api.models.webhook.rst

docs/api.models.webhook.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. currentmodule:: interactions
2+
3+
Webhook Models
4+
==============
5+
6+
.. automodule:: interactions.api.models.webhook
7+
:members:
8+
:noindex:

docs/api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Interactions
2020

2121
ext.rst
2222
context.rst
23+
get.rst
2324

2425
.. toctree::
2526
:maxdepth: 2

docs/client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
Bot Client
44
==========
55

6-
.. automodule:: interactions.client
6+
.. automodule:: interactions.client.bot
77
:members:
88
:noindex:

docs/conf.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"sphinx.ext.autosectionlabel",
4040
"hoverxref.extension",
4141
"karma_sphinx_theme",
42+
"sphinx_search.extension",
4243
]
4344

4445
# Stackoverflow said that this is gonna cure my LaTeX errors for ref handling.
@@ -57,7 +58,11 @@
5758
#
5859
# This is also used if you do content translation via gettext catalogs.
5960
# Usually you set "language" from the command line for these cases.
60-
language = "de"
61+
62+
# Language is commented out because of PR reviews. In a RTD-hosted case,
63+
# the variable seems to be skipped.
64+
# language = "de"
65+
6166
locale_dirs = ["locale/"]
6267
gettext_compact = True
6368

@@ -66,8 +71,9 @@
6671
# This pattern also affects html_static_path and html_extra_path.
6772
exclude_patterns = ["_build"]
6873

69-
# This should fix wrong sort
70-
autodoc_member_order = "bysource"
74+
# This autodocs private attrs and also fixes wrong sort
75+
autodoc_default_options = {"member-order": "bysource", "private-members": True}
76+
7177

7278
# -- Options for HTML output -------------------------------------------------
7379

0 commit comments

Comments
 (0)