Skip to content

Commit

Permalink
Merge branch 'master' into refactor/tls
Browse files Browse the repository at this point in the history
  • Loading branch information
dolfies committed Dec 31, 2023
2 parents 3f82855 + 7561e63 commit 0704df8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
4 changes: 2 additions & 2 deletions discord/ext/commands/cooldowns.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
import asyncio
from collections import deque

from ...abc import PrivateChannel
from discord.abc import PrivateChannel
from .errors import MaxConcurrencyReached
from .context import Context

if TYPE_CHECKING:
from typing_extensions import Self

from ...message import Message
from discord.message import Message

__all__ = (
'BucketType',
Expand Down
4 changes: 1 addition & 3 deletions discord/member.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,7 @@ class VoiceState:
'suppress',
)

def __init__(
self, *, data: VoiceStatePayload, channel: Optional[ConnectableChannel] = None
):
def __init__(self, *, data: VoiceStatePayload, channel: Optional[ConnectableChannel] = None):
self.session_id: Optional[str] = data.get('session_id')
self._update(data, channel)

Expand Down

0 comments on commit 0704df8

Please sign in to comment.