Skip to content

Commit

Permalink
Update to version 4.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Mustafa Asaad committed Jun 8, 2020
1 parent 85ff069 commit 8313100
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 45 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def read(filename):


setup(name='tgbotapi',
version='4.8.0',
version='4.9.0',
description='The Ultimate Telegram Bot API Client Framework',
long_description=read('README.rst'),
long_description_content_type="text/x-rst",
Expand Down
65 changes: 32 additions & 33 deletions tgbotapi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ def __process_new_updates(self, updates):
new_edited_messages = []
new_channel_posts = []
new_edited_channel_posts = []
new_inline_querys = []
new_inline_queries = []
new_chosen_inline_results = []
new_callback_querys = []
new_shipping_querys = []
new_pre_checkout_querys = []
new_callback_queries = []
new_shipping_queries = []
new_pre_checkout_queries = []
new_poll = []
new_poll_answer = []

Expand All @@ -195,15 +195,15 @@ def __process_new_updates(self, updates):
if update.edited_channel_post:
new_edited_channel_posts.append(update.edited_channel_post)
if update.inline_query:
new_inline_querys.append(update.inline_query)
new_inline_queries.append(update.inline_query)
if update.chosen_inline_result:
new_chosen_inline_results.append(update.chosen_inline_result)
if update.callback_query:
new_callback_querys.append(update.callback_query)
new_callback_queries.append(update.callback_query)
if update.shipping_query:
new_shipping_querys.append(update.shipping_query)
new_shipping_queries.append(update.shipping_query)
if update.pre_checkout_query:
new_pre_checkout_querys.append(update.pre_checkout_query)
new_pre_checkout_queries.append(update.pre_checkout_query)
if update.poll:
new_poll.append(update.poll)
if update.poll_answer:
Expand All @@ -218,16 +218,16 @@ def __process_new_updates(self, updates):
self.__process_new_channel_posts(new_channel_posts)
if len(new_edited_channel_posts) > 0:
self.__process_new_edited_channel_posts(new_edited_channel_posts)
if len(new_inline_querys) > 0:
self.__process_new_inline_query(new_inline_querys)
if len(new_inline_queries) > 0:
self.__process_new_inline_query(new_inline_queries)
if len(new_chosen_inline_results) > 0:
self.__process_new_chosen_inline_query(new_chosen_inline_results)
if len(new_callback_querys) > 0:
self.__process_new_callback_query(new_callback_querys)
if len(new_pre_checkout_querys) > 0:
self.__process_new_pre_checkout_query(new_pre_checkout_querys)
if len(new_shipping_querys) > 0:
self.__process_new_shipping_query(new_shipping_querys)
if len(new_callback_queries) > 0:
self.__process_new_callback_query(new_callback_queries)
if len(new_pre_checkout_queries) > 0:
self.__process_new_pre_checkout_query(new_pre_checkout_queries)
if len(new_shipping_queries) > 0:
self.__process_new_shipping_query(new_shipping_queries)
if len(new_poll) > 0:
self.__process_new_poll(new_poll)
if len(new_poll_answer) > 0:
Expand All @@ -250,24 +250,24 @@ def __process_new_edited_channel_posts(self, edited_channel_post):
self._notify_command_handlers(
self.__edited_channel_post_handlers, edited_channel_post)

def __process_new_inline_query(self, new_inline_querys):
self._notify_command_handlers(self.__inline_query_handlers, new_inline_querys)
def __process_new_inline_query(self, new_inline_queries):
self._notify_command_handlers(self.__inline_query_handlers, new_inline_queries)

def __process_new_chosen_inline_query(self, new_chosen_inline_querys):
def __process_new_chosen_inline_query(self, new_chosen_inline_queries):
self._notify_command_handlers(
self.__chosen_inline_handlers, new_chosen_inline_querys)
self.__chosen_inline_handlers, new_chosen_inline_queries)

def __process_new_callback_query(self, new_callback_querys):
def __process_new_callback_query(self, new_callback_queries):
self._notify_command_handlers(
self.__callback_query_handlers, new_callback_querys)
self.__callback_query_handlers, new_callback_queries)

def __process_new_shipping_query(self, new_shipping_querys):
def __process_new_shipping_query(self, new_shipping_queries):
self._notify_command_handlers(
self.__shipping_query_handlers, new_shipping_querys)
self.__shipping_query_handlers, new_shipping_queries)

def __process_new_pre_checkout_query(self, pre_checkout_querys):
def __process_new_pre_checkout_query(self, pre_checkout_queries):
self._notify_command_handlers(
self.__pre_checkout_query_handlers, pre_checkout_querys)
self.__pre_checkout_query_handlers, pre_checkout_queries)

def __process_new_poll(self, poll):
self._notify_command_handlers(self.__poll_handlers, poll)
Expand Down Expand Up @@ -416,7 +416,7 @@ def get_webhook_info(self):
"""
Use this method to get current webhook status.
:return: a WebhookInfo object, otherwise an object with the url field empty.
:rtype: dict
:rtype: types.WebhookInfo
"""
return types.WebhookInfo.de_json(methods.get_webhook_info(self.__token, self.__proxies))

