diff --git a/go.mod b/go.mod index 09699f2..633ac15 100644 --- a/go.mod +++ b/go.mod @@ -10,5 +10,5 @@ require ( github.com/tidwall/gjson v1.6.0 github.com/tidwall/pretty v1.0.1 // indirect golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e - gopkg.in/tucnak/telebot.v2 v2.0.0-20200301001213-9852df39ae6c + gopkg.in/tucnak/telebot.v2 v2.0.0-20200328014118-dd123e949ee1 ) diff --git a/go.sum b/go.sum index 683bb61..c4a6404 100644 --- a/go.sum +++ b/go.sum @@ -157,6 +157,8 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tucnak/telebot.v2 v2.0.0-20200301001213-9852df39ae6c h1:+7l/yyky9hchNME0hDMl+cA+wVlHQGte/5EwKHeSqoc= gopkg.in/tucnak/telebot.v2 v2.0.0-20200301001213-9852df39ae6c/go.mod h1:+//wyPtHTeW2kfyEBwB05Hqnxev7AGrsLIyylSH++KU= +gopkg.in/tucnak/telebot.v2 v2.0.0-20200328014118-dd123e949ee1 h1:L9z5n/aaxpAjeEMHu4PfZ7GgQa0lRirKW5G+LHuNQDU= +gopkg.in/tucnak/telebot.v2 v2.0.0-20200328014118-dd123e949ee1/go.mod h1:+//wyPtHTeW2kfyEBwB05Hqnxev7AGrsLIyylSH++KU= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I= diff --git a/sqlite.go b/sqlite.go index 6543cf1..b29f856 100644 --- a/sqlite.go +++ b/sqlite.go @@ -4,6 +4,7 @@ import ( "database/sql" "fmt" _ "github.com/mattn/go-sqlite3" + "github.com/tidwall/gjson" "time" ) @@ -97,6 +98,22 @@ func QueryDataAll(db *sql.DB) []MSData { } return result } +func QueryDataBySign(db *sql.DB, tgId int64, sign string) []MSData { + rows, err := db.Query("select * from users where tg_id = ?", tgId) + CheckErr(err) + var result = make([]MSData, 0) + defer rows.Close() + for rows.Next() { + var refresht, othert, msidt string + var tgIdt int64 + var uptimet time.Time + rows.Scan(&tgIdt, &refresht, &msidt, &uptimet, &othert) + if gjson.Get(othert, "sign").String() == sign { + result = append(result, MSData{tgIdt, refresht, msidt, uptimet, othert}) + } + } + return result +} //query data by tg_id func QueryDataByTG(db *sql.DB, tgId int64) []MSData { @@ -109,7 +126,6 @@ func QueryDataByTG(db *sql.DB, tgId int64) []MSData { var tgIdt int64 var uptimet time.Time rows.Scan(&tgIdt, &refresht, &msidt, &uptimet, &othert) - //fmt.Println(string(tgNamet) + "=>" + uptimet.Format("2006-01-02 15:04:05")) result = append(result, MSData{tgIdt, refresht, msidt, uptimet, othert}) } return result