Skip to content

Commit 4b5ccda

Browse files
authored
Merge pull request #751 from Pycord-Development/features/voice-receive
Features/voice receive
2 parents 33340c7 + 395ca7f commit 4b5ccda

File tree

19 files changed

+1713
-171
lines changed

19 files changed

+1713
-171
lines changed

.gitignore

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ docs/crowdin.py
1010
*.mp3
1111
*.m4a
1212
*.wav
13+
*.mp4
14+
*.ogg
15+
*.pcm
16+
*.png
1317
*.jpg
1418
*.flac
1519
*.mo
@@ -19,7 +23,11 @@ env/
1923
.DS_Store
2024
.python-version
2125
__pycache__
26+
.vs/*
27+
.vscode/*
28+
env/
2229
build/
23-
node_modules/*
2430
test.py
25-
*.png
31+
build/
32+
node_modules/*
33+
test.py

discord/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
__author__ = 'Pycord Development'
1414
__license__ = 'MIT'
1515
__copyright__ = 'Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development'
16-
__version__ = '2.0.0b'
16+
__version__ = '2.0.0b1'
1717

1818
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
1919

2020
import logging
2121
from typing import NamedTuple, Literal
2222

23-
from . import utils, opus, abc, ui
23+
from . import utils, opus, abc, ui, sinks
2424
from .activity import *
2525
from .appinfo import *
2626
from .asset import *

discord/errors.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ def __init__(self, shard_id: Optional[int]):
269269
)
270270
super().__init__(msg % shard_id)
271271

272-
273272
class InteractionResponded(ClientException):
274273
"""Exception that's raised when sending another interaction response using
275274
:class:`InteractionResponse` when one has already been done before.

discord/gateway.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,7 @@ def __init__(self, socket, loop, *, hook=None):
728728
self._keep_alive = None
729729
self._close_code = None
730730
self.secret_key = None
731+
self.ssrc_map = {}
731732
if hook:
732733
self._hook = hook
733734

@@ -839,6 +840,15 @@ async def received_message(self, msg):
839840
self._keep_alive = VoiceKeepAliveHandler(ws=self, interval=min(interval, 5.0))
840841
self._keep_alive.start()
841842

843+
elif op == self.SPEAKING:
844+
ssrc = data['ssrc']
845+
user = int(data['user_id'])
846+
speaking = data['speaking']
847+
if ssrc in self.ssrc_map:
848+
self.ssrc_map[ssrc]['speaking'] = speaking
849+
else:
850+
self.ssrc_map.update({ssrc: {'user_id': user, 'speaking': speaking}})
851+
842852
await self._hook(self, msg)
843853

844854
async def initial_connection(self, data):

0 commit comments

Comments
 (0)