update v0.0.2

Author: kirito

bot/bot.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"strings"
 )
 
 type Bot struct {
@@ -48,6 +49,10 @@ func (bot *Bot) Dispatch(update *tgbotapi.Update) {
 				if entity.Type == "bot_command" {
 					bot.Logger.Debug("offse:len", entity.Offset, entity.Length, "msg" , update.Message.Text)
 					url := update.Message.Text[entity.Offset : entity.Offset+entity.Length]
+					i := strings.Index(url, "@") // 提取命令 /help@kirito_testonly_bot
+					if i != -1 {
+						url = url[:i]
+					}
 					bot.Router.DoHandle(url, update)
 					return
 				}

callback.go

@@ -14,28 +14,30 @@ import (
 func help(update *tgbotapi.Update) {
 	Log.Debug("recv msg:", update.Message.Text, "chatID:", update.Message.Chat.ID)
 	msg := tgbotapi.NewMessage(update.Message.Chat.ID, "")
-	msg.Text = ParseToString("help", nil)
+	msg.Text = "@" + update.Message.From.UserName + " - " + update.Message.From.FirstName + "\n"
+	msg.Text += ParseToString("help", nil)
 	msg.ParseMode = "Markdown"
 	send(&msg, 5)
 }
 
 func newest(update *tgbotapi.Update) {
 	Log.Debug("recv msg:", update.Message.Text, "chatID:", update.Message.Chat.ID)
 	msg := tgbotapi.NewMessage(update.Message.Chat.ID, "")
-
+	msg.Text = "@" + update.Message.From.UserName + " - " + update.Message.From.FirstName + "\n"
 	block, err := getNewestBlock()
 	if err != nil {
 		Log.Error("GetBlockInfo:", err)
 		return
 	}
-	msg.Text = ParseToString("block", block)
+	msg.Text += ParseToString("block", block)
 	msg.ParseMode = "Markdown"
 	send(&msg, 5)
 }
 
 func recent(update *tgbotapi.Update) {
 	Log.Debug("recv msg:", update.Message.Text, "chatID:", update.Message.Chat.ID)
 	msg := tgbotapi.NewMessage(update.Message.Chat.ID, "")
+	msg.Text = "@" + update.Message.From.UserName + " - " + update.Message.From.FirstName + "\n"
 	msg.ParseMode = "Markdown"
 
 	arr := make([]*btcinfo.Block, 0)
@@ -55,13 +57,14 @@ func recent(update *tgbotapi.Update) {
 		arr = append(arr, b)
 	}
 
-	msg.Text = ParseToString("recent", arr)
+	msg.Text += ParseToString("recent", arr)
 	send(&msg, 5)
 }
 
 func q(update *tgbotapi.Update) {
 	Log.Debug("recv msg:", update.Message.Text, "chatID:", update.Message.Chat.ID)
 	msg := tgbotapi.NewMessage(update.Message.Chat.ID, "")
+	msg.Text = "@" + update.Message.From.UserName + " - " + update.Message.From.FirstName + "\n"
 	msg.ParseMode = "Markdown"
 	fields := strings.Fields(update.Message.Text)
 	var want string
@@ -86,13 +89,13 @@ func q(update *tgbotapi.Update) {
 	}
 	if len(want) < 20 || strings.HasPrefix(want, "000000") { // block 块
 		iface, err = API.GetBlockInfo(want)
-		msg.Text = ParseToString("block", iface)
+		msg.Text += ParseToString("block", iface)
 	} else if len(want) > 20 && len(want) < 40 { // address 地址
 		iface, err = API.GetAddressInfo(want)
-		msg.Text = ParseToString("address", iface)
+		msg.Text += ParseToString("address", iface)
 	} else if len(want) == 64 { // transaction 交易
 		iface, err = API.GetTransactionInfo(want)
-		msg.Text = ParseToString("transaction", iface)
+		msg.Text += ParseToString("transaction", iface)
 	} else {
 		return
 	}
@@ -103,6 +106,20 @@ func q(update *tgbotapi.Update) {
 	send(&msg, 5)
 }
 
+func quotes(update *tgbotapi.Update) {
+	Log.Debug("recv msg:", update.Message.Text, "chatID:", update.Message.Chat.ID)
+	msg := tgbotapi.NewMessage(update.Message.Chat.ID, "")
+	msg.Text = "@" + update.Message.From.UserName + " - " + update.Message.From.FirstName + "\n"
+	msg.ParseMode = "Markdown"
+
+	klines, err := HuobiAPI.GetKLine("btcusdt", "60min", 1)
+	if err != nil {
+		return
+	}
+	msg.Text += ParseToString("quotes", klines[0])
+	send(&msg, 5)
+}
+
 func unknow(update *tgbotapi.Update) {
 	q(update)
 }
@@ -138,7 +155,7 @@ func send(msg *tgbotapi.MessageConfig, duration int) {
 	for ; cnt > 0; cnt-- {
 		_, err := Bot.TgBot.Send(msg)
 		if err != nil {
-			Log.Debug("send msg:", err, " will retry...", cnt)
+			Log.Debug("send msg:", err, " will retry...", cnt-1)
 			<-time.After(time.Duration(duration)*time.Second)
 		} else {
 			break

houbi_test.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"github.com/zshorz/fkbro/util"
+	"testing"
+)
+
+func Test_KLine(t *testing.T) {
+	huobi := NewHuobi(util.Config.Proxy)
+	t.Log(util.Config.Proxy)
+	klines, err := huobi.GetKLine("btcusdt", "60min", 1)
+	t.Log(klines[0], err)
+}

huobi.go

@@ -0,0 +1,97 @@
+package main
+
+import (
+	"encoding/json"
+	"github.com/zshorz/ezlog"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"strconv"
+)
+
+/// https://huobiapi.github.io/docs/spot/v1/cn/
+type Response struct {
+	Status		string		`json:"status"`		// 接口返回状态
+	Ch 			string 		`json:"ch"`			// 接口数据对应的数据流。部分接口没有对应数据流因此不返回此字段
+	Ts 			int64 		`json:"ts"`			// 返回的时间戳
+	Data 		interface{}	`json:"data"`		// 数据主体
+}
+
+type KLine struct {
+	// TODO: 只使用了关注的字段
+	Id 			int64 		`json:"id"`			// 调整为新加坡时间的时间戳，单位秒，并以此作为此K线柱的id
+	Open 		float32 	`json:"open"`		// 开盘
+	Close 		float32 	`json:"close"`		// 收盘价
+	High 		float32 	`json:"high"`		// 最高
+	Low 		float32 	`json:"low"`		// 最低
+}
+
+var client *http.Client
+
+type Huobi struct {
+	Client 		*http.Client
+	Proxy		string
+	Logger 		*ezlog.EzLogger
+}
+
+func NewHuobi(proxy string) *Huobi {
+	Proxy := func(_ *http.Request) (*url.URL, error) {
+		return url.Parse(proxy)
+	}
+	Transport := &http.Transport{Proxy:Proxy}
+
+	huobi := &Huobi{
+		Client: &http.Client{},
+		Proxy:  proxy,
+		Logger: ezlog.New(os.Stdout, "", ezlog.BitDefault, ezlog.LogAll),
+	}
+
+	if proxy != "" {
+		huobi.Client.Transport = Transport
+	}
+	return huobi
+}
+
+// btcusdt 60min 1
+func (h *Huobi) GetKLine(symbol, period string, size int) ([]*KLine, error) {
+	req, _ := http.NewRequest("GET", "https://api.huobi.pro/market/history/kline", nil)
+	q := req.URL.Query()
+	q.Add("symbol", symbol)
+	q.Add("period", period)
+	q.Add("size", strconv.Itoa(size))
+	req.URL.RawQuery = q.Encode()
+
+	resp, err := h.query(req)
+	if err != nil {
+		return nil, err
+	}
+	kline := make([]*KLine,0)
+	js, err := json.Marshal(resp.Data)
+	if err != nil {
+		h.Logger.Debug(err)
+		return nil, err
+	}
+	err = json.Unmarshal(js, &kline)
+	if err != nil {
+		h.Logger.Debug(err)
+		return nil, err
+	}
+	return kline, nil
+}
+
+func (h *Huobi) query(req *http.Request) (*Response, error) {
+	resp, err := h.Client.Do(req)
+	if err != nil {
+		h.Logger.Debug(err, resp)
+		return nil, err
+	}
+	var ret Response
+	data, _ := ioutil.ReadAll(resp.Body)
+	err = json.Unmarshal(data, &ret)
+	if err != nil {
+		h.Logger.Debug(err)
+		return nil, err
+	}
+	return &ret, nil
+}

main.go

@@ -15,6 +15,7 @@ import (
 var Log = ezlog.New(os.Stdout, "", ezlog.BitDefault, ezlog.LogAll)
 var Bot *bot.Bot
 var API *btcinfo.BTC_com_api
+var HuobiAPI *Huobi
 
 var configfile string
 
@@ -26,6 +27,7 @@ func main() {
 	util.Config.Reload(configfile)
 
 	API = btcinfo.NewBTC_com_api(util.Config.ApiHost, util.Config.CacheSize)
+	HuobiAPI = NewHuobi(util.Config.Proxy)
 
 	for  {
 		bot, error := bot.NewBot(util.Config.BotToken, util.Config.Proxy)
@@ -52,6 +54,7 @@ func main() {
 	Bot.Router.AddHandle("/q", q)
 	Bot.Router.AddHandle("unknow", unknow)
 	Bot.Router.AddHandle("/recent", recent)
+	Bot.Router.AddHandle("/quotes", quotes)
 
 	LoadTemplate(util.Config.StaticPath)
 	go doSignal()

static/address.tmp

@@ -1,3 +1,5 @@
+地址详情:
+-
 `地址` : `{{.Address}}`
 `总接收` : `{{.GetRecv}}BTC`
 `总支出` : `{{.GetSent}}BTC`

static/block.tmp

@@ -1,3 +1,5 @@
+最新出块:
+-
 `播报方`: [{{.Extras.Pool_name}}]({{.Extras.Pool_link}})
 `块高度`: `{{.Height}}`
 `块收益`: `{{.GetReword}}BTC`

static/help.tmp

@@ -1,5 +1,7 @@
-这里是帮助
+帮助:
+-
 /newest - `最新出块`
 /q - `查询: 块高度 块哈希 交易哈希 地址`
 /recent - `查看最近出块情况`
-机器人地址 : [github](https://github.com/)
+/quotes - `1小时行情`
+机器人地址 : [github](https://github.com/zshorz/fkbro) @yesiare

static/quotes.tmp

@@ -0,0 +1,6 @@
+1小时行情: `BTC/USDT`
+-
+`最高` : `{{.High}}`
+`当前` : *{{.Close}}*
+`开盘` : `{{.Open}}`
+`最低` : `{{.Low}}`

static/recent.tmp

@@ -1,3 +1,4 @@
+最近出块:
 {{range .}}
 `播报方` : [{{.Extras.Pool_name}}]({{.Extras.Pool_link}})
 `时间` : `{{GetPastTime .Timestamp}}`