py-tgcalls 2.1.2b2__py3-none-any.whl → 2.2.0__py3-none-any.whl

pytgcalls/mtproto/telethon_client.py

@@ -6,7 +6,9 @@ from typing import Union
 from ntgcalls import MediaSegmentQuality
 from ntgcalls import Protocol
 from telethon import TelegramClient
+from telethon.errors import BadRequestError
 from telethon.errors import ChannelPrivateError
+from telethon.errors import FileMigrateError
 from telethon.errors import FloodWaitError
 from telethon.events import Raw
 from telethon.tl.functions.channels import GetFullChannelRequest
@@ -16,6 +18,7 @@ from telethon.tl.functions.phone import AcceptCallRequest
 from telethon.tl.functions.phone import ConfirmCallRequest
 from telethon.tl.functions.phone import CreateGroupCallRequest
 from telethon.tl.functions.phone import DiscardCallRequest
+from telethon.tl.functions.phone import DiscardGroupCallRequest
 from telethon.tl.functions.phone import EditGroupCallParticipantRequest
 from telethon.tl.functions.phone import GetGroupCallRequest
 from telethon.tl.functions.phone import GetGroupCallStreamChannelsRequest
@@ -68,7 +71,6 @@ from ..types import CallProtocol
 from ..types import ChatUpdate
 from ..types import GroupCallParticipant
 from ..types import RawCallUpdate
-from ..types import UpdatedGroupCallParticipant
 from .bridged_client import BridgedClient
 from .client_cache import ClientCache
 
@@ -178,19 +180,22 @@ class TelethonClient(BridgedClient):
                 update,
                 UpdateGroupCallParticipants,
             ):
