narayana/go-tdlib
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Handle updateMessageSendSucceeded if client send a text/dice message

Browse source
This commit is contained in:
c0re100 2022-01-30 01:04:23 +08:00
parent b535766aa0
commit e15362a612
No known key found for this signature in database
GPG key ID: 7C3B3004FE745AAF
1 changed files with 55 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
client/client.go
View file

@ -1,20 +1,23 @@
package client package client
import ( import (
"bytes"
"context" "context"
"errors" "errors"
"strconv"
"sync" "sync"
"time" "time"
) )
type Client struct { type Client struct {
jsonClient *JsonClient jsonClient *JsonClient
extraGenerator ExtraGenerator extraGenerator ExtraGenerator
responses chan *Response responses chan *Response
listenerStore *listenerStore listenerStore *listenerStore
catchersStore *sync.Map catchersStore *sync.Map
updatesTimeout time.Duration successMsgStore *sync.Map
catchTimeout time.Duration updatesTimeout time.Duration
catchTimeout time.Duration
} }
type Option func(*Client) type Option func(*Client)
@ -55,10 +58,11 @@ func SetFilePath(path string) {
func NewClient(authorizationStateHandler AuthorizationStateHandler, options ...Option) (*Client, error) { func NewClient(authorizationStateHandler AuthorizationStateHandler, options ...Option) (*Client, error) {
client := &Client{ client := &Client{
jsonClient: NewJsonClient(), jsonClient: NewJsonClient(),
responses: make(chan *Response, 1000), responses: make(chan *Response, 1000),
listenerStore: newListenerStore(), listenerStore: newListenerStore(),
catchersStore: &sync.Map{}, catchersStore: &sync.Map{},
successMsgStore: &sync.Map{},
} }
client.extraGenerator = UuidV4Generator() client.extraGenerator = UuidV4Generator()
@ -94,6 +98,13 @@ func (client *Client) receiver() {
continue continue
} }
if typ.GetType() == (&UpdateMessageSendSucceeded{}).GetType() {
value, ok := client.successMsgStore.Load(typ.(*UpdateMessageSendSucceeded).OldMessageId)
if ok {
value.(chan *Response) <- response
}
}
needGc := false needGc := false
for _, listener := range client.listenerStore.Listeners() { for _, listener := range client.listenerStore.Listeners() {
if listener.IsActive() && listener.Updates != nil && typ.GetType() == listener.Filter.GetType() { // All updates go to Updates channel if type == filter if listener.IsActive() && listener.Updates != nil && typ.GetType() == listener.Filter.GetType() { // All updates go to Updates channel if type == filter
@ -129,8 +140,37 @@ func (client *Client) Send(req Request) (*Response, error) {
select { select {
case response := <-catcher: case response := <-catcher:
return response, nil if response.Type != "error" && req.Type == "sendMessage" {
m, err := UnmarshalMessage(response.Data)
if err != nil {
return nil, err
}
if m.Content.MessageContentType() == "messageText" || m.Content.MessageContentType() == "messageDice" {
successCatcher := make(chan *Response, 1)
client.successMsgStore.Store(m.Id, successCatcher)
defer (func() {
client.successMsgStore.Delete(m.Id)
close(successCatcher)
})()
select {
case modResponse := <-successCatcher:
m2, err2 := UnmarshalUpdateMessageSendSucceeded(modResponse.Data)
if err2 != nil {
return response, nil
}
response.Data = bytes.Replace(response.Data, []byte("{\"@type\":\"messageSendingStatePending\"}"), []byte("{\"@type\":\"updateMessageSendSucceeded\"}"), 1)
response.Data = bytes.Replace(response.Data, []byte(strconv.FormatInt(m.Id, 10)), []byte(strconv.FormatInt(m2.Message.Id, 10)), 1)
return response, nil
case <-time.After(1 * time.Second):
client.successMsgStore.Delete(m.Id)
close(successCatcher)
}
}
}
return response, nil
case <-ctx.Done(): case <-ctx.Done():
return nil, errors.New("response catching timeout") return nil, errors.New("response catching timeout")
} }
@ -148,9 +188,9 @@ func (client *Client) GetListener() *Listener {
func (client *Client) AddEventReceiver(msgType Type, channelCapacity int) *Listener { func (client *Client) AddEventReceiver(msgType Type, channelCapacity int) *Listener {
listener := &Listener{ listener := &Listener{
isActive: true, isActive: true,
Updates: make(chan Type, channelCapacity), Updates: make(chan Type, channelCapacity),
Filter: msgType, Filter: msgType,
} }
client.listenerStore.Add(listener) client.listenerStore.Add(listener)