Makefile

@@ -2,7 +2,7 @@
 
 COMMIT := $(shell git rev-parse --short HEAD)
 TD_COMMIT := "5bbfc1cf5dab94f82e02f3430ded7241d4653551"
-VERSION := "v1.12.8"
+VERSION := "v1.9.5"
 MAKEOPTS := "-j4"
 
 all:

go.mod

@@ -4,7 +4,6 @@ go 1.19
 
 require (
 	github.com/dgraph-io/badger/v4 v4.1.0
-	github.com/google/uuid v1.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/santhosh-tekuri/jsonschema v1.2.4
 	github.com/sirupsen/logrus v1.4.2
@@ -24,6 +23,7 @@ require (
 	github.com/golang/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/google/flatbuffers v1.12.1 // indirect
+	github.com/google/uuid v1.1.1 // indirect
 	github.com/klauspost/compress v1.12.3 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	go.opencensus.io v0.22.5 // indirect
@@ -33,6 +33,5 @@ require (
 	nhooyr.io/websocket v1.6.5 // indirect
 )
 
-replace gosrc.io/xmpp => dev.narayana.im/narayana/go-xmpp v0.0.0-20240512132113-6725c3862314
+replace gosrc.io/xmpp => dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f
-
 replace github.com/zelenin/go-tdlib => dev.narayana.im/narayana/go-tdlib v0.0.0-20240124222245-b4c12addb061

go.sum

@@ -7,10 +7,6 @@ dev.narayana.im/narayana/go-tdlib v0.0.0-20240124222245-b4c12addb061 h1:CWAQT74L
 dev.narayana.im/narayana/go-tdlib v0.0.0-20240124222245-b4c12addb061/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
 dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f h1:6249ajbMjgYz53Oq0IjTvjHXbxTfu29Mj1J/6swRHs4=
 dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
-dev.narayana.im/narayana/go-xmpp v0.0.0-20240131013505-18c46e6c59fd h1:+UW+E7JjI88aH4beDn1cw6D8rs1I061hN91HU4Y4pT8=
-dev.narayana.im/narayana/go-xmpp v0.0.0-20240131013505-18c46e6c59fd/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
-dev.narayana.im/narayana/go-xmpp v0.0.0-20240512132113-6725c3862314 h1:29/NjOGOUDceO73Hk4Nj4uVa1je8MULJlsDSvKxSN/k=
-dev.narayana.im/narayana/go-xmpp v0.0.0-20240512132113-6725c3862314/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/agnivade/wasmbrowsertest v0.3.1/go.mod h1:zQt6ZTdl338xxRaMW395qccVE2eQm0SjC/SDz0mPWQI=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

persistence/sessions.go

@@ -47,17 +47,9 @@ type Session struct {
 	NativeEdits     bool           `yaml:":nativeedits"`
 	IgnoredChats    []int64        `yaml:":ignoredchats"`
 	ignoredChatsMap map[int64]bool `yaml:"-"`
-
-	IgnoreGroupDeletions bool `yaml:":ignoregroupdeletions"`
 }
 
-const (
+var configKeys = []string{
-	PropertyTypeUnknown byte = iota
-	PropertyTypeString
-	PropertyTypeBool
-)
-
-var ConfigKeys = []string{
 	"timezone",
 	"keeponline",
 	"rawmessages",
@@ -67,7 +59,6 @@ var ConfigKeys = []string{
 	"hideids",
 	"receipts",
 	"nativeedits",
-	"ignoregroupdeletions",
 }
 
 var sessionDB *SessionsYamlDB
@@ -174,8 +165,6 @@ func (s *Session) get(key string) (string, error) {
 		return fromBool(s.Receipts), nil
 	case "nativeedits":
 		return fromBool(s.NativeEdits), nil
-	case "ignoregroupdeletions":
-		return fromBool(s.IgnoreGroupDeletions), nil
 	}
 
 	return "", errors.New("Unknown session property")
@@ -187,7 +176,7 @@ func (s *Session) ToMap() map[string]string {
 	defer sessionsLock.Unlock()
 
 	m := make(map[string]string)
-	for _, configKey := range ConfigKeys {
+	for _, configKey := range configKeys {
 		value, _ := s.get(configKey)
 		m[configKey] = value
 	}
@@ -260,30 +249,11 @@ func (s *Session) Set(key string, value string) (string, error) {
 		}
 		s.NativeEdits = b
 		return value, nil
-	case "ignoregroupdeletions":
-		b, err := toBool(value)
-		if err != nil {
-			return "", err
-		}
-		s.IgnoreGroupDeletions = b
-		return value, nil
 	}
 
 	return "", errors.New("Unknown session property")
 }
 
-// PropertyType determines the property type
-func PropertyType(key string) byte {
-	switch key {
-	case "timezone":
-		return PropertyTypeString
-	case "keeponline", "rawmessages", "asciiarrows", "oobmode", "carbons", "hideids",
-		"receipts", "nativeedits", "ignoregroupdeletions":
-		return PropertyTypeBool
-	}
-	return PropertyTypeUnknown
-}
-
 // TimezoneToLocation tries to convert config timezone to location
 func (s *Session) TimezoneToLocation() *time.Location {
 	time, err := time.Parse("-07:00", s.Timezone)

staging.Dockerfile

@@ -26,8 +26,8 @@ WORKDIR /src
 RUN go env -w GOCACHE=/go-cache
 RUN go env -w GOMODCACHE=/gomod-cache
 RUN --mount=type=cache,target=/gomod-cache \
-    --mount=type=bind,source=./,target=/src,rw \
+    --mount=type=bind,source=./,target=/src \
-    /bin/bash -c 'go mod tidy; go get -t'
+    go mod download
 
 FROM cache AS build
 ARG MAKEOPTS

telegabber.go

@@ -16,7 +16,7 @@ import (
 	goxmpp "gosrc.io/xmpp"
 )
 
-var version string = "1.12.8"
+var version string = "1.9.5"
 var commit string
 
 var sm *goxmpp.StreamManager
@@ -68,7 +68,7 @@ func main() {
 
 	log.Infof("Starting telegabber version %v", version)
 
-	sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram, *idsPath, version)
+	sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram, *idsPath)
 	if err != nil {
 		log.Fatal(err)
 	}

telegram/cache/cache.go

@@ -16,8 +16,7 @@ type Status struct {
 // Cache allows operating the chats and users cache in
 // a thread-safe manner
 type Cache struct {
-	ownChats     map[int64]*client.Chat
+	chats        map[int64]*client.Chat
-	auxChats     map[int64]*client.Chat
 	users        map[int64]*client.User
 	statuses     map[int64]*Status
 	chatsLock    sync.Mutex
@@ -28,8 +27,7 @@ type Cache struct {
 // NewCache initializes a cache
 func NewCache() *Cache {
 	return &Cache{
-		ownChats: map[int64]*client.Chat{},
+		chats:    map[int64]*client.Chat{},
-		auxChats: map[int64]*client.Chat{},
 		users:    map[int64]*client.User{},
 		statuses: map[int64]*Status{},
 	}
@@ -42,23 +40,7 @@ func (cache *Cache) ChatsKeys() []int64 {
 	defer cache.chatsLock.Unlock()
 
 	var keys []int64
-	for id := range cache.ownChats {
+	for id := range cache.chats {
-		keys = append(keys, id)
-	}
-	for id := range cache.auxChats {
-		keys = append(keys, id)
-	}
-	return keys
-}
-
-// OwnChatsKeys grabs only own chat ids synchronously to avoid lockups
-// while they are used
-func (cache *Cache) OwnChatsKeys() []int64 {
-	cache.chatsLock.Lock()
-	defer cache.chatsLock.Unlock()
-
-	var keys []int64
-	for id := range cache.ownChats {
 		keys = append(keys, id)
 	}
 	return keys
@@ -102,10 +84,7 @@ func (cache *Cache) GetChat(id int64) (*client.Chat, bool) {
 	cache.chatsLock.Lock()
 	defer cache.chatsLock.Unlock()
 
-	chat, ok := cache.ownChats[id]
+	chat, ok := cache.chats[id]
-	if !ok {
-		chat, ok = cache.auxChats[id]
-	}
 	return chat, ok
 }
 
@@ -128,21 +107,11 @@ func (cache *Cache) GetStatus(id int64) (*Status, bool) {
 }
 
 // SetChat stores a chat in the cache
-func (cache *Cache) SetChat(id int64, chat *client.Chat, own bool) {
+func (cache *Cache) SetChat(id int64, chat *client.Chat) {
 	cache.chatsLock.Lock()
 	defer cache.chatsLock.Unlock()
 
-	if own {
+	cache.chats[id] = chat
-		cache.ownChats[id] = chat
-		// move from aux to own, but not vice versa
-		// (own: true means that presences for the chat are needed
-		// for sure, false means just "not necessarily")
-		if _, ok := cache.auxChats[id]; ok {
-			delete(cache.auxChats, id)
-		}
-	} else {
-		cache.auxChats[id] = chat
-	}
 }
 
 // SetUser stores a user in the cache

telegram/client.go

@@ -2,6 +2,7 @@ package telegram
 
 import (
 	"github.com/pkg/errors"
+	"hash/maphash"
 	"path/filepath"
 	"strconv"
 	"sync"
@@ -21,47 +22,6 @@ type DelayedStatus struct {
 	TimestampExpired int64
 }
 
-// HashedAvatar stores a SHA-1 hash and a Telegram file ID
-type HashedAvatar struct {
-	Hash string
-	File int32
-}
-
-// NewId stores message ids and timestamps of their additions so old ones can be truncated to save memory
-type newId struct {
-	Id      int64
-	Ts      int64
-	lock    sync.Mutex
-	ownLock sync.Mutex
-	locked  bool
-	fired   bool
-}
-
-func newNewId() *newId {
-	return &newId{Ts: time.Now().Unix()}
-}
-
-func (i *newId) Lock() {
-	i.ownLock.Lock()
-	if i.fired {
-		i.ownLock.Unlock()
-		return
-	}
-	i.locked = true
-	i.ownLock.Unlock()
-	i.lock.Lock()
-}
-
-func (i *newId) Unlock() {
-	i.ownLock.Lock()
-	if i.locked {
-		i.lock.Unlock()
-		i.locked = false
-		i.fired = true
-	}
-	i.ownLock.Unlock()
-}
-
 // Client stores the metadata for lazily invoked TDlib instance
 type Client struct {
 	client     *client.Client
@@ -78,10 +38,6 @@ type Client struct {
 	cache     *cache.Cache
 	online    bool
 
-	loginWizard *loginWizardMetadata
-
-	lastAuthorizationStateType string
-
 	outbox     map[string]string
 	editOutbox map[string]string
 
@@ -90,17 +46,7 @@ type Client struct {
 
 	lastMsgHashes map[int64]uint64
 	lastMsgIds    map[int64]string
-
+	msgHashSeed   maphash.Seed
-	LastBotCmdString string
-
-	XmppClientFeatures     map[string]*[]string
-	XmppClientFeaturesLock sync.Mutex
-
-	AvatarHashes     map[int64]*HashedAvatar
-	AvatarHashesLock sync.Mutex
-
-	MessageIdChanges     map[int64]map[int64]*newId
-	MessageIdChangesLock sync.Mutex
 
 	locks           clientLocks
 	SendMessageLock sync.Mutex
@@ -117,15 +63,6 @@ type clientLocks struct {
 
 	authorizerReadLock  sync.Mutex
 	authorizerWriteLock sync.Mutex
-
-	loginWizardReadLock  sync.Mutex
-	loginWizardWriteLock sync.Mutex
-}
-
-type loginWizardMetadata struct {
-	nextStage   chan string
-	chanBusy    bool
-	commandSent bool
 }
 
 // NewClient instantiates a Telegram App
@@ -185,9 +122,7 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component
 		DelayedStatuses: make(map[int64]*DelayedStatus),
 		lastMsgHashes:   make(map[int64]uint64),
 		lastMsgIds:      make(map[int64]string),
-		XmppClientFeatures: make(map[string]*[]string),
+		msgHashSeed:     maphash.MakeSeed(),
-		AvatarHashes:       make(map[int64]*HashedAvatar),
-		MessageIdChanges:   make(map[int64]map[int64]*newId),
 		locks: clientLocks{
 			chatMessageLocks: make(map[int64]*sync.Mutex),
 		},

telegram/connect.go

@@ -129,7 +129,6 @@ func (c *Client) Connect(resource string) error {
 	tdlibClient, err := client.NewClient(c.authorizer, c.options...)
 	if err != nil {
 		c.locks.authorizationReady.Unlock()
-		c.wizardStageOrPrompt("cancel", "")
 		return errors.Wrap(err, "Couldn't initialize a Telegram client instance")
 	}
 
@@ -138,8 +137,6 @@ func (c *Client) Connect(resource string) error {
 	// stage 3: if a client is succesfully created, AuthorizationStateReady is already reached
 	log.Warn("Authorization successful!")
 
-	c.wizardStageOrPrompt("success", "")
-
 	c.me, err = c.client.GetMe()
 	if err != nil {
 		log.Error("Could not retrieve me info")
@@ -153,13 +150,11 @@ func (c *Client) Connect(resource string) error {
 	c.addResource(resource)
 
 	go func() {
-		chats, err := c.client.GetChats(&client.GetChatsRequest{
+		_, err = c.client.GetChats(&client.GetChatsRequest{
 			Limit: chatsLimit,
 		})
 		if err != nil {
 			log.Errorf("Could not retrieve chats: %v", err)
-		} else {
-			log.Infof("Obtained ≈%v chats for initialization", chats.TotalCount)
 		}
 
 		gateway.SubscribeToTransport(c.xmpp, c.jid)
@@ -231,7 +226,7 @@ func (c *Client) Disconnect(resource string, quit bool) bool {
 	log.Warn("Disconnecting from Telegram network...")
 
 	// we're offline (unsubscribe if logout)
-	for _, id := range c.cache.OwnChatsKeys() {
+	for _, id := range c.cache.ChatsKeys() {
 		args := gateway.SimplePresence(id, "unavailable")
 		c.sendPresence(args...)
 	}
@@ -260,8 +255,6 @@ func (c *Client) interactor() {
 		log.Infof("Telegram authorization state: %#v", stateType)
 		log.Debugf("%#v", state)
 
-		c.lastAuthorizationStateType = stateType
-
 		switch stateType {
 		// stage 0: set login
 		case client.TypeAuthorizationStateWaitPhoneNumber:
@@ -269,12 +262,12 @@ func (c *Client) interactor() {
 			if c.Session.Login != "" {
 				c.authorizer.PhoneNumber <- c.Session.Login
 			} else {
-				c.wizardStageOrPrompt("login", "Please, enter your Telegram login via /login 12345, or use the Login Wizard via Ad-Hoc commands")
+				gateway.SendServiceMessage(c.jid, "Please, enter your Telegram login via /login 12345", c.xmpp)
 			}
 		// stage 1: wait for auth code
 		case client.TypeAuthorizationStateWaitCode:
 			log.Warn("Waiting for authorization code...")
-			c.wizardStageOrPrompt("code", "Please, enter authorization code via /code 12345")
+			gateway.SendServiceMessage(c.jid, "Please, enter authorization code via /code 12345", c.xmpp)
 		// stage 1b: wait for registration
 		case client.TypeAuthorizationStateWaitRegistration:
 			log.Warn("Waiting for full name...")
@@ -282,7 +275,7 @@ func (c *Client) interactor() {
 		// stage 2: wait for 2fa
 		case client.TypeAuthorizationStateWaitPassword:
 			log.Warn("Waiting for 2FA password...")
-			c.wizardStageOrPrompt("password", "Please, enter 2FA passphrase via /password 12345")
+			gateway.SendServiceMessage(c.jid, "Please, enter 2FA passphrase via /password 12345", c.xmpp)
 		}
 		c.locks.authorizerReadLock.Unlock()
 	}
@@ -301,7 +294,6 @@ func (c *Client) forceClose() {
 func (c *Client) close() {
 	c.locks.authorizerWriteLock.Lock()
 	if c.authorizer != nil && !c.authorizer.isClosed {
-		log.Debug("Closing authorizer")
 		c.authorizer.Close()
 	}
 	c.locks.authorizerWriteLock.Unlock()
@@ -316,7 +308,6 @@ func (c *Client) close() {
 }
 
 func (c *Client) cancelAuth() {
-	c.StopLoginWizard()
 	c.close()
 	c.Session.Login = ""
 }

telegram/handlers.go

@@ -186,13 +186,13 @@ func (c *Client) updateHandler() {
 func (c *Client) updateUser(update *client.UpdateUser) {
 	c.cache.SetUser(update.User.Id, update.User)
 	show, status, presenceType := c.userStatusToText(update.User.Status, update.User.Id)
-	go c.ProcessStatusUpdate(update.User.Id, status, show, false, gateway.SPType(presenceType))
+	go c.ProcessStatusUpdate(update.User.Id, status, show, gateway.SPType(presenceType))
 }
 
 // user status changed
 func (c *Client) updateUserStatus(update *client.UpdateUserStatus) {
 	show, status, presenceType := c.userStatusToText(update.Status, update.UserId)
-	go c.ProcessStatusUpdate(update.UserId, status, show, false, gateway.SPImmed(false), gateway.SPType(presenceType))
+	go c.ProcessStatusUpdate(update.UserId, status, show, gateway.SPImmed(false), gateway.SPType(presenceType))
 }
 
 // new chat discovered
@@ -206,14 +206,14 @@ func (c *Client) updateNewChat(update *client.UpdateNewChat) {
 			}
 		}
 
-		c.cache.SetChat(update.Chat.Id, update.Chat, true)
+		c.cache.SetChat(update.Chat.Id, update.Chat)
 
 		if update.Chat.Positions != nil && len(update.Chat.Positions) > 0 {
 			c.subscribeToID(update.Chat.Id, update.Chat)
 		}
 
 		if update.Chat.Id < 0 {
-			c.ProcessStatusUpdate(update.Chat.Id, update.Chat.Title, "chat", true)
+			c.ProcessStatusUpdate(update.Chat.Id, update.Chat.Title, "chat")
 		}
 	}()
 }
@@ -245,23 +245,12 @@ func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
 		lock.Lock()
 		defer lock.Unlock()
 
-		var forceCmd bool
+		c.updateLastMessageHash(update.Message.ChatId, update.Message.Id, update.Message.Content)
-		if c.LastBotCmdString != "" && update.Message.IsOutgoing {
-			if update.Message.Content.MessageContentType() == client.TypeMessageText {
-				textMessage, _ := update.Message.Content.(*client.MessageText)
-
-				if textMessage.Text != nil && textMessage.Text.Text == c.LastBotCmdString {
-					forceCmd = true
-					c.LastBotCmdString = ""
-				}
-			}
-		}
 
 		// ignore self outgoing messages
 		if update.Message.IsOutgoing &&
 			update.Message.SendingState != nil &&
-			update.Message.SendingState.MessageSendingStateType() == client.TypeMessageSendingStatePending &&
+			update.Message.SendingState.MessageSendingStateType() == client.TypeMessageSendingStatePending {
-			!forceCmd {
 			return
 		}
 
@@ -281,6 +270,8 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
 
 	markupFunction := c.getFormatter()
 
+	defer c.updateLastMessageHash(update.ChatId, update.MessageId, update.NewContent)
+
 	log.Debugf("newContent: %#v", update.NewContent)
 
 	lock := c.getChatMessageLock(update.ChatId)
@@ -304,7 +295,7 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
 		return
 	}
 
-	if update.NewContent.MessageContentType() == client.TypeMessageText {
+	if update.NewContent.MessageContentType() == client.TypeMessageText && c.hasLastMessageHashChanged(update.ChatId, update.MessageId, update.NewContent) {
 		textContent := update.NewContent.(*client.MessageText)
 		log.Debugf("textContent: %#v", textContent.Text)
 
@@ -312,50 +303,6 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
 		sId := strconv.FormatInt(update.MessageId, 10)
 		var isCarbon bool
 
-		go func() {
-			message, messageErr := c.client.GetMessage(&client.GetMessageRequest{
-				ChatId:    update.ChatId,
-				MessageId: update.MessageId,
-			})
-			if messageErr != nil {
-				// odnako za vremya puti
-				// sobaka mogla podrasti
-				c.MessageIdChangesLock.Lock()
-				idsMap, idsMapOk := c.MessageIdChanges[update.ChatId]
-				hadNoId := false
-				if idsMapOk {
-					newId, newIdOk := idsMap[update.MessageId]
-					if newIdOk {
-						if newId.Id == 0 {
-							hadNoId = true
-							c.MessageIdChangesLock.Unlock()
-							newId.Lock()
-						}
-						log.Infof("falling back to updated message id: %v/%v->%v", update.ChatId, update.MessageId, newId.Id)
-						message, messageErr = c.client.GetMessage(&client.GetMessageRequest{
-							ChatId:    update.ChatId,
-							MessageId: newId.Id,
-						})
-					}
-				}
-				if !hadNoId {
-					c.MessageIdChangesLock.Unlock()
-				}
-			}
-			var prefix string
-			if messageErr == nil {
-				if message.EditDate == 0 {
-					return
-				}
-				log.Debugf("editDate: %v", message.EditDate)
-
-				isCarbon = c.isCarbonsEnabled() && message.IsOutgoing
-				// reply correction support in clients is suboptimal yet, so cut them out for now
-				prefix, _ = c.messageToPrefix(message, "", "", true)
-			} else {
-				log.Errorf("No message %v/%v found, cannot reliably determine if it is a carbon and if it is edited: %v", update.ChatId, update.MessageId, messageErr.Error())
-			}
-
 		// use XEP-0308 edits only if the last message is edited for sure, fallback otherwise
 		if c.Session.NativeEdits {
 			lastXmppId, ok := c.getLastChatMessageId(update.ChatId)
@@ -369,6 +316,19 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
 			}
 		}
 
+		message, messageErr := c.client.GetMessage(&client.GetMessageRequest{
+			ChatId:    update.ChatId,
+			MessageId: update.MessageId,
+		})
+		var prefix string
+		if messageErr == nil {
+			isCarbon = c.isCarbonsEnabled() && message.IsOutgoing
+			// reply correction support in clients is suboptimal yet, so cut them out for now
+			prefix, _ = c.messageToPrefix(message, "", "", true)
+		} else {
+			log.Errorf("No message %v/%v found, cannot reliably determine if it's a carbon", update.ChatId, update.MessageId)
+		}
+
 		var text strings.Builder
 
 		if replaceId == "" {
@@ -394,26 +354,15 @@ func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
 		for _, jid := range jids {
 			gateway.SendMessage(jid, sChatId, text.String(), "e"+sId, c.xmpp, nil, replaceId, isCarbon, false)
 		}
-		}()
 	}
 }
 
 // message(s) deleted
 func (c *Client) updateDeleteMessages(update *client.UpdateDeleteMessages) {
 	if update.IsPermanent {
-		for _, deleteId := range update.MessageIds {
-			c.tryUnlockMessageId(update.ChatId, deleteId)
-		}
-
 		if c.Session.IsChatIgnored(update.ChatId) {
 			return
 		}
-		if c.Session.IgnoreGroupDeletions {
-			chatType, chatTypeErr := c.GetChatType(update.ChatId, false)
-			if chatTypeErr == nil && (chatType == ChatTypeBasicGroup || chatType == ChatTypeSupergroup) {
-				return
-			}
-		}
 
 		var deleteChar string
 		if c.Session.AsciiArrows {
@@ -443,19 +392,7 @@ func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucc
 		log.Errorf("failed to replace %v with %v: %v", update.OldMessageId, update.Message.Id, err.Error())
 	}
 
-	c.MessageIdChangesLock.Lock()
+	c.updateLastMessageHash(update.Message.ChatId, update.Message.Id, update.Message.Content)
-	idsMap, ok := c.MessageIdChanges[update.Message.ChatId]
-	if !ok {
-		idsMap = make(map[int64]*newId)
-		c.MessageIdChanges[update.Message.ChatId] = idsMap
-	}
-	id, ok := idsMap[update.OldMessageId]
-	if !ok {
-		id = newNewId()
-		idsMap[update.OldMessageId] = id
-	}
-	id.Id = update.Message.Id
-	c.MessageIdChangesLock.Unlock()
 
 	c.sendMarker(update.Message.ChatId, update.Message.Id, gateway.MarkerTypeReceived)
 
@@ -466,8 +403,6 @@ func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucc
 	}
 }
 func (c *Client) updateMessageSendFailed(update *client.UpdateMessageSendFailed) {
-	c.tryUnlockMessageId(update.Message.ChatId, update.OldMessageId)
-
 	// clean uploaded files
 	file, _ := c.contentToFile(update.Message.Content)
 	if file != nil && file.Local != nil {
@@ -480,9 +415,9 @@ func (c *Client) updateChatTitle(update *client.UpdateChatTitle) {
 	gateway.SetNickname(c.jid, strconv.FormatInt(update.ChatId, 10), update.Title, c.xmpp)
 
 	// set also the status (for group chats only)
-	chat, user, _ := c.GetContactByID(update.ChatId, nil, false)
+	chat, user, _ := c.GetContactByID(update.ChatId, nil)
 	if user == nil {
-		c.ProcessStatusUpdate(update.ChatId, update.Title, "chat", false, gateway.SPImmed(true))
+		c.ProcessStatusUpdate(update.ChatId, update.Title, "chat", gateway.SPImmed(true))
 	}
 
 	// update chat title in the cache
@@ -494,15 +429,3 @@ func (c *Client) updateChatTitle(update *client.UpdateChatTitle) {
 func (c *Client) updateChatReadOutbox(update *client.UpdateChatReadOutbox) {
 	c.sendMarker(update.ChatId, update.LastReadOutboxMessageId, gateway.MarkerTypeDisplayed)
 }
-
-func (c *Client) tryUnlockMessageId(chatId, messageId int64) {
-	c.MessageIdChangesLock.Lock()
-	idsMap, ok := c.MessageIdChanges[chatId]
-	if ok {
-		id, ok := idsMap[messageId]
-		if ok {
-			id.Unlock()
-		}
-	}
-	c.MessageIdChangesLock.Unlock()
-}

telegram/loginwizard.go

@@ -1,82 +0,0 @@
-package telegram
-
-import (
-	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/zelenin/go-tdlib/client"
-)
-
-// StartLoginWizard initiates a loginWizard object
-func (c *Client) StartLoginWizard(inCommand bool) {
-	if c.loginWizard == nil {
-		c.loginWizard = &loginWizardMetadata{
-			nextStage:   make(chan string, 1),
-			commandSent: inCommand,
-		}
-	} else {
-		c.loginWizard.commandSent = inCommand
-	}
-}
-
-// StopLoginWizard safely destroys the loginWizard object
-func (c *Client) StopLoginWizard() {
-	c.locks.loginWizardReadLock.Lock()
-	c.locks.loginWizardWriteLock.Lock()
-	if c.loginWizard != nil {
-		close(c.loginWizard.nextStage)
-		c.loginWizard = nil
-	}
-	c.locks.loginWizardReadLock.Unlock()
-	c.locks.loginWizardWriteLock.Unlock()
-}
-
-// GetLoginWizardNextStage waits for the next stage from the channel
-func (c *Client) GetLoginWizardNextStage() string {
-	c.locks.loginWizardReadLock.Lock()
-	defer c.locks.loginWizardReadLock.Unlock()
-
-	if c.loginWizard != nil {
-		if c.loginWizard.commandSent {
-			log.Debugf("waiting for nextStage...")
-			nextStage := <-c.loginWizard.nextStage
-			c.loginWizard.commandSent = false
-			c.loginWizard.chanBusy = false
-			log.Debugf("yielded stage %v", nextStage)
-			return nextStage
-		} else {
-			if c.lastAuthorizationStateType == client.TypeAuthorizationStateWaitPhoneNumber ||
-				c.lastAuthorizationStateType == client.TypeAuthorizationStateClosing ||
-				c.Session.Login == "" {
-				return "login"
-			}
-			switch c.lastAuthorizationStateType {
-			case client.TypeAuthorizationStateWaitCode:
-				return "code"
-			case client.TypeAuthorizationStateWaitPassword:
-				return "password"
-			}
-		}
-	}
-
-	return ""
-}
-
-func (c *Client) wizardStageOrPrompt(stage, message string) {
-	c.locks.loginWizardWriteLock.Lock()
-	if c.loginWizard == nil {
-		c.locks.loginWizardWriteLock.Unlock()
-		if message != "" {
-			gateway.SendServiceMessage(c.jid, message, c.xmpp)
-		}
-	} else {
-		if !c.loginWizard.chanBusy {
-			log.Debugf("writing wizard stage %v", stage)
-			c.loginWizard.nextStage <- stage
-		} else {
-			log.Warn("Skipping stage %v, wizard cannot keep up", stage)
-		}
-		c.loginWizard.chanBusy = true
-		c.locks.loginWizardWriteLock.Unlock()
-	}
-}

telegram/utils.go

@@ -1,11 +1,11 @@
 package telegram
 
 import (
-	"bytes"
 	"crypto/sha1"
-	"encoding/base64"
+	"encoding/binary"
 	"fmt"
 	"github.com/pkg/errors"
+	"hash/maphash"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -45,23 +45,7 @@ type messageStub struct {
 	Text      string
 }
 
-type BotCommand struct {
-	Command     string
-	Description string
-}
-
-type BotLink struct {
-	Description string
-	Link        string
-}
-
-const (
-	typeFileDataSha1 byte = iota
-	typeFileDataBase64
-)
-
 var errOffline = errors.New("TDlib instance is offline")
-var errOverLimit = errors.New("Over limit")
 
 var spaceRegex = regexp.MustCompile(`\s+`)
 var replyRegex = regexp.MustCompile("\\A>>? ?([0-9]+)\\n")
@@ -69,32 +53,8 @@ var replyRegex = regexp.MustCompile("\\A>>? ?([0-9]+)\\n")
 const newlineChar string = "\n"
 const messageHeaderSeparator string = " | " // no hrunicode allowed here yet
 
-// ChatType is an enum of chat types, roughly corresponding to TDLib's one but better
-type ChatType int
-
-const (
-	ChatTypeUnknown ChatType = iota
-	ChatTypePrivate
-	ChatTypeBasicGroup
-	ChatTypeSupergroup
-	ChatTypeSecret
-	ChatTypeChannel
-)
-
-// MembersList is an enum of member list filters
-type MembersList int
-
-const (
-	MembersListMembers MembersList = iota
-	MembersListRestricted
-	MembersListBanned
-	MembersListBannedAndAdministrators
-)
-
-const AVATAR_SIZE_LIMIT int64 = 128 * 1024
-
 // GetContactByUsername resolves username to user id retrieves user and chat information
-func (c *Client) GetContactByUsername(username string, own bool) (*client.Chat, *client.User, error) {
+func (c *Client) GetContactByUsername(username string) (*client.Chat, *client.User, error) {
 	if !c.Online() {
 		return nil, nil, errOffline
 	}
@@ -119,11 +79,11 @@ func (c *Client) GetContactByUsername(username string, own bool) (*client.Chat,
 		}
 	}
 
-	return c.GetContactByID(userID, chat, own)
+	return c.GetContactByID(userID, chat)
 }
 
 // GetContactByID gets user and chat information from cache (or tries to retrieve it, if missing)
-func (c *Client) GetContactByID(id int64, chat *client.Chat, own bool) (*client.Chat, *client.User, error) {
+func (c *Client) GetContactByID(id int64, chat *client.Chat) (*client.Chat, *client.User, error) {
 	if !c.Online() || id == 0 {
 		return nil, nil, errOffline
 	}
@@ -158,9 +118,9 @@ func (c *Client) GetContactByID(id int64, chat *client.Chat, own bool) (*client.
 				return nil, nil, err
 			}
 
-			c.cache.SetChat(id, cacheChat, own)
+			c.cache.SetChat(id, cacheChat)
 		} else {
-			c.cache.SetChat(id, chat, own)
+			c.cache.SetChat(id, chat)
 		}
 	}
 	if chat == nil {
@@ -170,10 +130,10 @@ func (c *Client) GetContactByID(id int64, chat *client.Chat, own bool) (*client.
 	return chat, user, nil
 }
 
-// GetChatType obtains chat type from its information
+// IsPM checks if a chat is PM
-func (c *Client) GetChatType(id int64, own bool) (ChatType, error) {
+func (c *Client) IsPM(id int64) (bool, error) {
 	if !c.Online() || id == 0 {
-		return ChatTypeUnknown, errOffline
+		return false, errOffline
 	}
 
 	var err error
@@ -184,77 +144,19 @@ func (c *Client) GetChatType(id int64, own bool) (ChatType, error) {
 			ChatId: id,
 		})
 		if err != nil {
-			return ChatTypeUnknown, err
+			return false, err
 		}
 
-		c.cache.SetChat(id, chat, own)
+		c.cache.SetChat(id, chat)
 	}
 
 	chatType := chat.Type.ChatTypeType()
-	if chatType == client.TypeChatTypePrivate {
+	if chatType == client.TypeChatTypePrivate || chatType == client.TypeChatTypeSecret {
-		return ChatTypePrivate, nil
-	} else if chatType == client.TypeChatTypeBasicGroup {
-		return ChatTypeBasicGroup, nil
-	} else if chatType == client.TypeChatTypeSupergroup {
-		supergroup, _ := chat.Type.(*client.ChatTypeSupergroup)
-		if supergroup.IsChannel {
-			return ChatTypeChannel, nil
-		}
-		return ChatTypeSupergroup, nil
-	} else if chatType == client.TypeChatTypeSecret {
-		return ChatTypeSecret, nil
-	}
-
-	return ChatTypeUnknown, errors.New("Unknown chat type")
-}
-
-// IsPM checks if a chat is PM
-func (c *Client) IsPM(id int64, own bool) (bool, error) {
-	typ, err := c.GetChatType(id, own)
-	if err != nil {
-		return false, err
-	}
-
-	if typ == ChatTypePrivate || typ == ChatTypeSecret {
 		return true, nil
 	}
 	return false, nil
 }
 
-// IsBot checks if a chat is a bot
-func (c *Client) IsBot(id int64, own bool) (bool, error) {
-	_, user, err := c.GetContactByID(id, nil, own)
-	if err != nil {
-		return false, err
-	}
-	if user == nil || user.Type == nil {
-		return false, nil
-	}
-
-	return user.Type.UserTypeType() == client.TypeUserTypeBot, nil
-}
-
-// GetBotMenu retrieves the bot's attachment menu
-func (c *Client) GetBotMenu(id int64) (*BotLink, []*BotCommand, error) {
-	fullInfo, err := c.client.GetUserFullInfo(&client.GetUserFullInfoRequest{
-		UserId: id,
-	})
-	if err == nil && fullInfo.BotInfo != nil {
-		if fullInfo.BotInfo.MenuButton != nil {
-			menuButton := fullInfo.BotInfo.MenuButton
-			return &BotLink{menuButton.Text, menuButton.Url}, nil, nil
-		} else {
-			var commands []*BotCommand
-			for _, command := range fullInfo.BotInfo.Commands {
-				commands = append(commands, &BotCommand{command.Command, command.Description})
-			}
-			return nil, commands, nil
-		}
-	}
-
-	return nil, nil, err
-}
-
 func (c *Client) userStatusToText(status client.UserStatus, chatID int64) (string, string, string) {
 	var show, textStatus, presenceType string
 
@@ -309,93 +211,8 @@ func (c *Client) LastSeenStatus(timestamp int64) string {
 		Format("Last seen at 15:04 02/01/2006")
 }
 
-func (c *Client) getFileData(tgFile *client.File, typ byte) string {
-	var priority int32
-	if typ == typeFileDataSha1 {
-		priority = 1
-	} else if typ == typeFileDataBase64 {
-		priority = 32
-	}
-
-	// avoid not-well-formed stanza errors
-	if typ == typeFileDataBase64 && c.GetPhotoSize(tgFile) > AVATAR_SIZE_LIMIT {
-		log.Warnf("Photo %v skipped as it's too huge", tgFile.Id)
-		return ""
-	}
-
-	file, path, err := c.ForceOpenFile(tgFile, priority)
-	if err == nil {
-		defer file.Close()
-
-		if typ == typeFileDataSha1 {
-			hash := sha1.New()
-			_, err = io.Copy(hash, file)
-			if err == nil {
-				return fmt.Sprintf("%x", hash.Sum(nil))
-			} else {
-				log.Errorf("Error calculating hash: %v", path)
-			}
-		} else if typ == typeFileDataBase64 {
-			buf := new(bytes.Buffer)
-			binval := base64.NewEncoder(base64.StdEncoding, buf)
-			_, err = io.Copy(binval, file)
-			binval.Close()
-			if err == nil {
-				return buf.String()
-			} else {
-				log.Errorf("Error calculating base64: %v", path)
-			}
-		}
-	} else if path != "" {
-		log.Errorf("Photo does not exist: %v", path)
-	} else {
-		log.Errorf("PHOTO: %#v", err.Error())
-	}
-
-	return ""
-}
-
-// SetEmptyAvatarHash puts a dummy value into the cache to avoid attempting to fetch surely missing avatars
-func (c *Client) SetEmptyAvatarHash(chatId int64) {
-	c.AvatarHashesLock.Lock()
-	c.AvatarHashes[chatId] = &HashedAvatar{
-		Hash: "",
-		File: 0,
-	}
-	c.AvatarHashesLock.Unlock()
-}
-
-// GetPhotoSize return at least a rough size
-func (c *Client) GetPhotoSize(photo *client.File) int64 {
-	if photo == nil {
-		return 0
-	}
-	size := photo.Size
-	if size == 0 {
-		size = photo.ExpectedSize
-	}
-	return size
-}
-
-// GetPhotoSha1 computes the photo hash
-func (c *Client) GetPhotoSha1(photo *client.File, chatId int64) string {
-	sha1 := c.getFileData(photo, typeFileDataSha1)
-	c.AvatarHashesLock.Lock()
-	c.AvatarHashes[chatId] = &HashedAvatar{
-		Hash: sha1,
-		File: photo.Id,
-	}
-	c.AvatarHashesLock.Unlock()
-	return sha1
-}
-
-// GetPhotoBase64 reads file data as Base64
-func (c *Client) GetPhotoBase64(photo *client.File) string {
-	return c.getFileData(photo, typeFileDataBase64)
-}
-
 // ProcessStatusUpdate sets contact status
-func (c *Client) ProcessStatusUpdate(chatID int64, status string, show string, own bool, oldArgs ...args.V) error {
+func (c *Client) ProcessStatusUpdate(chatID int64, status string, show string, oldArgs ...args.V) error {
 	if !c.Online() {
 		return nil
 	}
@@ -404,14 +221,27 @@ func (c *Client) ProcessStatusUpdate(chatID int64, status string, show string, o
 		"chat_id": chatID,
 	}).Info("Status update for")
 
-	chat, user, err := c.GetContactByID(chatID, nil, own)
+	chat, user, err := c.GetContactByID(chatID, nil)
 	if err != nil {
 		return err
 	}
 
 	var photo string
 	if chat != nil && chat.Photo != nil {
-		photo = c.GetPhotoSha1(chat.Photo.Small, chatID)
+		file, path, err := c.ForceOpenFile(chat.Photo.Small, 1)
+		if err == nil {
+			defer file.Close()
+
+			hash := sha1.New()
+			_, err = io.Copy(hash, file)
+			if err == nil {
+				photo = fmt.Sprintf("%x", hash.Sum(nil))
+			} else {
+				log.Errorf("Error calculating hash: %v", path)
+			}
+		} else if path != "" {
+			log.Errorf("Photo does not exist: %v", path)
+		}
 	}
 
 	var presenceType string
@@ -464,13 +294,12 @@ func (c *Client) ProcessStatusUpdate(chatID int64, status string, show string, o
 	return c.sendPresence(newArgs...)
 }
 
-// FormatContact retrieves a complete "full name (@usernames)" string for display
+func (c *Client) formatContact(chatID int64) string {
-func (c *Client) FormatContact(chatID int64) string {
 	if chatID == 0 {
 		return ""
 	}
 
-	chat, user, err := c.GetContactByID(chatID, nil, false)
+	chat, user, err := c.GetContactByID(chatID, nil)
 	if err != nil {
 		return "unknown contact: " + err.Error()
 	}
@@ -497,27 +326,23 @@ func (c *Client) FormatContact(chatID int64) string {
 	return str
 }
 
-func (c *Client) GetSenderId(sender client.MessageSender) (senderId int64) {
+func (c *Client) getSenderId(message *client.Message) (senderId int64) {
-	switch sender.MessageSenderType() {
+	if message.SenderId != nil {
+		switch message.SenderId.MessageSenderType() {
 		case client.TypeMessageSenderUser:
-		senderUser, _ := sender.(*client.MessageSenderUser)
+			senderUser, _ := message.SenderId.(*client.MessageSenderUser)
 			senderId = senderUser.UserId
 		case client.TypeMessageSenderChat:
-		senderChat, _ := sender.(*client.MessageSenderChat)
+			senderChat, _ := message.SenderId.(*client.MessageSenderChat)
 			senderId = senderChat.ChatId
 		}
-	return
-}
-
-func (c *Client) getMessageSenderId(message *client.Message) (senderId int64) {
-	if message.SenderId != nil {
-		senderId = c.GetSenderId(message.SenderId)
 	}
+
 	return
 }
 
 func (c *Client) formatSender(message *client.Message) string {
-	return c.FormatContact(c.getMessageSenderId(message))
+	return c.formatContact(c.getSenderId(message))
 }
 
 func (c *Client) messageToStub(message *client.Message, preview bool, text string) *messageStub {
@@ -567,7 +392,7 @@ func (c *Client) getMessageReply(message *client.Message, preview bool, noConten
 			}
 
 			gatewayReply = &gateway.Reply{
-				Author: fmt.Sprintf("%v@%s", c.getMessageSenderId(replyMsg), gateway.Jid.Full()),
+				Author: fmt.Sprintf("%v@%s", c.getSenderId(replyMsg), gateway.Jid.Full()),
 				Id:     replyId,
 			}
 		} else if !noContent {
@@ -584,7 +409,7 @@ func (c *Client) getMessageReply(message *client.Message, preview bool, noConten
 			}
 
 			tgReply = &messageStub{
-				Sender: c.formatOrigin(replyTo.Origin) + " @ " + c.FormatContact(replyTo.ChatId),
+				Sender: c.formatOrigin(replyTo.Origin) + " @ " + c.formatContact(replyTo.ChatId),
 				Date:   replyTo.OriginSendDate,
 				Text:   text,
 			}
@@ -654,14 +479,14 @@ func (c *Client) formatOrigin(origin client.MessageOrigin) string {
 	switch origin.MessageOriginType() {
 	case client.TypeMessageOriginUser:
 		originUser := origin.(*client.MessageOriginUser)
-		return c.FormatContact(originUser.SenderUserId)
+		return c.formatContact(originUser.SenderUserId)
 	case client.TypeMessageOriginChat:
 		originChat := origin.(*client.MessageOriginChat)
 		var signature string
 		if originChat.AuthorSignature != "" {
 			signature = fmt.Sprintf(" (%s)", originChat.AuthorSignature)
 		}
-		return c.FormatContact(originChat.SenderChatId) + signature
+		return c.formatContact(originChat.SenderChatId) + signature
 	case client.TypeMessageOriginHiddenUser:
 		originUser := origin.(*client.MessageOriginHiddenUser)
 		return originUser.SenderName
@@ -671,7 +496,7 @@ func (c *Client) formatOrigin(origin client.MessageOrigin) string {
 		if channel.AuthorSignature != "" {
 			signature = fmt.Sprintf(" (%s)", channel.AuthorSignature)
 		}
-		return c.FormatContact(channel.ChatId) + signature
+		return c.formatContact(channel.ChatId) + signature
 	}
 	return "Unknown origin type"
 }
@@ -840,13 +665,13 @@ func (c *Client) messageContentToText(content client.MessageContent, chatId int6
 
 		text := "invited "
 		if len(addMembers.MemberUserIds) > 0 {
-			text += c.FormatContact(addMembers.MemberUserIds[0])
+			text += c.formatContact(addMembers.MemberUserIds[0])
 		}
 
 		return text
 	case client.TypeMessageChatDeleteMember:
 		deleteMember, _ := content.(*client.MessageChatDeleteMember)
-		return "kicked " + c.FormatContact(deleteMember.UserId)
+		return "kicked " + c.formatContact(deleteMember.UserId)
 	case client.TypeMessagePinMessage:
 		pinMessage, _ := content.(*client.MessagePinMessage)
 		return "pinned message: " + c.formatMessage(chatId, pinMessage.MessageId, preview, nil)
@@ -996,7 +821,7 @@ func (c *Client) messageContentToText(content client.MessageContent, chatId int6
 		}
 	case client.TypeMessageChatSetMessageAutoDeleteTime:
 		ttl, _ := content.(*client.MessageChatSetMessageAutoDeleteTime)
-		name := c.FormatContact(ttl.FromUserId)
+		name := c.formatContact(ttl.FromUserId)
 		if name == "" {
 			if ttl.MessageAutoDeleteTime == 0 {
 				return "The self-destruct timer was disabled"
@@ -1091,7 +916,7 @@ func (c *Client) isCarbonsEnabled() bool {
 }
 
 func (c *Client) messageToPrefix(message *client.Message, previewString string, fileString string, suppressReply bool) (string, *gateway.Reply) {
-	isPM, err := c.IsPM(message.ChatId, true)
+	isPM, err := c.IsPM(message.ChatId)
 	if err != nil {
 		log.Errorf("Could not determine if chat is PM: %v", err)
 	}
@@ -1116,8 +941,7 @@ func (c *Client) messageToPrefix(message *client.Message, previewString string,
 			}
 		}
 	}
-	// with hideids options enabled, hide the id for everything but non-carbons in group chats
+	if !isPM || !c.Session.HideIds {
-	if (!isPM && !(c.isCarbonsEnabled() && message.IsOutgoing)) || !c.Session.HideIds {
 		prefix = append(prefix, directionChar+strconv.FormatInt(message.Id, 10))
 	}
 	// show sender in group chats
@@ -1215,28 +1039,9 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
 			ChatId: chatId,
 		})
 		if err == nil {
-			c.cache.SetChat(chatId, chat, true)
+			c.cache.SetChat(chatId, chat)
-			go c.ProcessStatusUpdate(chatId, "", "", true, gateway.SPImmed(true))
+			go c.ProcessStatusUpdate(chatId, "", "", gateway.SPImmed(true))
 			text = "<Chat photo has changed>"
-
-			if chat.Photo == nil {
-				c.SetEmptyAvatarHash(chatId)
-			} else {
-				sha1 := c.GetPhotoSha1(chat.Photo.Small, chatId)
-				size := c.GetPhotoSize(chat.Photo.Small)
-
-				for resource := range c.resourcesRange() {
-					features, ok := c.XmppClientFeatures[resource]
-					if ok && features != nil {
-						for _, feature := range *features {
-							if feature == gateway.NodeAvatarMetadataNotify {
-								go gateway.SendPubSubAvatarNotification(c.xmpp, c.jid+"/"+resource, chatId, sha1, size)
-								break
-							}
-						}
-					}
-				}
-			}
 		}
 	} else {
 		text = c.messageToText(message, false)
@@ -1253,17 +1058,13 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
 			fileName, link := c.formatFile(file, false)
 
 			oob = link
-			oobSwap := c.Session.OOBMode && oob != ""
+			if c.Session.OOBMode && oob != "" {
-
+				typ := message.Content.MessageContentType()
-			var ignorePrefix bool
+				if typ != client.TypeMessageSticker {
-			if oobSwap {
+					auxText = text
-				if text == "" || message.Content.MessageContentType() == client.TypeMessageSticker {
-					chatType, err := c.GetChatType(chatId, true)
-					ignorePrefix = err == nil && (chatType != ChatTypeBasicGroup && chatType != ChatTypeSupergroup) && c.isCarbonsEnabled()
 				}
-			}
+				text = oob
-
+			} else if !c.Session.RawMessages {
-			if !c.Session.RawMessages && !ignorePrefix {
 				var newText strings.Builder
 
 				prefix, prefixReply := c.messageToPrefix(message, previewName, fileName, false)
@@ -1273,23 +1074,12 @@ func (c *Client) ProcessIncomingMessage(chatId int64, message *client.Message) {
 
 				if text != "" {
 					if prefix != "" {
-						separator := c.getPrefixSeparator(chatId)
+						newText.WriteString(c.getPrefixSeparator(chatId))
-						newText.WriteString(separator)
-						if reply != nil {
-							reply.End += uint64(len(separator))
-						}
 					}
 					newText.WriteString(text)
 				}
 				text = newText.String()
 			}
-
-			if oobSwap {
-				if !ignorePrefix {
-					auxText = text
-				}
-				text = oob
-			}
 		}
 	}
 	if !replyObtained {
@@ -1329,15 +1119,15 @@ func (c *Client) PrepareOutgoingMessageContent(text string) client.InputMessageC
 }
 
 // ProcessOutgoingMessage executes commands or sends messages to mapped chats, returns message id
-func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid string, replyId int64, replaceId int64, raw bool) int64 {
+func (c *Client) ProcessOutgoingMessage(chatID int64, text string, returnJid string, replyId int64, replaceId int64) int64 {
 	if !c.Online() {
 		// we're offline
 		return 0
 	}
 
-	if replaceId == 0 && !raw && (strings.HasPrefix(text, "/") || strings.HasPrefix(text, "!")) {
+	if replaceId == 0 && (strings.HasPrefix(text, "/") || strings.HasPrefix(text, "!")) {
 		// try to execute commands
-		response, isCommand, _ := c.ProcessChatCommand(chatID, text)
+		response, isCommand := c.ProcessChatCommand(chatID, text)
 		if response != "" {
 			c.returnMessage(returnJid, chatID, response)
 		}
@@ -1460,11 +1250,6 @@ func (c *Client) prepareOutgoingMessageContent(text string, file *client.InputFi
 	return content
 }
 
-// OwnChatsKeys proxies the following function from unexported cache
-func (c *Client) OwnChatsKeys() []int64 {
-	return c.cache.OwnChatsKeys()
-}
-
 // StatusesRange proxies the following function from unexported cache
 func (c *Client) StatusesRange() chan *cache.Status {
 	return c.cache.StatusesRange()
@@ -1519,8 +1304,8 @@ func (c *Client) roster(resource string) {
 
 	log.Warnf("Sending roster for %v", resource)
 
-	for _, chat := range c.cache.OwnChatsKeys() {
+	for _, chat := range c.cache.ChatsKeys() {
-		c.ProcessStatusUpdate(chat, "", "", true)
+		c.ProcessStatusUpdate(chat, "", "")
 	}
 
 	c.sendPresence(gateway.SPStatus("Logged in as: " + c.Session.Login))
@@ -1539,13 +1324,6 @@ func (c *Client) getLastMessages(id int64, query string, from int64, count int32
 	})
 }
 
-// GetFile retrieves a file object by id given by TDlib
-func (c *Client) GetFile(id int32) (*client.File, error) {
-	return c.client.GetFile(&client.GetFileRequest{
-		FileId: id,
-	})
-}
-
 // DownloadFile actually obtains a file by id given by TDlib
 func (c *Client) DownloadFile(id int32, priority int32, synchronous bool) (*client.File, error) {
 	return c.client.DownloadFile(&client.DownloadFileRequest{
@@ -1634,7 +1412,7 @@ func (c *Client) subscribeToID(id int64, chat *client.Chat) {
 	args := gateway.SimplePresence(id, "subscribe")
 
 	if chat == nil {
-		chat, _, _ = c.GetContactByID(id, nil, true)
+		chat, _, _ = c.GetContactByID(id, nil)
 	}
 	if chat != nil {
 		args = append(args, gateway.SPNickname(chat.Title))
@@ -1664,7 +1442,7 @@ func (c *Client) prepareDiskSpace(size uint64) {
 
 func (c *Client) GetVcardInfo(toID int64) (VCardInfo, error) {
 	var info VCardInfo
-	chat, user, err := c.GetContactByID(toID, nil, false)
+	chat, user, err := c.GetContactByID(toID, nil)
 	if err != nil {
 		return info, err
 	}
@@ -1691,7 +1469,7 @@ func (c *Client) GetVcardInfo(toID int64) (VCardInfo, error) {
 }
 
 func (c *Client) UpdateChatNicknames() {
-	for _, id := range c.cache.OwnChatsKeys() {
+	for _, id := range c.cache.ChatsKeys() {
 		chat, ok := c.cache.GetChat(id)
 		if ok {
 			newArgs := []args.V{
@@ -1769,6 +1547,61 @@ func (c *Client) getCarbonFullJids(isOutgoing bool, ignoredResource string) []st
 	return jids
 }
 
+func (c *Client) calculateMessageHash(messageId int64, content client.MessageContent) uint64 {
+	var h maphash.Hash
+	h.SetSeed(c.msgHashSeed)
+
+	buf8 := make([]byte, 8)
+	binary.BigEndian.PutUint64(buf8, uint64(messageId))
+	h.Write(buf8)
+
+	if content != nil && content.MessageContentType() == client.TypeMessageText {
+		textContent, ok := content.(*client.MessageText)
+		if !ok {
+			uhOh()
+		}
+
+		if textContent.Text != nil {
+			h.WriteString(textContent.Text.Text)
+			for _, entity := range textContent.Text.Entities {
+				buf4 := make([]byte, 4)
+				binary.BigEndian.PutUint32(buf4, uint32(entity.Offset))
+				h.Write(buf4)
+				binary.BigEndian.PutUint32(buf4, uint32(entity.Length))
+				h.Write(buf4)
+				h.WriteString(entity.Type.TextEntityTypeType())
+			}
+		}
+	}
+
+	return h.Sum64()
+}
+
+func (c *Client) updateLastMessageHash(chatId, messageId int64, content client.MessageContent) {
+	c.locks.lastMsgHashesLock.Lock()
+	defer c.locks.lastMsgHashesLock.Unlock()
+
+	c.lastMsgHashes[chatId] = c.calculateMessageHash(messageId, content)
+}
+
+func (c *Client) hasLastMessageHashChanged(chatId, messageId int64, content client.MessageContent) bool {
+	c.locks.lastMsgHashesLock.Lock()
+	defer c.locks.lastMsgHashesLock.Unlock()
+
+	oldHash, ok := c.lastMsgHashes[chatId]
+	newHash := c.calculateMessageHash(messageId, content)
+
+	if !ok {
+		log.Warnf("Last message hash for chat %v does not exist", chatId)
+	}
+	log.WithFields(log.Fields{
+		"old hash": oldHash,
+		"new hash": newHash,
+	}).Info("Message hashes")
+
+	return !ok || oldHash != newHash
+}
+
 func (c *Client) UpdateLastChatMessageId(chatId int64, messageId string) {
 	c.locks.lastMsgIdsLock.Lock()
 	defer c.locks.lastMsgIdsLock.Unlock()
@@ -1795,83 +1628,3 @@ func (c *Client) usernamesToString(usernames []string) string {
 	}
 	return strings.Join(atUsernames, ", ")
 }
-
-func (c *Client) GetTZD() string {
-	if c.Session.Timezone == "" {
-		return "Z"
-	}
-	return c.Session.Timezone
-}
-
-// GetChatMembers retrieves a list of chat members. "Limited" mode works only if there are no more than 20 members at all
-func (c *Client) GetChatMembers(chatID int64, limited bool, query string, membersList MembersList) ([]*client.ChatMember, error) {
-	var filters []client.ChatMembersFilter
-	switch membersList {
-	case MembersListMembers:
-		filters = []client.ChatMembersFilter{&client.ChatMembersFilterMembers{}}
-	case MembersListRestricted:
-		filters = []client.ChatMembersFilter{&client.ChatMembersFilterRestricted{}}
-	case MembersListBanned:
-		filters = []client.ChatMembersFilter{&client.ChatMembersFilterBanned{}}
-	case MembersListBannedAndAdministrators:
-		filters = []client.ChatMembersFilter{&client.ChatMembersFilterBanned{}, &client.ChatMembersFilterAdministrators{}}
-	}
-
-	limit := int32(9999)
-	if limited {
-		limit = 20
-
-		chat, _, err := c.GetContactByID(chatID, nil, true)
-		if err != nil {
-			return nil, err
-		} else if chat == nil {
-			return nil, errors.New("Chat not found")
-		}
-
-		chatType := chat.Type.ChatTypeType()
-		if chatType == client.TypeChatTypeBasicGroup {
-			basicGroupType, _ := chat.Type.(*client.ChatTypeBasicGroup)
-			fullInfo, err := c.client.GetBasicGroupFullInfo(&client.GetBasicGroupFullInfoRequest{
-				BasicGroupId: basicGroupType.BasicGroupId,
-			})
-			if err != nil {
-				return nil, err
-			}
-
-			if len(fullInfo.Members) > int(limit) {
-				return nil, errOverLimit
-			}
-
-			return fullInfo.Members, nil
-		} else if chatType == client.TypeChatTypeSupergroup {
-			supergroupType, _ := chat.Type.(*client.ChatTypeSupergroup)
-			fullInfo, err := c.client.GetSupergroupFullInfo(&client.GetSupergroupFullInfoRequest{
-				SupergroupId: supergroupType.SupergroupId,
-			})
-			if err != nil {
-				return nil, err
-			}
-
-			if fullInfo.MemberCount > limit {
-				return nil, errOverLimit
-			}
-		} else {
-			return nil, errors.New("Inapplicable chat type")
-		}
-	}
-
-	var members []*client.ChatMember
-	for _, filter := range filters {
-		chatMembers, err := c.client.SearchChatMembers(&client.SearchChatMembersRequest{
-			ChatId: chatID,
-			Limit:  limit,
-			Query:  query,
-			Filter: filter,
-		})
-		if err != nil {
-			return nil, err
-		}
-		members = append(members, chatMembers.Members...)
-	}
-	return members, nil
-}

telegram/utils_test.go

@@ -593,7 +593,7 @@ func TestMessageToPrefix8(t *testing.T) {
 
 func GetSenderIdEmpty(t *testing.T) {
 	message := client.Message{}
-	senderId := (&Client{}).getMessageSenderId(&message)
+	senderId := (&Client{}).getSenderId(&message)
 	if senderId != 0 {
 		t.Errorf("Wrong sender id: %v", senderId)
 	}
@@ -605,7 +605,7 @@ func GetSenderIdUser(t *testing.T) {
 			UserId: 42,
 		},
 	}
-	senderId := (&Client{}).getMessageSenderId(&message)
+	senderId := (&Client{}).getSenderId(&message)
 	if senderId != 42 {
 		t.Errorf("Wrong sender id: %v", senderId)
 	}
@@ -617,7 +617,7 @@ func GetSenderIdChat(t *testing.T) {
 			ChatId: -42,
 		},
 	}
-	senderId := (&Client{}).getMessageSenderId(&message)
+	senderId := (&Client{}).getSenderId(&message)
 	if senderId != -42 {
 		t.Errorf("Wrong sender id: %v", senderId)
 	}

xmpp/component.go

@@ -39,11 +39,10 @@ var sizeRegex = regexp.MustCompile("\\A([0-9]+) ?([KMGTPE]?B?)\\z")
 
 // NewComponent starts a new component and wraps it in
 // a stream manager that you should start yourself
-func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig, idsPath string, version string) (*xmpp.StreamManager, *xmpp.Component, error) {
+func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig, idsPath string) (*xmpp.StreamManager, *xmpp.Component, error) {
 	var err error
 
 	gateway.Jid, err = stanza.NewJid(conf.Jid)
-	gateway.Version = version
 	if err != nil {
 		return nil, nil, err
 	}
@@ -142,24 +141,11 @@ func heartbeat(component *xmpp.Component) {
 						chatID,
 						session.LastSeenStatus(delayedStatus.TimestampOnline),
 						"away",
-						true,
 					)
 					delete(session.DelayedStatuses, chatID)
 				}
 			}
 			session.DelayedStatusesLock.Unlock()
-
-			// shrink message id maps
-			session.MessageIdChangesLock.Lock()
-			for _, idsMap := range session.MessageIdChanges {
-				for oldMessageId, newId := range idsMap {
-					if newId.Ts < now - 60 {
-						newId.Unlock()
-						delete(idsMap, oldMessageId)
-					}
-				}
-			}
-			session.MessageIdChangesLock.Unlock()
 		}
 		sessionLock.Unlock()
 

xmpp/extensions/extensions.go

@@ -213,20 +213,6 @@ type QueryRegisterRemove struct {
 	XMLName xml.Name `xml:"remove"`
 }
 
-// EntityTime is from XEP-0202
-type EntityTime struct {
-	XMLName   xml.Name          `xml:"urn:xmpp:time time"`
-	Tzo       string            `xml:"tzo"`
-	Utc       string            `xml:"utc"`
-	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
-}
-
-// AttachTo is from XEP-0367
-type AttachTo struct {
-	XMLName xml.Name `xml:"urn:xmpp:message-attaching:1 attach-to"`
-	Id      string   `xml:"id,attr"`
-}
-
 // Namespace is a namespace!
 func (c PresenceNickExtension) Namespace() string {
 	return c.XMLName.Space
@@ -292,26 +278,11 @@ func (c QueryRegister) GetSet() *stanza.ResultSet {
 	return c.ResultSet
 }
 
-// Namespace is a namespace!
-func (c EntityTime) Namespace() string {
-	return c.XMLName.Space
-}
-
-// GetSet getsets!
-func (c EntityTime) GetSet() *stanza.ResultSet {
-	return c.ResultSet
-}
-
 // Name is a packet name
 func (ClientMessage) Name() string {
 	return "message"
 }
 
-// Namespace is a namespace!
-func (c AttachTo) Namespace() string {
-	return c.XMLName.Space
-}
-
 // NewReplyFallback initializes a fallback range
 func NewReplyFallback(start uint64, end uint64) Fallback {
 	return Fallback{
@@ -391,16 +362,4 @@ func init() {
 		"jabber:iq:register",
 		"query",
 	}, QueryRegister{})
-
-	// entity time
-	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
-		"urn:xmpp:time",
-		"time",
-	}, EntityTime{})
-
-	// attach-to
-	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
-		"urn:xmpp:message-attaching:1",
-		"attach-to",
-	}, AttachTo{})
 }

xmpp/gateway/gateway.go

@@ -37,11 +37,6 @@ type marker struct {
 }
 
 const NSNick string = "http://jabber.org/protocol/nick"
-const NodeVCard4 string = "urn:xmpp:vcard4"
-const NodeAvatarMetadata string = "urn:xmpp:avatar:metadata"
-const NodeAvatarMetadataNotify string = NodeAvatarMetadata + "+notify"
-const NodeAvatarData string = "urn:xmpp:avatar:data"
-const NSCommand string = "http://jabber.org/protocol/commands"
 
 // Queue stores presences to send later
 var Queue = make(map[string]*stanza.Presence)
@@ -50,9 +45,6 @@ var QueueLock = sync.Mutex{}
 // Jid stores the component's JID object
 var Jid *stanza.Jid
 
-// Version stores this software's version
-var Version string
-
 // IdsDB provides a disk-backed bidirectional dictionary of Telegram and XMPP ids
 var IdsDB badger.IdsDB
 
@@ -443,46 +435,3 @@ func SplitJID(from string) (string, string, bool) {
 	}
 	return fromJid.Bare(), fromJid.Resource, true
 }
-
-// SendPubSubAvatarNotification encourages clients to fetch an avatar
-func SendPubSubAvatarNotification(component *xmpp.Component, jid string, chatId int64, sha1 string, size int64) {
-	info := stanza.Node{
-		XMLName: xml.Name{Local: "info"},
-		Attrs: []xml.Attr{
-			xml.Attr{Name: xml.Name{Local: "bytes"}, Value: strconv.FormatInt(size, 10)},
-			xml.Attr{Name: xml.Name{Local: "height"}, Value: "160"},
-			xml.Attr{Name: xml.Name{Local: "id"}, Value: sha1},
-			xml.Attr{Name: xml.Name{Local: "type"}, Value: "image/jpeg"},
-			xml.Attr{Name: xml.Name{Local: "width"}, Value: "160"},
-		},
-	}
-	log.WithFields(log.Fields{
-		"chatId": chatId,
-	}).Debugf("%#v", info)
-
-	event := &stanza.PubSubEvent{
-		EventElement: &stanza.ItemsEvent{
-			Node: NodeAvatarMetadata,
-			Items: []stanza.ItemEvent{
-				stanza.ItemEvent{
-					Id: sha1,
-					Any: &stanza.Node{
-						XMLName: xml.Name{Local: "metadata", Space: NodeAvatarMetadata},
-						Nodes:   []stanza.Node{info},
-					},
-				},
-			},
-		},
-	}
-
-	message := stanza.Message{
-		Attrs: stanza.Attrs{
-			From: strconv.FormatInt(chatId, 10) + "@" + Jid.Bare(),
-			To:   jid,
-			Type: stanza.MessageTypeHeadline,
-		},
-		Extensions: []stanza.MsgExtension{event},
-	}
-
-	_ = ResumableSend(component, message)
-}

xmpp/loginwizard.go

@@ -1,101 +0,0 @@
-package xmpp
-
-import (
-	"fmt"
-
-	"dev.narayana.im/narayana/telegabber/telegram"
-	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
-
-	log "github.com/sirupsen/logrus"
-	"gosrc.io/xmpp"
-	"gosrc.io/xmpp/stanza"
-)
-
-func loginWizardPayload(bare string, requestForm *stanza.Form, resource string) (payload *stanza.Command, cancelSend bool, returnSession *telegram.Client) {
-	payload = &stanza.Command{
-		SessionId: "loginwizard",
-		Node:      "loginwizard",
-	}
-
-	session, ok := sessions[bare]
-	if ok {
-		returnSession = session
-
-		if requestForm == nil {
-			session.StartLoginWizard(false)
-			cancelSend = true
-		} else {
-			if len(requestForm.Fields) != 1 {
-				setCommandPayloadError(payload, "Hey, don't tinker with the form!")
-				return
-			}
-			field := requestForm.Fields[0]
-			if field != nil {
-				if len(field.ValuesList) < 1 {
-					setCommandPayloadError(payload, "No value")
-					return
-				}
-				switch field.Var {
-				case "login", "code", "password":
-				default:
-					setCommandPayloadError(payload, "Unknown field")
-					return
-				}
-
-				session.StartLoginWizard(true)
-				response, success := session.ProcessTransportCommand(fmt.Sprintf("/%v %v", field.Var, field.ValuesList[0]), resource)
-				if !success {
-					setCommandPayloadError(payload, response)
-					session.StopLoginWizard()
-					return
-				}
-
-				cancelSend = true
-			}
-		}
-	} else {
-		setCommandPayloadError(payload, fmt.Sprintf("Session is not initialized, add the transport (%v) to contacts first", gateway.Jid.Bare()))
-	}
-
-	return
-}
-
-func sendLoginWizardResponse(component *xmpp.Component, answer *stanza.IQ, session *telegram.Client) {
-	payload := &stanza.Command{
-		SessionId: "loginwizard",
-		Node:      "loginwizard",
-	}
-
-	nextStage := "login"
-	if session != nil {
-		nextStage = session.GetLoginWizardNextStage()
-	}
-	log.Debugf("nextStage: %v", nextStage)
-
-	if nextStage == "cancel" {
-		setCommandPayloadError(payload, "Cancelled")
-		session.StopLoginWizard()
-	} else if nextStage == "success" {
-		payload.Status = stanza.CommandStatusCompleted
-		session.StopLoginWizard()
-	} else {
-		required := ""
-		form := stanza.Form{
-			Type:  stanza.FormTypeForm,
-			Title: "Login Wizard",
-			Fields: []*stanza.Field{
-				&stanza.Field{
-					Var:      nextStage,
-					Label:    nextStage,
-					Required: &required,
-				},
-			},
-		}
-		payload.Status = stanza.CommandStatusExecuting
-		payload.CommandElements = append(payload.CommandElements, &form)
-	}
-
-	answer.Payload = payload
-
-	gateway.ResumableSend(component, answer)
-}