Commit bce79590 authored by Armando Lüscher's avatar Armando Lüscher Committed by GitHub

Merge branch 'develop' into clean_db_code

parents 08f4f3d7 57858427
...@@ -24,7 +24,7 @@ A Telegram Bot based on the official [Telegram Bot API][Telegram-Bot-API] ...@@ -24,7 +24,7 @@ A Telegram Bot based on the official [Telegram Bot API][Telegram-Bot-API]
- [Webhook installation](#webhook-installation) - [Webhook installation](#webhook-installation)
- [Self Signed Certificate](#self-signed-certificate) - [Self Signed Certificate](#self-signed-certificate)
- [Unset Webhook](#unset-webhook) - [Unset Webhook](#unset-webhook)
- [getUpdate installation](#getupdate-installation) - [getUpdates installation](#getupdates-installation)
- [Support](#support) - [Support](#support)
- [Types](#types) - [Types](#types)
- [Inline Query](#inline-query) - [Inline Query](#inline-query)
...@@ -71,7 +71,7 @@ Bot aims to provide a platform where one can simply write a plugin ...@@ -71,7 +71,7 @@ Bot aims to provide a platform where one can simply write a plugin
and have interactions in a matter of minutes. and have interactions in a matter of minutes.
The Bot can: The Bot can:
- retrieve updates with webhook and getUpdate methods. - retrieve updates with webhook and getUpdates methods.
- supports all types and methods according to Telegram API (25 May 2016). - supports all types and methods according to Telegram API (25 May 2016).
- supports supergroups. - supports supergroups.
- handle commands in chat with other bots. - handle commands in chat with other bots.
...@@ -180,7 +180,7 @@ composer require longman/telegram-bot ...@@ -180,7 +180,7 @@ composer require longman/telegram-bot
The bot can handle updates with **Webhook** or **getUpdates** method: The bot can handle updates with **Webhook** or **getUpdates** method:
| | Webhook | getUpdate | | | Webhook | getUpdates |
| ---- | :----: | :----: | | ---- | :----: | :----: |
| Description | Telegram sends the updates directly to your host | You have to fetch Telegram updates manually | | Description | Telegram sends the updates directly to your host | You have to fetch Telegram updates manually |
| Host with https | Required | Not required | | Host with https | Required | Not required |
...@@ -281,7 +281,7 @@ try { ...@@ -281,7 +281,7 @@ try {
// Enable MySQL // Enable MySQL
$telegram->enableMySql($mysql_credentials); $telegram->enableMySql($mysql_credentials);
// Handle telegram getUpdate request // Handle telegram getUpdates request
$telegram->handleGetUpdates(); $telegram->handleGetUpdates();
} catch (Longman\TelegramBot\Exception\TelegramException $e) { } catch (Longman\TelegramBot\Exception\TelegramException $e) {
// log telegram errors // log telegram errors
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment