Compare commits

..

4 Commits

Author SHA1 Message Date
692bcc57ea Удалил ненужный закомментированный код
All checks were successful
continuous-integration/drone Build is passing
continuous-integration/drone/push Build is passing
2021-10-23 01:57:40 +00:00
a7e57523fd Новый способ получения токена 2021-10-23 01:49:57 +00:00
e8184e34b8 Авторизация теперь происходит по новому 2021-10-23 01:49:08 +00:00
35e3d54ea3 Избавился от Redis и убрал отправку сообщений в crisp 2021-10-23 01:48:45 +00:00
3 changed files with 11 additions and 103 deletions

View File

@ -12,7 +12,7 @@ Will Support:
## Getting Started ## Getting Started
1. Get your crisp API credentials from [Crisp API token generator](https://go.crisp.chat/account/token/) 1. Get your crisp API credentials from [Crisp API token generator](https://go.crisp.chat/account/token/) FIXME
1. Create a bot with [BotFather](https://t.me/botfather), save the token for later use. 1. Create a bot with [BotFather](https://t.me/botfather), save the token for later use.
1. Build & Run. 1. Build & Run.

View File

@ -4,7 +4,3 @@ services:
build: . build: .
volumes: volumes:
- /root/config.yml:/app/config.yml - /root/config.yml:/app/config.yml
depends_on:
- db
db:
image: redis

106
main.go
View File

@ -8,15 +8,15 @@ import (
"time" "time"
"github.com/crisp-im/go-crisp-api/crisp" "github.com/crisp-im/go-crisp-api/crisp"
"github.com/go-redis/redis"
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
"github.com/spf13/viper"
"github.com/l0sted/Crisp_Telegram_bot/utils" "github.com/l0sted/Crisp_Telegram_bot/utils"
"github.com/spf13/viper"
) )
var bot *tgbotapi.BotAPI var bot *tgbotapi.BotAPI
var client *crisp.Client var client *crisp.Client
var redisClient *redis.Client
// var redisClient *redis.Client
var config *viper.Viper var config *viper.Viper
// CrispMessageInfo stores the original message // CrispMessageInfo stores the original message
@ -35,85 +35,22 @@ func (s *CrispMessageInfo) UnmarshalBinary(data []byte) error {
return json.Unmarshal(data, s) return json.Unmarshal(data, s)
} }
func contains(s []interface{}, e int64) bool {
for _, a := range s {
if int64(a.(int)) == e {
return true
}
}
return false
}
//from tg to crisp
func replyToUser(update *tgbotapi.Update) {
if update.Message.ReplyToMessage == nil {
msg := tgbotapi.NewMessage(update.Message.Chat.ID, "请回复一个消息")
bot.Send(msg)
return
}
res, err := redisClient.Get(strconv.Itoa(update.Message.ReplyToMessage.MessageID)).Result()
if err != nil {
msg := tgbotapi.NewMessage(update.Message.Chat.ID, "ERROR: "+err.Error())
bot.Send(msg)
return
}
var msgInfo CrispMessageInfo
err = json.Unmarshal([]byte(res), &msgInfo)
if err := json.Unmarshal([]byte(res), &msgInfo); err != nil {
msg := tgbotapi.NewMessage(update.Message.Chat.ID, "ERROR: "+err.Error())
bot.Send(msg)
return
}
if update.Message.Text != "" {
client.Website.SendTextMessageInConversation(msgInfo.WebsiteID, msgInfo.SessionID, crisp.ConversationTextMessageNew{
Type: "text",
From: "operator",
Origin: "chat",
Content: update.Message.Text,
})
}
msg := tgbotapi.NewMessage(update.Message.Chat.ID, "回复成功!")
bot.Send(msg)
}
//from crisp to tg //from crisp to tg
func sendMsgToAdmins(text string, WebsiteID string, SessionID string) { func sendMsgToAdmins(text string, WebsiteID string, SessionID string) {
for _, id := range config.Get("admins").([]interface{}) { for _, id := range config.Get("admins").([]interface{}) {
msg := tgbotapi.NewMessage(int64(id.(int)), text) msg := tgbotapi.NewMessage(int64(id.(int)), text)
msg.ParseMode = "Markdown" msg.ParseMode = "Markdown"
sent, _ := bot.Send(msg) sent, _ := bot.Send(msg)
log.Println(strconv.Itoa(sent.MessageID))
redisClient.Set(strconv.Itoa(sent.MessageID), &CrispMessageInfo{
WebsiteID,
SessionID,
}, 12*time.Hour)
} }
} }
func init() { func main() {
config = utils.GetConfig() config = utils.GetConfig()
var chat_prefix = config.GetString("prefix") var chat_prefix = config.GetString("prefix")
log.Printf("Initializing Redis...")
redisClient = redis.NewClient(&redis.Options{
Addr: config.GetString("redis.host"),
Password: config.GetString("redis.password"),
DB: config.GetInt("redis.db"),
})
var err error var err error
_, err = redisClient.Ping().Result()
if err != nil {
log.Panic(err)
}
log.Printf("Initializing Bot...") log.Printf("Initializing Bot...")
bot, err = tgbotapi.NewBotAPI(config.GetString("telegram.key")) bot, err = tgbotapi.NewBotAPI(config.GetString("telegram.key"))
@ -130,7 +67,8 @@ func init() {
log.Printf("Initializing Crisp Listner") log.Printf("Initializing Crisp Listner")
client = crisp.New() client = crisp.New()
// Set authentication parameters // Set authentication parameters
client.Authenticate(config.GetString("crisp.identifier"), config.GetString("crisp.key")) // client.Authenticate(config.GetString("crisp.identifier"), config.GetString("crisp.key"))
client.AuthenticateTier("plugin", config.GetString("crisp.identifier"), config.GetString("crisp.key"))
// Connect to realtime events backend and listen (only to 'message:send' namespace) // Connect to realtime events backend and listen (only to 'message:send' namespace)
client.Events.Listen( client.Events.Listen(
@ -171,33 +109,7 @@ func init() {
log.Fatal("Crisp listener error, check your API key or internet connection?") log.Fatal("Crisp listener error, check your API key or internet connection?")
}, },
) )
} for {
time.Sleep(1 * time.Second)
func main() {
var updates tgbotapi.UpdatesChannel
log.Print("Start pooling")
u := tgbotapi.NewUpdate(0)
u.Timeout = 60
updates, _ = bot.GetUpdatesChan(u)
for update := range updates {
if update.Message == nil {
continue
}
log.Printf("%s %s: %s", update.Message.From.FirstName, update.Message.From.LastName, update.Message.Text)
switch update.Message.Command() {
case "start":
msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Blinkload Telegram 客服助手")
msg.ParseMode = "Markdown"
bot.Send(msg)
}
if contains(config.Get("admins").([]interface{}), int64(update.Message.From.ID)) {
// replyToUser(&update)
}
} }
} }