nambrogi
/
pomice
mirror of https://github.com/cloudwithax/pomice.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from vveeps/main 

add discord.py 2.0 support
This commit is contained in:
Clxud 2021-10-03 15:13:46 -04:00 committed by GitHub
parent afc3109b27 c0b4e1a446
commit f6c2267e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pomice/player.py
View File

@ -42,9 +42,7 @@ class Player(VoiceProtocol):
self._last_update: int = 0 self._last_update: int = 0
self._current_track_id = None self._current_track_id = None
self._voice_server_update_data = {}
self._session_id: Optional[str] = None
self._voice_server_update_data: Optional[dict] = None
def __repr__(self): def __repr__(self):
@ -106,28 +104,29 @@ class Player(VoiceProtocol):
self._is_connected = state.get('connected') self._is_connected = state.get('connected')
self._last_position = state.get('position') self._last_position = state.get('position')
async def _dispatch_voice_update(self) -> None: async def _dispatch_voice_update(self, voice_data: Dict[str, Any]) -> None:
if {'sessionId', 'event'} != self._voice_server_update_data.keys():
if not self._session_id or not self._voice_server_update_data:
return return
await self._node.send(op='voiceUpdate', sessionId=self._session_id, guildId=str(self._guild.id), event={**self._voice_server_update_data}) await self._node.send(
op='voiceUpdate',
guildId=str(self._guild.id),
**voice_data
)
async def _voice_server_update(self, data: dict): async def _voice_server_update(self, data: dict):
self._voice_server_update_data.update({'event': data})
self._voice_server_update_data = data await self._dispatch_voice_update(self._voice_server_update_data)
await self._dispatch_voice_update()
async def _voice_state_update(self, data: dict): async def _voice_state_update(self, data: dict):
self._voice_server_update_data.update({'sessionId': data.get('session_id')})
if not (channel_id := data.get('channel_id')): if not (channel_id := data.get('channel_id')):
self.channel, self._session_id, self._voice_server_update_data = None self.channel = None
self._voice_server_update_data.clear()
return return
self.channel = self._guild.get_channel(int(channel_id)) self.channel = self._guild.get_channel(int(channel_id))
self._session_id = data.get('session_id') await self._dispatch_voice_update({**self._voice_server_update_data, "event": data})
await self._dispatch_voice_update()
async def _dispatch_event(self, data: dict): async def _dispatch_event(self, data: dict):
event_type = data.get('type') event_type = data.get('type')