-                participants = update.participants
-                for participant in participants:
-                    result = self._cache.set_participants_cache_call(
-                        update.call.id,
-                        self.parse_participant(participant),
+                for participant in update.participants:
+                    chat_id = self._cache.get_chat_id(update.call.id)
+                    p_updates = await self.diff_participants_update(
+                        self._cache,
+                        chat_id,
+                        participant,
                     )
-                    if result is not None:
-                        await self._propagate(
-                            UpdatedGroupCallParticipant(
-                                self._cache.get_chat_id(update.call.id),
-                                result,
-                            ),
+                    for p_update in p_updates:
+                        result = self._cache.set_participants_cache(
+                            chat_id,
+                            update.call.id,
+                            p_update.action,
+                            p_update.participant,
                         )
+                        if result is not None:
+                            await self._propagate(p_update)
             if isinstance(
                 update,
                 UpdateGroupCall,
@@ -309,7 +314,7 @@ class TelethonClient(BridgedClient):
         chat = await self._app.get_input_entity(chat_id)
         if isinstance(chat, InputPeerChannel):
             input_call = (
-                await self._app(
+                await self._invoke(
                     GetFullChannelRequest(
                         InputChannel(
                             chat.channel_id,
@@ -320,14 +325,14 @@ class TelethonClient(BridgedClient):
             ).full_chat.call
         else:
             input_call = (
-                await self._app(
+                await self._invoke(
                     GetFullChatRequest(chat_id),
                 )
             ).full_chat.call
 
         if input_call is not None:
             raw_call = (
-                await self._app(
+                await self._invoke(
                     GetGroupCallRequest(
                         call=input_call,
                         limit=-1,
@@ -337,9 +342,10 @@ class TelethonClient(BridgedClient):
             call: GroupCall = raw_call.call
             participants: List[GroupCallParticipant] = raw_call.participants
             for participant in participants:
-                self._cache.set_participants_cache_chat(
+                self._cache.set_participants_cache(
                     chat_id,
                     call.id,
+                    self.parse_participant_action(participant),
                     self.parse_participant(participant),
                 )
             if call.schedule_date is not None:
@@ -348,7 +354,7 @@ class TelethonClient(BridgedClient):
         return input_call
 
     async def get_dhc(self) -> DhConfig:
-        return await self._app(
+        return await self._invoke(
             GetDhConfigRequest(
                 version=0,
                 random_length=256,
@@ -370,7 +376,7 @@ class TelethonClient(BridgedClient):
         participants = []
         next_offset = ''
         while True:
-            result = await self._app(
+            result = await self._invoke(
                 GetGroupParticipantsRequest(
                     call=input_call,
                     ids=[],
@@ -397,7 +403,7 @@ class TelethonClient(BridgedClient):
     ) -> str:
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            result: Updates = await self._app(
+            result: Updates = await self._invoke(
                 JoinGroupCallRequest(
                     call=chat_call,
                     params=DataJSON(data=json_join),
@@ -414,8 +420,10 @@ class TelethonClient(BridgedClient):
                 ):
                     participants = update.participants
                     for participant in participants:
-                        self._cache.set_participants_cache_call(
+                        self._cache.set_participants_cache(
+                            chat_id,
                             update.call.id,
+                            self.parse_participant_action(participant),
                             self.parse_participant(participant),
                         )
                 if isinstance(update, UpdateGroupCallConnection):
@@ -430,7 +438,7 @@ class TelethonClient(BridgedClient):
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            result: Updates = await self._app(
+            result: Updates = await self._invoke(
                 JoinGroupCallPresentationRequest(
                     call=chat_call,
                     params=DataJSON(data=json_join),
@@ -448,7 +456,7 @@ class TelethonClient(BridgedClient):
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            await self._app(
+            await self._invoke(
                 LeaveGroupCallPresentationRequest(
                     call=chat_call,
                 ),
@@ -461,7 +469,7 @@ class TelethonClient(BridgedClient):
         protocol: Protocol,
         has_video: bool,
     ):
-        update = await self._app(
+        update = await self._invoke(
             RequestCallRequest(
                 user_id=await self.resolve_peer(user_id),
                 random_id=self.rnd_id(),
@@ -484,7 +492,7 @@ class TelethonClient(BridgedClient):
         g_b: bytes,
         protocol: Protocol,
     ):
-        return await self._app(
+        return await self._invoke(
             AcceptCallRequest(
                 peer=self._cache.get_phone_call(user_id),
                 g_b=g_b,
@@ -500,7 +508,7 @@ class TelethonClient(BridgedClient):
         protocol: Protocol,
     ) -> CallProtocol:
         res = (
-            await self._app(
+            await self._invoke(
                 ConfirmCallRequest(
                     peer=self._cache.get_phone_call(user_id),
                     g_a=g_a,
@@ -520,7 +528,7 @@ class TelethonClient(BridgedClient):
         user_id: int,
         data: bytes,
     ):
-        await self._app(
+        await self._invoke(
             SendSignalingDataRequest(
                 peer=self._cache.get_phone_call(user_id),
                 data=data,
@@ -531,7 +539,7 @@ class TelethonClient(BridgedClient):
         self,
         chat_id: int,
     ):
-        result: Updates = await self._app(
+        result: Updates = await self._invoke(
             CreateGroupCallRequest(
                 peer=await self.resolve_peer(chat_id),
                 random_id=self.rnd_id(),
@@ -561,13 +569,26 @@ class TelethonClient(BridgedClient):
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            await self._app(
+            await self._invoke(
                 LeaveGroupCallRequest(
                     call=chat_call,
                     source=0,
                 ),
             )
 
+    async def close_voice_chat(
+        self,
+        chat_id: int,
+    ):
+        chat_call = await self._cache.get_full_chat(chat_id)
+        if chat_call is not None:
+            await self._invoke(
+                DiscardGroupCallRequest(
+                    call=chat_call,
+                ),
+            )
+            self._cache.drop_cache(chat_id)
+
     async def discard_call(
         self,
         chat_id: int,
@@ -581,7 +602,7 @@ class TelethonClient(BridgedClient):
             if is_missed
             else PhoneCallDiscardReasonHangup()
         )
-        await self._app(
+        await self._invoke(
             DiscardCallRequest(
                 peer=peer,
                 duration=0,
@@ -600,7 +621,7 @@ class TelethonClient(BridgedClient):
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            await self._app(
+            await self._invoke(
                 EditGroupCallParticipantRequest(
                     call=chat_call,
                     participant=participant,
@@ -621,7 +642,7 @@ class TelethonClient(BridgedClient):
         if chat_call is not None:
             try:
                 return (
-                    await self._app(
+                    await self._invoke(
                         GetFileRequest(
                             location=InputGroupCallStream(
                                 call=chat_call,
@@ -635,7 +656,8 @@ class TelethonClient(BridgedClient):
                             offset=0,
                             limit=limit,
                         ),
-                        flood_sleep_threshold=0,
+                        chat_id=chat_id,
+                        sleep_threshold=0,
                     )
                 ).bytes
             except FloodWaitError:
@@ -648,12 +670,12 @@ class TelethonClient(BridgedClient):
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            # noinspection PyBroadException
             channels = (
-                await self._app(
+                await self._invoke(
                     GetGroupCallStreamChannelsRequest(
                         call=chat_call,
                     ),
+                    chat_id=chat_id,
                 )
             ).channels
             if len(channels) > 0:
@@ -672,7 +694,7 @@ class TelethonClient(BridgedClient):
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
         if chat_call is not None:
-            await self._app(
+            await self._invoke(
                 EditGroupCallParticipantRequest(
                     call=chat_call,
                     participant=participant,
@@ -711,6 +733,44 @@ class TelethonClient(BridgedClient):
     def no_updates(self):
         return False
 
+    # noinspection PyProtectedMember,PyUnresolvedReferences
+    async def _invoke(
+        self,
+        request,
+        dc_id: Optional[int] = None,
+        chat_id: Optional[int] = None,
+        sleep_threshold: Optional[int] = None,
+    ):
+        try:
+            if chat_id is not None:
+                dc_id = self._cache.get_dc_call(chat_id)
+            if dc_id is None or self._app.session.dc_id == dc_id:
+                sender_dc = self._app._sender
+            else:
+                sender_dc = await self._app._borrow_exported_sender(dc_id)
+            return await self._app._call(
+                sender_dc,
+                request,
+                flood_sleep_threshold=sleep_threshold,
+            )
+        except (BadRequestError, FileMigrateError) as e:
+            dc_new = BridgedClient.extract_dc(
+                str(e),
+            )
+            if dc_new is not None:
+                if chat_id is not None:
+                    self._cache.set_dc_call(
+                        chat_id,
+                        dc_new,
+                    )
+                return await self._invoke(
+                    request,
+                    dc_new,
+                    chat_id,
+                    sleep_threshold,
+                )
+            raise
+
     # noinspection PyUnresolvedReferences
     async def start(self):
         await self._app.start()

pytgcalls/mutex.py

@@ -7,7 +7,9 @@ def mutex(func):
     @wraps(func)
     async def async_wrapper(*args, **kwargs):
         self = args[0]
-        chat_id = await self.resolve_chat_id(args[1])
+        chat_id = await self.resolve_chat_id(
+            args[1] if len(args) > 1 else kwargs['chat_id'],
+        )
         async with self._lock:
             self._calls_lock[chat_id] = self._calls_lock.get(
                 chat_id,

pytgcalls/types/cache.py

@@ -8,13 +8,13 @@ from typing import Optional
 @dataclass
 class CacheEntry:
     time: int
-    expiry_time: int
     data: Any
 
 
 class Cache:
-    def __init__(self):
+    def __init__(self, expiry_time: int = 0):
         self._store: Dict[int, CacheEntry] = {}  # type: ignore
+        self._expiry_time = expiry_time
 
     def get(self, chat_id: int):
         if chat_id in self._store:
@@ -25,13 +25,18 @@ class Cache:
                 self._store.pop(chat_id, None)
         return None
 
-    def put(self, chat_id: int, data: Any, expiry_time: int = 0) -> None:
+    def put(self, chat_id: int, data: Any) -> None:
         self._store[chat_id] = CacheEntry(
-            time=0 if expiry_time == 0 else (int(time()) + expiry_time),
-            expiry_time=expiry_time,
+            time=0
+            if self._expiry_time == 0 else
+            (int(time()) + self._expiry_time),
             data=data,
         )
 
+    def update_cache(self, chat_id: int) -> None:
+        if chat_id in self._store:
+            self._store[chat_id].time = int(time()) + self._expiry_time
+
     @property
     def keys(self):
         return list(self._store)

pytgcalls/types/chats/group_call_participant.py

@@ -12,6 +12,7 @@ class GroupCallParticipant(PyObject):
     class Action(Flag):
         JOINED = auto()
         LEFT = auto()
+        KICKED = auto()
         UPDATED = auto()
 
     class SourceInfo(PyObject):
@@ -33,8 +34,6 @@ class GroupCallParticipant(PyObject):
         video_camera: bool,
         raised_hand: bool,
         volume: int,
-        joined: bool,
-        left: bool,
         source: int,
         video_info: Optional[SourceInfo],
         presentation_info: Optional[SourceInfo],
@@ -48,12 +47,6 @@ class GroupCallParticipant(PyObject):
         self.video_camera: bool = video_camera
         self.raised_hand: bool = raised_hand
         self.volume: int = volume
-        if joined:
-            self.action = self.Action.JOINED
-        elif left:
-            self.action = self.Action.LEFT
-        else:
-            self.action = self.Action.UPDATED
         self.video_info: Optional[
             GroupCallParticipant.SourceInfo
         ] = video_info

pytgcalls/types/chats/updated_group_call_participant.py

@@ -6,7 +6,9 @@ class UpdatedGroupCallParticipant(Update):
     def __init__(
         self,
         chat_id: int,
+        action: GroupCallParticipant.Action,
         participant: GroupCallParticipant,
     ):
         super().__init__(chat_id)
+        self.action = action
         self.participant = participant

pytgcalls/types/dict.py

@@ -1,5 +1,5 @@
 from ..types.py_object import PyObject
 
 
-class Dict(dict, PyObject):
+class Dict(PyObject, dict):
     pass

pytgcalls/types/flag.py

@@ -1,6 +1,7 @@
 from enum import Flag as _Flag
 
+from .py_object import PyObject
 
-class Flag(_Flag):
-    def __repr__(self):
-        return f'{self.__class__.__name__}.{self.name}'
+
+class Flag(PyObject, _Flag):
+    pass

pytgcalls/types/list.py

@@ -1,5 +1,5 @@
 from ..types.py_object import PyObject
 
 
-class List(list, PyObject):
+class List(PyObject, list):
     pass

pytgcalls/types/participant_list.py

@@ -10,14 +10,14 @@ class ParticipantList:
         input_id: int,
     ):
         self._list_participants: Dict[int, GroupCallParticipant] = {}
-        self.last_mtproto_update: int = 0
         self.input_id: int = input_id
 
     def update_participant(
         self,
+        action: GroupCallParticipant.Action,
         participant: GroupCallParticipant,
-    ):
-        if participant.action == GroupCallParticipant.Action.LEFT:
+    ) -> GroupCallParticipant:
+        if action == GroupCallParticipant.Action.LEFT:
             if participant.user_id in self._list_participants:
                 del self._list_participants[participant.user_id]
         else:

pytgcalls/types/py_object.py

@@ -11,8 +11,10 @@ class PyObject:
     def default(obj) -> Union[str, Dict[str, str], List[Any]]:
         if isinstance(obj, bytes):
             return repr(obj)
-        if isinstance(obj, Enum):
-            return repr(obj)
+        elif isinstance(obj, Enum):
+            return ' | '.join(
+                [f"{obj.__class__.__name__}.{x}" for x in obj.name.split('|')],
+            )
         return {
             '_': obj.__class__.__name__,
             **{

pytgcalls/types/stream/media_stream.py

@@ -13,6 +13,7 @@ from ...exceptions import NoAudioSourceFound
 from ...exceptions import NoVideoSourceFound
 from ...ffmpeg import build_command
 from ...ffmpeg import check_stream
+from ...list_to_cmd import list_to_cmd
 from ...media_devices.input_device import InputDevice
 from ...media_devices.screen_device import ScreenDevice
 from ...statictypes import statictypes
@@ -145,7 +146,7 @@ class MediaStream(Stream):
             if self._is_audio_external else
             AudioStream(
                 MediaSource.SHELL,
-                ' '.join(
+                list_to_cmd(
                     build_command(
                         'ffmpeg',
                         self._ffmpeg_parameters,
@@ -178,7 +179,7 @@ class MediaStream(Stream):
             if self._is_video_external else
             VideoStream(
                 MediaSource.SHELL,
-                ' '.join(
+                list_to_cmd(
                     build_command(
                         'ffmpeg',
                         self._ffmpeg_parameters,
@@ -229,7 +230,7 @@ class MediaStream(Stream):
                         ]
                     except LiveStreamFound:
                         live_stream = True
-                    self.camera.path = ' '.join(
+                    self.camera.path = list_to_cmd(
                         build_command(
                             'ffmpeg',
                             self._ffmpeg_parameters,
@@ -278,7 +279,7 @@ class MediaStream(Stream):
                         )
                     except LiveStreamFound:
                         live_stream = True
-                    self.microphone.path = ' '.join(
+                    self.microphone.path = list_to_cmd(
                         build_command(
                             'ffmpeg',
                             self._ffmpeg_parameters,

pytgcalls/types/stream/record_stream.py

@@ -3,6 +3,7 @@ from typing import Union
 
 from ntgcalls import MediaSource
 
+from ...list_to_cmd import list_to_cmd
 from ...media_devices.speaker_device import SpeakerDevice
 from ...statictypes import statictypes
 from ..raw.audio_parameters import AudioParameters
@@ -72,7 +73,7 @@ class RecordStream(Stream):
             ]
             return AudioStream(
                 media_source=MediaSource.SHELL,
-                path=' '.join(commands),
+                path=list_to_cmd(commands),
                 parameters=raw_audio_parameters,
             )
         if isinstance(audio, SpeakerDevice):
@@ -81,6 +82,7 @@ class RecordStream(Stream):
                 path=audio.metadata,
                 parameters=raw_audio_parameters,
             )
+        return None
 
     @staticmethod
     def _get_video_stream(enable):

pytgcalls/types/stream/video_quality.py

@@ -1,7 +1,9 @@
 from enum import Enum
 
+from ..py_object import PyObject
 
-class VideoQuality(Enum):
+
+class VideoQuality(PyObject, Enum):
     UHD_4K = (3840, 2160, 60)
     QHD_2K = (2560, 1440, 60)
     FHD_1080p = (1920, 1080, 60)

pytgcalls/ytdlp.py

@@ -7,6 +7,7 @@ from typing import Tuple
 
 from .exceptions import YtDlpError
 from .ffmpeg import cleanup_commands
+from .list_to_cmd import list_to_cmd
 from .types.raw import VideoParameters
 
 py_logger = logging.getLogger('pytgcalls')
@@ -37,7 +38,7 @@ class YtDlp:
             'yt-dlp',
             '-g',
             '-f',
-            'bestvideo[vcodec~=\'(vp09|avc1)\']+m4a/best',
+            'bestvideo[vcodec~="(vp09|avc1)"]+m4a/best',
             '-S',
             'res:'
             f'{min(video_parameters.width, video_parameters.height)}',
@@ -59,7 +60,7 @@ class YtDlp:
 
         py_logger.log(
             logging.DEBUG,
-            f'Running with "{" ".join(commands)}" command',
+            f'Running with "{list_to_cmd(commands)}" command',
         )
         try:
             proc = await asyncio.create_subprocess_exec(