1
0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Commit Graph

68 Commits

Author SHA1 Message Date
pieter
0068388872 Implemented #17 (with some small adjustments) and ForceReply
Changed apihelper#convert_markup
Constructed the Jsonable abstract class. All subclasses must override Jsonable#to_json.
Made ReplyKeyboardHide, ReplyKeyboardMarkup and ForceReply a subclass of Jsonable to make things less complicated in convert_markup.
2015-07-01 18:56:21 +02:00
pieter
938c98ced1 Merge branch 'develop' of https://github.com/eternnoir/pyTelegramBotAPI
Merge develop to receive the Python3 compatible version of pyTelegramBotAPI.
2015-07-01 18:29:29 +02:00
pieter
b444565b7b Implemented #17 (with some small adjustments) and ForceReply
Changed apihelper#convert_markup
Constructed the Jsonable abstract class. All subclasses must override Jsonable#to_json.
Made ReplyKeyboardHide, ReplyKeyboardMarkup and ForceReply a subclass of Jsonable to make things less complicated in convert_markup.
2015-07-01 18:29:11 +02:00
pieter
8812765652 Merge branch 'master' of https://github.com/eternnoir/pyTelegramBotAPI
Sync with upstream.
2015-07-01 18:00:17 +02:00
FrankWang
d9bd77503f Merge pull request #16 from ntcong/python3
make telebot compatible with python3
2015-07-01 11:57:41 +08:00
CongNT
0a58f343fe add python3 to travis test, add python3 to readme 2015-07-01 10:17:45 +07:00
CongNT
24491f467f make telebot compatible with python3
also two small PEP8 fixes
2015-07-01 09:49:41 +07:00
FrankWang
924099ddfa Update README.md 2015-07-01 09:55:25 +08:00
pieter
759474924d Implemented getUserProfilePhotos (Though I do not see the use of it currently, because bots cannot download photos with the API) 2015-06-30 16:40:44 +02:00
eternnoir
77580e6784 Support ReplyKeyboardMarkup object. 2015-06-30 13:20:44 +08:00
FrankWang
9e27680266 Merge pull request #11 from pevdh/master
Implemented the offset parameter.
2015-06-30 12:53:57 +08:00
pieter
af02000534 PEP 8 & IntelliJ code clean-up. 2015-06-30 05:54:04 +02:00
pieter
34da2552dd Implemented the offset parameter.
Implemented the offset parameter for the getUpdates API call according to https://core.telegram.org/bots/api#getupdates
In short: the offset is calculated by adding 1 to the id of the last received Update.
Caching messages in a list is now redundant, so the cache is removed. Only the id of the last received Update is kept for future getUpdates calls.
2015-06-30 05:49:35 +02:00
FrankWang
53c76e75f7 Merge pull request #10 from eternnoir/revert-9-master
Revert "...actually implemented the offset in TeleBot#get_update now..."
2015-06-30 10:02:15 +08:00
FrankWang
8eda6a4f13 Revert "...actually implemented the offset in TeleBot#get_update now..." 2015-06-30 10:00:19 +08:00
FrankWang
4c28537199 Merge pull request #9 from pevdh/master
...actually implemented the offset in TeleBot#get_update now...
2015-06-30 09:44:19 +08:00
pieter
37ffcdf6a6 ...actually implemented the offset now... 2015-06-30 03:39:36 +02:00
FrankWang
284c20f7ca Merge pull request #8 from pevdh/master
Extending ReplyKeyboardMarkup and implementing the offset getUpdates parameter
2015-06-30 09:04:07 +08:00
pieter
c9adf52236 Extended the ReplyKeyboardMarkup class to allow easy creation of a complex ReplyKeyboardMarkup (so without the hassle of manipulating json strings directly). 2015-06-30 02:00:47 +02:00
pieter
64811a3960 - Implemented an optional "offset" argument in apihelper.py.
- TeleBot#get_update now makes use of this argument, which improves the efficiency of the method.
- Removed useless req.status_code statement in apihelper.py#send_data
2015-06-30 01:44:14 +02:00
FrankWang
7bffd4331b Update README.md 2015-06-29 08:02:06 +08:00
FrankWang
b72c414e55 Update README.md 2015-06-29 08:01:39 +08:00
FrankWang
3d396445b1 Update README.md 2015-06-28 22:34:27 +08:00
FrankWang
2183d0df7c Update README.md 2015-06-28 18:42:46 +08:00
FrankWang
938b685115 Update README.md 2015-06-28 18:07:27 +08:00
eternnoir
a4057e45c1 Update readme. 2015-06-28 18:03:06 +08:00
eternnoir
155b264fb0 Merge branch 'master' of github.com:eternnoir/pyTelegramBotAPI 2015-06-28 18:02:06 +08:00
eternnoir
499931ee82 Update version. 2015-06-28 18:01:43 +08:00
eternnoir
47fd523820 Merge branch 'develop' 2015-06-28 17:58:57 +08:00
eternnoir
a8af3eb269 Add send_chat_action to readme. 2015-06-28 17:58:15 +08:00
eternnoir
dd0f7ab1d5 Send chat action support. 2015-06-28 17:56:32 +08:00
FrankWang
29eeb8ffff Update README.md 2015-06-28 17:42:04 +08:00
eternnoir
3ef164f21c Update version. 2015-06-28 17:37:24 +08:00
eternnoir
e71dd24d46 Upate readme. 2015-06-28 17:35:47 +08:00
eternnoir
8898e3b8cc Add some comment. 2015-06-28 17:27:25 +08:00
eternnoir
1a8fd78204 Update Readme. 2015-06-28 17:21:11 +08:00
eternnoir
891b66b3cc Add some message parse test. 2015-06-28 17:20:11 +08:00
eternnoir
8e22bbf180 Message support text, audio, document, photo, sticker, video, location. 2015-06-28 17:19:15 +08:00
eternnoir
7c1c982b3f Add try to polling getUpdates. 2015-06-27 22:31:40 +08:00
eternnoir
3ab248ad9e Update version. 2015-06-27 22:15:59 +08:00
eternnoir
cd0b85c03c sendLocation method supported. 2015-06-27 22:11:18 +08:00
eternnoir
343b8ebc85 Add ApiError exception. 2015-06-27 21:55:45 +08:00
FrankWang
6676f8a52a Update README.md 2015-06-27 10:31:42 +08:00
eternnoir
da57faa12c Update version. 2015-06-27 10:27:09 +08:00
eternnoir
5505d0e2a9 Merge branch 'develop' 2015-06-27 10:26:28 +08:00
eternnoir
b3c5f402ef Add API usage. 2015-06-27 10:25:22 +08:00
eternnoir
cc4ff12103 Change telebot polling thread to daemon. fix #2 2015-06-27 10:03:02 +08:00
eternnoir
a62139fafc Add some comment 2015-06-27 02:14:45 +08:00
eternnoir
70b63fddc1 send file methods done. 2015-06-27 01:53:07 +08:00
eternnoir
e99b4f6e64 Update some pip info. 2015-06-26 23:10:46 +08:00