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

{py_tgcalls-2.1.2b2.dist-info → py_tgcalls-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: py-tgcalls
-Version: 2.1.2b2
+Version: 2.2.0
 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<1.4.0,>=1.3.5b3
+Requires-Dist: ntgcalls<3.0.0,>=2.0.0
 Requires-Dist: deprecation
 Provides-Extra: pyrogram
 Requires-Dist: pyrogram>=1.2.20; extra == "pyrogram"

{py_tgcalls-2.1.2b2.dist-info → py_tgcalls-2.2.0.dist-info}/RECORD

@@ -1,12 +1,13 @@
-py_tgcalls-2.1.2b2.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.2.0.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 pytgcalls/__init__.py,sha256=qbfwN7rYwIdCegMOzdcbvwazeNjDzgmowgcqLFNqKIM,308
-pytgcalls/__version__.py,sha256=FprLafBuvz-hzBW23aNWsGkjU3pSVyK0rnV3nOorhlc,24
+pytgcalls/__version__.py,sha256=Vyf6P6UCZKFeQtRzYujPmFfdlqSfnc01VEMWE3O0ZrA,22
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
 pytgcalls/exceptions.py,sha256=Rijc-8T93WEWJxNW9jncU8_M6mYZZZcs8F2bqitEIeI,3787
-pytgcalls/ffmpeg.py,sha256=tm6DBxyNfPh3h3an-b2s9x1UyX-cvkCdov9prlXxVZY,8649
-pytgcalls/filters.py,sha256=qTFDlt-23xnMh_Ug2WmmOUf13JPX6_yacrv7c3F9Pp0,6125
+pytgcalls/ffmpeg.py,sha256=CZvSyuztc-TGKbKI9_2G7CLITe1ITf315YPyprWu_Pg,8645
+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=6hOwGnUTNUJliJ1GGhk47D0A3KEn8eVd-kjZq_1DdZY,670
+pytgcalls/mutex.py,sha256=vWqji9IAHtAc61FUTVXncx5rZ3rVf5qG_7PI4LmuYmU,733
 pytgcalls/pytgcalls.py,sha256=DxCE0--mb53vyDXLLBAwy1cPrJgLsyC9rba_h2OzR2o,1608
 pytgcalls/pytgcalls_session.py,sha256=_BGJWvf7t3mki2DhlEPjh9cypvYuSFkMSxzTsfepwUk,2719
 pytgcalls/scaffold.py,sha256=Gahln5l70FJZwo1KGqv1A7K9Vn_ozAATpADGFJuPhKA,3162
@@ -14,7 +15,7 @@ pytgcalls/statictypes.py,sha256=CdlqgQNhTZ_uTE8-B8m01fJ7TlD2B42EI2QBPxDdAtA,3842
 pytgcalls/sync.py,sha256=IsOH3TD7cxUg_-zdGt12HoS8sBlXvcGayPZAoxxKM48,3396
 pytgcalls/version_manager.py,sha256=egeGgvb66zWlLTMuw2U-b0x8MfnRzMm1xAEVN87HF5c,296
 pytgcalls/wait_counter_lock.py,sha256=J-KCWUBCt7ktKQKyIseNG0RfXDVRh-h0wKhaZlf4aFs,437
-pytgcalls/ytdlp.py,sha256=jRA-mKQEXleWvaoGv9wtMa77aRjxsyQxn6_0tXI3-sA,2435
+pytgcalls/ytdlp.py,sha256=MEPkVlFdbexbgqVRMt7C1YadPIER2R-4oN03osl5vq8,2473
 pytgcalls/custom_api/__init__.py,sha256=ZT8d0lc2YrDuw_YSFAXXHHMewoXGFZ-ANOBIAr0vGFQ,60
 pytgcalls/custom_api/custom_api.py,sha256=Ko3aS6psrwPmOhRPxvG0fepXt4STrA0StvINSxz4Cj8,1890
 pytgcalls/handlers/__init__.py,sha256=pubbxI4pLqQpAKf8-toD6ija4cpSvbCJOQFjTiDjX1E,75
@@ -29,16 +30,16 @@ 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=YxeCB6mq5OhIy5MoFuC2PgKQ2H0E8VGr4I79upC5URY,1603
 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
 pytgcalls/methods/internal/clear_cache.py,sha256=qgG-oubmdtnefnXSiHSPHyBTyXypiLDC7G8l3FzjNw8,236
 pytgcalls/methods/internal/clear_call.py,sha256=yElvn3i6_j14Q7n9kcLSl-muYAGcaIZaEFHdp6MrN0g,549
-pytgcalls/methods/internal/connect_call.py,sha256=2DRmsILPyGNxV2880tVsQ2XUwd89iSIqVWHl5AkgEaE,5393
+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
@@ -51,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
@@ -69,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=svXufZkCj7WM9XOWkuk5oJVQxgL1Bg_8rz7w_ZKWlQg,6451
-pytgcalls/mtproto/client_cache.py,sha256=fpmZhRUGD3G2t2LjEK0z4OPLmWVhJQZUvDW6bgr6StI,5907
-pytgcalls/mtproto/hydrogram_client.py,sha256=pSEtHowL833-vD5ppm78eBe7_Ik0pumChbDTMLsyP5Y,25553
-pytgcalls/mtproto/mtproto_client.py,sha256=95A13HsNJfpNslsY_gWiqYXj_Vvo-pl3rVrsJGxftgg,8517
-pytgcalls/mtproto/pyrogram_client.py,sha256=linvRHAxZCb4PenJEN9-OtjQm7Go9OONyDotZcMydNY,25710
-pytgcalls/mtproto/telethon_client.py,sha256=iDMAAKvvFVigOrLPusG9ytiswxM2UCp4KZZuwtT-vKo,24987
+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
@@ -96,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
@@ -110,12 +111,12 @@ pytgcalls/types/stream/device.py,sha256=EdoDg6lPE7fgoZI04Nr0E9zbIk-iRIBgYYAzVqoC
 pytgcalls/types/stream/direction.py,sha256=VepLMe-dXg4M5eVdVyIb2uxYvnpB9OJL5fEgPYUFtTI,592
 pytgcalls/types/stream/external_media.py,sha256=RiuSX5tZGdNsQZ8LIRk5Lp4Ksv9oTvaccmInJRZYo4M,114
 pytgcalls/types/stream/frame.py,sha256=TXo5HZVHbbaVNBqulMhTqGODXH3bpBVlN_of1rosNUQ,586
-pytgcalls/types/stream/media_stream.py,sha256=_NJFTAIUdYyTh-gjiqs6aCpAIfSVjE16mBYUapMnDfg,11917
-pytgcalls/types/stream/record_stream.py,sha256=RWeD9U-sqUmb_PuZQxYnExZyoibepU_8oI2yrH2Y18c,3135
+pytgcalls/types/stream/media_stream.py,sha256=zcRVpNXfL8mhg-SEfAi-f0lDUZMyNYLetophvcAN_gQ,11968
+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.1.2b2.dist-info/METADATA,sha256=GxtcdfoQ7YJZWo5rwwvc1IDUdK4dR7teugIeXM80NLQ,5284
-py_tgcalls-2.1.2b2.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-py_tgcalls-2.1.2b2.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.1.2b2.dist-info/RECORD,,
+pytgcalls/types/stream/video_quality.py,sha256=eMCBFPwh5meX3UVEaozcGlwmgaujfpiTa3vBVSBBP_8,275
+py_tgcalls-2.2.0.dist-info/METADATA,sha256=OLWKAf_6F7CxLaWYFyNr0A88kPEhdIRKi2uhTkUii38,5280
+py_tgcalls-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+py_tgcalls-2.2.0.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.2.0.dist-info/RECORD,,

{py_tgcalls-2.1.2b2.dist-info → py_tgcalls-2.2.0.dist-info}/WHEEL

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

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.1.2b2'
+__version__ = '2.2.0'

pytgcalls/ffmpeg.py

@@ -207,12 +207,12 @@ def build_command(
     if headers is not None:
         for i in headers:
             ffmpeg_command.append('-headers')
-            ffmpeg_command.append(f'"{i}: {headers[i]}"')
+            ffmpeg_command.append(f'{i}: {headers[i]}')
 
     ffmpeg_command += [
         '-nostdin',
         '-i',
-        f'"{path}"' if name == 'ffmpeg' else path,
+        f'{path}' if name == 'ffmpeg' else path,
     ]
     ffmpeg_command += command['mid']
 

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/list_to_cmd.py

@@ -0,0 +1,11 @@
+import platform
+import shlex
+import subprocess
+from typing import List
+
+
+def list_to_cmd(args: List[str]) -> str:
+    if platform.system() == 'Windows':
+        return subprocess.list2cmdline(args)
+    else:
+        return shlex.join(args)

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
+            self._app.close_voice_chat(chat_id)

pytgcalls/methods/internal/connect_call.py

@@ -5,6 +5,7 @@ from typing import Union
 from ntgcalls import ConnectionMode
 from ntgcalls import ConnectionNotFound
 from ntgcalls import MediaDescription
+from ntgcalls import StreamMode
 from ntgcalls import TelegramServerError
 
 from ...exceptions import TimedOutAnswer
@@ -31,8 +32,12 @@ class ConnectCall(Scaffold):
                     if not payload:
                         payload = await self._binding.create_call(
                             chat_id,
-                            media_description,
                         )
+                    await self._binding.set_stream_sources(
+                        chat_id,
+                        StreamMode.CAPTURE,
+                        media_description,
+                    )
                     result_params = await self._app.join_group_call(
                         chat_id,
                         payload,
@@ -63,6 +68,10 @@ class ConnectCall(Scaffold):
                     )
                     await self._binding.create_p2p_call(
                         chat_id,
+                    )
+                    await self._binding.set_stream_sources(
+                        chat_id,
+                        StreamMode.CAPTURE,
                         media_description,
                     )
                     data.g_a_or_b = await self._binding.init_exchange(

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

@@ -1,4 +1,5 @@
 import random
+import re
 from typing import Any
 from typing import List
 from typing import Optional
@@ -10,6 +11,7 @@ from ntgcalls import SsrcGroup
 
 from ..handlers import HandlersHolder
 from ..types import GroupCallParticipant
+from ..types import UpdatedGroupCallParticipant
 
 
 class BridgedClient(HandlersHolder):
@@ -95,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,
@@ -189,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__
@@ -260,6 +311,17 @@ class BridgedClient(HandlersHolder):
         else:
             return None
 
+    @staticmethod
+    def extract_dc(error: str) -> Optional[int]:
+        dc_id = re.findall(
+            r'('
+            r'CALL_MIGRATE_|'
+            r'The file to be accessed is currently stored in DC *'
+            r')([0-9])',
+            error,
+        )
+        return int(dc_id[0][1]) if dc_id else None
+
     @staticmethod
     def rnd_id() -> int:
         return random.randint(0, 0x7FFFFFFF - 1)

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,10 +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._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,
@@ -45,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(
@@ -148,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(
@@ -164,6 +140,23 @@ class ClientCache:
     ) -> None:
         self._full_chat_cache.pop(chat_id)
         self._call_participants_cache.pop(chat_id)
+        self._dc_call_cache.pop(chat_id)
+
+    def set_dc_call(
+        self,
+        chat_id: int,
+        dc_id: int,
+    ) -> None:
+        self._dc_call_cache.put(
+            chat_id,
+            dc_id,
+        )
+
+    def get_dc_call(
+        self,
+        chat_id: int,
+    ) -> Optional[int]:
+        return self._dc_call_cache.get(chat_id)
 
     def set_phone_call(
         self,