LonamiWebs/Telethon
1
1
Fork 0
mirror of https://github.com/LonamiWebs/Telethon.git synced 2025-08-06 21:20:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/master' into delete-messages

Browse Source 
# Conflicts:
#	telethon/telegram_client.py
This commit is contained in:
JosXa 2017-10-02 16:09:41 +02:00
parent 8e026123f5
commit bd00e29c5d
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -101,6 +101,3 @@ ENV/
# Rope project settings # Rope project settings
.ropeproject .ropeproject
# Developer tests
test.py

7
telethon/telegram_client.py
View File

@ -1,10 +1,9 @@
import os import os
import re
from datetime import datetime, timedelta from datetime import datetime, timedelta
from functools import lru_cache from functools import lru_cache
from mimetypes import guess_type from mimetypes import guess_type
import re
try: try:
import socks import socks
except ImportError: except ImportError:
@ -385,8 +384,6 @@ class TelegramClient(TelegramBareClient):
else: else:
return self(messages.DeleteMessagesRequest(message_ids, revoke=revoke)) return self(messages.DeleteMessagesRequest(message_ids, revoke=revoke))
def get_message_history(self, def get_message_history(self,
entity, entity,
limit=20, limit=20,
@ -435,7 +432,7 @@ class TelegramClient(TelegramBareClient):
utils.find_user_or_chat(m.to_id, result.users, result.chats) utils.find_user_or_chat(m.to_id, result.users, result.chats)
for m in result.messages for m in result.messages
] ]
return total_messages, result.messages, entities return total_messages, result.messages, entities