Revert "Avoid webpage preview updates being sent as message edits"
This reverts commit 563cb2d624
.
This commit is contained in:
parent
563cb2d624
commit
eadef987be
|
@ -53,7 +53,6 @@ type Client struct {
|
|||
Session *persistence.Session
|
||||
resources map[string]bool
|
||||
outbox map[string]string
|
||||
editQueue map[ChatMessageId]bool
|
||||
content *config.TelegramContentConfig
|
||||
cache *cache.Cache
|
||||
online bool
|
||||
|
@ -70,7 +69,6 @@ type clientLocks struct {
|
|||
chatMessageLocks map[int64]*sync.Mutex
|
||||
resourcesLock sync.Mutex
|
||||
outboxLock sync.Mutex
|
||||
editQueueLock sync.Mutex
|
||||
}
|
||||
|
||||
// NewClient instantiates a Telegram App
|
||||
|
@ -127,7 +125,6 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component
|
|||
Session: session,
|
||||
resources: make(map[string]bool),
|
||||
outbox: make(map[string]string),
|
||||
editQueue: make(map[ChatMessageId]bool),
|
||||
content: &conf.Content,
|
||||
cache: cache.NewCache(),
|
||||
options: options,
|
||||
|
|
|
@ -104,13 +104,6 @@ func (c *Client) updateHandler() {
|
|||
}
|
||||
c.updateNewMessage(typedUpdate)
|
||||
log.Debugf("%#v", typedUpdate.Message)
|
||||
case client.TypeUpdateMessageEdited:
|
||||
typedUpdate, ok := update.(*client.UpdateMessageEdited)
|
||||
if !ok {
|
||||
uhOh()
|
||||
}
|
||||
c.updateMessageEdited(typedUpdate)
|
||||
log.Debugf("%#v", typedUpdate)
|
||||
case client.TypeUpdateMessageContent:
|
||||
typedUpdate, ok := update.(*client.UpdateMessageContent)
|
||||
if !ok {
|
||||
|
@ -236,11 +229,6 @@ func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
|
|||
}()
|
||||
}
|
||||
|
||||
// message content edited
|
||||
func (c *Client) updateMessageEdited(update *client.UpdateMessageEdited) {
|
||||
c.addToEditQueue(update.ChatId, update.MessageId)
|
||||
}
|
||||
|
||||
// message content updated
|
||||
func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
|
||||
markupFunction := formatter.EntityToXEP0393
|
||||
|
@ -256,14 +244,6 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
|
|||
}
|
||||
log.Infof("ignoredResource: %v", ignoredResource)
|
||||
|
||||
if !c.deleteFromEditQueue(update.ChatId, update.MessageId) {
|
||||
log.WithFields(log.Fields{
|
||||
"chatId": update.ChatId,
|
||||
"messageId": update.MessageId,
|
||||
}).Infof("Content update with no preceding message edit, ignoring")
|
||||
return
|
||||
}
|
||||
|
||||
jids := c.getCarbonFullJids(true, ignoredResource)
|
||||
if len(jids) == 0 {
|
||||
log.Info("The only resource is ignored, aborting")
|
||||
|
|
|
@ -24,7 +24,6 @@ import (
|
|||
"github.com/zelenin/go-tdlib/client"
|
||||
)
|
||||
|
||||
// VCardInfo contains intermediate data to produce a vCard
|
||||
type VCardInfo struct {
|
||||
Fn string
|
||||
Photo *client.File
|
||||
|
@ -35,12 +34,6 @@ type VCardInfo struct {
|
|||
Info string
|
||||
}
|
||||
|
||||
// ChatMessageId uniquely identifies a Telegram message
|
||||
type ChatMessageId struct {
|
||||
ChatId int64
|
||||
MessageId int64
|
||||
}
|
||||
|
||||
var errOffline = errors.New("TDlib instance is offline")
|
||||
|
||||
var spaceRegex = regexp.MustCompile(`\s+`)
|
||||
|
@ -1391,29 +1384,3 @@ func (c *Client) getCarbonFullJids(isOutgoing bool, ignoredResource string) []st
|
|||
}
|
||||
return jids
|
||||
}
|
||||
|
||||
func (c *Client) addToEditQueue(chatId, messageId int64) {
|
||||
c.locks.editQueueLock.Lock()
|
||||
defer c.locks.editQueueLock.Unlock()
|
||||
|
||||
c.editQueue[ChatMessageId{
|
||||
ChatId: chatId,
|
||||
MessageId: messageId,
|
||||
}] = true
|
||||
}
|
||||
|
||||
func (c *Client) deleteFromEditQueue(chatId, messageId int64) bool {
|
||||
c.locks.editQueueLock.Lock()
|
||||
defer c.locks.editQueueLock.Unlock()
|
||||
|
||||
key := ChatMessageId{
|
||||
ChatId: chatId,
|
||||
MessageId: messageId,
|
||||
}
|
||||
_, ok := c.editQueue[key]
|
||||
if ok {
|
||||
delete(c.editQueue, key)
|
||||
}
|
||||
|
||||
return ok
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue