py-tgcalls 2.0.5__py3-none-any.whl → 2.1.0__py3-none-any.whl

pytgcalls/mtproto/pyrogram_client.py

@@ -21,7 +21,9 @@ from pyrogram.raw.functions.phone import EditGroupCallParticipant
 from pyrogram.raw.functions.phone import GetGroupCall
 from pyrogram.raw.functions.phone import GetGroupParticipants
 from pyrogram.raw.functions.phone import JoinGroupCall
+from pyrogram.raw.functions.phone import JoinGroupCallPresentation
 from pyrogram.raw.functions.phone import LeaveGroupCall
+from pyrogram.raw.functions.phone import LeaveGroupCallPresentation
 from pyrogram.raw.functions.phone import RequestCall
 from pyrogram.raw.functions.phone import SendSignalingData
 from pyrogram.raw.types import Channel
@@ -43,6 +45,7 @@ from pyrogram.raw.types import PhoneCall
 from pyrogram.raw.types import PhoneCallAccepted
 from pyrogram.raw.types import PhoneCallDiscarded
 from pyrogram.raw.types import PhoneCallDiscardReasonHangup
+from pyrogram.raw.types import PhoneCallDiscardReasonMissed
 from pyrogram.raw.types import PhoneCallProtocol
 from pyrogram.raw.types import PhoneCallRequested
 from pyrogram.raw.types import PhoneCallWaiting
@@ -94,7 +97,7 @@ class PyrogramClient(BridgedClient):
             ):
                 user_id = self._cache.get_user_id(update.phone_call_id)
                 if user_id is not None:
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             user_id,
                             RawCallUpdate.Type.SIGNALING_DATA,
@@ -118,7 +121,7 @@ class PyrogramClient(BridgedClient):
                         ),
                     )
                 if isinstance(update.phone_call, PhoneCallAccepted):
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             self.user_from_call(update.phone_call),
                             RawCallUpdate.Type.ACCEPTED,
@@ -134,14 +137,14 @@ class PyrogramClient(BridgedClient):
                         self._cache.drop_phone_call(
                             user_id,
                         )
-                        await self.propagate(
+                        await self._propagate(
                             ChatUpdate(
                                 user_id,
                                 ChatUpdate.Status.DISCARDED_CALL,
                             ),
                         )
                 if isinstance(update.phone_call, PhoneCallRequested):
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             self.user_from_call(update.phone_call),
                             RawCallUpdate.Type.REQUESTED,
@@ -152,7 +155,7 @@ class PyrogramClient(BridgedClient):
                         ),
                     )
                 if isinstance(update.phone_call, PhoneCall):
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             self.user_from_call(update.phone_call),
                             RawCallUpdate.Type.CONFIRMED,
@@ -174,12 +177,12 @@ class PyrogramClient(BridgedClient):
             ):
                 participants = update.participants
                 for participant in participants:
