narayana/telegabber
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Asynchronous message processing with guaranteed sequential per-chat delivery

Browse source
This commit is contained in:
bodqhrohro 2019-12-30 07:01:56 +02:00
parent 307d5136d4
commit 7ea5e9ac73
2 changed files with 96 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
telegram/client.go
View file

@ -55,6 +55,7 @@ type Client struct {
type clientLocks struct { type clientLocks struct {
authorizationReady sync.WaitGroup authorizationReady sync.WaitGroup
chatMessageLocks map[int64]*sync.Mutex
} }
// NewClient instantiates a Telegram App // NewClient instantiates a Telegram App
@ -107,6 +108,8 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component
content: &conf.Content, content: &conf.Content,
cache: cache.NewCache(), cache: cache.NewCache(),
options: options, options: options,
locks: clientLocks{}, locks: clientLocks{
chatMessageLocks: make(map[int64]*sync.Mutex),
},
}, nil }, nil
} }

21
telegram/handlers.go
View file

@ -35,6 +35,16 @@ func int64SliceToStringSlice(ints []int64) []string {
return strings return strings
} }
func (c *Client) getChatMessageLock(chatID int64) *sync.Mutex {
lock, ok := c.locks.chatMessageLocks[chatID]
if !ok {
lock = &sync.Mutex{}
c.locks.chatMessageLocks[chatID] = lock
}
return lock
}
func (c *Client) updateHandler() { func (c *Client) updateHandler() {
listener := c.client.GetListener() listener := c.client.GetListener()
defer listener.Close() defer listener.Close()
@ -121,6 +131,7 @@ func (c *Client) updateUserStatus(update *client.UpdateUserStatus) {
// new chat discovered // new chat discovered
func (c *Client) updateNewChat(update *client.UpdateNewChat) { func (c *Client) updateNewChat(update *client.UpdateNewChat) {
go func() {
if update.Chat != nil && update.Chat.Photo != nil && update.Chat.Photo.Small != nil { if update.Chat != nil && update.Chat.Photo != nil && update.Chat.Photo.Small != nil {
_, err := c.client.DownloadFile(&client.DownloadFileRequest{ _, err := c.client.DownloadFile(&client.DownloadFileRequest{
FileId: update.Chat.Photo.Small.Id, FileId: update.Chat.Photo.Small.Id,
@ -155,12 +166,19 @@ func (c *Client) updateNewChat(update *client.UpdateNewChat) {
} }
if update.Chat.Id < 0 { if update.Chat.Id < 0 {
go c.processStatusUpdate(update.Chat.Id, update.Chat.Title, "chat") c.processStatusUpdate(update.Chat.Id, update.Chat.Title, "chat")
} }
}()
} }
// message received // message received
func (c *Client) updateNewMessage(update *client.UpdateNewMessage) { func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
go func() {
// guarantee sequential message delivering per chat
lock := c.getChatMessageLock(update.Message.ChatId)
lock.Lock()
defer lock.Unlock()
// ignore self outgoing messages // ignore self outgoing messages
if update.Message.IsOutgoing && if update.Message.IsOutgoing &&
update.Message.SendingState != nil && update.Message.SendingState != nil &&
@ -209,6 +227,7 @@ func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
}) })
// forward message to XMPP // forward message to XMPP
gateway.SendMessage(c.jid, strconv.FormatInt(update.Message.ChatId, 10), text, c.xmpp) gateway.SendMessage(c.jid, strconv.FormatInt(update.Message.ChatId, 10), text, c.xmpp)
}()
} }
// message content updated // message content updated