From c11a9f810c7019965ff3ceaeabae83a1ab19838f Mon Sep 17 00:00:00 2001 From: sviat9440 Date: Wed, 21 Mar 2018 07:35:42 +0300 Subject: [PATCH 1/6] Update types.py Added 'json' property to class 'Message', to quickly save a message to the database --- telebot/types.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telebot/types.py b/telebot/types.py index f497a7c..a8dbe62 100644 --- a/telebot/types.py +++ b/telebot/types.py @@ -369,7 +369,7 @@ class Message(JsonDeserializable): if 'connected_website' in obj: opts['connected_website'] = obj['connected_website'] content_type = 'connected_website' - return cls(message_id, from_user, date, chat, content_type, opts) + return cls(message_id, from_user, date, chat, content_type, opts, json) @classmethod def parse_chat(cls, chat): @@ -436,6 +436,7 @@ class Message(JsonDeserializable): self.connected_website = None for key in options: setattr(self, key, options[key]) + self.json = json class MessageEntity(JsonDeserializable): From 82e252ec46891b1603575146e6eee84cab6067fa Mon Sep 17 00:00:00 2001 From: sviat9440 Date: Wed, 21 Mar 2018 10:44:37 +0300 Subject: [PATCH 2/6] Update types.py Fix --- telebot/types.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telebot/types.py b/telebot/types.py index a8dbe62..e53f9cd 100644 --- a/telebot/types.py +++ b/telebot/types.py @@ -392,7 +392,7 @@ class Message(JsonDeserializable): ret.append(MessageEntity.de_json(me)) return ret - def __init__(self, message_id, from_user, date, chat, content_type, options): + def __init__(self, message_id, from_user, date, chat, content_type, options, json_string): self.content_type = content_type self.message_id = message_id self.from_user = from_user @@ -436,7 +436,7 @@ class Message(JsonDeserializable): self.connected_website = None for key in options: setattr(self, key, options[key]) - self.json = json + self.json = json_string class MessageEntity(JsonDeserializable): From 0422e62f6574f0b5a8b3ab3bc2f7277c2c3438c3 Mon Sep 17 00:00:00 2001 From: sviat9440 Date: Wed, 21 Mar 2018 10:45:34 +0300 Subject: [PATCH 3/6] Update types.py Fix --- telebot/types.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telebot/types.py b/telebot/types.py index e53f9cd..7af3ac4 100644 --- a/telebot/types.py +++ b/telebot/types.py @@ -369,7 +369,7 @@ class Message(JsonDeserializable): if 'connected_website' in obj: opts['connected_website'] = obj['connected_website'] content_type = 'connected_website' - return cls(message_id, from_user, date, chat, content_type, opts, json) + return cls(message_id, from_user, date, chat, content_type, opts, json_string) @classmethod def parse_chat(cls, chat): From ff3cbaf45bb3a4a29ee7abd4a376d40007bde5f6 Mon Sep 17 00:00:00 2001 From: sviat9440 Date: Sun, 25 Mar 2018 13:21:55 +0300 Subject: [PATCH 4/6] Update apihelper.py --- telebot/apihelper.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/telebot/apihelper.py b/telebot/apihelper.py index a02c8e4..043bd16 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -98,6 +98,11 @@ def get_file(token, file_id): return _make_request(token, method_url, params={'file_id': file_id}) +def get_file_url(token, file_id): + method_url = r'getFile' + return FILE_URL.format(token, types.File.de_json(_make_request(token, method_url, params={'file_id': file_id})).file_path) + + def download_file(token, file_path): url = FILE_URL.format(token, file_path) result = _get_req_session().get(url) From cb0256b37d5a5e99e9a221a1f620fce49c49b573 Mon Sep 17 00:00:00 2001 From: sviat9440 Date: Sun, 25 Mar 2018 13:22:35 +0300 Subject: [PATCH 5/6] Update __init__.py --- telebot/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/telebot/__init__.py b/telebot/__init__.py index d6c16e1..27381a4 100644 --- a/telebot/__init__.py +++ b/telebot/__init__.py @@ -351,6 +351,9 @@ class TeleBot: def get_file(self, file_id): return types.File.de_json(apihelper.get_file(self.token, file_id)) + def get_file_url(self, file_id): + return apihelper.get_file_url(self.token, file_id) + def download_file(self, file_path): return apihelper.download_file(self.token, file_path) From e761e1e1d9c4c8d2d48c9c0ef31fc3e2de2079c9 Mon Sep 17 00:00:00 2001 From: sviat9440 Date: Sun, 25 Mar 2018 14:54:28 +0300 Subject: [PATCH 6/6] Update apihelper.py --- telebot/apihelper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telebot/apihelper.py b/telebot/apihelper.py index 043bd16..1173aa3 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -100,7 +100,7 @@ def get_file(token, file_id): def get_file_url(token, file_id): method_url = r'getFile' - return FILE_URL.format(token, types.File.de_json(_make_request(token, method_url, params={'file_id': file_id})).file_path) + return FILE_URL.format(token, get_file(token, file_id).file_path) def download_file(token, file_path):