From 5824d47590cf77d36a0ebcaef1c184aa806e8b6c Mon Sep 17 00:00:00 2001 From: Badiboy Date: Wed, 18 Nov 2020 02:22:52 +0300 Subject: [PATCH] added only_if_banned to unban_chat_member --- telebot/__init__.py | 5 +++-- telebot/apihelper.py | 4 +++- telebot/types.py | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/telebot/__init__.py b/telebot/__init__.py index ccc017a..20fdf45 100644 --- a/telebot/__init__.py +++ b/telebot/__init__.py @@ -1052,14 +1052,15 @@ class TeleBot: """ return apihelper.kick_chat_member(self.token, chat_id, user_id, until_date) - def unban_chat_member(self, chat_id, user_id): + def unban_chat_member(self, chat_id, user_id, only_if_banned = False): """ Removes member from the ban :param chat_id: :param user_id: + :param only_if_banned: :return: """ - return apihelper.unban_chat_member(self.token, chat_id, user_id) + return apihelper.unban_chat_member(self.token, chat_id, user_id, only_if_banned) def restrict_chat_member( self, chat_id, user_id, until_date=None, diff --git a/telebot/apihelper.py b/telebot/apihelper.py index 8e817bd..3bc6d35 100644 --- a/telebot/apihelper.py +++ b/telebot/apihelper.py @@ -700,9 +700,11 @@ def kick_chat_member(token, chat_id, user_id, until_date=None): return _make_request(token, method_url, params=payload, method='post') -def unban_chat_member(token, chat_id, user_id): +def unban_chat_member(token, chat_id, user_id, only_if_banned): method_url = 'unbanChatMember' payload = {'chat_id': chat_id, 'user_id': user_id} + if only_if_banned: + payload['only_if_banned'] = only_if_banned return _make_request(token, method_url, params=payload, method='post') diff --git a/telebot/types.py b/telebot/types.py index 6dcf6c2..5e6b59a 100644 --- a/telebot/types.py +++ b/telebot/types.py @@ -413,6 +413,7 @@ class Message(JsonDeserializable): def __init__(self, message_id, from_user, date, chat, content_type, options, json_string): self.content_type = content_type + self.id = message_id # Lets fix the telegram usability ####up with ID in Message :) self.message_id = message_id self.from_user = from_user self.date = date