Skip to content

remove Bot._message_wrapper #822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsnoam merged 4 commits into from
Oct 11, 2017
Merged

remove Bot._message_wrapper #822

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47c834b
remove Bot._message_wrapper
Eldinnie Sep 10, 2017
0858eee
remove Bot._message_wrapper
Eldinnie Sep 10, 2017
2228dca
Merge remote-tracking branch 'origin/fix-752' into fix-752
Eldinnie Sep 14, 2017
2c4e282
Merge remote-tracking branch 'origin/master' into pr_822
tsnoam Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions telegram/bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,25 @@ def message(func):
@functools.wraps(func)
def decorator(self, *args, **kwargs):
url, data = func(self, *args, **kwargs)
return self._message_wrapper(url, data, *args, **kwargs)
if kwargs.get('reply_to_message_id'):
data['reply_to_message_id'] = kwargs.get('reply_to_message_id')

if kwargs.get('disable_notification'):
data['disable_notification'] = kwargs.get('disable_notification')

if kwargs.get('reply_markup'):
reply_markup = kwargs.get('reply_markup')
if isinstance(reply_markup, ReplyMarkup):
data['reply_markup'] = reply_markup.to_json()
else:
data['reply_markup'] = reply_markup

result = self._request.post(url, data, timeout=kwargs.get('timeout'))

if result is True:
return result

return Message.de_json(result, self)

return decorator

Expand Down Expand Up @@ -148,27 +166,6 @@ def name(self):

return '@{0}'.format(self.username)

def _message_wrapper(self, url, data, *args, **kwargs):
if kwargs.get('reply_to_message_id'):
data['reply_to_message_id'] = kwargs.get('reply_to_message_id')

if kwargs.get('disable_notification'):
data['disable_notification'] = kwargs.get('disable_notification')

if kwargs.get('reply_markup'):
reply_markup = kwargs.get('reply_markup')
if isinstance(reply_markup, ReplyMarkup):
data['reply_markup'] = reply_markup.to_json()
else:
data['reply_markup'] = reply_markup

result = self._request.post(url, data, timeout=kwargs.get('timeout'))

if result is True:
return result

return Message.de_json(result, self)

@log
def get_me(self, timeout=None, **kwargs):
"""A simple method for testing your bot's auth token. Requires no parameters.
Expand Down