Commit Graph

2434 Commits

Author SHA1 Message Date
FrankWang 144fa64604 Merge pull request #20 from pevdh/develop
Some new features and minor improvements.
2015-07-02 21:21:57 +08:00
pieter bc3e2115ac Made Contact implement JsonDeserializable. 2015-07-02 14:12:10 +02:00
pieter 36ba21643b Resolve merge conflicts. 2015-07-02 13:54:45 +02:00
pieter 86500fc9fa Added some documentation. 2015-07-02 13:43:49 +02:00
FrankWang b17416e718 Update README.md 2015-07-02 11:53:11 +08:00
eternnoir 77d699bc3a Add python 3 to setup.py. 2015-07-02 11:51:50 +08:00
eternnoir 1e221433f0 Update Version 0.1.9
Change log:
- Support python3
- ReplyKeyboardHide
- Message support contact
2015-07-02 11:30:45 +08:00
eternnoir 1fdf8bd570 Message support contact. 2015-07-02 11:19:38 +08:00
pieter 13133ac5c6 Implemented command decorator. 2015-07-02 04:17:36 +02:00
FrankWang 23574dee59 Merge pull request #18 from pevdh/master
Implemented #17 (with some small adjustments) and ForceReply
2015-07-02 09:21:25 +08:00
pieter b41330774b Renamed ApiError to ApiException (Subclass of Exception) 2015-07-02 01:18:23 +02:00
pieter be155afcd8 Deleted last unnecessaty json.dumps 2015-07-02 01:16:17 +02:00
pieter 2f8d1ad4ed PEP 8 clean-up. 2015-07-01 22:34:40 +02:00
pieter a03769adde Created _make_request and removed check_result in apihelper.py for efficiency and consistency improvements.
Created JsonSerializable (previously Jsonable) and JsonDeserializable.
All relevant classes now subclass JsonDeserializable to eliminate unneeded json -> string -> json conversions.
2015-07-01 22:16:13 +02:00
pieter b4dc441ffd Update TODO 2015-07-01 19:44:49 +02:00
pieter 949dfc0fb0 Fix unnecessary Thread creation when no new messages arrived. 2015-07-01 19:12:12 +02:00
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