Skip to content

Commit 6aa29b4

Browse files
committed
Merge branch 'master' into develop
2 parents afc0bc1 + 7f71580 commit 6aa29b4

File tree

5 files changed

+40
-12
lines changed

5 files changed

+40
-12
lines changed

.github/FUNDING.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
github: noplanman, akalongman, jacklul
2+
tidelift: packagist/longman%2Ftelegram-bot
3+
patreon: phptelegrambot
4+
liberapay: PHP-Telegram-Bot
5+
open_collective: php-telegram-bot
6+
ko_fi: phptelegrambot
7+
custom: https://github.com/php-telegram-bot/core#donate

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
55

66
## [Unreleased]
77
### Added
8+
- New funding and support details.
89
### Changed
910
- Use PSR-12 for code style.
1011
### Deprecated
@@ -13,6 +14,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
1314
### Fixed
1415
- `forward_date` is now correctly saved to the DB.
1516
### Security
17+
- Security disclosure managed by Tidelift.
1618

1719
## [0.57.0] - 2019-06-01
1820
:exclamation: After updating to this version, you will need to execute the [SQL migration script][0.57.0-sql-migration] on your database.

LICENSE.md renamed to LICENSE

File renamed without changes.

README.md

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
[![Donate](https://img.shields.io/badge/%F0%9F%92%99-Donate-blue.svg)](#donate)
55

66
[![Build Status](https://travis-ci.org/php-telegram-bot/core.svg?branch=master)](https://travis-ci.org/php-telegram-bot/core)
7+
[![Dependencies](https://tidelift.com/badges/github/php-telegram-bot/core)][Tidelift]
78
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-telegram-bot/core/develop.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-telegram-bot/core/?b=develop)
89
[![Code Quality](https://img.shields.io/scrutinizer/g/php-telegram-bot/core/develop.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-telegram-bot/core/?b=develop)
910
[![Latest Stable Version](https://img.shields.io/packagist/v/Longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
1011
[![Total Downloads](https://img.shields.io/packagist/dt/Longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
1112
[![Downloads Month](https://img.shields.io/packagist/dm/Longman/telegram-bot.svg)](https://packagist.org/packages/longman/telegram-bot)
1213
[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D5.6-8892BF.svg)](https://php.net/)
13-
[![License](https://img.shields.io/packagist/l/Longman/telegram-bot.svg)](https://github.com/php-telegram-bot/core/LICENSE.md)
14+
[![License](https://img.shields.io/packagist/l/longman/telegram-bot.svg)](https://github.com/php-telegram-bot/core/LICENSE)
1415

1516
![Telegram Bot API Logo](assets/logo/512px/logo_plain.png)
1617

@@ -53,6 +54,7 @@ A Telegram Bot based on the official [Telegram Bot API][Telegram-Bot-API]
5354
- [Projects with this library](#projects-with-this-library)
5455
- [Troubleshooting](#troubleshooting)
5556
- [Contributing](#contributing)
57+
- [Security](#security)
5658
- [Donate](#donate)
5759
- [License](#license)
5860
- [Credits](#credits)
@@ -580,22 +582,31 @@ If you like living on the edge, please report any bugs you find on the
580582

581583
See [CONTRIBUTING](.github/CONTRIBUTING.md) for more information.
582584

585+
## Security
586+
587+
See [SECURITY](SECURITY.md) for more information.
588+
583589
## Donate
584590

585591
All work on this bot consists of many hours of coding during our free time, to provide you with a Telegram Bot library that is easy to use and extend.
586592
If you enjoy using this library and would like to say thank you, donations are a great way to show your support.
587593

588594
Donations are invested back into the project :+1:
589595

590-
- Gratipay: [Gratipay/PHP-Telegram-Bot]
591-
- Liberapay: [Liberapay/PHP-Telegram-Bot]
592-
- PayPal: [PayPal/noplanman] (account of @noplanman)
593-
- Bitcoin: [166NcyE7nDxkRPWidWtG1rqrNJoD5oYNiV][bitcoin]
594-
- Ethereum: [0x485855634fa212b0745375e593fAaf8321A81055][ethereum]
596+
Thank you for keeping this project alive :pray:
597+
598+
- [![Patreon](https://user-images.githubusercontent.com/9423417/59235980-a5fa6b80-8be3-11e9-8ae7-020bc4ae9baa.png) Patreon.com/phptelegrambot][Patreon]
599+
- [![OpenCollective](https://user-images.githubusercontent.com/9423417/59235978-a561d500-8be3-11e9-89be-82ec54be1546.png) OpenCollective.com/php-telegram-bot][OpenCollective]
600+
- [![Ko-fi](https://user-images.githubusercontent.com/9423417/59235976-a561d500-8be3-11e9-911d-b1908c3e6a33.png) Ko-fi.com/phptelegrambot][Ko-fi]
601+
- [![Tidelift](https://user-images.githubusercontent.com/9423417/59235982-a6930200-8be3-11e9-8ac2-bfb6991d80c5.png) Tidelift.com/longman/telegram-bot][Tidelift]
602+
- [![Liberapay](https://user-images.githubusercontent.com/9423417/59235977-a561d500-8be3-11e9-9d16-bc3b13d3ceba.png) Liberapay.com/PHP-Telegram-Bot][liberapay]
603+
- [![PayPal](https://user-images.githubusercontent.com/9423417/59235981-a5fa6b80-8be3-11e9-9761-15eb7a524cb0.png) PayPal.me/noplanman][PayPal-noplanman] (account of @noplanman)
604+
- [![Bitcoin](https://user-images.githubusercontent.com/9423417/59235974-a4c93e80-8be3-11e9-9fde-260c821b6eae.png) 166NcyE7nDxkRPWidWtG1rqrNJoD5oYNiV][Bitcoin]
605+
- [![Ethereum](https://user-images.githubusercontent.com/9423417/59235975-a4c93e80-8be3-11e9-8762-7a47c62c968d.png) 0x485855634fa212b0745375e593fAaf8321A81055][Ethereum]
595606

596607
## License
597608

598-
Please see the [LICENSE](LICENSE.md) included in this repository for a full copy of the MIT license,
609+
Please see the [LICENSE](LICENSE) included in this repository for a full copy of the MIT license,
599610
which this project is licensed under.
600611

601612
## Credits
@@ -620,8 +631,12 @@ Credit list in [CREDITS](CREDITS)
620631
[wiki]: https://github.com/php-telegram-bot/core/wiki "PHP Telegram Bot Wiki"
621632
[wiki-create-your-own-commands]: https://github.com/php-telegram-bot/core/wiki/Create-your-own-commands "Create your own commands"
622633
[issues]: https://github.com/php-telegram-bot/core/issues "PHP Telegram Bot Issues"
623-
[Gratipay/PHP-Telegram-Bot]: https://gratipay.com/PHP-Telegram-Bot "Donate with Gratipay"
624-
[Liberapay/PHP-Telegram-Bot]: https://liberapay.com/PHP-Telegram-Bot "Donate with Liberapay"
625-
[PayPal/noplanman]: https://paypal.me/noplanman "Donate with PayPal"
626-
[bitcoin]: bitcoin:166NcyE7nDxkRPWidWtG1rqrNJoD5oYNiV "Donate with Bitcoin"
627-
[ethereum]: https://www.myetherwallet.com/?to=0x485855634fa212b0745375e593fAaf8321A81055 "Donate with Ethereum"
634+
635+
[Patreon]: https://www.patreon.com/phptelegrambot "Support us on Patreon"
636+
[OpenCollective]: https://opencollective.com/php-telegram-bot "Support us on Open Collective"
637+
[Ko-fi]: https://ko-fi.com/phptelegrambot "Support us on Ko-fi"
638+
[Tidelift]: https://tidelift.com/subscription/pkg/packagist-longman-telegram-bot?utm_source=packagist-longman-telegram-bot&utm_medium=referral&utm_campaign=readme "Support us on Tidelift"
639+
[liberapay]: https://liberapay.com/PHP-Telegram-Bot "Donate with Liberapay"
640+
[PayPal-noplanman]: https://paypal.me/noplanman "Donate with PayPal"
641+
[Bitcoin]: https://www.blockchain.com/btc/address/166NcyE7nDxkRPWidWtG1rqrNJoD5oYNiV "Donate with Bitcoin"
642+
[Ethereum]: https://etherscan.io/address/0x485855634fa212b0745375e593fAaf8321A81055 "Donate with Ethereum"

SECURITY.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Security
2+
3+
To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security).
4+
Tidelift will then coordinate the fix and disclosure.

0 commit comments

Comments
 (0)