python/aiogram
1
0
Fork 0
mirror of https://github.com/aiogram/aiogram.git synced 2025-12-16 12:07:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Oops. Found types in Base Bot object

Browse source
This commit is contained in:
Alex Root Junior 2017-07-11 23:23:35 +03:00
parent 019bf06f71
commit d2c99fccf4
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
aiogram/bot/base.py
View file

@ -5,7 +5,6 @@ import json
import aiohttp import aiohttp
from . import api from . import api
from .. import types
from ..utils.payload import generate_payload from ..utils.payload import generate_payload
@ -135,7 +134,7 @@ class BaseBot:
return await req return await req
async def get_me(self) -> types.User: async def get_me(self) -> dict:
return await self.request(api.Methods.GET_ME) return await self.request(api.Methods.GET_ME)
async def get_updates(self, offset=None, limit=None, timeout=None, allowed_updates=None) -> [dict, ...]: async def get_updates(self, offset=None, limit=None, timeout=None, allowed_updates=None) -> [dict, ...]:
@ -156,7 +155,7 @@ class BaseBot:
payload = {} payload = {}
return await self.request(api.Methods.DELETE_WEBHOOK, payload) return await self.request(api.Methods.DELETE_WEBHOOK, payload)
async def get_webhook_info(self) -> types.WebhookInfo: async def get_webhook_info(self) -> dict:
payload = {} payload = {}
return await self.request(api.Methods.GET_WEBHOOK_INFO, payload) return await self.request(api.Methods.GET_WEBHOOK_INFO, payload)
@ -252,7 +251,7 @@ class BaseBot:
return await self.request(api.Methods.SEND_VENUE, payload) return await self.request(api.Methods.SEND_VENUE, payload)
async def send_contact(self, chat_id, phone_number, first_name, last_name=None, disable_notification=None, async def send_contact(self, chat_id, phone_number, first_name, last_name=None, disable_notification=None,
reply_to_message_id=None, reply_markup=None) -> types.Message: reply_to_message_id=None, reply_markup=None) -> dict:
if reply_markup and isinstance(reply_markup, dict): if reply_markup and isinstance(reply_markup, dict):
reply_markup = json.dumps(reply_markup) reply_markup = json.dumps(reply_markup)
@ -343,11 +342,11 @@ class BaseBot:
payload = generate_payload(**locals()) payload = generate_payload(**locals())
return await self.request(api.Methods.LEAVE_CHAT, payload) return await self.request(api.Methods.LEAVE_CHAT, payload)
async def get_chat(self, chat_id) -> types.Chat: async def get_chat(self, chat_id) -> dict:
payload = generate_payload(**locals()) payload = generate_payload(**locals())
return await self.request(api.Methods.GET_CHAT, payload) return await self.request(api.Methods.GET_CHAT, payload)
async def get_chat_administrators(self, chat_id) -> [types.ChatMember]: async def get_chat_administrators(self, chat_id) -> [dict]:
payload = generate_payload(**locals()) payload = generate_payload(**locals())
return await self.request(api.Methods.GET_CHAT_ADMINISTRATORS, payload) return await self.request(api.Methods.GET_CHAT_ADMINISTRATORS, payload)
@ -355,7 +354,7 @@ class BaseBot:
payload = generate_payload(**locals()) payload = generate_payload(**locals())
return await self.request(api.Methods.GET_CHAT_MEMBERS_COUNT, payload) return await self.request(api.Methods.GET_CHAT_MEMBERS_COUNT, payload)
async def get_chat_member(self, chat_id, user_id) -> types.ChatMember: async def get_chat_member(self, chat_id, user_id) -> dict:
payload = generate_payload(**locals()) payload = generate_payload(**locals())
return await self.request(api.Methods.GET_CHAT_MEMBER, payload) return await self.request(api.Methods.GET_CHAT_MEMBER, payload)
@ -415,7 +414,7 @@ class BaseBot:
need_name: bool = None, need_phone_number: bool = None, need_email: bool = None, need_name: bool = None, need_phone_number: bool = None, need_email: bool = None,
need_shipping_address: bool = None, is_flexible: bool = None, need_shipping_address: bool = None, is_flexible: bool = None,
disable_notification: bool = None, reply_to_message_id: int = None, disable_notification: bool = None, reply_to_message_id: int = None,
reply_markup: types.InlineKeyboardMarkup = None) -> dict: reply_markup: dict or st = None) -> dict:
if reply_markup and isinstance(reply_markup, dict): if reply_markup and isinstance(reply_markup, dict):
reply_markup = json.dumps(reply_markup) reply_markup = json.dumps(reply_markup)
@ -427,7 +426,7 @@ class BaseBot:
return await self.request(api.Methods.SEND_INVOICE, payload_) return await self.request(api.Methods.SEND_INVOICE, payload_)
async def answer_shipping_query(self, shipping_query_id: str, ok: bool, async def answer_shipping_query(self, shipping_query_id: str, ok: bool,
shipping_options: [types.ShippingOption] = None, error_message: str = None) -> bool: shipping_options = None, error_message: str = None) -> bool:
if shipping_options and isinstance(shipping_options, list): if shipping_options and isinstance(shipping_options, list):
shipping_options = json.dumps(shipping_options) shipping_options = json.dumps(shipping_options)
@ -442,7 +441,7 @@ class BaseBot:
async def send_game(self, chat_id: int, game_short_name: str, disable_notification: bool = None, async def send_game(self, chat_id: int, game_short_name: str, disable_notification: bool = None,
reply_to_message_id: int = None, reply_to_message_id: int = None,
reply_markup: types.InlineKeyboardMarkup = None) -> dict: reply_markup: dict or str = None) -> dict:
if reply_markup and isinstance(reply_markup, dict): if reply_markup and isinstance(reply_markup, dict):
reply_markup = json.dumps(reply_markup) reply_markup = json.dumps(reply_markup)