py-tgcalls 2.2.0rc2__py3-none-any.whl → 2.2.1__py3-none-any.whl

{py_tgcalls-2.2.0rc2.dist-info → py_tgcalls-2.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-tgcalls
-Version: 2.2.0rc2
+Version: 2.2.1
 Summary: Async client API for the Telegram Calls.
 Author-email: Laky-64 <iraci.matteo@gmail.com>
 Project-URL: Homepage, https://pytgcalls.github.io/
@@ -20,7 +20,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.3
-Requires-Dist: ntgcalls<3.0.0,>=2.0.0rc4
+Requires-Dist: ntgcalls<3.0.0,>=2.0.1
 Requires-Dist: deprecation
 Provides-Extra: pyrogram
 Requires-Dist: pyrogram>=1.2.20; extra == "pyrogram"

{py_tgcalls-2.2.0rc2.dist-info → py_tgcalls-2.2.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-py_tgcalls-2.2.0rc2.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.2.1.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 pytgcalls/__init__.py,sha256=qbfwN7rYwIdCegMOzdcbvwazeNjDzgmowgcqLFNqKIM,308
-pytgcalls/__version__.py,sha256=Cyc7uLJxAPLnuEEaO5JtEF4rXv_8vGUZ7RKqg1iyVH8,25
+pytgcalls/__version__.py,sha256=-7agX4LcQ0956RU4mY0EYyxYQU9llH7JklZOsqoujdU,22
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
 pytgcalls/exceptions.py,sha256=Rijc-8T93WEWJxNW9jncU8_M6mYZZZcs8F2bqitEIeI,3787
 pytgcalls/ffmpeg.py,sha256=CZvSyuztc-TGKbKI9_2G7CLITe1ITf315YPyprWu_Pg,8645
-pytgcalls/filters.py,sha256=qTFDlt-23xnMh_Ug2WmmOUf13JPX6_yacrv7c3F9Pp0,6125
+pytgcalls/filters.py,sha256=8Fq_gvHHdqhIk_XwMJ9wneeZOwrvBkSOKaMJ60r3bZU,6157
 pytgcalls/list_to_cmd.py,sha256=rGJLsejbAQdDb8pctMbLnwea5NkitlfVKc3IpoGi4V4,240
 pytgcalls/mtproto_required.py,sha256=6B-31p5qH_6oekUgypV4nK3hqPS6Nr-pA8S81wjnbaY,630
 pytgcalls/mutex.py,sha256=vWqji9IAHtAc61FUTVXncx5rZ3rVf5qG_7PI4LmuYmU,733
@@ -30,7 +30,7 @@ pytgcalls/methods/__init__.py,sha256=KKnG3uI_3oKKBByQ96kHJiabjxk2J6YLs4HDfOKvQ0A
 pytgcalls/methods/calls/__init__.py,sha256=xg4DZZClEnxwaj-DAq3e8gSR-g-MiYBdUEBth64lSXA,214
 pytgcalls/methods/calls/change_volume_call.py,sha256=xMUszg44Gs1RgTXGCwcWEESnwu3XVkW8Kx9HGLDGSEo,842
 pytgcalls/methods/calls/get_participants.py,sha256=HDEMwZwNZM7KSb76P5XVH46qNONvBEVg4x_e-rgJscI,716
-pytgcalls/methods/calls/leave_call.py,sha256=Q7v0xT_CjbMIUBrugtvKbZqbSgmw5laMQYVhrMcaD1U,1475
+pytgcalls/methods/calls/leave_call.py,sha256=XiaKrnSgaItbAIUpdGXCo1HgXY7V7FcDjRsi5OwNweY,1609
 pytgcalls/methods/decorators/__init__.py,sha256=TCGaEVZnHjtOwv-3PNfaCVm0kyFhJApUPUNntt6MwyM,78
 pytgcalls/methods/decorators/on_update.py,sha256=ZTL4YcQk0N4Ru56a5WItUvkSN5SAqr6_RDZvXmZMIHs,316
 pytgcalls/methods/internal/__init__.py,sha256=fcgIxUJKT6QJD30ltnOfzKsLhzTTTklD2qxKlwCvyv0,1057
@@ -39,7 +39,7 @@ pytgcalls/methods/internal/clear_call.py,sha256=yElvn3i6_j14Q7n9kcLSl-muYAGcaIZa
 pytgcalls/methods/internal/connect_call.py,sha256=Py-sB_ImH839tK9GxNUCJDJUNizsZtlm5m6kuiUX3lE,5739
 pytgcalls/methods/internal/emit_sig_data.py,sha256=ucIsknhJHB-0x7lcymXvwQ647AJQ852zH2W6MdlC3ws,216
 pytgcalls/methods/internal/handle_connection_changed.py,sha256=_1u3J6_Pjl1Gs1u_WkhG2FAUl_hxlHUiflaMkKkJDsc,866
-pytgcalls/methods/internal/handle_mtproto_updates.py,sha256=Ev2Jake6Z_SrBodnjO5N16YiYaEY3Ti4tkU1pKOsJVM,7747
+pytgcalls/methods/internal/handle_mtproto_updates.py,sha256=ZPGvenIjWiNnTTTKdhQdapHsxwYn4pSKOgKm8bPcPOk,7415
 pytgcalls/methods/internal/handle_stream_ended.py,sha256=DllD1ZfGQbwVh-S0neocwnN-8lQtwwyrzWl9teSrZbY,561
 pytgcalls/methods/internal/handle_stream_frame.py,sha256=_FA782qlOT3tUqnySm7RBpjbgfEEzt1oEBDm-iADsbQ,1145
 pytgcalls/methods/internal/join_presentation.py,sha256=dLB2kolIIm2KQH8yBQbEPJi_y1_cVLWpE52_Rwjn_KE,2178
@@ -52,7 +52,7 @@ pytgcalls/methods/internal/update_status.py,sha256=6zH7oMM_qPE-88mdC5CBhT07gPvay
 pytgcalls/methods/stream/__init__.py,sha256=mAcOih0-NT6T_Gspej6mySpJNPuEe46sUwgKV3vSvYM,336
 pytgcalls/methods/stream/mute.py,sha256=ZrZS_EeNUeUxb6UgbdhwXUdRX826u-qSjH5a6sg7LsE,557
 pytgcalls/methods/stream/pause.py,sha256=-kNvWQuv5VlssNcL-M6rkT5TKFmXlbOzJrDny95qsUc,560
-pytgcalls/methods/stream/play.py,sha256=fTZS-XHF50Wo9BNOZ373n4YhGqRuu7uZR-GJEACjqYY,2935
+pytgcalls/methods/stream/play.py,sha256=XJB7o4Y5ImY1Qh_tHCkT70cUKOr9JlinWtVKwE8W5Rw,2951
 pytgcalls/methods/stream/record.py,sha256=geYSVtSbp0yRIR1Nmj-L1s-6nqQAh0x0IcA1OuFvuyA,1306
 pytgcalls/methods/stream/resume.py,sha256=AUHU3AtpXO2rtp2V1EKSC_KAWTk2KHMiHaqHluYy31M,563
 pytgcalls/methods/stream/send_frame.py,sha256=Kj9R8OqUM-g7pt-FiWP-US7sCFkH5ciPr9S8v-WPtLg,1062
@@ -70,20 +70,20 @@ pytgcalls/methods/utilities/run.py,sha256=cnYQd2xB5Cr_WS0Q2cXJZPGiN6JOCULzj1r4xX
 pytgcalls/methods/utilities/start.py,sha256=mn0kQZhTUuc-9CCJDbFIVsEtJ8kfnfZOGbVC505qVRM,3232
 pytgcalls/methods/utilities/stream_params.py,sha256=fOSloo1A7WTxaZEtOiPXjdexMeoJjq8CZtfHuIFX7Ns,3325
 pytgcalls/mtproto/__init__.py,sha256=X4zvzFG7km7qHyE0fdvA550WcOVO_xl_p__gvIfDGmw,130
-pytgcalls/mtproto/bridged_client.py,sha256=b8RmasIkXBTn15tAWZJ2ptPfxhIh0rGoNuAYRUlaUyQ,6776
-pytgcalls/mtproto/client_cache.py,sha256=iVcBW9WE2w4s-yswOZpZ1eC2t0yR8TjppS86qOv6f2Q,6292
-pytgcalls/mtproto/hydrogram_client.py,sha256=hhQ2fnPR74G39hoJ3oKRP3jeC7c-QGSuVpyCMp2mqr4,28312
-pytgcalls/mtproto/mtproto_client.py,sha256=95A13HsNJfpNslsY_gWiqYXj_Vvo-pl3rVrsJGxftgg,8517
-pytgcalls/mtproto/pyrogram_client.py,sha256=vqFLbDLJt5rrhgTqmzuiW2mAVGl9-c9LK5cXgup0QAU,28308
-pytgcalls/mtproto/telethon_client.py,sha256=ZMyLEZvog5iojoRyjcuk6-WIUnaJrJGnO6nfaKSMwao,26411
+pytgcalls/mtproto/bridged_client.py,sha256=Qb9-9FrUdh3g_sx-JOcvkzv3kJtS_pz2Qaos85DgVPI,8280
+pytgcalls/mtproto/client_cache.py,sha256=5unu8sjLRaIKoEgJGaIRjhA4P3U2lFpfakTKFxKLzAM,5591
+pytgcalls/mtproto/hydrogram_client.py,sha256=P2YpeIBYXzBHWLXyk9pGiO_TsIBuzDQ7LvorGZFFM-o,28974
+pytgcalls/mtproto/mtproto_client.py,sha256=9SIG3DNeICIXvggyVE8DQWtToPtxV0t9ZKr6dEMnEMg,8783
+pytgcalls/mtproto/pyrogram_client.py,sha256=CI9uPMdwwE3UGSNfenqIKUl-UD_caVZpCzYR1PB4drY,28970
+pytgcalls/mtproto/telethon_client.py,sha256=w9PuqE_gsDKFYVpF5o_ULMSsYf5sAK8VgImVxbNz2Bc,27106
 pytgcalls/types/__init__.py,sha256=GlgBBXAwbNopXSeTTmiXktrEJhhN_rMBtuAllTBbN3k,1189
 pytgcalls/types/browsers.py,sha256=47Kr5q96n4Q4WvVhA6IUlS2egEcA9GRLlDeFcQYyc9M,9545
-pytgcalls/types/cache.py,sha256=FfsOcmYnsBGPlJoTPIXXYcUSpGE3rhx6cjIH77hyUL0,1059
-pytgcalls/types/dict.py,sha256=lAo9hu4VlVJa9S7P8Y81BYmKtvz0rH7hwpGcH3ynHUw,78
-pytgcalls/types/flag.py,sha256=dQPcQmTgTQzcOLTvGe8t_e9mY4qsVnCZFrrTk17b2Xw,132
-pytgcalls/types/list.py,sha256=UjP_XxxMpPkLlu6yEy29JYqOM5VITFwwJcDm0wZni1c,78
-pytgcalls/types/participant_list.py,sha256=LmGjU63MK1v3SS2_4xNbk04OOjmukNdAXYLRn2L-730,916
-pytgcalls/types/py_object.py,sha256=__GNXgffGK4jhdF4QPqIknd0k2myObJf_7fW3pNGpbU,836
+pytgcalls/types/cache.py,sha256=nJh6B7xnvAiLh0mDJYS9sYhnRvj0BqxrQBLXs4WEUMs,1235
+pytgcalls/types/dict.py,sha256=-R1v5-v5WzhquPN25Bfw9Ow6q2lRRgpsq_FlsOawCUw,78
+pytgcalls/types/flag.py,sha256=MeWDKkUAZa97fUPg5Ni5Rf4pDgiZ_OSRZPseEY7d3rw,104
+pytgcalls/types/list.py,sha256=rGzD9LWAI2hUX71OL_pqZn08YHEbZ-AZ6RTjXPc9wJA,78
+pytgcalls/types/participant_list.py,sha256=wG7a8dvcmcUkagmSo-g4thGMBrqMdEU0fA_zD4tCk2w,931
+pytgcalls/types/py_object.py,sha256=jisGKqJINuzAjkIkLIps61uYM0eFSmC9TtgxGRDAMZI,934
 pytgcalls/types/update.py,sha256=wPCzWLhrsScZ3ksRTyt8IuDaaG5YI-ItG_Yw-OqzK2Y,157
 pytgcalls/types/user_agent.py,sha256=sSfeGqUe0v0wqBgdVszNFK0iOC_0Tdyto9CglBXlY4U,1086
 pytgcalls/types/calls/__init__.py,sha256=lgFG89_NGhWHOQqhfw3adPaQZMzsMKI1f-MyZW3TBBU,478
@@ -97,8 +97,8 @@ pytgcalls/types/calls/pending_connection.py,sha256=qRRmutInj70rtzbThM7CNznFhEPqT
 pytgcalls/types/calls/raw_call_update.py,sha256=hpNw6HrTW8Z36Lh2HinS-wzprryRtsIxyIFbIfjGgeI,795
 pytgcalls/types/chats/__init__.py,sha256=v8pUp_vbr2kQpyHtAQc80N-YqzmXHe9SbllUsa6njkU,261
 pytgcalls/types/chats/chat_update.py,sha256=lzrqNDPv4a_yXpKIfUnhocXqZyIy8XgZladOQTYrrYA,730
-pytgcalls/types/chats/group_call_participant.py,sha256=XG4dekFV9GYHASqy_bSE6YnZ1uDunFFif-xLAy_eYGY,1711
-pytgcalls/types/chats/updated_group_call_participant.py,sha256=-KID-z-4e43fhYWQp0pNMKPfmZizbJHXyzn6yLtIGNg,291
+pytgcalls/types/chats/group_call_participant.py,sha256=aK7nvI0Jy93g9A_FVeFzk1BZFXzhFry06h8xR4VpqXY,1507
+pytgcalls/types/chats/updated_group_call_participant.py,sha256=bZQsZAsMv_i4k8DJW3phyuHqpa9Dp6IbheHCvj3M630,365
 pytgcalls/types/raw/__init__.py,sha256=ROHsKFeUMUtlFbx2rhfrdB-TuVm0zBuvNo29Ccn5614,308
 pytgcalls/types/raw/audio_parameters.py,sha256=1DsBPwdn_Ukd2Tbkb3whP_ILo9xJY_3XNNmbO4_NO9Q,449
 pytgcalls/types/raw/audio_stream.py,sha256=oN7Sx9oLbNFuNXiGYpoNabMwqWKGquLiHEywef28o7c,488
@@ -115,8 +115,8 @@ pytgcalls/types/stream/media_stream.py,sha256=zcRVpNXfL8mhg-SEfAi-f0lDUZMyNYLeto
 pytgcalls/types/stream/record_stream.py,sha256=f4VQ6MY8HtOxt7vz0hWBFmbbAIvTRHpAIU2nmj0TF6Y,3197
 pytgcalls/types/stream/stream_ended.py,sha256=xR_kZwFf03hA6rw_nvI7Be7GwoCKzQf_1MKaGpPDXqY,716
 pytgcalls/types/stream/stream_frames.py,sha256=028ZhNV-mN3BGqMlmxusAV1xDQpXRYCeM0WXBZhRUhA,446
-pytgcalls/types/stream/video_quality.py,sha256=HBfWq005kh-D19MaVE9VzVdnODzrXf4IJUimCfslfiU,231
-py_tgcalls-2.2.0rc2.dist-info/METADATA,sha256=LkSNsGghHhrmEQAXwxTGygFaHVKhLD_yzsRIN7eqj2M,5286
-py_tgcalls-2.2.0rc2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-py_tgcalls-2.2.0rc2.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.2.0rc2.dist-info/RECORD,,
+pytgcalls/types/stream/video_quality.py,sha256=eMCBFPwh5meX3UVEaozcGlwmgaujfpiTa3vBVSBBP_8,275
+py_tgcalls-2.2.1.dist-info/METADATA,sha256=7j-AgY6sI6uL623U_ZbjjXwbfu7_KymRphdpSLssPJE,5280
+py_tgcalls-2.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+py_tgcalls-2.2.1.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.2.1.dist-info/RECORD,,

{py_tgcalls-2.2.0rc2.dist-info → py_tgcalls-2.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.2.0rc2'
+__version__ = '2.2.1'

pytgcalls/filters.py

@@ -158,6 +158,7 @@ class stream_end(Filter):
                     self.device & update.device
                 )
             )
+        return False
 
 
 # noinspection PyPep8Naming
@@ -190,14 +191,17 @@ class chat_update(Filter):
 
 # noinspection PyPep8Naming
 class call_participant(Filter):
-    def __init__(self, flags: Optional[GroupCallParticipant.Action] = None):
+    def __init__(
+        self,
+        flags: Optional[GroupCallParticipant.Action] = None,
+    ):
         self.flags = flags
 
     async def __call__(self, client: PyTgCalls, update: Update):
         if isinstance(update, UpdatedGroupCallParticipant):
             if self.flags is None:
                 return True
-            return self.flags & update.participant.action
+            return self.flags & update.action
         return False
 
 

pytgcalls/methods/calls/leave_call.py

@@ -17,6 +17,7 @@ class LeaveCall(Scaffold):
     async def leave_call(
         self,
         chat_id: Union[int, str],
+        close: bool = False,
     ):
         chat_id = await self.resolve_chat_id(chat_id)
         is_p2p_waiting = (
@@ -48,3 +49,6 @@ class LeaveCall(Scaffold):
             self._need_unmute.discard(chat_id)
             self._presentations.discard(chat_id)
             self._call_sources.pop(chat_id, None)
+
+        if chat_id < 0 and close:  # type: ignore
+            await self._app.close_voice_chat(chat_id)

pytgcalls/methods/internal/handle_mtproto_updates.py

@@ -72,7 +72,7 @@ class HandleMTProtoUpdates(Scaffold):
                 await self._clear_call(chat_id)
         if isinstance(update, UpdatedGroupCallParticipant):
             participant = update.participant
-            action = participant.action
+            action = update.action
             chat_peer = self._cache_user_peer.get(chat_id)
             user_id = participant.user_id
             if chat_id in self._call_sources:
@@ -141,19 +141,12 @@ class HandleMTProtoUpdates(Scaffold):
                     chat_peer,
                 ) == participant.user_id if chat_peer else False
                 if is_self:
-                    if action == GroupCallParticipant.Action.LEFT:
-                        if await self._clear_call(chat_id):
-                            await self._propagate(
-                                ChatUpdate(
-                                    chat_id,
-                                    ChatUpdate.Status.KICKED,
-                                ),
-                                self,
-                            )
+                    if action == GroupCallParticipant.Action.KICKED:
+                        await self._clear_call(chat_id)
                     if (
-                            chat_id in self._need_unmute and
-                            action == GroupCallParticipant.Action.UPDATED and
-                            not participant.muted_by_admin
+                        chat_id in self._need_unmute and
+                        action == GroupCallParticipant.Action.UPDATED
+                        and not participant.muted_by_admin
                     ):
                         await self._update_status(
                             chat_id,
@@ -162,8 +155,8 @@ class HandleMTProtoUpdates(Scaffold):
                         await self._switch_connection(chat_id)
 
                     if (
-                            participant.muted_by_admin and
-                            action != GroupCallParticipant.Action.LEFT
+                        participant.muted_by_admin and
+                        action != GroupCallParticipant.Action.LEFT
                     ):
                         self._need_unmute.add(chat_id)
                     else:

pytgcalls/methods/stream/play.py

@@ -44,11 +44,12 @@ class Play(Scaffold):
 
         if chat_id in await self._binding.calls():
             try:
-                return await self._binding.set_stream_sources(
+                await self._binding.set_stream_sources(
                     chat_id,
                     StreamMode.CAPTURE,
                     media_description,
                 )
+                return
             except FileError as e:
                 raise FileNotFoundError(e)
 

pytgcalls/mtproto/bridged_client.py

@@ -11,6 +11,7 @@ from ntgcalls import SsrcGroup
 
 from ..handlers import HandlersHolder
 from ..types import GroupCallParticipant
+from ..types import UpdatedGroupCallParticipant
 
 
 class BridgedClient(HandlersHolder):
@@ -96,6 +97,12 @@ class BridgedClient(HandlersHolder):
     ):
         pass
 
+    async def close_voice_chat(
+        self,
+        chat_id: int,
+    ):
+        pass
+
     async def get_group_call_participants(
         self,
         chat_id: int,
@@ -190,13 +197,56 @@ class BridgedClient(HandlersHolder):
             bool(participant.raise_hand_rating),
             participant.volume // 100
             if participant.volume is not None else 100,
-            bool(participant.just_joined),
-            bool(participant.left),
             participant.source,
             BridgedClient.parse_source(participant.video),
             BridgedClient.parse_source(participant.presentation),
         )
 
+    @staticmethod
+    async def diff_participants_update(
+        cache,
+        chat_id: Optional[int],
+        participant,
+    ) -> List[UpdatedGroupCallParticipant]:
+        if chat_id is None:
+            return []
+        user_id = BridgedClient.chat_id(participant.peer)
+        participants = await cache.get_participant_list(
+            chat_id,
+            True,
+        )
+        updates = []
+        for p in participants:
+            if p.user_id == user_id:
+                if p.source != participant.source:
+                    updates.append(
+                        UpdatedGroupCallParticipant(
+                            chat_id,
+                            GroupCallParticipant.Action.KICKED,
+                            p,
+                        ),
+                    )
+                    participant.just_joined = True
+                break
+
+        updates.append(
+            UpdatedGroupCallParticipant(
+                chat_id,
+                BridgedClient.parse_participant_action(participant),
+                BridgedClient.parse_participant(participant),
+            ),
+        )
+        return updates
+
+    @staticmethod
+    def parse_participant_action(participant):
+        if participant.just_joined:
+            return GroupCallParticipant.Action.JOINED
+        elif participant.left:
+            return GroupCallParticipant.Action.LEFT
+        else:
+            return GroupCallParticipant.Action.UPDATED
+
     @staticmethod
     def chat_id(input_peer) -> int:
         class_name = input_peer.__class__.__name__

pytgcalls/mtproto/client_cache.py

@@ -1,5 +1,4 @@
 import logging
-from time import time
 from typing import Any
 from typing import List
 from typing import Optional
@@ -19,11 +18,12 @@ class ClientCache:
         app: BridgedClient,
     ):
         self._app: BridgedClient = app
-        self._cache_duration = 1 if app.no_updates() else cache_duration
-        self._full_chat_cache = Cache()
-        self._call_participants_cache = Cache()
-        self._dc_call_cache = Cache()
-        self._phone_calls = Cache()
+        cache_duration = 0 if app.no_updates() else cache_duration
+        full_chat_duration = 1 if app.no_updates() else cache_duration
+        self._full_chat_cache = Cache(full_chat_duration)
+        self._call_participants_cache = Cache(cache_duration)
+        self._dc_call_cache = Cache(full_chat_duration)
+        self._phone_calls = Cache(full_chat_duration)
 
     async def get_full_chat(
         self,
@@ -46,88 +46,64 @@ class ClientCache:
                 pass
         return None
 
-    def set_participants_cache_call(
+    def set_participants_cache(
         self,
-        input_id: int,
-        participant: GroupCallParticipant,
-    ) -> Optional[GroupCallParticipant]:
-        chat_id = self.get_chat_id(input_id)
-        if chat_id is not None:
-            return self._internal_set_participants_cache(
-                chat_id,
-                participant,
-            )
-        return None
-
-    def set_participants_cache_chat(
-        self,
-        chat_id: int,
+        chat_id: Optional[int],
         call_id: int,
+        action: GroupCallParticipant.Action,
         participant: GroupCallParticipant,
     ) -> Optional[GroupCallParticipant]:
-        if self._call_participants_cache.get(chat_id) is None:
-            self._call_participants_cache.put(
+        if chat_id is not None:
+            if self._call_participants_cache.get(chat_id) is None:
+                self._call_participants_cache.put(
+                    chat_id,
+                    ParticipantList(
+                        call_id,
+                    ),
+                )
+            participants: Optional[
+                ParticipantList
+            ] = self._call_participants_cache.get(
                 chat_id,
-                ParticipantList(
-                    call_id,
-                ),
-            )
-        return self._internal_set_participants_cache(
-            chat_id,
-            participant,
-        )
-
-    def _internal_set_participants_cache(
-        self,
-        chat_id: int,
-        participant: GroupCallParticipant,
-    ) -> Optional[GroupCallParticipant]:
-        participants: Optional[
-            ParticipantList
-        ] = self._call_participants_cache.get(
-            chat_id,
-        )
-        if participants is not None:
-            participants.last_mtproto_update = (
-                int(time()) + self._cache_duration
             )
-            return participants.update_participant(participant)
+            if participants is not None:
+                self._call_participants_cache.update_cache(chat_id)
+                return participants.update_participant(
+                    action,
+                    participant,
+                )
         return None
 
     async def get_participant_list(
         self,
         chat_id: int,
-    ) -> Optional[List[GroupCallParticipant]]:
+        only_cached: bool = False,
+    ) -> List[GroupCallParticipant]:
         input_call = await self.get_full_chat(
             chat_id,
         )
         if input_call is not None:
-            participants: Optional[
-                ParticipantList
-            ] = self._call_participants_cache.get(
-                chat_id,
-            )
-            if participants is not None:
-                last_update = participants.last_mtproto_update
-                curr_time = int(time())
-                if not (last_update - curr_time > 0):
-                    py_logger.debug(
-                        'GetParticipant cache miss for %d', chat_id,
+            if self._call_participants_cache.get(chat_id) is None:
+                if only_cached:
+                    return []
+                py_logger.debug(
+                    'GetParticipant cache miss for %d', chat_id,
+                )
+                list_participants = await self._app.get_participants(
+                    input_call,
+                )
+                for participant in list_participants:
+                    self.set_participants_cache(
+                        chat_id,
+                        input_call.id,
+                        GroupCallParticipant.Action.UPDATED,
+                        participant,
                     )
-                    try:
-                        list_participants = await self._app.get_participants(
-                            input_call,
-                        )
-                        for participant in list_participants:
-                            self.set_participants_cache_call(
-                                input_call.id,
-                                participant,
-                            )
-                    except Exception as e:
-                        py_logger.error('Error for %s in %d', e, chat_id)
-                else:
-                    py_logger.debug('GetParticipant cache hit for %d', chat_id)
-                return participants.get_participants()
+            else:
+                py_logger.debug('GetParticipant cache hit for %d', chat_id)
+            return self._call_participants_cache.get(
+                chat_id,
+            ).get_participants()
         return []
 
     def get_chat_id(
@@ -149,7 +125,6 @@ class ClientCache:
         self._full_chat_cache.put(
             chat_id,
             input_call,
-            self._cache_duration,
         )
         if self._call_participants_cache.get(chat_id) is None:
             self._call_participants_cache.put(

pytgcalls/mtproto/hydrogram_client.py

@@ -21,6 +21,7 @@ from hydrogram.raw.functions.phone import AcceptCall
 from hydrogram.raw.functions.phone import ConfirmCall
 from hydrogram.raw.functions.phone import CreateGroupCall
 from hydrogram.raw.functions.phone import DiscardCall
+from hydrogram.raw.functions.phone import DiscardGroupCall
 from hydrogram.raw.functions.phone import EditGroupCallParticipant
 from hydrogram.raw.functions.phone import GetGroupCall
 from hydrogram.raw.functions.phone import GetGroupCallStreamChannels
@@ -76,7 +77,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
 
@@ -94,7 +94,7 @@ class HydrogramClient(BridgedClient):
             self,
         )
 
-        @self._app.on_raw_update(group=-1)
+        @self._app.on_raw_update(group=-9999)
         async def on_update(_, update, __, chats):
             if isinstance(
                 update,
@@ -186,19 +186,22 @@ class HydrogramClient(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,
@@ -352,9 +355,10 @@ class HydrogramClient(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:
@@ -429,8 +433,10 @@ class HydrogramClient(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):
@@ -583,6 +589,19 @@ class HydrogramClient(BridgedClient):
                 ),
             )
 
+    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(
+                DiscardGroupCall(
+                    call=chat_call,
+                ),
+            )
+            self._cache.drop_cache(chat_id)
+
     async def discard_call(
         self,
         chat_id: int,
@@ -734,7 +753,6 @@ class HydrogramClient(BridgedClient):
     ):
         if chat_id is not None:
             dc_id = self._cache.get_dc_call(chat_id)
-
         if dc_id is None:
             session = self._app
         else:
@@ -784,12 +802,12 @@ class HydrogramClient(BridgedClient):
             dc_new = BridgedClient.extract_dc(
                 str(e),
             )
-            if chat_id is not None and dc_new is not None:
-                self._cache.set_dc_call(
-                    chat_id,
-                    dc_new,
-                )
             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,

pytgcalls/mtproto/mtproto_client.py

@@ -197,6 +197,17 @@ class MtProtoClient:
         else:
             raise InvalidMTProtoClient()
 
+    async def close_voice_chat(
+        self,
+        chat_id: int,
+    ):
+        if self._bind_client is not None:
+            await self._bind_client.close_voice_chat(
+                chat_id,
+            )
+        else:
+            raise InvalidMTProtoClient()
+
     async def change_volume(
         self,
         chat_id: int,

pytgcalls/mtproto/pyrogram_client.py

@@ -23,6 +23,7 @@ from pyrogram.raw.functions.phone import AcceptCall
 from pyrogram.raw.functions.phone import ConfirmCall
 from pyrogram.raw.functions.phone import CreateGroupCall
 from pyrogram.raw.functions.phone import DiscardCall
+from pyrogram.raw.functions.phone import DiscardGroupCall
 from pyrogram.raw.functions.phone import EditGroupCallParticipant
 from pyrogram.raw.functions.phone import GetGroupCall
 from pyrogram.raw.functions.phone import GetGroupCallStreamChannels
@@ -76,7 +77,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
 
@@ -94,7 +94,7 @@ class PyrogramClient(BridgedClient):
             self,
         )
 
-        @self._app.on_raw_update(group=-1)
+        @self._app.on_raw_update(group=-9999)
         async def on_update(_, update, __, chats):
             if isinstance(
                 update,
@@ -186,19 +186,23 @@ class PyrogramClient(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,
@@ -352,9 +356,10 @@ class PyrogramClient(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:
@@ -429,8 +434,10 @@ class PyrogramClient(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):
@@ -583,6 +590,19 @@ class PyrogramClient(BridgedClient):
                 ),
             )
 
+    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(
+                DiscardGroupCall(
+                    call=chat_call,
+                ),
+            )
+            self._cache.drop_cache(chat_id)
+
     async def discard_call(
         self,
         chat_id: int,
@@ -736,7 +756,6 @@ class PyrogramClient(BridgedClient):
     ):
         if chat_id is not None:
             dc_id = self._cache.get_dc_call(chat_id)
-
         if dc_id is None:
             session = self._app
         else:
@@ -786,12 +805,12 @@ class PyrogramClient(BridgedClient):
             dc_new = BridgedClient.extract_dc(
                 str(e),
             )
-            if chat_id is not None and dc_new is not None:
-                self._cache.set_dc_call(
-                    chat_id,
-                    dc_new,
-                )
             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,

pytgcalls/mtproto/telethon_client.py

@@ -18,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
@@ -70,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
 
@@ -180,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,
@@ -339,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:
@@ -416,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):
@@ -570,6 +576,19 @@ class TelethonClient(BridgedClient):
                 ),
             )
 
+    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,
@@ -714,7 +733,7 @@ class TelethonClient(BridgedClient):
     def no_updates(self):
         return False
 
-    # noinspection PyProtectedMember
+    # noinspection PyProtectedMember,PyUnresolvedReferences
     async def _invoke(
         self,
         request,
@@ -738,12 +757,12 @@ class TelethonClient(BridgedClient):
             dc_new = BridgedClient.extract_dc(
                 str(e),
             )
-            if chat_id is not None and dc_new is not None:
-                self._cache.set_dc_call(
-                    chat_id,
-                    dc_new,
-                )
             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,

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/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)