-                    result = self._cache.set_participants_cache(
+                    result = self._cache.set_participants_cache_call(
                         update.call.id,
                         self.parse_participant(participant),
                     )
                     if result is not None:
-                        await self.propagate(
+                        await self._propagate(
                             UpdatedGroupCallParticipant(
                                 self._cache.get_chat_id(update.call.id),
                                 result,
@@ -207,7 +210,7 @@ class PyrogramClient(BridgedClient):
                     GroupCallDiscarded,
                 ):
                     self._cache.drop_cache(chat_id)
-                    await self.propagate(
+                    await self._propagate(
                         ChatUpdate(
                             chat_id,
                             ChatUpdate.Status.CLOSED_VOICE_CHAT,
@@ -224,7 +227,7 @@ class PyrogramClient(BridgedClient):
                         ChannelForbidden,
                     ):
                         self._cache.drop_cache(chat_id)
-                        await self.propagate(
+                        await self._propagate(
                             ChatUpdate(
                                 chat_id,
                                 ChatUpdate.Status.KICKED,
@@ -247,7 +250,7 @@ class PyrogramClient(BridgedClient):
                             update.message.peer_id,
                             PeerChat,
                         ):
-                            await self.propagate(
+                            await self._propagate(
                                 ChatUpdate(
                                     chat_id,
                                     ChatUpdate.Status.INVITED_VOICE_CHAT,
@@ -267,7 +270,7 @@ class PyrogramClient(BridgedClient):
                                 ChatForbidden,
                             ):
                                 self._cache.drop_cache(chat_id)
-                                await self.propagate(
+                                await self._propagate(
                                     ChatUpdate(
                                         chat_id,
                                         ChatUpdate.Status.KICKED,
@@ -295,7 +298,7 @@ class PyrogramClient(BridgedClient):
                                     self._cache.drop_cache(
                                         chat_id,
                                     )
-                                    await self.propagate(
+                                    await self._propagate(
                                         ChatUpdate(
                                             chat_id,
                                             ChatUpdate.Status.LEFT_GROUP,
@@ -327,15 +330,22 @@ class PyrogramClient(BridgedClient):
             ).full_chat.call
 
         if input_call is not None:
-            call: GroupCall = (
+            raw_call = (
                 await self._app.send(
                     GetGroupCall(
                         call=input_call,
                         limit=-1,
                     ),
                 )
-            ).call
-
+            )
+            call: GroupCall = raw_call.call
+            participants: List[GroupCallParticipant] = raw_call.participants
+            for participant in participants:
+                self._cache.set_participants_cache_chat(
+                    chat_id,
+                    call.id,
+                    self.parse_participant(participant),
+                )
             if call.schedule_date is not None:
                 return None
 
@@ -403,12 +413,12 @@ class PyrogramClient(BridgedClient):
             )
             for update in result.updates:
                 if isinstance(
-                        update,
-                        UpdateGroupCallParticipants,
+                    update,
+                    UpdateGroupCallParticipants,
                 ):
                     participants = update.participants
                     for participant in participants:
-                        self._cache.set_participants_cache(
+                        self._cache.set_participants_cache_call(
                             update.call.id,
                             self.parse_participant(participant),
                         )
@@ -417,6 +427,37 @@ class PyrogramClient(BridgedClient):
 
         return json.dumps({'transport': None})
 
+    async def join_presentation(
+        self,
+        chat_id: int,
+        json_join: str,
+    ):
+        chat_call = await self._cache.get_full_chat(chat_id)
+        if chat_call is not None:
+            result: Updates = await self._app.send(
+                JoinGroupCallPresentation(
+                    call=chat_call,
+                    params=DataJSON(data=json_join),
+                ),
+            )
+            for update in result.updates:
+                if isinstance(update, UpdateGroupCallConnection):
+                    return update.params.data
+
+        return json.dumps({'transport': None})
+
+    async def leave_presentation(
+        self,
+        chat_id: int,
+    ):
+        chat_call = await self._cache.get_full_chat(chat_id)
+        if chat_call is not None:
+            await self._app.send(
+                LeaveGroupCallPresentation(
+                    call=chat_call,
+                ),
+            )
+
     async def request_call(
         self,
         user_id: int,
@@ -526,15 +567,21 @@ class PyrogramClient(BridgedClient):
     async def discard_call(
         self,
         chat_id: int,
+        is_missed: bool,
     ):
         peer = self._cache.get_phone_call(chat_id)
         if peer is None:
             return
+        reason = (
+            PhoneCallDiscardReasonMissed()
+            if is_missed
+            else PhoneCallDiscardReasonHangup()
+        )
         await self._app.invoke(
             DiscardCall(
                 peer=peer,
                 duration=0,
-                reason=PhoneCallDiscardReasonHangup(),
+                reason=reason,
                 connection_id=0,
                 video=False,
             ),
@@ -562,8 +609,9 @@ class PyrogramClient(BridgedClient):
         self,
         chat_id: int,
         muted_status: Optional[bool],
-        paused_status: Optional[bool],
-        stopped_status: Optional[bool],
+        video_paused: Optional[bool],
+        video_stopped: Optional[bool],
+        presentation_paused: Optional[bool],
         participant: InputPeer,
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
@@ -573,8 +621,9 @@ class PyrogramClient(BridgedClient):
                     call=chat_call,
                     participant=participant,
                     muted=muted_status,
-                    video_stopped=stopped_status,
-                    video_paused=paused_status,
+                    video_paused=video_paused,
+                    video_stopped=video_stopped,
+                    presentation_paused=presentation_paused,
                 ),
             )
 

pytgcalls/mtproto/telethon_client.py

@@ -17,7 +17,9 @@ from telethon.tl.functions.phone import DiscardCallRequest
 from telethon.tl.functions.phone import EditGroupCallParticipantRequest
 from telethon.tl.functions.phone import GetGroupCallRequest
 from telethon.tl.functions.phone import GetGroupParticipantsRequest
+from telethon.tl.functions.phone import JoinGroupCallPresentationRequest
 from telethon.tl.functions.phone import JoinGroupCallRequest
+from telethon.tl.functions.phone import LeaveGroupCallPresentationRequest
 from telethon.tl.functions.phone import LeaveGroupCallRequest
 from telethon.tl.functions.phone import RequestCallRequest
 from telethon.tl.functions.phone import SendSignalingDataRequest
@@ -32,11 +34,13 @@ from telethon.tl.types import InputPhoneCall
 from telethon.tl.types import MessageActionChatDeleteUser
 from telethon.tl.types import MessageActionInviteToGroupCall
 from telethon.tl.types import MessageService
+from telethon.tl.types import PeerChannel
 from telethon.tl.types import PeerChat
 from telethon.tl.types import PhoneCall
 from telethon.tl.types import PhoneCallAccepted
 from telethon.tl.types import PhoneCallDiscarded
 from telethon.tl.types import PhoneCallDiscardReasonHangup
+from telethon.tl.types import PhoneCallDiscardReasonMissed
 from telethon.tl.types import PhoneCallProtocol
 from telethon.tl.types import PhoneCallRequested
 from telethon.tl.types import PhoneCallWaiting
@@ -84,7 +88,7 @@ class TelethonClient(BridgedClient):
             ):
                 user_id = self._cache.get_user_id(update.phone_call_id)
                 if user_id is not None:
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             user_id,
                             RawCallUpdate.Type.SIGNALING_DATA,
@@ -108,7 +112,7 @@ class TelethonClient(BridgedClient):
                         ),
                     )
                 if isinstance(update.phone_call, PhoneCallAccepted):
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             self.user_from_call(update.phone_call),
                             RawCallUpdate.Type.ACCEPTED,
@@ -124,14 +128,14 @@ class TelethonClient(BridgedClient):
                         self._cache.drop_phone_call(
                             user_id,
                         )
-                        await self.propagate(
+                        await self._propagate(
                             ChatUpdate(
                                 user_id,
                                 ChatUpdate.Status.DISCARDED_CALL,
                             ),
                         )
                 if isinstance(update.phone_call, PhoneCallRequested):
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             self.user_from_call(update.phone_call),
                             RawCallUpdate.Type.REQUESTED,
@@ -142,7 +146,7 @@ class TelethonClient(BridgedClient):
                         ),
                     )
                 if isinstance(update.phone_call, PhoneCall):
-                    await self.propagate(
+                    await self._propagate(
                         RawCallUpdate(
                             self.user_from_call(update.phone_call),
                             RawCallUpdate.Type.CONFIRMED,
@@ -164,12 +168,12 @@ class TelethonClient(BridgedClient):
             ):
                 participants = update.participants
                 for participant in participants:
-                    result = self._cache.set_participants_cache(
+                    result = self._cache.set_participants_cache_call(
                         update.call.id,
                         self.parse_participant(participant),
                     )
                     if result is not None:
-                        await self.propagate(
+                        await self._propagate(
                             UpdatedGroupCallParticipant(
                                 self._cache.get_chat_id(update.call.id),
                                 result,
@@ -180,7 +184,9 @@ class TelethonClient(BridgedClient):
                 UpdateGroupCall,
             ):
                 chat_id = self.chat_id(
-                    await self._app.get_entity(update.chat_id),
+                    await self._get_entity_group(
+                        update.chat_id,
+                    ),
                 )
                 if isinstance(
                     update.call,
@@ -201,7 +207,7 @@ class TelethonClient(BridgedClient):
                     self._cache.drop_cache(
                         chat_id,
                     )
-                    await self.propagate(
+                    await self._propagate(
                         ChatUpdate(
                             chat_id,
                             ChatUpdate.Status.CLOSED_VOICE_CHAT,
@@ -213,10 +219,12 @@ class TelethonClient(BridgedClient):
             ):
                 chat_id = self.chat_id(update)
                 try:
-                    await self._app.get_entity(chat_id)
+                    await self._app.get_entity(
+                        PeerChannel(chat_id),
+                    )
                 except ChannelPrivateError:
                     self._cache.drop_cache(chat_id)
-                    await self.propagate(
+                    await self._propagate(
                         ChatUpdate(
                             chat_id,
                             ChatUpdate.Status.KICKED,
@@ -236,7 +244,7 @@ class TelethonClient(BridgedClient):
                         update.message.action,
                         MessageActionInviteToGroupCall,
                     ):
-                        await self.propagate(
+                        await self._propagate(
                             ChatUpdate(
                                 chat_id,
                                 ChatUpdate.Status.INVITED_VOICE_CHAT,
@@ -246,7 +254,7 @@ class TelethonClient(BridgedClient):
                     if isinstance(update.message.out, bool):
                         if update.message.out:
                             self._cache.drop_cache(chat_id)
-                            await self.propagate(
+                            await self._propagate(
                                 ChatUpdate(
                                     chat_id,
                                     ChatUpdate.Status.LEFT_GROUP,
@@ -265,13 +273,23 @@ class TelethonClient(BridgedClient):
                                 ChatForbidden,
                             ):
                                 self._cache.drop_cache(chat_id)
-                                await self.propagate(
+                                await self._propagate(
                                     ChatUpdate(
                                         chat_id,
                                         ChatUpdate.Status.KICKED,
                                     ),
                                 )
 
+    async def _get_entity_group(self, chat_id):
+        try:
+            return await self._app.get_entity(
+                PeerChannel(chat_id),
+            )
+        except ValueError:
+            return await self._app.get_entity(
+                PeerChat(chat_id),
+            )
+
     async def get_call(
         self,
         chat_id: int,
@@ -294,20 +312,27 @@ class TelethonClient(BridgedClient):
                     GetFullChatRequest(chat_id),
                 )
             ).full_chat.call
+
         if input_call is not None:
-            try:
-                call: GroupCall = (
-                    await self._app(
-                        GetGroupCallRequest(
-                            call=input_call,
-                            limit=-1,
-                        ),
-                    )
-                ).call
-                if call.schedule_date is not None:
-                    return None
-            except Exception as e:
-                print(e)
+            raw_call = (
+                await self._app(
+                    GetGroupCallRequest(
+                        call=input_call,
+                        limit=-1,
+                    ),
+                )
+            )
+            call: GroupCall = raw_call.call
+            participants: List[GroupCallParticipant] = raw_call.participants
+            for participant in participants:
+                self._cache.set_participants_cache_chat(
+                    chat_id,
+                    call.id,
+                    self.parse_participant(participant),
+                )
+            if call.schedule_date is not None:
+                return None
+
         return input_call
 
     async def get_dhc(self) -> DhConfig:
@@ -377,7 +402,7 @@ class TelethonClient(BridgedClient):
                 ):
                     participants = update.participants
                     for participant in participants:
-                        self._cache.set_participants_cache(
+                        self._cache.set_participants_cache_call(
                             update.call.id,
                             self.parse_participant(participant),
                         )
@@ -386,6 +411,37 @@ class TelethonClient(BridgedClient):
 
         return json.dumps({'transport': None})
 
+    async def join_presentation(
+        self,
+        chat_id: int,
+        json_join: str,
+    ):
+        chat_call = await self._cache.get_full_chat(chat_id)
+        if chat_call is not None:
+            result: Updates = await self._app(
+                JoinGroupCallPresentationRequest(
+                    call=chat_call,
+                    params=DataJSON(data=json_join),
+                ),
+            )
+            for update in result.updates:
+                if isinstance(update, UpdateGroupCallConnection):
+                    return update.params.data
+
+        return json.dumps({'transport': None})
+
+    async def leave_presentation(
+        self,
+        chat_id: int,
+    ):
+        chat_call = await self._cache.get_full_chat(chat_id)
+        if chat_call is not None:
+            await self._app(
+                LeaveGroupCallPresentationRequest(
+                    call=chat_call,
+                ),
+            )
+
     async def request_call(
         self,
         user_id: int,
@@ -495,15 +551,21 @@ class TelethonClient(BridgedClient):
     async def discard_call(
         self,
         chat_id: int,
+        is_missed: bool,
     ):
         peer = self._cache.get_phone_call(chat_id)
         if peer is None:
             return
+        reason = (
+            PhoneCallDiscardReasonMissed()
+            if is_missed
+            else PhoneCallDiscardReasonHangup()
+        )
         await self._app(
             DiscardCallRequest(
                 peer=peer,
                 duration=0,
-                reason=PhoneCallDiscardReasonHangup(),
+                reason=reason,
                 connection_id=0,
                 video=False,
             ),
@@ -531,8 +593,9 @@ class TelethonClient(BridgedClient):
         self,
         chat_id: int,
         muted_status: Optional[bool],
-        paused_status: Optional[bool],
-        stopped_status: Optional[bool],
+        video_paused: Optional[bool],
+        video_stopped: Optional[bool],
+        presentation_paused: Optional[bool],
         participant: TypeInputPeer,
     ):
         chat_call = await self._cache.get_full_chat(chat_id)
@@ -542,8 +605,9 @@ class TelethonClient(BridgedClient):
                     call=chat_call,
                     participant=participant,
                     muted=muted_status,
-                    video_stopped=stopped_status,
-                    video_paused=paused_status,
+                    video_paused=video_paused,
+                    video_stopped=video_stopped,
+                    presentation_paused=presentation_paused,
                 ),
             )
 

pytgcalls/scaffold.py

@@ -22,7 +22,9 @@ class Scaffold(HandlersHolder):
         self.loop = None
         self._need_unmute = set()
         self._p2p_configs = dict()
+        self._call_sources = dict()
         self._wait_connect = dict()
+        self._presentations = set()
 
     def _handle_mtproto(self):
         pass
@@ -36,5 +38,18 @@ class Scaffold(HandlersHolder):
     async def start(self):
         pass
 
+    async def play(self, chat_id: Union[int, str], stream=None, config=None):
+        pass
+
+    async def _update_sources(self, chat_id: Union[int, str]):
+        pass
+
+    async def _join_presentation(self, chat_id: Union[int, str], join: bool):
+        pass
+
+    @staticmethod
+    def _log_retries(r: int):
+        pass
+
     def on_update(self, filters=None):
         pass

pytgcalls/types/__init__.py

@@ -10,14 +10,23 @@ from .chats import ChatUpdate
 from .chats import GroupCallParticipant
 from .chats import UpdatedGroupCallParticipant
 from .stream import AudioQuality
+from .stream import Device
+from .stream import Direction
+from .stream import ExternalMedia
+from .stream import Frame
 from .stream import MediaStream
-from .stream import StreamAudioEnded
-from .stream import StreamVideoEnded
+from .stream import RecordStream
+from .stream import StreamEnded
+from .stream import StreamFrames
 from .stream import VideoQuality
 from .update import Update
 
 __all__ = (
     'AudioQuality',
+    'Device',
+    'Direction',
+    'ExternalMedia',
+    'Frame',
     'Browsers',
     'Cache',
     'ChatUpdate',
@@ -28,9 +37,10 @@ __all__ = (
     'RawCallUpdate',
     'GroupCallConfig',
     'GroupCallParticipant',
+    'RecordStream',
     'MediaStream',
-    'StreamAudioEnded',
-    'StreamVideoEnded',
+    'StreamEnded',
+    'StreamFrames',
     'Update',
     'UpdatedGroupCallParticipant',
     'VideoQuality',

pytgcalls/types/calls/__init__.py

@@ -2,6 +2,7 @@ from .call import Call
 from .call_config import CallConfig
 from .call_data import CallData
 from .call_protocol import CallProtocol
+from .call_sources import CallSources
 from .group_call_config import GroupCallConfig
 from .raw_call_update import RawCallUpdate
 
@@ -10,6 +11,7 @@ __all__ = (
     'CallData',
     'CallConfig',
     'CallProtocol',
+    'CallSources',
     'GroupCallConfig',
     'RawCallUpdate',
 )

pytgcalls/types/calls/call.py

@@ -6,7 +6,7 @@ from ..flag import Flag
 
 class Call(PyObject):
     class Status(Flag):
-        PLAYING = auto()
+        ACTIVE = auto()
         PAUSED = auto()
         IDLE = auto()
 
@@ -17,8 +17,10 @@ class Call(PyObject):
     def __init__(
         self,
         chat_id: int,
-        status: Status,
+        playback: Status,
+        capture: Status,
     ):
         self.call_type = Call.Type.GROUP \
             if chat_id < 0 else Call.Type.PRIVATE
-        self.status = status
+        self.playback = playback
+        self.capture = capture

pytgcalls/types/calls/call_sources.py

@@ -0,0 +1,4 @@
+class CallSources:
+    def __init__(self):
+        self.camera = dict()
+        self.presentation = dict()