nefrace
/
nechotron
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Custom API server

This commit is contained in:
nefrace 2023-01-20 16:32:13 +03:00
parent 3a06ae5f0e
commit 677f28182a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nechotron.go
View File

@ -8,7 +8,8 @@ import (
type Nechotron struct { type Nechotron struct {
Token string Token string
DefaultState *State DefaultState Runnable
ApiServer string
} }
func NewTron(token string, defaultState *State) *Nechotron { func NewTron(token string, defaultState *State) *Nechotron {
@ -23,7 +24,8 @@ func NewTron(token string, defaultState *State) *Nechotron {
} }
func (n *Nechotron) newBot(chatID int64) echo.Bot { func (n *Nechotron) newBot(chatID int64) echo.Bot {
a := echo.NewAPI(n.Token) a := echo.NewCustomAPI(n.Token, n.ApiServer)
// a := echo.NewAPI(n.Token)
me, _ := a.GetMe() me, _ := a.GetMe()
// log.Println("New bot active: ", chatID, me.Result) // log.Println("New bot active: ", chatID, me.Result)
b := &bot{ b := &bot{

6
state.go
View File

@ -13,11 +13,11 @@ type Runnable interface {
} }
type State struct { type State struct {
fn stateFn Fn stateFn
} }
func (s *State) Call(u *Update) (Runnable, error) { func (s *State) Call(u *Update) (Runnable, error) {
return s.fn(u) return s.Fn(u)
} }
type stateFn func(*Update) (Runnable, error) type stateFn func(*Update) (Runnable, error)
@ -46,7 +46,7 @@ func (d StateData) Clear() {
} }
var EchoState = State{ var EchoState = State{
fn: EchoFunc, Fn: EchoFunc,
} }
func EchoFunc(u *Update) (Runnable, error) { func EchoFunc(u *Update) (Runnable, error) {

2
update.go
View File

@ -188,7 +188,7 @@ func (u *Update) LogError(text string, e error, send bool) {
} else { } else {
text = "Произошла внутренняя ошибка" text = "Произошла внутренняя ошибка"
} }
log.Printf("[%s] %s: %v", u.UpdateID.String(), text, e) log.Printf("ERROR :: [%s] :: %s: %v", u.UpdateID.String(), text, e)
if send { if send {
u.AnswerMarkdown(fmt.Sprintf("%s\nКод запроса: `%s`", text, u.UpdateID.String())) u.AnswerMarkdown(fmt.Sprintf("%s\nКод запроса: `%s`", text, u.UpdateID.String()))
} }