Merge branch 'master' of https://github.com/pyrogram/pyrogram

delivrance · delivrance · commit a917596cb124 · 2021-12-17T11:50:14.000+01:00
diff --git a/pyrogram/methods/chats/delete_user_history.py b/pyrogram/methods/chats/delete_user_history.py
@@ -42,9 +42,9 @@ async def delete_user_history(
         """
 
         r = await self.send(
-            raw.functions.channels.DeleteUserHistory(
+            raw.functions.channels.DeleteParticipantHistory(
                 channel=await self.resolve_peer(chat_id),
-                user_id=await self.resolve_peer(user_id)
+                participant=await self.resolve_peer(user_id)
             )
         )
 
diff --git a/pyrogram/methods/messages/send_chat_action.py b/pyrogram/methods/messages/send_chat_action.py
@@ -37,6 +37,8 @@ class ChatAction:
     PLAYING = raw.types.SendMessageGamePlayAction
     CHOOSE_CONTACT = raw.types.SendMessageChooseContactAction
     SPEAKING = raw.types.SpeakingInGroupCallAction
+    IMPORT_HISTORY = raw.types.SendMessageHistoryImportAction
+    CHOOSE_STICKER = raw.types.SendMessageChooseStickerAction
     CANCEL = raw.types.SendMessageCancelAction
 
 
@@ -59,6 +61,7 @@ async def send_chat_action(self, chat_id: Union[int, str], action: str) -> bool:
                 *"record_audio"* or *"upload_audio"* for audio files, *"upload_document"* for general files,
                 *"find_location"* for location data, *"record_video_note"* or *"upload_video_note"* for video notes,
                 *"choose_contact"* for contacts, *"playing"* for games, *"speaking"* for speaking in group calls or
+                *"import_history"* for importing history, *"choose_sticker"* for stickers or
                 *"cancel"* to cancel any chat action currently displayed.
 
         Returns:
@@ -89,7 +92,7 @@ async def send_chat_action(self, chat_id: Union[int, str], action: str) -> bool:
             raise ValueError("Invalid chat action '{}'. Possible values are: {}".format(
                 action, json.dumps(POSSIBLE_VALUES, indent=4))) from None
 
-        if "Upload" in action.__name__:
+        if "Upload" in action.__name__ or "History" in action.__name__:
             action = action(progress=0)
         else:
             action = action()

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,9 @@ async def delete_user_history(`
`42`	`42`	`"""`
`43`	`43`
`44`	`44`	`r = await self.send(`
`45`		`- raw.functions.channels.DeleteUserHistory(`
	`45`	`+ raw.functions.channels.DeleteParticipantHistory(`
`46`	`46`	`channel=await self.resolve_peer(chat_id),`
`47`		`- user_id=await self.resolve_peer(user_id)`
	`47`	`+ participant=await self.resolve_peer(user_id)`
`48`	`48`	`)`
`49`	`49`	`)`
`50`	`50`