Expand Down Expand Up @@ -444,8 +444,7 @@ def send_message(self, chat_id, text, parse_mode=None, disable_web_page_preview=
"""
return types.Message.de_json(
methods.send_message(self.__token, self.__proxies, chat_id, text, parse_mode, disable_web_page_preview,
disable_notification,
reply_to_message_id, reply_markup))
disable_notification, reply_to_message_id, reply_markup))

def forward_message(self, chat_id, from_chat_id, message_id, disable_notification=False):
"""
Expand Down Expand Up @@ -656,7 +655,7 @@ def edit_message_live_location(self, latitude, longitude, chat_id=None, message_
:param str or None inline_message_id: Required if chat_id and message_id are not specified, Identifier of the inline message.
:param float latitude: Latitude of the location.
:param float longitude: Longitude of the location.
:param types.InlineKeyboardMarkup reply_markup: A JSON-serialized object for an InlineKeyboardMarkup.
:param dict reply_markup: A JSON-serialized object for an InlineKeyboardMarkup.
:return: a Message object, otherwise True.
:rtype: types.Message
"""
Expand All @@ -670,7 +669,7 @@ def stop_message_live_location(self, chat_id=None, message_id=None, inline_messa
:param int or str chat_id: Required if inline_message_id is not specified, Unique identifier for the target chat.
:param int or None message_id: Required if inline_message_id is not specified, Identifier of the message to edit.
:param str or None inline_message_id: Required if chat_id and message_id are not specified, Identifier of the inline message.
:param types.InlineKeyboardMarkup reply_markup: A JSON-serialized object for an InlineKeyboardMarkup.
:param dict reply_markup: A JSON-serialized object for an InlineKeyboardMarkup.
:return: a Message object, otherwise True.
:rtype: types.Message
"""
Expand Down Expand Up @@ -832,7 +831,7 @@ def restrict_chat_member(self, chat_id, user_id, permissions, until_date=None):
Use this method to restrict a user in a supergroup.
:param int or str chat_id: Unique identifier for the target chat or username of the target channel.
:param int user_id: Unique identifier of the target user.
:param types.ChatPermissions permissions: New user permissions must be ChatPermissions object.
:param dict permissions: New user permissions must be ChatPermissions object.
:param int or None until_date: Date when restrictions will be lifted for the user, unix time.
:return: True On success.
:rtype: dict
Expand Down Expand Up @@ -877,7 +876,7 @@ def set_chat_permissions(self, chat_id, permissions):
"""
Use this method to set default chat permissions for all members.
:param int or str chat_id: Unique identifier for the target chat or username of the target channel.
:param types.ChatPermissions permissions: New default chat permissions must be a ChatPermissions object
:param dict permissions: New default chat permissions must be a ChatPermissions object
:return: True on success.
:rtype: dict
"""
Expand Down
2 changes: 1 addition & 1 deletion tgbotapi/methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ def send_media_group(token, proxies, chat_id, media, disable_notification, reply
:type token: str
:type proxies: dict or None
:type chat_id: int or str
:type media: dict
:type media: list
:type disable_notification: bool
:type reply_to_message_id: int or None
:rtype: dict
Expand Down
20 changes: 10 additions & 10 deletions tgbotapi/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -1757,9 +1757,9 @@ def de_json(cls, obj_type):
return cls(name, title, contains_masks, stickers, thumb)

@classmethod
def parse_stickers(cls, objs):
def parse_stickers(cls, obj):
stickers = []
for sticker in objs:
for sticker in obj:
stickers.append(Sticker.de_json(sticker))
return stickers

Expand Down Expand Up @@ -2985,17 +2985,17 @@ def de_json(cls, obj_type):
return cls(type, data, phone_number, files, front_side, reverse_side, selfie, translation, hash)

@classmethod
def parse_files(cls, objs):
def parse_files(cls, obj):
files = []
for x in objs:
for x in obj:
file = PassportFile.de_json(x)
files.append(file)
return files

@classmethod
def parse_translation(cls, objs):
def parse_translation(cls, obj):
translations = []
for x in objs:
for x in obj:
translation = PassportFile.de_json(x)
translations.append(translation)
return translations
Expand Down Expand Up @@ -3283,16 +3283,16 @@ def de_json(cls, obj_type):
return cls(title, description, photo, text, text_entities, animation)

@classmethod
def parse_photo(cls, objs):
def parse_photo(cls, obj):
photos = []
for x in objs:
for x in obj:
photos.append(PhotoSize.de_json(x))
return photos

@classmethod
def parse_entities(cls, objs):
def parse_entities(cls, obj):
entities = []
for x in objs:
for x in obj:
entities.append(MessageEntity.de_json(x))
return entities

Expand Down

0 comments on commit 8313100

Please sign in to comment.