chtwrs/gocw2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix delay

Browse Source
This commit is contained in:
shoopea 2019-08-24 13:58:58 +08:00
parent ace2ff22e9
commit 43ef0a50fc
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main.go
View File

@ -4,6 +4,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"log" "log"
"sync"
"time" "time"
"gopkg.in/gcfg.v1" "gopkg.in/gcfg.v1"
@ -45,6 +46,7 @@ var (
ownUserID64 = int64(0) ownUserID64 = int64(0)
ownUserID32 = int32(0) ownUserID32 = int32(0)
lastOwnTDMsg time.Time lastOwnTDMsg time.Time
lastOwnTDMsgMux sync.Mutex
MQCWMsgQueue chan ChatWarsMessage MQCWMsgQueue chan ChatWarsMessage
MQTGCmdQueue chan TGCommand MQTGCmdQueue chan TGCommand
) )
@ -133,7 +135,10 @@ func main() {
} }
go MQKeepAliveWorker() go MQKeepAliveWorker()
lastOwnTDMsgMux.Lock()
lastOwnTDMsg = time.Now() lastOwnTDMsg = time.Now()
lastOwnTDMsgMux.Unlock()
go ListenCW(client) go ListenCW(client)
go ListenMQ(client, MQTGCmdQueue) go ListenMQ(client, MQTGCmdQueue)
go ListenMe(client) go ListenMe(client)

18
td.go
View File

@ -30,11 +30,6 @@ func ListenMe(c *tdlib.Client) {
func ListenMQ(c *tdlib.Client, msgs <-chan TGCommand) { func ListenMQ(c *tdlib.Client, msgs <-chan TGCommand) {
for m := range msgs { for m := range msgs {
for now := time.Now(); lastOwnTDMsg.Add(time.Second).After(now); {
log.Printf("ListenMQ : channel busy, waiting before acting...\n")
time.Sleep(time.Until(lastOwnTDMsg.Add(time.Second)))
now = time.Now()
}
b, _ := json.Marshal(m) b, _ := json.Marshal(m)
log.Printf("****************************** New MQ command ******************************\n%s\n****************************************************************************\n", string(b)) log.Printf("****************************** New MQ command ******************************\n%s\n****************************************************************************\n", string(b))
go clientMsg(c, m) go clientMsg(c, m)
@ -224,9 +219,22 @@ func OwnUserID(c *tdlib.Client) int32 {
} }
func clientMsg(c *tdlib.Client, m TGCommand) { func clientMsg(c *tdlib.Client, m TGCommand) {
log.Printf("clientMsg : Delaying message by %d seconds.\n", m.Delay)
if m.Delay != 0 { if m.Delay != 0 {
time.Sleep(time.Duration(m.Delay) * time.Second) time.Sleep(time.Duration(m.Delay) * time.Second)
} }
for {
lastOwnTDMsgMux.Lock()
now := time.Now()
if lastOwnTDMsg.Add(time.Second).Before(now) {
lastOwnTDMsg = now
lastOwnTDMsgMux.Unlock()
break
}
lastOwnTDMsgMux.Unlock()
time.Sleep(time.Until(now.Add(time.Second)))
}
switch m.Type { switch m.Type {
case commandSendMsg: case commandSendMsg:
msgTxt := tdlib.NewInputMessageText(tdlib.NewFormattedText(m.Text, nil), true, true) msgTxt := tdlib.NewInputMessageText(tdlib.NewFormattedText(m.Text, nil), true, true)