🔀 Merge branch 'develop'
This commit is contained in:
Maxim Lebedev
commit
d4afafdf81
14
constants.go
14
constants.go
|
|
@ -25,6 +25,16 @@ const (
|
|||
ChatSuperGroup = "supergroup"
|
||||
)
|
||||
|
||||
// Command... represents global commands which should be supported by any bot.
|
||||
// You can user IsCommandEqual method of Message for checking.
|
||||
//
|
||||
// See: https://core.telegram.org/bots#global-commands
|
||||
const (
|
||||
CommandStart = "start"
|
||||
CommandHelp = "help"
|
||||
CommandSettings = "settings"
|
||||
)
|
||||
|
||||
// Entity... represents available and supported entity types
|
||||
const (
|
||||
EntityBold = "bold"
|
||||
|
|
@ -105,8 +115,8 @@ const (
|
|||
|
||||
// Mode... represents available and supported parsing modes of messages
|
||||
const (
|
||||
ModeHTML = "html"
|
||||
ModeMarkdown = "markdown"
|
||||
StyleHTML = "html"
|
||||
StyleMarkdown = "markdown"
|
||||
)
|
||||
|
||||
// Mime... represents available and supported MIME types of data
|
||||
|
|
|
|||
|
|
@ -1,24 +1,16 @@
|
|||
# GoLang bindings for the Telegram API [](https://discord.gg/dCWkgSS)
|
||||
# GoLang bindings for the Telegram API
|
||||
> This package is in active development and **not recommended for use in production for now**. Use [go dep](https://golang.github.io/dep/) to freeze the state of the package in your projects!
|
||||
|
||||
[](LICENSE.md)
|
||||
[](https://app.fossa.io/projects/git%2Bgithub.com%2Ftoby3d%2Ftelegram?ref=badge_shield)
|
||||
[](https://travis-ci.org/toby3d/telegram)
|
||||
[](https://godoc.org/github.com/toby3d/telegram)
|
||||
[](https://goreportcard.com/report/github.com/toby3d/telegram)
|
||||
[](https://www.patreon.com/toby3d)
|
||||
[](https://github.com/avelino/awesome-go)
|
||||
|
||||
## Start using telegram
|
||||
Download and install it:
|
||||
`$ go get -u github.com/toby3d/telegram`
|
||||
`$ go get -u gitlab.com/toby3d/telegram`
|
||||
|
||||
Import it in your code:
|
||||
`import "github.com/toby3d/telegram"`
|
||||
`import "gitlab.com/toby3d/telegram"`
|
||||
|
||||
## Need help?
|
||||
- [Open new issue](https://github.com/toby3d/telegram/issues/new)
|
||||
- [Open new issue](https://gitlab.com/toby3d/telegram/issues/new)
|
||||
- [Discuss in Discord](https://discord.gg/dCWkgSS)
|
||||
|
||||
## License
|
||||
[](https://app.fossa.io/projects/git%2Bgithub.com%2Ftoby3d%2Ftelegram?ref=badge_large)
|
||||
[](https://app.fossa.io/projects/git%2Bgitlab.com%2Ftoby3d%2Ftelegram?ref=badge_large)
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
I develop this project in my spare time, and I do it and I will do it free of charge. However, you can make a donation or become a sponsor to make sure that I have enough coffee and pizza for night coding.
|
||||
|
||||
**These people sponsored current version of the project:**
|
||||
- Alina
|
||||
- Aurielb
|
||||
- Daniil Tlenov
|
||||
- @kirillDanshin
|
||||
- MoD21k
|
||||
- @YamiOdymel
|
||||
- Yami Odymel
|
||||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/toby3d/telegram"
|
||||
"gitlab.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
const accessToken = "153667468:AAHlSHlMqSt1f_uFmVRJbm5gntu2HI4WW8I"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/toby3d/telegram"
|
||||
"gitlab.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package test
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/toby3d/telegram"
|
||||
"gitlab.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
func TestGetMe(t *testing.T) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/toby3d/telegram"
|
||||
"gitlab.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
const replyToMessageID = 35
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"net/url"
|
||||
"testing"
|
||||
|
||||
"github.com/toby3d/telegram"
|
||||
"gitlab.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ package test
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/toby3d/telegram"
|
||||
"gitlab.com/toby3d/telegram"
|
||||
)
|
||||
|
||||
func TestSetWebhook(t *testing.T) {
|
||||
ok, err := bot.SetWebhook(
|
||||
telegram.NewWebhook("https://toby3d.github.io/telegram", nil),
|
||||
telegram.NewWebhook("https://toby3d.ru/telegram", nil),
|
||||
)
|
||||
if err != nil {
|
||||
t.Error(err.Error())
|
||||
|
|
|
|||
49
utils.go
49
utils.go
|
|
@ -1,6 +1,7 @@
|
|||
package telegram
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/url"
|
||||
"strconv"
|
||||
)
|
||||
|
|
@ -23,3 +24,51 @@ func NewInlineMentionURL(userID int) *url.URL {
|
|||
|
||||
return link
|
||||
}
|
||||
|
||||
func NewMarkdownBold(text string) string {
|
||||
return fmt.Sprint("*", text, "*")
|
||||
}
|
||||
|
||||
func NewMarkdownItalic(text string) string {
|
||||
return fmt.Sprint("_", text, "_")
|
||||
}
|
||||
|
||||
func NewMarkdownURL(text string, link *url.URL) string {
|
||||
return fmt.Sprint("[", text, "](", link.String(), ")")
|
||||
}
|
||||
|
||||
func NewMarkdownMention(text string, id int) string {
|
||||
return fmt.Sprint("[", text, "](tg://user?id=", id, ")")
|
||||
}
|
||||
|
||||
func NewMarkdownCode(text string) string {
|
||||
return fmt.Sprint("`", text, "`")
|
||||
}
|
||||
|
||||
func NewMarkdownCodeBlock(text string) string {
|
||||
return fmt.Sprint("```", text, "```")
|
||||
}
|
||||
|
||||
func NewHtmlBold(text string) string {
|
||||
return fmt.Sprint("<b>", text, "</b>")
|
||||
}
|
||||
|
||||
func NewHtmlItalic(text string) string {
|
||||
return fmt.Sprint("<i>", text, "</i>")
|
||||
}
|
||||
|
||||
func NewHtmlURL(text string, link *url.URL) string {
|
||||
return fmt.Sprint(`<a href="`, link.String(), `">`, text, `</a>`)
|
||||
}
|
||||
|
||||
func NewHtmlMention(text string, id int) string {
|
||||
return fmt.Sprint(`<a href="tg://user?id=`, id, `">`, text, `</a>`)
|
||||
}
|
||||
|
||||
func NewHtmlCode(text string) string {
|
||||
return fmt.Sprint("<code>", text, "</code>")
|
||||
}
|
||||
|
||||
func NewHtmlCodeBlock(text string) string {
|
||||
return fmt.Sprint("<pre>", text, "</pre>")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package telegram
|
|||
import (
|
||||
"bytes"
|
||||
"log"
|
||||
"net/url"
|
||||
"time"
|
||||
|
||||
"github.com/kirillDanshin/dlog"
|
||||
|
|
@ -49,17 +50,17 @@ func (bot *Bot) NewLongPollingChannel(params *GetUpdatesParameters) UpdatesChann
|
|||
|
||||
// NewWebhookChannel creates channel for receive incoming updates via an outgoing
|
||||
// webhook.
|
||||
func (bot *Bot) NewWebhookChannel(params *SetWebhookParameters, certFile, keyFile, set, listen, serve string) (updates UpdatesChannel) {
|
||||
func (bot *Bot) NewWebhookChannel(setURL *url.URL, params *SetWebhookParameters, certFile, keyFile, serveAddr string) (updates UpdatesChannel) {
|
||||
if params == nil {
|
||||
params = &SetWebhookParameters{
|
||||
URL: set,
|
||||
URL: setURL.String(),
|
||||
MaxConnections: 40,
|
||||
}
|
||||
}
|
||||
|
||||
var err error
|
||||
channel := make(chan Update, 100)
|
||||
requiredPath := []byte(listen)
|
||||
requiredPath := []byte(setURL.Path)
|
||||
dlog.Ln("requiredPath:", string(requiredPath))
|
||||
handleFunc := func(ctx *http.RequestCtx) {
|
||||
dlog.Ln("Request path:", string(ctx.Path()))
|
||||
|
|
@ -80,10 +81,10 @@ func (bot *Bot) NewWebhookChannel(params *SetWebhookParameters, certFile, keyFil
|
|||
go func() {
|
||||
if certFile != "" && keyFile != "" {
|
||||
dlog.Ln("Creating TLS router...")
|
||||
err = http.ListenAndServeTLS(serve, certFile, keyFile, handleFunc)
|
||||
err = http.ListenAndServeTLS(serveAddr, certFile, keyFile, handleFunc)
|
||||
} else {
|
||||
dlog.Ln("Creating simple router...")
|
||||
err = http.ListenAndServe(serve, handleFunc)
|
||||
err = http.ListenAndServe(serveAddr, handleFunc)
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatalln(err.Error())
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user