Skip to content

Commit ba2e166

Browse files
committed
Method getMe done.
1 parent b4691a2 commit ba2e166

3 files changed

Lines changed: 32 additions & 2 deletions

File tree

‎telebot/__init__.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# -*- coding: utf-8 -*-
22

33
import apihelper
4+
import json
5+
import types
46

57
"""
68
Module : telebot
@@ -31,8 +33,11 @@ def __init__(self, token):
3133
self.token = token
3234

3335
def get_me(self):
34-
# TODO
35-
return None
36+
result = apihelper.get_me(self.token)
37+
if result['ok'] is not True:
38+
raise Exception('getMe Error.'+json.dumps(result))
39+
u = types.User.de_json(json.dumps(result['result']))
40+
return u
3641

3742
def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
3843
return apihelper.send_message(self.token, chat_id, text, disable_web_page_preview, reply_to_message_id,

‎telebot/apihelper.py‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,24 @@
33
import telebot
44
import requests
55

6+
def get_me(token):
7+
apiurl=telebot.API_URL
8+
method_url = r'getMe'
9+
request_url = apiurl+'bot'+token+'/'+method_url
10+
req = requests.get(request_url)
11+
return req.json()
612

713
def send_message(token, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
14+
"""
15+
Use this method to send text messages. On success, the sent Message is returned.
16+
:param token:
17+
:param chat_id:
18+
:param text:
19+
:param disable_web_page_preview:
20+
:param reply_to_message_id:
21+
:param reply_markup:
22+
:return:
23+
"""
824
api_url = telebot.API_URL
925
method_url = r'sendMessage'
1026
request_url = api_url + 'bot' + token + '/' + method_url

‎tests/test_types.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# -*- coding: utf-8 -*-
2+
import sys
3+
sys.path.append('../')
4+
from telebot import types
5+
6+
def test_json_user():
7+
jsonstring = r'{"id":101176298,"first_name":"RDSSBOT","username":"rdss_bot"}'
8+
u = types.User.de_json(jsonstring)
9+
assert u.id is not 101176298

0 commit comments

Comments
 (0)