Attach prefix to OOB descriptions and omit empty ones only if sender is displayed by carbon

This reverts commit 563cb2d624.

.gitignore

@@ -3,3 +3,5 @@ telegabber
 sessions/
 session.dat
 session.dat.new
+release/
+tdlib/

Dockerfile

@@ -0,0 +1,36 @@
+FROM golang:1.19-bookworm AS base
+
+RUN apt-get update
+run apt-get install -y libssl-dev cmake build-essential gperf libz-dev make git
+
+FROM base AS tdlib
+
+ARG TD_COMMIT
+ARG MAKEOPTS
+RUN git clone https://github.com/tdlib/td /src/
+RUN git -C /src/ checkout "${TD_COMMIT}"
+RUN mkdir build
+WORKDIR /build/
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/compiled/ /src/
+RUN cmake --build . ${MAKEOPTS}
+RUN make install
+
+FROM base AS cache
+ARG VERSION
+COPY --from=tdlib /compiled/ /usr/local/
+COPY ./ /src
+RUN git -C /src checkout "${VERSION}"
+WORKDIR /src
+RUN go get
+
+FROM cache AS build
+ARG MAKEOPTS
+WORKDIR /src
+RUN make ${MAKEOPTS}
+
+FROM scratch AS telegabber
+COPY --from=build /src/release/telegabber /usr/local/bin/
+ENTRYPOINT ["/usr/local/bin/telegabber"]
+
+FROM scratch AS binaries
+COPY --from=telegabber /usr/local/bin/telegabber /

Makefile

@@ -1,12 +1,25 @@
 .PHONY: all test
 
 COMMIT := $(shell git rev-parse --short HEAD)
+TD_COMMIT := "5bbfc1cf5dab94f82e02f3430ded7241d4653551"
+VERSION := "v1.9.6"
+MAKEOPTS := "-j4"
 
 all:
-	go build -ldflags "-X main.commit=${COMMIT}" -o telegabber
+	mkdir -p release
+	go build -ldflags "-X main.commit=${COMMIT}" -o release/telegabber
 
 test:
-	go test -v ./config ./ ./telegram ./xmpp ./xmpp/gateway ./persistence ./telegram/formatter
+	go test -v ./config ./ ./telegram ./xmpp ./xmpp/gateway ./persistence ./telegram/formatter ./badger
 
 lint:
 	$(GOPATH)/bin/golint ./...
+
+build_indocker:
+	docker build --build-arg "TD_COMMIT=${TD_COMMIT}" --build-arg "VERSION=${VERSION}" --build-arg "MAKEOPTS=${MAKEOPTS}" --output=release --target binaries .
+
+build_indocker_staging:
+	DOCKER_BUILDKIT=1 docker build --build-arg "TD_COMMIT=${TD_COMMIT}" --build-arg "MAKEOPTS=${MAKEOPTS}" --network host --output=release --target binaries -f staging.Dockerfile .
+
+build_tdlib:
+	DOCKER_BUILDKIT=1 docker build --build-arg "TD_COMMIT=${TD_COMMIT}" --build-arg "MAKEOPTS=${MAKEOPTS}" --output=tdlib --target binaries -f tdlib.Dockerfile .

README.md

@@ -75,6 +75,7 @@ It is good idea to obtain Telegram API ID from [**https://my.telegram.org**](htt
 * `--profiling-port=xxxx`: start the pprof server on port `xxxx`. Access is limited to localhost.
 * `--config=/bla/bla/config.yml`: set the config file path (default: `config.yml`).
 * `--schema=/bla/bla/schema.json`: set the schema file path (default: `./config_schema.json`).
+* `--ids=/bla/bla/ids`: set the folder for ids database (default: `ids`).
 
 ### How to receive files from Telegram ###
 

badger/ids.go

@@ -0,0 +1,230 @@
+package badger
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"strconv"
+
+	badger "github.com/dgraph-io/badger/v4"
+	log "github.com/sirupsen/logrus"
+)
+
+// IdsDB represents a Badger database
+type IdsDB struct {
+	db *badger.DB
+}
+
+// IdsDBOpen returns a new DB object
+func IdsDBOpen(path string) IdsDB {
+	bdb, err := badger.Open(badger.DefaultOptions(path))
+	if err != nil {
+		log.Errorf("Failed to open ids database: %v, falling back to in-memory database", path)
+		bdb, err = badger.Open(badger.DefaultOptions("").WithInMemory(true))
+		if err != nil {
+			log.Fatalf("Couldn't initialize the ids database")
+		}
+	}
+
+	return IdsDB{
+		db: bdb,
+	}
+}
+
+// Set stores an id pair
+func (db *IdsDB) Set(tgAccount, xmppAccount string, tgChatId, tgMsgId int64, xmppId string) error {
+	bPrefix := toKeyPrefix(tgAccount, xmppAccount)
+	bTgId := toTgByteString(tgChatId, tgMsgId)
+	bXmppId := toXmppByteString(xmppId)
+	bTgKey := toByteKey(bPrefix, bTgId, "tg")
+	bXmppKey := toByteKey(bPrefix, bXmppId, "xmpp")
+
+	return db.db.Update(func(txn *badger.Txn) error {
+		if err := txn.Set(bTgKey, bXmppId); err != nil {
+			return err
+		}
+		return txn.Set(bXmppKey, bTgId)
+	})
+}
+
+func (db *IdsDB) getByteValue(key []byte) ([]byte, error) {
+	var valCopy []byte
+	err := db.db.View(func(txn *badger.Txn) error {
+		item, err := txn.Get(key)
+		if err != nil {
+			return err
+		}
+
+		valCopy, err = item.ValueCopy(nil)
+		return err
+	})
+	return valCopy, err
+}
+
+// GetByTgIds obtains an XMPP id by Telegram chat/message ids
+func (db *IdsDB) GetByTgIds(tgAccount, xmppAccount string, tgChatId, tgMsgId int64) (string, error) {
+	val, err := db.getByteValue(toByteKey(
+		toKeyPrefix(tgAccount, xmppAccount),
+		toTgByteString(tgChatId, tgMsgId),
+		"tg",
+	))
+	if err != nil {
+		return "", err
+	}
+	return string(val), nil
+}
+
+// GetByXmppId obtains Telegram chat/message ids by an XMPP id
+func (db *IdsDB) GetByXmppId(tgAccount, xmppAccount, xmppId string) (int64, int64, error) {
+	val, err := db.getByteValue(toByteKey(
+		toKeyPrefix(tgAccount, xmppAccount),
+		toXmppByteString(xmppId),
+		"xmpp",
+	))
+	if err != nil {
+		return 0, 0, err
+	}
+	return splitTgByteString(val)
+}
+
+func toKeyPrefix(tgAccount, xmppAccount string) []byte {
+	return []byte(fmt.Sprintf("%v/%v/", tgAccount, xmppAccount))
+}
+
+func toByteKey(prefix, suffix []byte, typ string) []byte {
+	key := make([]byte, 0, len(prefix)+len(suffix)+6)
+	key = append(key, prefix...)
+	key = append(key, []byte(typ)...)
+	key = append(key, []byte("/")...)
+	key = append(key, suffix...)
+	return key
+}
+
+func toTgByteString(tgChatId, tgMsgId int64) []byte {
+	return []byte(fmt.Sprintf("%v/%v", tgChatId, tgMsgId))
+}
+
+func toXmppByteString(xmppId string) []byte {
+	return []byte(xmppId)
+}
+
+func splitTgByteString(val []byte) (int64, int64, error) {
+	parts := bytes.Split(val, []byte("/"))
+	if len(parts) != 2 {
+		return 0, 0, errors.New("Couldn't parse tg id pair")
+	}
+	tgChatId, err := strconv.ParseInt(string(parts[0]), 10, 64)
+	if err != nil {
+		return 0, 0, err
+	}
+	tgMsgId, err := strconv.ParseInt(string(parts[1]), 10, 64)
+	return tgChatId, tgMsgId, err
+}
+
+// ReplaceIdPair replaces an old entry by XMPP ID with both new XMPP and Tg ID
+func (db *IdsDB) ReplaceIdPair(tgAccount, xmppAccount, oldXmppId, newXmppId string, newMsgId int64) error {
+	// read old pair
+	chatId, oldMsgId, err := db.GetByXmppId(tgAccount, xmppAccount, oldXmppId)
+	if err != nil {
+		return err
+	}
+
+	bPrefix := toKeyPrefix(tgAccount, xmppAccount)
+
+	bOldTgId := toTgByteString(chatId, oldMsgId)
+	bOldXmppId := toXmppByteString(oldXmppId)
+	bOldTgKey := toByteKey(bPrefix, bOldTgId, "tg")
+	bOldXmppKey := toByteKey(bPrefix, bOldXmppId, "xmpp")
+
+	bTgId := toTgByteString(chatId, newMsgId)
+	bXmppId := toXmppByteString(newXmppId)
+	bTgKey := toByteKey(bPrefix, bTgId, "tg")
+	bXmppKey := toByteKey(bPrefix, bXmppId, "xmpp")
+
+	return db.db.Update(func(txn *badger.Txn) error {
+		// save new pair
+		if err := txn.Set(bTgKey, bXmppId); err != nil {
+			return err
+		}
+		if err := txn.Set(bXmppKey, bTgId); err != nil {
+			return err
+		}
+		// delete old pair
+		if err := txn.Delete(bOldTgKey); err != nil {
+			return err
+		}
+		return txn.Delete(bOldXmppKey)
+	})
+}
+
+// ReplaceXmppId replaces an old XMPP ID with new XMPP ID and keeps Tg ID intact
+func (db *IdsDB) ReplaceXmppId(tgAccount, xmppAccount, oldXmppId, newXmppId string) error {
+	// read old Tg IDs
+	chatId, msgId, err := db.GetByXmppId(tgAccount, xmppAccount, oldXmppId)
+	if err != nil {
+		return err
+	}
+
+	bPrefix := toKeyPrefix(tgAccount, xmppAccount)
+
+	bOldXmppId := toXmppByteString(oldXmppId)
+	bOldXmppKey := toByteKey(bPrefix, bOldXmppId, "xmpp")
+
+	bTgId := toTgByteString(chatId, msgId)
+	bXmppId := toXmppByteString(newXmppId)
+	bTgKey := toByteKey(bPrefix, bTgId, "tg")
+	bXmppKey := toByteKey(bPrefix, bXmppId, "xmpp")
+
+	return db.db.Update(func(txn *badger.Txn) error {
+		// save new pair
+		if err := txn.Set(bTgKey, bXmppId); err != nil {
+			return err
+		}
+		if err := txn.Set(bXmppKey, bTgId); err != nil {
+			return err
+		}
+		// delete old xmpp->tg entry
+		return txn.Delete(bOldXmppKey)
+	})
+}
+
+// ReplaceTgId replaces an old Tg ID with new Tg ID and keeps Tg chat ID and XMPP ID intact
+func (db *IdsDB) ReplaceTgId(tgAccount, xmppAccount string, chatId, oldMsgId, newMsgId int64) error {
+	// read old XMPP ID
+	xmppId, err := db.GetByTgIds(tgAccount, xmppAccount, chatId, oldMsgId)
+	if err != nil {
+		return err
+	}
+
+	bPrefix := toKeyPrefix(tgAccount, xmppAccount)
+
+	bOldTgId := toTgByteString(chatId, oldMsgId)
+	bOldTgKey := toByteKey(bPrefix, bOldTgId, "tg")
+
+	bTgId := toTgByteString(chatId, newMsgId)
+	bXmppId := toXmppByteString(xmppId)
+	bTgKey := toByteKey(bPrefix, bTgId, "tg")
+	bXmppKey := toByteKey(bPrefix, bXmppId, "xmpp")
+
+	return db.db.Update(func(txn *badger.Txn) error {
+		// save new pair
+		if err := txn.Set(bTgKey, bXmppId); err != nil {
+			return err
+		}
+		if err := txn.Set(bXmppKey, bTgId); err != nil {
+			return err
+		}
+		// delete old tg->xmpp entry
+		return txn.Delete(bOldTgKey)
+	})
+}
+
+// Gc compacts the value log
+func (db *IdsDB) Gc() {
+	db.db.RunValueLogGC(0.7)
+}
+
+// Close closes a DB
+func (db *IdsDB) Close() {
+	db.db.Close()
+}

badger/ids_test.go

@@ -0,0 +1,72 @@
+package badger
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestToKeyPrefix(t *testing.T) {
+	if !reflect.DeepEqual(toKeyPrefix("+123456789", "test@example.com"), []byte("+123456789/test@example.com/")) {
+		t.Error("Wrong prefix")
+	}
+}
+
+func TestToByteKey(t *testing.T) {
+	if !reflect.DeepEqual(toByteKey([]byte("ababa/galamaga/"), []byte("123"), "ppp"), []byte("ababa/galamaga/ppp/123")) {
+		t.Error("Wrong key")
+	}
+}
+
+func TestToTgByteString(t *testing.T) {
+	if !reflect.DeepEqual(toTgByteString(-2345, 6789), []byte("-2345/6789")) {
+		t.Error("Wrong tg string")
+	}
+}
+
+func TestToXmppByteString(t *testing.T) {
+	if !reflect.DeepEqual(toXmppByteString("aboba"), []byte("aboba")) {
+		t.Error("Wrong xmpp string")
+	}
+}
+
+func TestSplitTgByteStringUnparsable(t *testing.T) {
+	_, _, err := splitTgByteString([]byte("@#U*&$(@#"))
+	if err == nil {
+		t.Error("Unparsable should not be parsed")
+		return
+	}
+	if err.Error() != "Couldn't parse tg id pair" {
+		t.Error("Wrong parse error")
+	}
+}
+
+func TestSplitTgByteManyParts(t *testing.T) {
+	_, _, err := splitTgByteString([]byte("a/b/c/d"))
+	if err == nil {
+		t.Error("Should not parse many parts")
+		return
+	}
+	if err.Error() != "Couldn't parse tg id pair" {
+		t.Error("Wrong parse error")
+	}
+}
+
+func TestSplitTgByteNonNumeric(t *testing.T) {
+	_, _, err := splitTgByteString([]byte("0/a"))
+	if err == nil {
+		t.Error("Should not parse non-numeric msgid")
+	}
+}
+
+func TestSplitTgByteSuccess(t *testing.T) {
+	chatId, msgId, err := splitTgByteString([]byte("-198282398/23798478"))
+	if err != nil {
+		t.Error("Should be parsed well")
+	}
+	if chatId != -198282398 {
+		t.Error("Wrong chatId")
+	}
+	if msgId != 23798478 {
+		t.Error("Wrong msgId")
+	}
+}

go.mod

@@ -1,10 +1,10 @@
 module dev.narayana.im/narayana/telegabber
 
-go 1.13
+go 1.19
 
 require (
-	github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7
+	github.com/dgraph-io/badger/v4 v4.1.0
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/santhosh-tekuri/jsonschema v1.2.4
 	github.com/sirupsen/logrus v1.4.2
 	github.com/soheilhy/args v0.0.0-20150720134047-6bcf4c78e87e
@@ -13,4 +13,25 @@ require (
 	gosrc.io/xmpp v0.5.2-0.20211214110136-5f99e1cd06e1
 )
 
+require (
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/dgraph-io/ristretto v0.1.1 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
+	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
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	nhooyr.io/websocket v1.6.5 // indirect
+)
+
 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

@@ -1,34 +1,35 @@
-dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829 h1:qe81G6+t1V1ySRMa7lSu5CayN5aP5GEiHXL2DYwHzuA=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-dev.narayana.im/narayana/go-xmpp v0.0.0-20211218155535-e55463fc9829/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
+dev.narayana.im/narayana/go-tdlib v0.0.0-20230730021136-47da33180615 h1:RRUZJSro+k8FkazNx7QEYLVoO4wZtchvsd0Y2RBWjeU=
+dev.narayana.im/narayana/go-tdlib v0.0.0-20230730021136-47da33180615/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
+dev.narayana.im/narayana/go-tdlib v0.0.0-20231111182840-bc2f985e6268 h1:NCbc2bYuUGQsb/3z5SCIia3N34Ktwq3FwaUAfgF/WEU=
+dev.narayana.im/narayana/go-tdlib v0.0.0-20231111182840-bc2f985e6268/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
+dev.narayana.im/narayana/go-tdlib v0.0.0-20240124222245-b4c12addb061 h1:CWAQT74LwQne/3Po5KXDvudu3N0FBWm3XZZZhtl5j2w=
+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=
-github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7 h1:GbV1Lv3lVHsSeKAqPTBem72OCsGjXntW4jfJdXciE+w=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7/go.mod h1:ZzkRfuaFj8etIYMj/ECtXtgfz72RE6U+dos27b3XIwk=
 github.com/agnivade/wasmbrowsertest v0.3.1/go.mod h1:zQt6ZTdl338xxRaMW395qccVE2eQm0SjC/SDz0mPWQI=
-github.com/bodqhrohro/go-tdlib v0.1.1 h1:lmHognymABxP3cmHkfAGhGnWaJaZ3htpJ7RSbZacin4=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/bodqhrohro/go-tdlib v0.1.2-0.20191121200156-e826071d3317 h1:+mv4FwWXl8hTa7PrhekwVzPknH+rHqB60jIPBi2XqI8=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/bodqhrohro/go-tdlib v0.1.2-0.20191121200156-e826071d3317/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/bodqhrohro/go-tdlib v0.1.2-0.20191121233100-48d2382034fb h1:y5PnjdAnNVS0q8xuwjm3TxBfLriJmykQdoGiyYZB3s0=
-github.com/bodqhrohro/go-tdlib v0.1.2-0.20191121233100-48d2382034fb/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
-github.com/bodqhrohro/go-tdlib v0.4.4-0.20211229000346-ee6018be8ec0 h1:9ysLk2hG2q0NeNdX6StzS+4fTAG2FeZJYKKegCuB4q4=
-github.com/bodqhrohro/go-tdlib v0.4.4-0.20211229000346-ee6018be8ec0/go.mod h1:sOdXFpJ3zn6RHRc8aNVkJYALHpoplwBgMwIbRCYABIg=
-github.com/bodqhrohro/go-xmpp v0.1.4-0.20191106203535-f3b463f3b26c h1:LzcQyE+Gs+0kAbpnPAUD68FvUCieKZip44URAmH70PI=
-github.com/bodqhrohro/go-xmpp v0.1.4-0.20191106203535-f3b463f3b26c/go.mod h1:fWixaMaFvx8cxXcJVJ5kU9csMeD/JN8on7ybassU8rY=
-github.com/bodqhrohro/go-xmpp v0.2.1-0.20191105232737-9abd5be0aa1b h1:9BLd/SNO4JJZLRl1Qb1v9mNivIlHuwHDe2c8hQvBxFA=
-github.com/bodqhrohro/go-xmpp v0.2.1-0.20191105232737-9abd5be0aa1b/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
-github.com/bodqhrohro/go-xmpp v0.2.1-0.20211205194122-f8c4ecb59d8b h1:rTK55SNCBmssyRgNAweVwVVfuoRstI8RbL+8Ys/RzxE=
-github.com/bodqhrohro/go-xmpp v0.2.1-0.20211205194122-f8c4ecb59d8b/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
-github.com/bodqhrohro/go-xmpp v0.2.1-0.20211218153313-a8aadd78b65b h1:VDi8z3PzEDhQzazRRuv1fkv662DT3Mm/TY/Lni2Sgrc=
-github.com/bodqhrohro/go-xmpp v0.2.1-0.20211218153313-a8aadd78b65b/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
 github.com/chromedp/cdproto v0.0.0-20190614062957-d6d2f92b486d/go.mod h1:S8mB5wY3vV+vRIzf39xDXsw3XKYewW9X6rW2aEmkrSw=
 github.com/chromedp/cdproto v0.0.0-20190621002710-8cbd498dd7a0/go.mod h1:S8mB5wY3vV+vRIzf39xDXsw3XKYewW9X6rW2aEmkrSw=
 github.com/chromedp/cdproto v0.0.0-20190812224334-39ef923dcb8d/go.mod h1:0YChpVzuLJC5CPr+x3xkHN6Z8KOSXjNbL7qV8Wc4GW0=
 github.com/chromedp/cdproto v0.0.0-20190926234355-1b4886c6fad6/go.mod h1:0YChpVzuLJC5CPr+x3xkHN6Z8KOSXjNbL7qV8Wc4GW0=
 github.com/chromedp/chromedp v0.3.1-0.20190619195644-fd957a4d2901/go.mod h1:mJdvfrVn594N9tfiPecUidF6W5jPRKHymqHfzbobPsM=
 github.com/chromedp/chromedp v0.4.0/go.mod h1:DC3QUn4mJ24dwjcaGQLoZrhm4X/uPHZ6spDbS2uFhm4=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgraph-io/badger/v4 v4.1.0 h1:E38jc0f+RATYrycSUf9LMv/t47XAy+3CApyYSq4APOQ=
+github.com/dgraph-io/badger/v4 v4.1.0/go.mod h1:P50u28d39ibBRmIJuQC/NSdBOg46HnHw7al2SW5QRHg=
+github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
+github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/fatih/color v1.6.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
@@ -38,25 +39,43 @@ github.com/go-interpreter/wagon v0.6.0/go.mod h1:5+b/MBYkclRZngKF5s6qrgWxSLgE9F5
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/godcong/go-tdlib v0.4.4-0.20211203152853-64d22ab8d4ac h1:5FQGW4yHSkbwm+4i/8ef7FvkIFt4NOM4HexSbvPduRo=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/godcong/go-tdlib v0.4.4-0.20211203152853-64d22ab8d4ac/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 h1:ZgQEtGgCBiWRM39fZuwSd1LwSqqSW0hOdXCYYDX0R3I=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/flatbuffers v1.12.1 h1:MVlul7pQNoDzWRLTw5imwYsl+usrS1TXG2H4jg6ImGw=
+github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190908185732-236ed259b199/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.12.3 h1:G5AfA94pHPysR56qqrkO2pxEexdDzrpFJ6yt/VqWxVU=
+github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/knq/sysutil v0.0.0-20181215143952-f05b59f0f307/go.mod h1:BjPj+aVjl9FW/cCGiF3nGh5v+9Gd3VCgBQbod/GlMaQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mailru/easyjson v0.0.0-20190403194419-1ea4449da983/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -72,8 +91,9 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/santhosh-tekuri/jsonschema v1.2.4 h1:hNhW8e7t+H1vgY+1QeEQpveR6D4+OwKPXCfD2aieJis=
@@ -87,48 +107,95 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/twitchyliquid64/golang-asm v0.0.0-20190126203739-365674df15fc/go.mod h1:NoCfSFWosfqMqmmD7hApkirIK9ozpHjxRnRxs1l413A=
-github.com/zelenin/go-tdlib v0.1.0 h1:Qq+FGE0/EWdsRB6m26ULDndu2DtW558aFXNzi0Y/FqQ=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zelenin/go-tdlib v0.1.0/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zelenin/go-tdlib v0.5.2 h1:inEATEM0Pz6/HBI3wTlhd+brDHpmoXGgwdSb8/V6GiA=
 github.com/zelenin/go-tdlib v0.5.2/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
 go.coder.com/go-tools v0.0.0-20190317003359-0c6a35b74a16/go.mod h1:iKV5yK9t+J5nG9O3uF6KYdPEz3dyfMyB15MN1rbQ8Qw=
+go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 golang.org/x/crypto v0.0.0-20180426230345-b49d69b5da94/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190306220234-b354f8bf4d9e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190618155005-516e3c20635f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190927073244-c990c680b611 h1:q9u40nxWT5zRClI/uU9dHCiYGottAg6Nzz4YUQyHxdA=
 golang.org/x/sys v0.0.0-20190927073244-c990c680b611/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -136,12 +203,9 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gosrc.io/xmpp v0.1.3 h1:VYP1bA35irlQ1ZAJqNhJOz8NSsSTkzQRhREfmuG1H80=
-gosrc.io/xmpp v0.1.3/go.mod h1:fWixaMaFvx8cxXcJVJ5kU9csMeD/JN8on7ybassU8rY=
-gosrc.io/xmpp v0.5.2-0.20211214110136-5f99e1cd06e1 h1:E3uJqX6ImJL9AFdjGbiW04jq8IQ+NcOK+JSiWq2TbRw=
-gosrc.io/xmpp v0.5.2-0.20211214110136-5f99e1cd06e1/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
 gotest.tools v2.1.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/gotestsum v0.3.5/go.mod h1:Mnf3e5FUzXbkCfynWBGOwLssY7gTQgCHObK9tMpAriY=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 mvdan.cc/sh v2.6.4+incompatible/go.mod h1:IeeQbZq+x2SUGBensq/jge5lLQbS3XT2ktyp3wrt4x8=
 nhooyr.io/websocket v1.6.5 h1:8TzpkldRfefda5JST+CnOH135bzVPz5uzfn/AF+gVKg=
 nhooyr.io/websocket v1.6.5/go.mod h1:F259lAzPRAH0htX2y3ehpJe09ih1aSHN7udWki1defY=

persistence/sessions.go

@@ -3,6 +3,7 @@ package persistence
 import (
 	"github.com/pkg/errors"
 	"io/ioutil"
+	"sync"
 	"time"
 
 	"dev.narayana.im/narayana/telegabber/yamldb"
@@ -34,14 +35,18 @@ type SessionsMap struct {
 
 // Session is a key-values subtree
 type Session struct {
-	Login       string `yaml:":login"`
+	Login           string         `yaml:":login"`
-	Timezone    string `yaml:":timezone"`
+	Timezone        string         `yaml:":timezone"`
-	KeepOnline  bool   `yaml:":keeponline"`
+	KeepOnline      bool           `yaml:":keeponline"`
-	RawMessages bool   `yaml:":rawmessages"`
+	RawMessages     bool           `yaml:":rawmessages"`
-	AsciiArrows bool   `yaml:":asciiarrows"`
+	AsciiArrows     bool           `yaml:":asciiarrows"`
-	OOBMode     bool   `yaml:":oobmode"`
+	OOBMode         bool           `yaml:":oobmode"`
-	Carbons     bool   `yaml:":carbons"`
+	Carbons         bool           `yaml:":carbons"`
-	HideIds     bool   `yaml:":hideids"`
+	HideIds         bool           `yaml:":hideids"`
+	Receipts        bool           `yaml:":receipts"`
+	NativeEdits     bool           `yaml:":nativeedits"`
+	IgnoredChats    []int64        `yaml:":ignoredchats"`
+	ignoredChatsMap map[int64]bool `yaml:"-"`
 }
 
 var configKeys = []string{
@@ -52,17 +57,26 @@ var configKeys = []string{
 	"oobmode",
 	"carbons",
 	"hideids",
+	"receipts",
+	"nativeedits",
 }
 
 var sessionDB *SessionsYamlDB
+var sessionsLock sync.Mutex
 
 // SessionMarshaller implementation for YamlDB
 func SessionMarshaller() ([]byte, error) {
 	cleanedMap := SessionsMap{}
 	emptySessionsMap(&cleanedMap)
 
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
 	for jid, session := range sessionDB.Data.Sessions {
 		if session.Login != "" {
+			session.IgnoredChats = make([]int64, 0, len(session.ignoredChatsMap))
+			for chatID := range session.ignoredChatsMap {
+				session.IgnoredChats = append(session.IgnoredChats, chatID)
+			}
 			cleanedMap.Sessions[jid] = session
 		}
 	}
@@ -104,6 +118,16 @@ func initYamlDB(path string, dataPtr *SessionsMap) (*SessionsYamlDB, error) {
 		emptySessionsMap(dataPtr)
 	}
 
+	// convert ignored users slice to map
+	for jid, session := range dataPtr.Sessions {
+		session.ignoredChatsMap = make(map[int64]bool)
+		for _, chatID := range session.IgnoredChats {
+			session.ignoredChatsMap[chatID] = true
+		}
+		session.IgnoredChats = nil
+		dataPtr.Sessions[jid] = session
+	}
+
 	return &SessionsYamlDB{
 		YamlDB: yamldb.YamlDB{
 			Path:    path,
@@ -115,6 +139,13 @@ func initYamlDB(path string, dataPtr *SessionsMap) (*SessionsYamlDB, error) {
 
 // Get retrieves a session value
 func (s *Session) Get(key string) (string, error) {
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
+
+	return s.get(key)
+}
+
+func (s *Session) get(key string) (string, error) {
 	switch key {
 	case "timezone":
 		return s.Timezone, nil
@@ -130,6 +161,10 @@ func (s *Session) Get(key string) (string, error) {
 		return fromBool(s.Carbons), nil
 	case "hideids":
 		return fromBool(s.HideIds), nil
+	case "receipts":
+		return fromBool(s.Receipts), nil
+	case "nativeedits":
+		return fromBool(s.NativeEdits), nil
 	}
 
 	return "", errors.New("Unknown session property")
@@ -137,9 +172,12 @@ func (s *Session) Get(key string) (string, error) {
 
 // ToMap converts the session to a map
 func (s *Session) ToMap() map[string]string {
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
+
 	m := make(map[string]string)
 	for _, configKey := range configKeys {
-		value, _ := s.Get(configKey)
+		value, _ := s.get(configKey)
 		m[configKey] = value
 	}
 
@@ -148,6 +186,9 @@ func (s *Session) ToMap() map[string]string {
 
 // Set sets a session value
 func (s *Session) Set(key string, value string) (string, error) {
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
+
 	switch key {
 	case "timezone":
 		s.Timezone = value
@@ -194,6 +235,20 @@ func (s *Session) Set(key string, value string) (string, error) {
 		}
 		s.HideIds = b
 		return value, nil
+	case "receipts":
+		b, err := toBool(value)
+		if err != nil {
+			return "", err
+		}
+		s.Receipts = b
+		return value, nil
+	case "nativeedits":
+		b, err := toBool(value)
+		if err != nil {
+			return "", err
+		}
+		s.NativeEdits = b
+		return value, nil
 	}
 
 	return "", errors.New("Unknown session property")
@@ -210,6 +265,51 @@ func (s *Session) TimezoneToLocation() *time.Location {
 	return zeroLocation
 }
 
+// IgnoreChat adds a chat id to ignore list, returns false if already ignored
+func (s *Session) IgnoreChat(chatID int64) bool {
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
+
+	if s.ignoredChatsMap == nil {
+		s.ignoredChatsMap = make(map[int64]bool)
+	} else if _, ok := s.ignoredChatsMap[chatID]; ok {
+		return false
+	}
+
+	s.ignoredChatsMap[chatID] = true
+	return true
+}
+
+// UnignoreChat removes a chat id from ignore list, returns false if not already ignored
+func (s *Session) UnignoreChat(chatID int64) bool {
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
+
+	if s.ignoredChatsMap == nil {
+		return false
+	}
+
+	if _, ok := s.ignoredChatsMap[chatID]; !ok {
+		return false
+	}
+
+	delete(s.ignoredChatsMap, chatID)
+	return true
+}
+
+// IsChatIgnored checks the chat id against the ignore list
+func (s *Session) IsChatIgnored(chatID int64) bool {
+	sessionsLock.Lock()
+	defer sessionsLock.Unlock()
+
+	if s.ignoredChatsMap == nil {
+		return false
+	}
+
+	_, ok := s.ignoredChatsMap[chatID]
+	return ok
+}
+
 func fromBool(b bool) string {
 	if b {
 		return "true"

persistence/sessions_test.go

@@ -48,6 +48,7 @@ func TestSessionToMap(t *testing.T) {
 		Timezone:    "klsf",
 		RawMessages: true,
 		OOBMode:     true,
+		Receipts:    true,
 	}
 	m := session.ToMap()
 	sample := map[string]string{
@@ -58,6 +59,8 @@ func TestSessionToMap(t *testing.T) {
 		"oobmode":     "true",
 		"carbons":     "false",
 		"hideids":     "false",
+		"receipts":    "true",
+		"nativeedits": "false",
 	}
 	if !reflect.DeepEqual(m, sample) {
 		t.Errorf("Map does not match the sample: %v", m)
@@ -85,3 +88,31 @@ func TestSessionSetAbsent(t *testing.T) {
 		t.Error("There shouldn't come a donkey!")
 	}
 }
+
+func TestSessionIgnore(t *testing.T) {
+	session := Session{}
+	if session.IsChatIgnored(3) {
+		t.Error("Shouldn't be ignored yet")
+	}
+	if !session.IgnoreChat(3) {
+		t.Error("Shouldn't have been ignored")
+	}
+	if session.IgnoreChat(3) {
+		t.Error("Shouldn't ignore second time")
+	}
+	if !session.IsChatIgnored(3) {
+		t.Error("Should be ignored already")
+	}
+	if session.IsChatIgnored(-145) {
+		t.Error("Wrong chat is ignored")
+	}
+	if !session.UnignoreChat(3) {
+		t.Error("Should successfully unignore")
+	}
+	if session.UnignoreChat(3) {
+		t.Error("Should unignore second time")
+	}
+	if session.IsChatIgnored(3) {
+		t.Error("Shouldn't be ignored already")
+	}
+}

staging.Dockerfile

@@ -0,0 +1,46 @@
+FROM golang:1.19-bullseye AS base
+
+RUN apt-get update
+RUN apt-get install -y libssl-dev cmake build-essential gperf libz-dev make git php
+
+FROM base AS tdlib
+
+ARG TD_COMMIT
+ARG MAKEOPTS
+RUN git clone https://github.com/tdlib/td /src/
+RUN git -C /src/ checkout "${TD_COMMIT}"
+RUN mkdir build
+WORKDIR /build/
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/compiled/ /src/
+RUN cmake --build . --target prepare_cross_compiling ${MAKEOPTS}
+WORKDIR /src/
+RUN php SplitSource.php
+WORKDIR /build/
+RUN cmake --build . ${MAKEOPTS}
+RUN make install
+
+FROM base AS cache
+ARG VERSION
+COPY --from=tdlib /compiled/ /usr/local/
+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 \
+    go mod download
+
+FROM cache AS build
+ARG MAKEOPTS
+WORKDIR /src
+RUN --mount=type=bind,source=./,target=/src,rw \
+    --mount=type=cache,target=/go-cache \
+    --mount=type=cache,target=/gomod-cache \
+    --mount=type=cache,destination=/src/release \
+    make ${MAKEOPTS}
+
+FROM build AS release
+RUN --mount=type=cache,destination=/src/release \
+    cp /src/release/telegabber /
+
+FROM scratch AS binaries
+COPY --from=release /telegabber /

tdlib.Dockerfile

@@ -0,0 +1,23 @@
+FROM golang:1.19-bullseye AS base
+
+RUN apt-get update
+RUN apt-get install -y libssl-dev cmake build-essential gperf libz-dev make git php
+
+FROM base AS tdlib
+
+ARG TD_COMMIT
+ARG MAKEOPTS
+RUN git clone https://github.com/tdlib/td /src/
+RUN git -C /src/ checkout "${TD_COMMIT}"
+RUN mkdir build
+WORKDIR /build/
+RUN cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/compiled/ /src/
+RUN cmake --build . --target prepare_cross_compiling ${MAKEOPTS}
+WORKDIR /src/
+RUN php SplitSource.php
+WORKDIR /build/
+RUN cmake --build . ${MAKEOPTS}
+RUN make install
+
+FROM scratch AS binaries
+COPY --from=tdlib /compiled/ /

telegabber.go

@@ -12,10 +12,11 @@ import (
 	"dev.narayana.im/narayana/telegabber/xmpp"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/zelenin/go-tdlib/client"
 	goxmpp "gosrc.io/xmpp"
 )
 
-var version string = "1.5.0"
+var version string = "1.9.6"
 var commit string
 
 var sm *goxmpp.StreamManager
@@ -35,6 +36,8 @@ func main() {
 	var configPath = flag.String("config", "config.yml", "Config file path")
 	// JSON schema (not for editing by a user)
 	var schemaPath = flag.String("schema", "./config_schema.json", "Schema file path")
+	// Folder for Badger DB of message ids
+	var idsPath = flag.String("ids", "ids", "Ids folder path")
 	var versionFlag = flag.Bool("version", false, "Print the version and exit")
 	flag.Parse()
 
@@ -58,11 +61,14 @@ func main() {
 		log.Fatal(err)
 	}
 
+	client.SetLogVerbosityLevel(&client.SetLogVerbosityLevelRequest{
+		NewVerbosityLevel: stringToTdlibLogConstant(config.Telegram.Loglevel),
+	})
 	SetLogrusLevel(config.XMPP.Loglevel)
 
 	log.Infof("Starting telegabber version %v", version)
 
-	sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram)
+	sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram, *idsPath)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -87,6 +93,25 @@ func main() {
 	}
 }
 
+var tdlibLogConstants = map[string]int32{
+	":fatal":   0,
+	":error":   1,
+	":warn":    2,
+	":info":    3,
+	":debug":   4,
+	":verbose": 5,
+	":all":     1023,
+}
+
+func stringToTdlibLogConstant(c string) int32 {
+	level, ok := tdlibLogConstants[c]
+	if !ok {
+		level = 0
+	}
+
+	return level
+}
+
 func exit() {
 	xmpp.Close(component)
 	close(cleanupDone)

telegabber_test.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestTdlibLogInfo(t *testing.T) {
+	tdlibConstant := stringToTdlibLogConstant(":info")
+	if tdlibConstant != 3 {
+		t.Errorf("Wrong TDlib constant for info")
+	}
+}
+
+func TestTdlibLogInvalid(t *testing.T) {
+	tdlibConstant := stringToTdlibLogConstant("ziz")
+	if tdlibConstant != 0 {
+		t.Errorf("Unknown strings should return fatal loglevel")
+	}
+}

telegram/cache/cache.go

@@ -133,3 +133,13 @@ func (cache *Cache) SetStatus(id int64, show string, status string) {
 		Description: status,
 	}
 }
+
+// Destruct splits a cached status into show, description and type
+func (status *Status) Destruct() (show, description, typ string) {
+	show, description = status.XMPP, status.Description
+	if show == "unavailable" {
+		typ = show
+		show = ""
+	}
+	return
+}

telegram/client.go

@@ -2,6 +2,7 @@ package telegram
 
 import (
 	"github.com/pkg/errors"
+	"hash/maphash"
 	"path/filepath"
 	"strconv"
 	"sync"
@@ -15,25 +16,6 @@ import (
 	"gosrc.io/xmpp"
 )
 
-var logConstants = map[string]int32{
-	":fatal":   0,
-	":error":   1,
-	":warn":    2,
-	":info":    3,
-	":debug":   4,
-	":verbose": 5,
-	":all":     1023,
-}
-
-func stringToLogConstant(c string) int32 {
-	level, ok := logConstants[c]
-	if !ok {
-		level = 0
-	}
-
-	return level
-}
-
 // DelayedStatus describes an online status expiring on timeout
 type DelayedStatus struct {
 	TimestampOnline  int64
@@ -44,7 +26,7 @@ type DelayedStatus struct {
 type Client struct {
 	client     *client.Client
 	authorizer *clientAuthorizer
-	parameters *client.TdlibParameters
+	parameters *client.SetTdlibParametersRequest
 	options    []client.Option
 	me         *client.User
 
@@ -56,26 +38,37 @@ type Client struct {
 	cache     *cache.Cache
 	online    bool
 
+	outbox     map[string]string
+	editOutbox map[string]string
+
 	DelayedStatuses     map[int64]*DelayedStatus
 	DelayedStatusesLock sync.Mutex
 
-	locks clientLocks
+	lastMsgHashes map[int64]uint64
+	lastMsgIds    map[int64]string
+	msgHashSeed   maphash.Seed
+
+	locks           clientLocks
+	SendMessageLock sync.Mutex
 }
 
 type clientLocks struct {
 	authorizationReady sync.Mutex
 	chatMessageLocks   map[int64]*sync.Mutex
 	resourcesLock      sync.Mutex
+	outboxLock         sync.Mutex
+	editOutboxLock     sync.Mutex
+	lastMsgHashesLock  sync.Mutex
+	lastMsgIdsLock     sync.RWMutex
+
+	authorizerReadLock  sync.Mutex
+	authorizerWriteLock sync.Mutex
 }
 
 // NewClient instantiates a Telegram App
 func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component, session *persistence.Session) (*Client, error) {
 	var options []client.Option
 
-	options = append(options, client.WithLogVerbosity(&client.SetLogVerbosityLevelRequest{
-		NewVerbosityLevel: stringToLogConstant(conf.Loglevel),
-	}))
-
 	if conf.Tdlib.Client.CatchTimeout != 0 {
 		options = append(options, client.WithCatchTimeout(
 			time.Duration(conf.Tdlib.Client.CatchTimeout)*time.Second,
@@ -92,7 +85,7 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component
 		datadir = "./sessions/" // ye olde defaute
 	}
 
-	parameters := client.TdlibParameters{
+	parameters := client.SetTdlibParametersRequest{
 		UseTestDc: false,
 
 		DatabaseDirectory: filepath.Join(datadir, jid),
@@ -123,8 +116,13 @@ func NewClient(conf config.TelegramConfig, jid string, component *xmpp.Component
 		resources:       make(map[string]bool),
 		content:         &conf.Content,
 		cache:           cache.NewCache(),
+		outbox:          make(map[string]string),
+		editOutbox:      make(map[string]string),
 		options:         options,
 		DelayedStatuses: make(map[int64]*DelayedStatus),
+		lastMsgHashes:   make(map[int64]uint64),
+		lastMsgIds:      make(map[int64]string),
+		msgHashSeed:     maphash.MakeSeed(),
 		locks: clientLocks{
 			chatMessageLocks: make(map[int64]*sync.Mutex),
 		},

telegram/client_test.go

@@ -1,19 +0,0 @@
-package telegram
-
-import (
-	"testing"
-)
-
-func TestLogInfo(t *testing.T) {
-	tdlibConstant := stringToLogConstant(":info")
-	if tdlibConstant != 3 {
-		t.Errorf("Wrong TDlib constant for info")
-	}
-}
-
-func TestLogInvalid(t *testing.T) {
-	tdlibConstant := stringToLogConstant("ziz")
-	if tdlibConstant != 0 {
-		t.Errorf("Unknown strings should return fatal loglevel")
-	}
-}

telegram/commands.go

@@ -15,11 +15,11 @@ import (
 )
 
 const notEnoughArguments string = "Not enough arguments"
-const telegramNotInitialized string = "Telegram connection is not initialized yet"
+const TelegramNotInitialized string = "Telegram connection is not initialized yet"
+const TelegramAuthDone string = "Authorization is done already"
 const notOnline string = "Not online"
 
-var permissionsAdmin = client.ChatMemberStatusAdministrator{
+var permissionsAdmin = client.ChatAdministratorRights{
-	CanBeEdited:        true,
 	CanChangeInfo:      true,
 	CanPostMessages:    true,
 	CanEditMessages:    true,
@@ -30,20 +30,27 @@ var permissionsAdmin = client.ChatMemberStatusAdministrator{
 	CanPromoteMembers:  false,
 }
 var permissionsMember = client.ChatPermissions{
-	CanSendMessages:       true,
+	CanSendBasicMessages:  true,
-	CanSendMediaMessages:  true,
+	CanSendAudios:         true,
+	CanSendDocuments:      true,
+	CanSendPhotos:         true,
+	CanSendVideos:         true,
+	CanSendVideoNotes:     true,
+	CanSendVoiceNotes:     true,
 	CanSendPolls:          true,
 	CanSendOtherMessages:  true,
 	CanAddWebPagePreviews: true,
 	CanChangeInfo:         true,
 	CanInviteUsers:        true,
 	CanPinMessages:        true,
+	CanManageTopics:       true,
 }
 var permissionsReadonly = client.ChatPermissions{}
 
 var transportCommands = map[string]command{
 	"login":       command{"phone", "sign in"},
 	"logout":      command{"", "sign out"},
+	"cancelauth":  command{"", "quit the signin wizard"},
 	"code":        command{"", "check one-time code"},
 	"password":    command{"", "check 2fa password"},
 	"setusername": command{"", "update @username"},
@@ -64,6 +71,7 @@ var chatCommands = map[string]command{
 	"silent":     command{"message", "send a message without sound"},
 	"schedule":   command{"{online | 2006-01-02T15:04:05 | 15:04:05} message", "schedules a message either to timestamp or to whenever the user goes online"},
 	"forward":    command{"message_id target_chat", "forwards a message"},
+	"vcard":      command{"", "print vCard as text"},
 	"add":        command{"@username", "add @username to your chat list"},
 	"join":       command{"https://t.me/invite_link", "join to chat via invite link or @publicname"},
 	"group":      command{"title", "create groupchat «title» with current user"},
@@ -77,8 +85,8 @@ var chatCommands = map[string]command{
 	"invite":     command{"id or @username", "add user to current chat"},
 	"link":       command{"", "get invite link for current chat"},
 	"kick":       command{"id or @username", "remove user to current chat"},
-	"mute":       command{"id or @username [hours]", "mute user in current chat"},
+	"mute":       command{"[id or @username] [hours]", "mute the whole chat or a user in current chat"},
-	"unmute":     command{"id or @username", "unrestrict user from current chat"},
+	"unmute":     command{"[id or @username]", "unmute the whole chat or a user in the current chat"},
 	"ban":        command{"id or @username [hours]", "restrict @username from current chat for [hours] or forever"},
 	"unban":      command{"id or @username", "unbans @username in current chat (and devotes from admins)"},
 	"promote":    command{"id or @username [title]", "promote user to admin in current chat"},
@@ -172,19 +180,19 @@ func rawCmdArguments(cmdline string, start uint8) string {
 	return ""
 }
 
+func keyValueString(key, value string) string {
+	return fmt.Sprintf("%s: %s", key, value)
+}
+
 func (c *Client) unsubscribe(chatID int64) error {
-	return gateway.SendPresence(
+	args := gateway.SimplePresence(chatID, "unsubscribed")
-		c.xmpp,
+	return c.sendPresence(args...)
-		c.jid,
-		gateway.SPFrom(strconv.FormatInt(chatID, 10)),
-		gateway.SPType("unsubscribed"),
-	)
 }
 
 func (c *Client) sendMessagesReverse(chatID int64, messages []*client.Message) {
 	for i := len(messages) - 1; i >= 0; i-- {
 		message := messages[i]
-		reply, _ := c.getMessageReply(message)
+		reply, _ := c.getMessageReply(message, false, true)
 
 		gateway.SendMessage(
 			c.jid,
@@ -193,6 +201,8 @@ func (c *Client) sendMessagesReverse(chatID int64, messages []*client.Message) {
 			strconv.FormatInt(message.Id, 10),
 			c.xmpp,
 			reply,
+			"",
+			false,
 			false,
 		)
 	}
@@ -225,7 +235,7 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 	switch cmd {
 	case "login", "code", "password":
 		if cmd == "login" && c.Session.Login != "" {
-			return ""
+			return "Phone number already provided, use /cancelauth to start over"
 		}
 
 		if len(args) < 1 {
@@ -233,36 +243,35 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 		}
 
 		if cmd == "login" {
-			wasSessionLoginEmpty := c.Session.Login == ""
+			err := c.TryLogin(resource, args[0])
-			c.Session.Login = args[0]
+			if err != nil {
-
+				return err.Error()
-			if wasSessionLoginEmpty && c.authorizer == nil {
-				go func() {
-					err := c.Connect(resource)
-					if err != nil {
-						log.Error(errors.Wrap(err, "TDlib connection failure"))
-					}
-				}()
-				// a quirk for authorizer to become ready. If it's still not,
-				// nothing bad: the command just needs to be resent again
-				time.Sleep(1e5)
 			}
-		}
 
-		if c.authorizer == nil {
+			c.locks.authorizerWriteLock.Lock()
-			return telegramNotInitialized
+			defer c.locks.authorizerWriteLock.Unlock()
-		}
 
-		switch cmd {
-		// sign in
-		case "login":
 			c.authorizer.PhoneNumber <- args[0]
-		// check auth code
+		} else {
-		case "code":
+			c.locks.authorizerWriteLock.Lock()
-			c.authorizer.Code <- args[0]
+			defer c.locks.authorizerWriteLock.Unlock()
-		// check auth password
+
-		case "password":
+			if c.authorizer == nil {
-			c.authorizer.Password <- args[0]
+				return TelegramNotInitialized
+			}
+
+			if c.authorizer.isClosed {
+				return TelegramAuthDone
+			}
+
+			switch cmd {
+			// check auth code
+			case "code":
+				c.authorizer.Code <- args[0]
+			// check auth password
+			case "password":
+				c.authorizer.Password <- args[0]
+			}
 		}
 	// sign out
 	case "logout":
@@ -270,17 +279,23 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 			return notOnline
 		}
 
+		_, err := c.client.LogOut()
+		if err != nil {
+			return errors.Wrap(err, "Logout error").Error()
+		}
+
 		for _, id := range c.cache.ChatsKeys() {
 			c.unsubscribe(id)
 		}
 
-		_, err := c.client.LogOut()
-		if err != nil {
-			c.forceClose()
-			return errors.Wrap(err, "Logout error").Error()
-		}
-
 		c.Session.Login = ""
+	// cancel auth
+	case "cancelauth":
+		if c.Online() {
+			return "Not allowed when online, use /logout instead"
+		}
+		c.cancelAuth()
+		return "Cancelled"
 	// set @username
 	case "setusername":
 		if !c.Online() {
@@ -312,10 +327,13 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 			lastname = rawCmdArguments(cmdline, 1)
 		}
 
+		c.locks.authorizerWriteLock.Lock()
 		if c.authorizer != nil && !c.authorizer.isClosed {
 			c.authorizer.FirstName <- firstname
 			c.authorizer.LastName <- lastname
+			c.locks.authorizerWriteLock.Unlock()
 		} else {
+			c.locks.authorizerWriteLock.Unlock()
 			if !c.Online() {
 				return notOnline
 			}
@@ -362,7 +380,8 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 		}
 	case "config":
 		if len(args) > 1 {
-			if !gateway.MessageOutgoingPermission && args[0] == "carbons" && args[1] == "true" {
+			var msg string
+			if gateway.MessageOutgoingPermissionVersion == 0 && args[0] == "carbons" && args[1] == "true" {
 				return "The server did not allow to enable carbons"
 			}
 
@@ -372,7 +391,7 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 			}
 			gateway.DirtySessions = true
 
-			return fmt.Sprintf("%s set to %s", args[0], value)
+			return fmt.Sprintf("%s%s set to %s", msg, args[0], value)
 		} else if len(args) > 0 {
 			value, err := c.Session.Get(args[0])
 			if err != nil {
@@ -401,7 +420,7 @@ func (c *Client) ProcessTransportCommand(cmdline string, resource string) string
 		text := rawCmdArguments(cmdline, 1)
 		_, err = c.client.ReportChat(&client.ReportChatRequest{
 			ChatId: contact.Id,
-			Reason: &client.ChatReportReasonCustom{},
+			Reason: &client.ReportReasonCustom{},
 			Text:   text,
 		})
 		if err != nil {
@@ -493,14 +512,17 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 			return "Last message is empty", true
 		}
 
-		content := c.ProcessOutgoingMessage(0, rawCmdArguments(cmdline, 0), "", 0)
+		content := c.PrepareOutgoingMessageContent(rawCmdArguments(cmdline, 0))
 
 		if content != nil {
-			c.client.EditMessageText(&client.EditMessageTextRequest{
+			_, err = c.client.EditMessageText(&client.EditMessageTextRequest{
 				ChatId:              chatID,
 				MessageId:           message.Id,
 				InputMessageContent: content,
 			})
+			if err != nil {
+				return "Message editing error", true
+			}
 		} else {
 			return "Message processing error", true
 		}
@@ -510,7 +532,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 			return "Not enough arguments", true
 		}
 
-		content := c.ProcessOutgoingMessage(0, rawCmdArguments(cmdline, 0), "", 0)
+		content := c.PrepareOutgoingMessageContent(rawCmdArguments(cmdline, 0))
 
 		if content != nil {
 			_, err := c.client.SendMessage(&client.SendMessageRequest{
@@ -589,7 +611,7 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 			}
 		}
 
-		content := c.ProcessOutgoingMessage(0, rawCmdArguments(cmdline, 1), "", 0)
+		content := c.PrepareOutgoingMessageContent(rawCmdArguments(cmdline, 1))
 
 		if content != nil {
 			_, err := c.client.SendMessage(&client.SendMessageRequest{
@@ -636,6 +658,21 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 				c.ProcessIncomingMessage(targetChatId, message)
 			}
 		}
+	// print vCard
+	case "vcard":
+		info, err := c.GetVcardInfo(chatID)
+		if err != nil {
+			return err.Error(), true
+		}
+		_, link := c.PermastoreFile(info.Photo, true)
+		entries := []string{
+			keyValueString("Chat title", info.Fn),
+			keyValueString("Photo", link),
+			keyValueString("Usernames", c.usernamesToString(info.Nicknames)),
+			keyValueString("Full name", info.Given+" "+info.Family),
+			keyValueString("Phone number", info.Tel),
+		}
+		return strings.Join(entries, "\n"), true
 	// add @contact
 	case "add":
 		return c.cmdAdd(args), true
@@ -671,18 +708,18 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 		}
 	// blacklists current user
 	case "block":
-		_, err := c.client.ToggleMessageSenderIsBlocked(&client.ToggleMessageSenderIsBlockedRequest{
+		_, err := c.client.SetMessageSenderBlockList(&client.SetMessageSenderBlockListRequest{
 			SenderId:  &client.MessageSenderUser{UserId: chatID},
-			IsBlocked: true,
+			BlockList: &client.BlockListMain{},
 		})
 		if err != nil {
 			return err.Error(), true
 		}
 	// unblacklists current user
 	case "unblock":
-		_, err := c.client.ToggleMessageSenderIsBlocked(&client.ToggleMessageSenderIsBlockedRequest{
+		_, err := c.client.SetMessageSenderBlockList(&client.SetMessageSenderBlockListRequest{
 			SenderId:  &client.MessageSenderUser{UserId: chatID},
-			IsBlocked: false,
+			BlockList: nil,
 		})
 		if err != nil {
 			return err.Error(), true
@@ -734,59 +771,65 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 		if err != nil {
 			return err.Error(), true
 		}
-	// mute @username [n hours]
+	// mute [@username [n hours]]
 	case "mute":
-		if len(args) < 1 {
+		if len(args) > 0 {
-			return notEnoughArguments, true
+			contact, _, err := c.GetContactByUsername(args[0])
-		}
-
-		contact, _, err := c.GetContactByUsername(args[0])
-		if err != nil {
-			return err.Error(), true
-		}
-
-		var hours int64
-		if len(args) > 1 {
-			hours, err = strconv.ParseInt(args[1], 10, 32)
 			if err != nil {
-				return "Invalid number of hours", true
+				return err.Error(), true
 			}
-		}
 
-		_, err = c.client.SetChatMemberStatus(&client.SetChatMemberStatusRequest{
+			var hours int64
-			ChatId:   chatID,
+			if len(args) > 1 {
-			MemberId: &client.MessageSenderUser{UserId: contact.Id},
+				hours, err = strconv.ParseInt(args[1], 10, 32)
-			Status: &client.ChatMemberStatusRestricted{
+				if err != nil {
-				IsMember:            true,
+					return "Invalid number of hours", true
-				RestrictedUntilDate: c.formatBantime(hours),
+				}
-				Permissions:         &permissionsReadonly,
+			}
-			},
+
-		})
+			_, err = c.client.SetChatMemberStatus(&client.SetChatMemberStatusRequest{
-		if err != nil {
+				ChatId:   chatID,
-			return err.Error(), true
+				MemberId: &client.MessageSenderUser{UserId: contact.Id},
+				Status: &client.ChatMemberStatusRestricted{
+					IsMember:            true,
+					RestrictedUntilDate: c.formatBantime(hours),
+					Permissions:         &permissionsReadonly,
+				},
+			})
+			if err != nil {
+				return err.Error(), true
+			}
+		} else {
+			if !c.Session.IgnoreChat(chatID) {
+				return "Chat is already ignored", true
+			}
+			gateway.DirtySessions = true
 		}
-	// unmute @username
+	// unmute [@username]
 	case "unmute":
-		if len(args) < 1 {
+		if len(args) > 0 {
-			return notEnoughArguments, true
+			contact, _, err := c.GetContactByUsername(args[0])
-		}
+			if err != nil {
+				return err.Error(), true
+			}
 
-		contact, _, err := c.GetContactByUsername(args[0])
+			_, err = c.client.SetChatMemberStatus(&client.SetChatMemberStatusRequest{
-		if err != nil {
+				ChatId:   chatID,
-			return err.Error(), true
+				MemberId: &client.MessageSenderUser{UserId: contact.Id},
-		}
+				Status: &client.ChatMemberStatusRestricted{
-
+					IsMember:            true,
-		_, err = c.client.SetChatMemberStatus(&client.SetChatMemberStatusRequest{
+					RestrictedUntilDate: 0,
-			ChatId:   chatID,
+					Permissions:         &permissionsMember,
-			MemberId: &client.MessageSenderUser{UserId: contact.Id},
+				},
-			Status: &client.ChatMemberStatusRestricted{
+			})
-				IsMember:            true,
+			if err != nil {
-				RestrictedUntilDate: 0,
+				return err.Error(), true
-				Permissions:         &permissionsMember,
+			}
-			},
+		} else {
-		})
+			if !c.Session.UnignoreChat(chatID) {
-		if err != nil {
+				return "Chat wasn't ignored", true
-			return err.Error(), true
+			}
+			gateway.DirtySessions = true
 		}
 	// ban @username from current chat [for N hours]
 	case "ban":
@@ -848,7 +891,10 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 		}
 
 		// clone the permissions
-		status := permissionsAdmin
+		status := client.ChatMemberStatusAdministrator{
+			CanBeEdited: true,
+			Rights:      &permissionsAdmin,
+		}
 
 		if len(args) > 1 {
 			status.CustomTitle = args[1]
@@ -898,9 +944,9 @@ func (c *Client) ProcessChatCommand(chatID int64, cmdline string) (string, bool)
 				return "Invalid TTL", true
 			}
 		}
-		_, err = c.client.SetChatMessageTtl(&client.SetChatMessageTtlRequest{
+		_, err = c.client.SetChatMessageAutoDeleteTime(&client.SetChatMessageAutoDeleteTimeRequest{
-			ChatId: chatID,
+			ChatId:                chatID,
-			Ttl:    int32(ttl),
+			MessageAutoDeleteTime: int32(ttl),
 		})
 
 		if err != nil {

telegram/connect.go

@@ -2,7 +2,7 @@ package telegram
 
 import (
 	"github.com/pkg/errors"
-	"strconv"
+	"time"
 
 	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
 
@@ -13,7 +13,7 @@ import (
 const chatsLimit int32 = 999
 
 type clientAuthorizer struct {
-	TdlibParameters chan *client.TdlibParameters
+	TdlibParameters chan *client.SetTdlibParametersRequest
 	PhoneNumber     chan string
 	Code            chan string
 	State           chan client.AuthorizationState
@@ -24,17 +24,14 @@ type clientAuthorizer struct {
 }
 
 func (stateHandler *clientAuthorizer) Handle(c *client.Client, state client.AuthorizationState) error {
+	if stateHandler.isClosed {
+		return errors.New("Channel is closed")
+	}
 	stateHandler.State <- state
 
 	switch state.AuthorizationStateType() {
 	case client.TypeAuthorizationStateWaitTdlibParameters:
-		_, err := c.SetTdlibParameters(&client.SetTdlibParametersRequest{
+		_, err := c.SetTdlibParameters(<-stateHandler.TdlibParameters)
-			Parameters: <-stateHandler.TdlibParameters,
-		})
-		return err
-
-	case client.TypeAuthorizationStateWaitEncryptionKey:
-		_, err := c.CheckDatabaseEncryptionKey(&client.CheckDatabaseEncryptionKeyRequest{})
 		return err
 
 	case client.TypeAuthorizationStateWaitPhoneNumber:
@@ -71,10 +68,10 @@ func (stateHandler *clientAuthorizer) Handle(c *client.Client, state client.Auth
 		return nil
 
 	case client.TypeAuthorizationStateLoggingOut:
-		return client.ErrNotSupportedAuthorizationState
+		return nil
 
 	case client.TypeAuthorizationStateClosing:
-		return client.ErrNotSupportedAuthorizationState
+		return nil
 
 	case client.TypeAuthorizationStateClosed:
 		return client.ErrNotSupportedAuthorizationState
@@ -84,6 +81,9 @@ func (stateHandler *clientAuthorizer) Handle(c *client.Client, state client.Auth
 }
 
 func (stateHandler *clientAuthorizer) Close() {
+	if stateHandler.isClosed {
+		return
+	}
 	stateHandler.isClosed = true
 	close(stateHandler.TdlibParameters)
 	close(stateHandler.PhoneNumber)
@@ -109,8 +109,9 @@ func (c *Client) Connect(resource string) error {
 
 	log.Warn("Connecting to Telegram network...")
 
+	c.locks.authorizerWriteLock.Lock()
 	c.authorizer = &clientAuthorizer{
-		TdlibParameters: make(chan *client.TdlibParameters, 1),
+		TdlibParameters: make(chan *client.SetTdlibParametersRequest, 1),
 		PhoneNumber:     make(chan string, 1),
 		Code:            make(chan string, 1),
 		State:           make(chan client.AuthorizationState, 10),
@@ -120,8 +121,10 @@ func (c *Client) Connect(resource string) error {
 	}
 
 	go c.interactor()
+	log.Warn("Interactor launched")
 
 	c.authorizer.TdlibParameters <- c.parameters
+	c.locks.authorizerWriteLock.Unlock()
 
 	tdlibClient, err := client.NewClient(c.authorizer, c.options...)
 	if err != nil {
@@ -154,14 +157,55 @@ func (c *Client) Connect(resource string) error {
 			log.Errorf("Could not retrieve chats: %v", err)
 		}
 
-		gateway.SendPresence(c.xmpp, c.jid, gateway.SPType("subscribe"))
+		gateway.SubscribeToTransport(c.xmpp, c.jid)
-		gateway.SendPresence(c.xmpp, c.jid, gateway.SPType("subscribed"))
+		c.sendPresence(gateway.SPStatus("Logged in as: " + c.Session.Login))
-		gateway.SendPresence(c.xmpp, c.jid, gateway.SPStatus("Logged in as: "+c.Session.Login))
 	}()
 
 	return nil
 }
 
+func (c *Client) TryLogin(resource string, login string) error {
+	wasSessionLoginEmpty := c.Session.Login == ""
+	c.Session.Login = login
+
+	if wasSessionLoginEmpty && c.authorizer == nil {
+		go func() {
+			err := c.Connect(resource)
+			if err != nil {
+				log.Error(errors.Wrap(err, "TDlib connection failure"))
+			}
+		}()
+		// a quirk for authorizer to become ready. If it's still not,
+		// nothing bad: just re-login again
+		time.Sleep(1e5)
+	}
+
+	c.locks.authorizerWriteLock.Lock()
+	defer c.locks.authorizerWriteLock.Unlock()
+
+	if c.authorizer == nil {
+		return errors.New(TelegramNotInitialized)
+	}
+
+	if c.authorizer.isClosed {
+		return errors.New(TelegramAuthDone)
+	}
+
+	return nil
+}
+
+func (c *Client) SetPhoneNumber(login string) error {
+	c.locks.authorizerWriteLock.Lock()
+	defer c.locks.authorizerWriteLock.Unlock()
+
+	if c.authorizer == nil || c.authorizer.isClosed {
+		return errors.New("Authorization not needed")
+	}
+
+	c.authorizer.PhoneNumber <- login
+	return nil
+}
+
 // Disconnect drops TDlib connection and
 // returns the flag indicating if disconnecting is permitted
 func (c *Client) Disconnect(resource string, quit bool) bool {
@@ -183,28 +227,27 @@ func (c *Client) Disconnect(resource string, quit bool) bool {
 
 	// we're offline (unsubscribe if logout)
 	for _, id := range c.cache.ChatsKeys() {
-		gateway.SendPresence(
+		args := gateway.SimplePresence(id, "unavailable")
-			c.xmpp,
+		c.sendPresence(args...)
-			c.jid,
-			gateway.SPFrom(strconv.FormatInt(id, 10)),
-			gateway.SPType("unavailable"),
-		)
 	}
 
-	_, err := c.client.Close()
+	c.close()
-	if err != nil {
-		log.Errorf("Couldn't close the Telegram instance: %v; %#v", err, c)
-	}
-	c.forceClose()
 
 	return true
 }
 
 func (c *Client) interactor() {
 	for {
+		c.locks.authorizerReadLock.Lock()
+		if c.authorizer == nil {
+			log.Warn("Authorizer is lost, halting the interactor")
+			c.locks.authorizerReadLock.Unlock()
+			return
+		}
 		state, ok := <-c.authorizer.State
 		if !ok {
 			log.Warn("Interactor is disconnected")
+			c.locks.authorizerReadLock.Unlock()
 			return
 		}
 
@@ -234,14 +277,41 @@ func (c *Client) interactor() {
 			log.Warn("Waiting for 2FA password...")
 			gateway.SendServiceMessage(c.jid, "Please, enter 2FA passphrase via /password 12345", c.xmpp)
 		}
+		c.locks.authorizerReadLock.Unlock()
 	}
 }
 
 func (c *Client) forceClose() {
+	c.locks.authorizerReadLock.Lock()
+	c.locks.authorizerWriteLock.Lock()
+	defer c.locks.authorizerReadLock.Unlock()
+	defer c.locks.authorizerWriteLock.Unlock()
+
 	c.online = false
 	c.authorizer = nil
 }
 
+func (c *Client) close() {
+	c.locks.authorizerWriteLock.Lock()
+	if c.authorizer != nil && !c.authorizer.isClosed {
+		c.authorizer.Close()
+	}
+	c.locks.authorizerWriteLock.Unlock()
+
+	if c.client != nil {
+		_, err := c.client.Close()
+		if err != nil {
+			log.Errorf("Couldn't close the Telegram instance: %v; %#v", err, c)
+		}
+	}
+	c.forceClose()
+}
+
+func (c *Client) cancelAuth() {
+	c.close()
+	c.Session.Login = ""
+}
+
 // Online checks if the updates listener is alive
 func (c *Client) Online() bool {
 	return c.online

telegram/formatter/formatter.go

@@ -8,15 +8,31 @@ import (
 	"github.com/zelenin/go-tdlib/client"
 )
 
-// Insertion is a piece of text in given position
+type insertionType int
-type Insertion struct {
+
+const (
+	insertionOpening insertionType = iota
+	insertionClosing
+	insertionUnpaired
+)
+
+type MarkupModeType int
+
+const (
+	MarkupModeXEP0393 MarkupModeType = iota
+	MarkupModeMarkdown
+)
+
+// insertion is a piece of text in given position
+type insertion struct {
 	Offset int32
 	Runes  []rune
+	Type   insertionType
 }
 
-// InsertionStack contains the sequence of insertions
+// insertionStack contains the sequence of insertions
 // from the start or from the end
-type InsertionStack []*Insertion
+type insertionStack []*insertion
 
 var boldRunesMarkdown = []rune("**")
 var boldRunesXEP0393 = []rune("*")
@@ -24,13 +40,18 @@ var italicRunes = []rune("_")
 var strikeRunesMarkdown = []rune("~~")
 var strikeRunesXEP0393 = []rune("~")
 var codeRunes = []rune("`")
-var preRuneStart = []rune("```\n")
+var preRunesStart = []rune("```\n")
-var preRuneEnd = []rune("\n```")
+var preRunesEnd = []rune("\n```")
+var quoteRunes = []rune("> ")
+var newlineRunes = []rune("\n")
+var doubleNewlineRunes = []rune("\n\n")
+var newlineCode = rune(0x0000000a)
+var bmpCeil = rune(0x0000ffff)
 
 // rebalance pumps all the values until the given offset to current stack (growing
 // from start) from given stack (growing from end); should be called
 // before any insertions to the current stack at the given offset
-func (s InsertionStack) rebalance(s2 InsertionStack, offset int32) (InsertionStack, InsertionStack) {
+func (s insertionStack) rebalance(s2 insertionStack, offset int32) (insertionStack, insertionStack) {
 	for len(s2) > 0 && s2[len(s2)-1].Offset <= offset {
 		s = append(s, s2[len(s2)-1])
 		s2 = s2[:len(s2)-1]
@@ -41,10 +62,10 @@ func (s InsertionStack) rebalance(s2 InsertionStack, offset int32) (InsertionSta
 
 // NewIterator is a second order function that sequentially scans and returns
 // stack elements; starts returning nil when elements are ended
-func (s InsertionStack) NewIterator() func() *Insertion {
+func (s insertionStack) NewIterator() func() *insertion {
 	i := -1
 
-	return func() *Insertion {
+	return func() *insertion {
 		i++
 		if i < len(s) {
 			return s[i]
@@ -120,21 +141,10 @@ func MergeAdjacentEntities(entities []*client.TextEntity) []*client.TextEntity {
 }
 
 // ClaspDirectives to the following span as required by XEP-0393
-func ClaspDirectives(text string, entities []*client.TextEntity) []*client.TextEntity {
+func ClaspDirectives(doubledRunes []rune, entities []*client.TextEntity) []*client.TextEntity {
 	alignedEntities := make([]*client.TextEntity, len(entities))
 	copy(alignedEntities, entities)
 
-	// transform the source text into a form with uniform runes and code points,
-	// by duplicating the Basic Multilingual Plane
-	doubledRunes := make([]rune, 0, len(text)*2)
-
-	for _, cp := range text {
-		if cp > 0x0000ffff {
-			doubledRunes = append(doubledRunes, cp, cp)
-		} else {
-			doubledRunes = append(doubledRunes, cp)
-		}
-	}
 	for i, entity := range alignedEntities {
 		var dirty bool
 		endOffset := entity.Offset + entity.Length
@@ -167,18 +177,89 @@ func ClaspDirectives(text string, entities []*client.TextEntity) []*client.TextE
 	return alignedEntities
 }
 
-func markupBraces(entity *client.TextEntity, lbrace, rbrace []rune) (*Insertion, *Insertion) {
+func markupBraces(entity *client.TextEntity, lbrace, rbrace []rune) []*insertion {
-	return &Insertion{
+	return []*insertion{
+		&insertion{
 			Offset: entity.Offset,
 			Runes:  lbrace,
-		}, &Insertion{
+			Type:   insertionOpening,
+		},
+		&insertion{
 			Offset: entity.Offset + entity.Length,
 			Runes:  rbrace,
-		}
+			Type:   insertionClosing,
+		},
+	}
 }
 
-// EntityToMarkdown generates the wrapping Markdown tags
+func quotePrependNewlines(entity *client.TextEntity, doubledRunes []rune, markupMode MarkupModeType) []*insertion {
-func EntityToMarkdown(entity *client.TextEntity) (*Insertion, *Insertion) {
+	if len(doubledRunes) == 0 {
+		return []*insertion{}
+	}
+
+	startRunes := []rune("\n> ")
+	if entity.Offset == 0 || doubledRunes[entity.Offset-1] == newlineCode {
+		startRunes = quoteRunes
+	}
+	insertions := []*insertion{
+		&insertion{
+			Offset: entity.Offset,
+			Runes:  startRunes,
+			Type:   insertionUnpaired,
+		},
+	}
+
+	entityEnd := entity.Offset + entity.Length
+	entityEndInt := int(entityEnd)
+
+	var wasNewline bool
+	// last newline is omitted, there's no need to put quote mark after the quote
+	for i := entity.Offset; i < entityEnd-1; i++ {
+		isNewline := doubledRunes[i] == newlineCode
+		if (isNewline && markupMode == MarkupModeXEP0393) || (wasNewline && isNewline && markupMode == MarkupModeMarkdown) {
+			insertions = append(insertions, &insertion{
+				Offset: i + 1,
+				Runes:  quoteRunes,
+				Type:   insertionUnpaired,
+			})
+		}
+
+		if isNewline {
+			wasNewline = true
+		} else {
+			wasNewline = false
+		}
+	}
+
+	var rbrace []rune
+	if len(doubledRunes) > entityEndInt {
+		if doubledRunes[entityEnd] == newlineCode {
+			if markupMode == MarkupModeMarkdown && len(doubledRunes) > entityEndInt+1 && doubledRunes[entityEndInt+1] != newlineCode {
+				rbrace = newlineRunes
+			}
+		} else {
+			if markupMode == MarkupModeMarkdown {
+				rbrace = doubleNewlineRunes
+			} else {
+				rbrace = newlineRunes
+			}
+		}
+	}
+	insertions = append(insertions, &insertion{
+		Offset: entityEnd,
+		Runes:  rbrace,
+		Type:   insertionClosing,
+	})
+
+	return insertions
+}
+
+// entityToMarkdown generates the wrapping Markdown tags
+func entityToMarkdown(entity *client.TextEntity, doubledRunes []rune, markupMode MarkupModeType) []*insertion {
+	if entity == nil || entity.Type == nil {
+		return []*insertion{}
+	}
+
 	switch entity.Type.TextEntityTypeType() {
 	case client.TypeTextEntityTypeBold:
 		return markupBraces(entity, boldRunesMarkdown, boldRunesMarkdown)
@@ -189,22 +270,24 @@ func EntityToMarkdown(entity *client.TextEntity) (*Insertion, *Insertion) {
 	case client.TypeTextEntityTypeCode:
 		return markupBraces(entity, codeRunes, codeRunes)
 	case client.TypeTextEntityTypePre:
-		return markupBraces(entity, preRuneStart, preRuneEnd)
+		return markupBraces(entity, preRunesStart, preRunesEnd)
 	case client.TypeTextEntityTypePreCode:
 		preCode, _ := entity.Type.(*client.TextEntityTypePreCode)
-		return markupBraces(entity, []rune("\n```"+preCode.Language+"\n"), codeRunes)
+		return markupBraces(entity, []rune("\n```"+preCode.Language+"\n"), preRunesEnd)
+	case client.TypeTextEntityTypeBlockQuote:
+		return quotePrependNewlines(entity, doubledRunes, MarkupModeMarkdown)
 	case client.TypeTextEntityTypeTextUrl:
 		textURL, _ := entity.Type.(*client.TextEntityTypeTextUrl)
 		return markupBraces(entity, []rune("["), []rune("]("+textURL.Url+")"))
 	}
 
-	return nil, nil
+	return []*insertion{}
 }
 
-// EntityToXEP0393 generates the wrapping XEP-0393 tags
+// entityToXEP0393 generates the wrapping XEP-0393 tags
-func EntityToXEP0393(entity *client.TextEntity) (*Insertion, *Insertion) {
+func entityToXEP0393(entity *client.TextEntity, doubledRunes []rune, markupMode MarkupModeType) []*insertion {
 	if entity == nil || entity.Type == nil {
-		return nil, nil
+		return []*insertion{}
 	}
 
 	switch entity.Type.TextEntityTypeType() {
@@ -217,33 +300,59 @@ func EntityToXEP0393(entity *client.TextEntity) (*Insertion, *Insertion) {
 	case client.TypeTextEntityTypeCode:
 		return markupBraces(entity, codeRunes, codeRunes)
 	case client.TypeTextEntityTypePre:
-		return markupBraces(entity, preRuneStart, preRuneEnd)
+		return markupBraces(entity, preRunesStart, preRunesEnd)
 	case client.TypeTextEntityTypePreCode:
 		preCode, _ := entity.Type.(*client.TextEntityTypePreCode)
-		return markupBraces(entity, []rune("\n```"+preCode.Language+"\n"), codeRunes)
+		return markupBraces(entity, []rune("\n```"+preCode.Language+"\n"), preRunesEnd)
+	case client.TypeTextEntityTypeBlockQuote:
+		return quotePrependNewlines(entity, doubledRunes, MarkupModeXEP0393)
 	case client.TypeTextEntityTypeTextUrl:
 		textURL, _ := entity.Type.(*client.TextEntityTypeTextUrl)
 		// non-standard, Pidgin-specific
 		return markupBraces(entity, []rune{}, []rune(" <"+textURL.Url+">"))
 	}
 
-	return nil, nil
+	return []*insertion{}
+}
+
+// transform the source text into a form with uniform runes and code points,
+// by duplicating anything beyond the Basic Multilingual Plane
+func textToDoubledRunes(text string) []rune {
+	doubledRunes := make([]rune, 0, len(text)*2)
+	for _, cp := range text {
+		if cp > bmpCeil {
+			doubledRunes = append(doubledRunes, cp, cp)
+		} else {
+			doubledRunes = append(doubledRunes, cp)
+		}
+	}
+
+	return doubledRunes
 }
 
 // Format traverses an already sorted list of entities and wraps the text in a markup
 func Format(
 	sourceText string,
 	entities []*client.TextEntity,
-	entityToMarkup func(*client.TextEntity) (*Insertion, *Insertion),
+	markupMode MarkupModeType,
 ) string {
 	if len(entities) == 0 {
 		return sourceText
 	}
 
-	mergedEntities := SortEntities(ClaspDirectives(sourceText, MergeAdjacentEntities(SortEntities(entities))))
+	var entityToMarkup func(*client.TextEntity, []rune, MarkupModeType) []*insertion
+	if markupMode == MarkupModeXEP0393 {
+		entityToMarkup = entityToXEP0393
+	} else {
+		entityToMarkup = entityToMarkdown
+	}
 
-	startStack := make(InsertionStack, 0, len(sourceText))
+	doubledRunes := textToDoubledRunes(sourceText)
-	endStack := make(InsertionStack, 0, len(sourceText))
+
+	mergedEntities := SortEntities(ClaspDirectives(doubledRunes, MergeAdjacentEntities(SortEntities(entities))))
+
+	startStack := make(insertionStack, 0, len(sourceText))
+	endStack := make(insertionStack, 0, len(sourceText))
 
 	// convert entities to a stack of brackets
 	var maxEndOffset int32
@@ -260,36 +369,70 @@ func Format(
 
 		startStack, endStack = startStack.rebalance(endStack, entity.Offset)
 
-		startInsertion, endInsertion := entityToMarkup(entity)
+		insertions := entityToMarkup(entity, doubledRunes, markupMode)
-		if startInsertion != nil {
+		if len(insertions) > 1 {
-			startStack = append(startStack, startInsertion)
+			startStack = append(startStack, insertions[0:len(insertions)-1]...)
 		}
-		if endInsertion != nil {
+		if len(insertions) > 0 {
-			endStack = append(endStack, endInsertion)
+			endStack = append(endStack, insertions[len(insertions)-1])
 		}
 	}
 	// flush the closing brackets that still remain in endStack
 	startStack, endStack = startStack.rebalance(endStack, maxEndOffset)
+	// sort unpaired insertions
+	sort.SliceStable(startStack, func(i int, j int) bool {
+		ins1 := startStack[i]
+		ins2 := startStack[j]
+		if ins1.Type == insertionUnpaired && ins2.Type == insertionUnpaired {
+			return ins1.Offset < ins2.Offset
+		}
+		if ins1.Type == insertionUnpaired {
+			if ins1.Offset == ins2.Offset {
+				if ins2.Type == insertionOpening { // > **
+					return true
+				} else if ins2.Type == insertionClosing { // **>
+					return false
+				}
+			} else {
+				return ins1.Offset < ins2.Offset
+			}
+		}
+		if ins2.Type == insertionUnpaired {
+			if ins1.Offset == ins2.Offset {
+				if ins1.Type == insertionOpening { // > **
+					return false
+				} else if ins1.Type == insertionClosing { // **>
+					return true
+				}
+			} else {
+				return ins1.Offset < ins2.Offset
+			}
+		}
+		return false
+	})
 
 	// merge brackets into text
 	markupRunes := make([]rune, 0, len(sourceText))
 
 	nextInsertion := startStack.NewIterator()
 	insertion := nextInsertion()
-	var runeI int32
+	var skipNext bool
 
-	for _, cp := range sourceText {
+	for i, cp := range doubledRunes {
-		for insertion != nil && insertion.Offset <= runeI {
+		if skipNext {
+			skipNext = false
+			continue
+		}
+
+		for insertion != nil && int(insertion.Offset) <= i {
 			markupRunes = append(markupRunes, insertion.Runes...)
 			insertion = nextInsertion()
 		}
 
 		markupRunes = append(markupRunes, cp)
 		// skip two UTF-16 code units (not points actually!) if needed
-		if cp > 0x0000ffff {
+		if cp > bmpCeil {
-			runeI += 2
+			skipNext = true
-		} else {
-			runeI++
 		}
 	}
 	for insertion != nil {

telegram/formatter/formatter_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestNoFormatting(t *testing.T) {
-	markup := Format("abc\ndef", []*client.TextEntity{}, EntityToMarkdown)
+	markup := Format("abc\ndef", []*client.TextEntity{}, MarkupModeMarkdown)
 	if markup != "abc\ndef" {
 		t.Errorf("No formatting expected, but: %v", markup)
 	}
@@ -20,7 +20,7 @@ func TestFormattingSimple(t *testing.T) {
 			Length: 4,
 			Type:   &client.TextEntityTypeBold{},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown)
 	if markup != "👙**🐧🐖**" {
 		t.Errorf("Wrong simple formatting: %v", markup)
 	}
@@ -40,7 +40,7 @@ func TestFormattingAdjacent(t *testing.T) {
 				Url: "https://narayana.im/",
 			},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown)
 	if markup != "a👙_🐧_[🐖](https://narayana.im/)" {
 		t.Errorf("Wrong adjacent formatting: %v", markup)
 	}
@@ -63,18 +63,18 @@ func TestFormattingAdjacentAndNested(t *testing.T) {
 			Length: 2,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown)
 	if markup != "```\n**👙**🐧\n```_🐖_" {
 		t.Errorf("Wrong adjacent&nested formatting: %v", markup)
 	}
 }
 
 func TestRebalanceTwoZero(t *testing.T) {
-	s1 := InsertionStack{
+	s1 := insertionStack{
-		&Insertion{Offset: 7},
+		&insertion{Offset: 7},
-		&Insertion{Offset: 8},
+		&insertion{Offset: 8},
 	}
-	s2 := InsertionStack{}
+	s2 := insertionStack{}
 	s1, s2 = s1.rebalance(s2, 7)
 	if !(len(s1) == 2 && len(s2) == 0 && s1[0].Offset == 7 && s1[1].Offset == 8) {
 		t.Errorf("Wrong rebalance 2–0: %#v %#v", s1, s2)
@@ -82,13 +82,13 @@ func TestRebalanceTwoZero(t *testing.T) {
 }
 
 func TestRebalanceNeeded(t *testing.T) {
-	s1 := InsertionStack{
+	s1 := insertionStack{
-		&Insertion{Offset: 7},
+		&insertion{Offset: 7},
-		&Insertion{Offset: 8},
+		&insertion{Offset: 8},
 	}
-	s2 := InsertionStack{
+	s2 := insertionStack{
-		&Insertion{Offset: 10},
+		&insertion{Offset: 10},
-		&Insertion{Offset: 9},
+		&insertion{Offset: 9},
 	}
 	s1, s2 = s1.rebalance(s2, 9)
 	if !(len(s1) == 3 && len(s2) == 1 &&
@@ -99,13 +99,13 @@ func TestRebalanceNeeded(t *testing.T) {
 }
 
 func TestRebalanceNotNeeded(t *testing.T) {
-	s1 := InsertionStack{
+	s1 := insertionStack{
-		&Insertion{Offset: 7},
+		&insertion{Offset: 7},
-		&Insertion{Offset: 8},
+		&insertion{Offset: 8},
 	}
-	s2 := InsertionStack{
+	s2 := insertionStack{
-		&Insertion{Offset: 10},
+		&insertion{Offset: 10},
-		&Insertion{Offset: 9},
+		&insertion{Offset: 9},
 	}
 	s1, s2 = s1.rebalance(s2, 8)
 	if !(len(s1) == 2 && len(s2) == 2 &&
@@ -116,13 +116,13 @@ func TestRebalanceNotNeeded(t *testing.T) {
 }
 
 func TestRebalanceLate(t *testing.T) {
-	s1 := InsertionStack{
+	s1 := insertionStack{
-		&Insertion{Offset: 7},
+		&insertion{Offset: 7},
-		&Insertion{Offset: 8},
+		&insertion{Offset: 8},
 	}
-	s2 := InsertionStack{
+	s2 := insertionStack{
-		&Insertion{Offset: 10},
+		&insertion{Offset: 10},
-		&Insertion{Offset: 9},
+		&insertion{Offset: 9},
 	}
 	s1, s2 = s1.rebalance(s2, 10)
 	if !(len(s1) == 4 && len(s2) == 0 &&
@@ -133,7 +133,7 @@ func TestRebalanceLate(t *testing.T) {
 }
 
 func TestIteratorEmpty(t *testing.T) {
-	s := InsertionStack{}
+	s := insertionStack{}
 	g := s.NewIterator()
 	v := g()
 	if v != nil {
@@ -142,9 +142,9 @@ func TestIteratorEmpty(t *testing.T) {
 }
 
 func TestIterator(t *testing.T) {
-	s := InsertionStack{
+	s := insertionStack{
-		&Insertion{Offset: 7},
+		&insertion{Offset: 7},
-		&Insertion{Offset: 8},
+		&insertion{Offset: 8},
 	}
 	g := s.NewIterator()
 	v := g()
@@ -208,7 +208,7 @@ func TestSortEmpty(t *testing.T) {
 }
 
 func TestNoFormattingXEP0393(t *testing.T) {
-	markup := Format("abc\ndef", []*client.TextEntity{}, EntityToXEP0393)
+	markup := Format("abc\ndef", []*client.TextEntity{}, MarkupModeXEP0393)
 	if markup != "abc\ndef" {
 		t.Errorf("No formatting expected, but: %v", markup)
 	}
@@ -221,7 +221,7 @@ func TestFormattingXEP0393Simple(t *testing.T) {
 			Length: 4,
 			Type:   &client.TextEntityTypeBold{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "👙*🐧🐖*" {
 		t.Errorf("Wrong simple formatting: %v", markup)
 	}
@@ -241,7 +241,7 @@ func TestFormattingXEP0393Adjacent(t *testing.T) {
 				Url: "https://narayana.im/",
 			},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "a👙_🐧_🐖 <https://narayana.im/>" {
 		t.Errorf("Wrong adjacent formatting: %v", markup)
 	}
@@ -264,7 +264,7 @@ func TestFormattingXEP0393AdjacentAndNested(t *testing.T) {
 			Length: 2,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "```\n*👙*🐧\n```_🐖_" {
 		t.Errorf("Wrong adjacent&nested formatting: %v", markup)
 	}
@@ -287,7 +287,7 @@ func TestFormattingXEP0393AdjacentItalicBoldItalic(t *testing.T) {
 			Length: 69,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "_раса двуногих крысолюдей, *которую так редко замечают, что многие отрицают само их существование*_" {
 		t.Errorf("Wrong adjacent italic/bold-italic formatting: %v", markup)
 	}
@@ -315,7 +315,7 @@ func TestFormattingXEP0393MultipleAdjacent(t *testing.T) {
 			Length: 1,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "a*bcd*_e_" {
 		t.Errorf("Wrong multiple adjacent formatting: %v", markup)
 	}
@@ -343,7 +343,7 @@ func TestFormattingXEP0393Intersecting(t *testing.T) {
 			Length: 1,
 			Type:   &client.TextEntityTypeBold{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "a*b*_*cd*e_" {
 		t.Errorf("Wrong intersecting formatting: %v", markup)
 	}
@@ -361,7 +361,7 @@ func TestFormattingXEP0393InlineCode(t *testing.T) {
 			Length: 25,
 			Type:   &client.TextEntityTypePre{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "Is `Gajim` a thing?\n\n```\necho 'Hello'\necho 'world'\n```\n\nhruck(" {
 		t.Errorf("Wrong intersecting formatting: %v", markup)
 	}
@@ -374,7 +374,7 @@ func TestFormattingMarkdownStrikethrough(t *testing.T) {
 			Length: 3,
 			Type:   &client.TextEntityTypeStrikethrough{},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown)
 	if markup != "Everyone ~~dis~~likes cake." {
 		t.Errorf("Wrong strikethrough formatting: %v", markup)
 	}
@@ -387,14 +387,14 @@ func TestFormattingXEP0393Strikethrough(t *testing.T) {
 			Length: 3,
 			Type:   &client.TextEntityTypeStrikethrough{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393)
 	if markup != "Everyone ~dis~likes cake." {
 		t.Errorf("Wrong strikethrough formatting: %v", markup)
 	}
 }
 
 func TestClaspLeft(t *testing.T) {
-	text := "a b c"
+	text := textToDoubledRunes("a b c")
 	entities := []*client.TextEntity{
 		&client.TextEntity{
 			Offset: 1,
@@ -409,7 +409,7 @@ func TestClaspLeft(t *testing.T) {
 }
 
 func TestClaspBoth(t *testing.T) {
-	text := "a b c"
+	text := textToDoubledRunes("a b c")
 	entities := []*client.TextEntity{
 		&client.TextEntity{
 			Offset: 1,
@@ -424,7 +424,7 @@ func TestClaspBoth(t *testing.T) {
 }
 
 func TestClaspNotNeeded(t *testing.T) {
-	text := " abc "
+	text := textToDoubledRunes(" abc ")
 	entities := []*client.TextEntity{
 		&client.TextEntity{
 			Offset: 1,
@@ -439,7 +439,7 @@ func TestClaspNotNeeded(t *testing.T) {
 }
 
 func TestClaspNested(t *testing.T) {
-	text := "a b c"
+	text := textToDoubledRunes("a b c")
 	entities := []*client.TextEntity{
 		&client.TextEntity{
 			Offset: 1,
@@ -459,7 +459,7 @@ func TestClaspNested(t *testing.T) {
 }
 
 func TestClaspEmoji(t *testing.T) {
-	text := "a 🐖 c"
+	text := textToDoubledRunes("a 🐖 c")
 	entities := []*client.TextEntity{
 		&client.TextEntity{
 			Offset: 1,
@@ -472,3 +472,111 @@ func TestClaspEmoji(t *testing.T) {
 		t.Errorf("Wrong claspemoji: %#v", entities)
 	}
 }
+
+func TestNoNewlineBlockquoteXEP0393(t *testing.T) {
+	markup := Format("yes it can i think", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 4,
+			Length: 6,
+			Type:   &client.TextEntityTypeBlockQuote{},
+		},
+	}, MarkupModeXEP0393)
+	if markup != "yes \n> it can\n i think" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}
+
+func TestNoNewlineBlockquoteMarkdown(t *testing.T) {
+	markup := Format("yes it can i think", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 4,
+			Length: 6,
+			Type:   &client.TextEntityTypeBlockQuote{},
+		},
+	}, MarkupModeMarkdown)
+	if markup != "yes \n> it can\n\n i think" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}
+
+func TestMultilineBlockquoteXEP0393(t *testing.T) {
+	markup := Format("hruck\npuck\n\nshuck\ntext", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 0,
+			Length: 17,
+			Type:   &client.TextEntityTypeBlockQuote{},
+		},
+	}, MarkupModeXEP0393)
+	if markup != "> hruck\n> puck\n> \n> shuck\ntext" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}
+
+func TestMultilineBlockquoteMarkdown(t *testing.T) {
+	markup := Format("hruck\npuck\n\nshuck\ntext", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 0,
+			Length: 17,
+			Type:   &client.TextEntityTypeBlockQuote{},
+		},
+	}, MarkupModeMarkdown)
+	if markup != "> hruck\npuck\n\n> shuck\n\ntext" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}
+
+func TestMixedBlockquoteXEP0393(t *testing.T) {
+	markup := Format("hruck\npuck\nshuck\ntext", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 0,
+			Length: 16,
+			Type:   &client.TextEntityTypeBlockQuote{},
+		},
+		&client.TextEntity{
+			Offset: 0,
+			Length: 16,
+			Type:   &client.TextEntityTypeBold{},
+		},
+		&client.TextEntity{
+			Offset: 0,
+			Length: 10,
+			Type:   &client.TextEntityTypeItalic{},
+		},
+		&client.TextEntity{
+			Offset: 7,
+			Length: 2,
+			Type:   &client.TextEntityTypeStrikethrough{},
+		},
+	}, MarkupModeXEP0393)
+	if markup != "> *_hruck\n> p~uc~k_\n> shuck*\ntext" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}
+
+func TestMixedBlockquoteMarkdown(t *testing.T) {
+	markup := Format("hruck\npuck\nshuck\ntext", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 0,
+			Length: 16,
+			Type:   &client.TextEntityTypeBlockQuote{},
+		},
+		&client.TextEntity{
+			Offset: 0,
+			Length: 16,
+			Type:   &client.TextEntityTypeBold{},
+		},
+		&client.TextEntity{
+			Offset: 0,
+			Length: 10,
+			Type:   &client.TextEntityTypeItalic{},
+		},
+		&client.TextEntity{
+			Offset: 7,
+			Length: 2,
+			Type:   &client.TextEntityTypeStrikethrough{},
+		},
+	}, MarkupModeMarkdown)
+	if markup != "> **_hruck\np~~uc~~k_\nshuck**\n\ntext" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}

telegram/handlers.go

@@ -55,6 +55,31 @@ func (c *Client) cleanTempFile(path string) {
 	}
 }
 
+func (c *Client) sendMarker(chatId, messageId int64, typ gateway.MarkerType) {
+	xmppId, err := gateway.IdsDB.GetByTgIds(c.Session.Login, c.jid, chatId, messageId)
+	if err != nil {
+		xmppId = strconv.FormatInt(messageId, 10)
+	}
+
+	var stringType string
+	if typ == gateway.MarkerTypeReceived {
+		stringType = "received"
+	} else if typ == gateway.MarkerTypeDisplayed {
+		stringType = "displayed"
+	}
+	log.WithFields(log.Fields{
+		"xmppId": xmppId,
+	}).Debugf("marker: %s", stringType)
+
+	gateway.SendMessageMarker(
+		c.jid,
+		strconv.FormatInt(chatId, 10),
+		c.xmpp,
+		typ,
+		xmppId,
+	)
+}
+
 func (c *Client) updateHandler() {
 	listener := c.client.GetListener()
 	defer listener.Close()
@@ -141,6 +166,12 @@ func (c *Client) updateHandler() {
 					uhOh()
 				}
 				c.updateChatTitle(typedUpdate)
+			case client.TypeUpdateChatReadOutbox:
+				typedUpdate, ok := update.(*client.UpdateChatReadOutbox)
+				if !ok {
+					uhOh()
+				}
+				c.updateChatReadOutbox(typedUpdate)
 			default:
 				// log only handled types
 				continue
@@ -203,14 +234,19 @@ func (c *Client) updateChatLastMessage(update *client.UpdateChatLastMessage) {
 
 // message received
 func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
-	go func() {
+	chatId := update.Message.ChatId
-		chatId := update.Message.ChatId
+	if c.Session.IsChatIgnored(chatId) {
+		return
+	}
 
-		// guarantee sequential message delivering per chat
+	// guarantee sequential message delivering per chat
-		lock := c.getChatMessageLock(chatId)
+	lock := c.getChatMessageLock(chatId)
+	go func() {
 		lock.Lock()
 		defer lock.Unlock()
 
+		c.updateLastMessageHash(update.Message.ChatId, update.Message.Id, update.Message.Content)
+
 		// ignore self outgoing messages
 		if update.Message.IsOutgoing &&
 			update.Message.SendingState != nil &&
@@ -228,27 +264,106 @@ func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
 
 // message content updated
 func (c *Client) updateMessageContent(update *client.UpdateMessageContent) {
-	markupFunction := formatter.EntityToXEP0393
+	if c.Session.IsChatIgnored(update.ChatId) {
-	if update.NewContent.MessageContentType() == client.TypeMessageText {
+		return
+	}
+
+	markupFunction := c.getFormatter()
+
+	defer c.updateLastMessageHash(update.ChatId, update.MessageId, update.NewContent)
+
+	log.Debugf("newContent: %#v", update.NewContent)
+
+	lock := c.getChatMessageLock(update.ChatId)
+	lock.Lock()
+	lock.Unlock()
+	c.SendMessageLock.Lock()
+	c.SendMessageLock.Unlock()
+
+	xmppId, xmppIdErr := gateway.IdsDB.GetByTgIds(c.Session.Login, c.jid, update.ChatId, update.MessageId)
+	var ignoredResource string
+	if xmppIdErr == nil {
+		ignoredResource = c.popFromEditOutbox(xmppId)
+	} else {
+		log.Infof("Couldn't retrieve XMPP message ids for %v, an echo may happen", update.MessageId)
+	}
+	log.Infof("ignoredResource: %v", ignoredResource)
+
+	jids := c.getCarbonFullJids(true, ignoredResource)
+	if len(jids) == 0 {
+		log.Info("The only resource is ignored, aborting")
+		return
+	}
+
+	if update.NewContent.MessageContentType() == client.TypeMessageText && c.hasLastMessageHashChanged(update.ChatId, update.MessageId, update.NewContent) {
 		textContent := update.NewContent.(*client.MessageText)
-		var editChar string
+		log.Debugf("textContent: %#v", textContent.Text)
-		if c.Session.AsciiArrows {
+
-			editChar = "e "
+		var replaceId string
-		} else {
+		sId := strconv.FormatInt(update.MessageId, 10)
-			editChar = "✎ "
+		var isCarbon bool
+
+		// 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)
+			if xmppIdErr != nil {
+				xmppId = sId
+			}
+			if ok && lastXmppId == xmppId {
+				replaceId = xmppId
+			} else {
+				log.Infof("Mismatching message ids: %v %v, falling back to separate edit message", lastXmppId, xmppId)
+			}
 		}
-		text := editChar + fmt.Sprintf("%v | %s", update.MessageId, formatter.Format(
+
+		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 == "" {
+			var editChar string
+			if c.Session.AsciiArrows {
+				editChar = "e"
+			} else {
+				editChar = "✎"
+			}
+			text.WriteString(fmt.Sprintf("%s %v | ", editChar, update.MessageId))
+		} else if prefix != "" {
+			text.WriteString(prefix)
+			text.WriteString(c.getPrefixSeparator(update.ChatId))
+		}
+
+		text.WriteString(formatter.Format(
 			textContent.Text.Text,
 			textContent.Text.Entities,
 			markupFunction,
 		))
-		gateway.SendMessage(c.jid, strconv.FormatInt(update.ChatId, 10), text, "e"+strconv.FormatInt(update.MessageId, 10), c.xmpp, nil, false)
+
+		sChatId := strconv.FormatInt(update.ChatId, 10)
+		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 {
+		if c.Session.IsChatIgnored(update.ChatId) {
+			return
+		}
+
 		var deleteChar string
 		if c.Session.AsciiArrows {
 			deleteChar = "X "
@@ -270,14 +385,25 @@ func (c *Client) updateAuthorizationState(update *client.UpdateAuthorizationStat
 	}
 }
 
-// clean uploaded files
 func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucceeded) {
+	// replace message ID in local database
+	log.Debugf("replace message %v with %v", update.OldMessageId, update.Message.Id)
+	if err := gateway.IdsDB.ReplaceTgId(c.Session.Login, c.jid, update.Message.ChatId, update.OldMessageId, update.Message.Id); err != nil {
+		log.Errorf("failed to replace %v with %v: %v", update.OldMessageId, update.Message.Id, err.Error())
+	}
+
+	c.updateLastMessageHash(update.Message.ChatId, update.Message.Id, update.Message.Content)
+
+	c.sendMarker(update.Message.ChatId, update.Message.Id, gateway.MarkerTypeReceived)
+
+	// clean uploaded files
 	file, _ := c.contentToFile(update.Message.Content)
 	if file != nil && file.Local != nil {
 		c.cleanTempFile(file.Local.Path)
 	}
 }
 func (c *Client) updateMessageSendFailed(update *client.UpdateMessageSendFailed) {
+	// clean uploaded files
 	file, _ := c.contentToFile(update.Message.Content)
 	if file != nil && file.Local != nil {
 		c.cleanTempFile(file.Local.Path)
@@ -289,8 +415,17 @@ 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)
-	_, user, _ := c.GetContactByID(update.ChatId, nil)
+	chat, user, _ := c.GetContactByID(update.ChatId, nil)
 	if user == nil {
 		c.ProcessStatusUpdate(update.ChatId, update.Title, "chat", gateway.SPImmed(true))
 	}
+
+	// update chat title in the cache
+	if chat != nil {
+		chat.Title = update.Title
+	}
+}
+
+func (c *Client) updateChatReadOutbox(update *client.UpdateChatReadOutbox) {
+	c.sendMarker(update.ChatId, update.LastReadOutboxMessageId, gateway.MarkerTypeDisplayed)
 }

telegram/utils_test.go

@@ -369,6 +369,53 @@ func TestMessageAnimation(t *testing.T) {
 	}
 }
 
+func TestMessageTtl1(t *testing.T) {
+	ttl := client.Message{
+		Content: &client.MessageChatSetMessageAutoDeleteTime{},
+	}
+	text := (&Client{}).messageToText(&ttl, false)
+	if text != "The self-destruct timer was disabled" {
+		t.Errorf("Wrong anonymous off ttl label: %v", text)
+	}
+}
+
+func TestMessageTtl2(t *testing.T) {
+	ttl := client.Message{
+		Content: &client.MessageChatSetMessageAutoDeleteTime{
+			MessageAutoDeleteTime: 3,
+		},
+	}
+	text := (&Client{}).messageToText(&ttl, false)
+	if text != "The self-destruct timer was set to 3 seconds" {
+		t.Errorf("Wrong anonymous ttl label: %v", text)
+	}
+}
+
+func TestMessageTtl3(t *testing.T) {
+	ttl := client.Message{
+		Content: &client.MessageChatSetMessageAutoDeleteTime{
+			FromUserId: 3,
+		},
+	}
+	text := (&Client{}).messageToText(&ttl, false)
+	if text != "unknown contact: TDlib instance is offline disabled the self-destruct timer" {
+		t.Errorf("Wrong off ttl label: %v", text)
+	}
+}
+
+func TestMessageTtl4(t *testing.T) {
+	ttl := client.Message{
+		Content: &client.MessageChatSetMessageAutoDeleteTime{
+			FromUserId:            3,
+			MessageAutoDeleteTime: 3,
+		},
+	}
+	text := (&Client{}).messageToText(&ttl, false)
+	if text != "unknown contact: TDlib instance is offline set the self-destruct timer to 3 seconds" {
+		t.Errorf("Wrong ttl label: %v", text)
+	}
+}
+
 func TestMessageUnknown(t *testing.T) {
 	unknown := client.Message{
 		Content: &client.MessageExpiredPhoto{},
@@ -384,20 +431,17 @@ func TestMessageToPrefix1(t *testing.T) {
 		Id:         42,
 		IsOutgoing: true,
 		ForwardInfo: &client.MessageForwardInfo{
-			Origin: &client.MessageForwardOriginHiddenUser{
+			Origin: &client.MessageOriginHiddenUser{
 				SenderName: "ziz",
 			},
 		},
 	}
-	prefix, replyStart, replyEnd := (&Client{Session: &persistence.Session{}}).messageToPrefix(&message, "", "", nil)
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{}}).messageToPrefix(&message, "", "", false)
 	if prefix != "➡ 42 | fwd: ziz" {
 		t.Errorf("Wrong prefix: %v", prefix)
 	}
-	if replyStart != 0 {
+	if gatewayReply != nil {
-		t.Errorf("Wrong replyStart: %v", replyStart)
+		t.Errorf("Reply is not nil: %v", gatewayReply)
-	}
-	if replyEnd != 0 {
-		t.Errorf("Wrong replyEnd: %v", replyEnd)
 	}
 }
 
@@ -405,20 +449,17 @@ func TestMessageToPrefix2(t *testing.T) {
 	message := client.Message{
 		Id: 56,
 		ForwardInfo: &client.MessageForwardInfo{
-			Origin: &client.MessageForwardOriginChannel{
+			Origin: &client.MessageOriginChannel{
 				AuthorSignature: "zaz",
 			},
 		},
 	}
-	prefix, replyStart, replyEnd := (&Client{Session: &persistence.Session{}}).messageToPrefix(&message, "y.jpg", "", nil)
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{}}).messageToPrefix(&message, "y.jpg", "", false)
 	if prefix != "⬅ 56 | fwd:  (zaz) | preview: y.jpg" {
 		t.Errorf("Wrong prefix: %v", prefix)
 	}
-	if replyStart != 0 {
+	if gatewayReply != nil {
-		t.Errorf("Wrong replyStart: %v", replyStart)
+		t.Errorf("Reply is not nil: %v", gatewayReply)
-	}
-	if replyEnd != 0 {
-		t.Errorf("Wrong replyEnd: %v", replyEnd)
 	}
 }
 
@@ -426,20 +467,17 @@ func TestMessageToPrefix3(t *testing.T) {
 	message := client.Message{
 		Id: 56,
 		ForwardInfo: &client.MessageForwardInfo{
-			Origin: &client.MessageForwardOriginChannel{
+			Origin: &client.MessageOriginChannel{
 				AuthorSignature: "zuz",
 			},
 		},
 	}
-	prefix, replyStart, replyEnd := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "a.jpg", nil)
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "a.jpg", false)
 	if prefix != "< 56 | fwd:  (zuz) | file: a.jpg" {
 		t.Errorf("Wrong prefix: %v", prefix)
 	}
-	if replyStart != 0 {
+	if gatewayReply != nil {
-		t.Errorf("Wrong replyStart: %v", replyStart)
+		t.Errorf("Reply is not nil: %v", gatewayReply)
-	}
-	if replyEnd != 0 {
-		t.Errorf("Wrong replyEnd: %v", replyEnd)
 	}
 }
 
@@ -448,15 +486,12 @@ func TestMessageToPrefix4(t *testing.T) {
 		Id:         23,
 		IsOutgoing: true,
 	}
-	prefix, replyStart, replyEnd := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", nil)
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", false)
 	if prefix != "> 23" {
 		t.Errorf("Wrong prefix: %v", prefix)
 	}
-	if replyStart != 0 {
+	if gatewayReply != nil {
-		t.Errorf("Wrong replyStart: %v", replyStart)
+		t.Errorf("Reply is not nil: %v", gatewayReply)
-	}
-	if replyEnd != 0 {
-		t.Errorf("Wrong replyEnd: %v", replyEnd)
 	}
 }
 
@@ -464,46 +499,95 @@ func TestMessageToPrefix5(t *testing.T) {
 	message := client.Message{
 		Id: 560,
 		ForwardInfo: &client.MessageForwardInfo{
-			Origin: &client.MessageForwardOriginChat{
+			Origin: &client.MessageOriginChat{
 				AuthorSignature: "zyz",
 			},
 		},
 	}
-	prefix, replyStart, replyEnd := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "h.jpg", "a.jpg", nil)
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "h.jpg", "a.jpg", false)
 	if prefix != "< 560 | fwd:  (zyz) | preview: h.jpg | file: a.jpg" {
 		t.Errorf("Wrong prefix: %v", prefix)
 	}
-	if replyStart != 0 {
+	if gatewayReply != nil {
-		t.Errorf("Wrong replyStart: %v", replyStart)
+		t.Errorf("Reply is not nil: %v", gatewayReply)
-	}
-	if replyEnd != 0 {
-		t.Errorf("Wrong replyEnd: %v", replyEnd)
 	}
 }
 
 func TestMessageToPrefix6(t *testing.T) {
 	message := client.Message{
-		Id:               23,
+		Id:         23,
-		IsOutgoing:       true,
+		ChatId:     25,
-		ReplyToMessageId: 42,
+		IsOutgoing: true,
-	}
+		ReplyTo: &client.MessageReplyToMessage{
-	reply := client.Message{
+			ChatId: 41,
-		Id: 42,
+			Quote: &client.TextQuote{
-		Content: &client.MessageText{
+				Text: &client.FormattedText{
-			Text: &client.FormattedText{
+					Text: "tist\nuz\niz",
-				Text: "tist",
+				},
+			},
+			Origin: &client.MessageOriginHiddenUser{
+				SenderName: "ziz",
 			},
 		},
 	}
-	prefix, replyStart, replyEnd := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", &reply)
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", false)
-	if prefix != "> 23 | reply: 42 |  | tist" {
+	if prefix != "> 23 | reply: ziz @ unknown contact: TDlib instance is offline | tist uz iz" {
 		t.Errorf("Wrong prefix: %v", prefix)
 	}
-	if replyStart != 4 {
+	if gatewayReply != nil {
-		t.Errorf("Wrong replyStart: %v", replyStart)
+		t.Errorf("Reply is not nil: %v", gatewayReply)
 	}
-	if replyEnd != 26 {
+}
-		t.Errorf("Wrong replyEnd: %v", replyEnd)
+
+func TestMessageToPrefix7(t *testing.T) {
+	message := client.Message{
+		Id:         23,
+		ChatId:     42,
+		IsOutgoing: true,
+		ReplyTo: &client.MessageReplyToMessage{
+			ChatId: 41,
+			Content: &client.MessageText{
+				Text: &client.FormattedText{
+					Text: "tist",
+				},
+			},
+			Origin: &client.MessageOriginChannel{
+				AuthorSignature: "zaz",
+			},
+		},
+	}
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", false)
+	if prefix != "> 23 | reply:  (zaz) @ unknown contact: TDlib instance is offline | tist" {
+		t.Errorf("Wrong prefix: %v", prefix)
+	}
+	if gatewayReply != nil {
+		t.Errorf("Reply is not nil: %v", gatewayReply)
+	}
+}
+
+func TestMessageToPrefix8(t *testing.T) {
+	message := client.Message{
+		Id:         23,
+		ChatId:     42,
+		IsOutgoing: true,
+		ReplyTo: &client.MessageReplyToMessage{
+			ChatId: 41,
+			Content: &client.MessageText{
+				Text: &client.FormattedText{
+					Text: "tist",
+				},
+			},
+			Origin: &client.MessageOriginChannel{
+				AuthorSignature: "zuz",
+			},
+		},
+	}
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", true)
+	if prefix != "> 23" {
+		t.Errorf("Wrong prefix: %v", prefix)
+	}
+	if gatewayReply != nil {
+		t.Errorf("Reply is not nil: %v", gatewayReply)
 	}
 }
 

xmpp/component.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"dev.narayana.im/narayana/telegabber/badger"
 	"dev.narayana.im/narayana/telegabber/config"
 	"dev.narayana.im/narayana/telegabber/persistence"
 	"dev.narayana.im/narayana/telegabber/telegram"
@@ -38,7 +39,7 @@ 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) (*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)
@@ -53,6 +54,8 @@ func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig) (*xmpp.Strea
 		}
 	}
 
+	gateway.IdsDB = badger.IdsDBOpen(idsPath)
+
 	tgConf = tc
 
 	if tc.Content.Quota != "" {
@@ -163,6 +166,8 @@ func heartbeat(component *xmpp.Component) {
 			// it would be resolved on the next iteration
 			SaveSessions()
 		}
+
+		gateway.IdsDB.Gc()
 	}
 }
 
@@ -240,6 +245,9 @@ func Close(component *xmpp.Component) {
 	// save sessions
 	SaveSessions()
 
+	// flush the ids database
+	gateway.IdsDB.Close()
+
 	// close stream
 	component.Disconnect()
 }

xmpp/extensions/extensions.go

@@ -154,12 +154,19 @@ type CarbonSent struct {
 }
 
 // ComponentPrivilege is from XEP-0356
-type ComponentPrivilege struct {
+type ComponentPrivilege1 struct {
 	XMLName   xml.Name         `xml:"urn:xmpp:privilege:1 privilege"`
 	Perms     []ComponentPerm  `xml:"perm"`
 	Forwarded stanza.Forwarded `xml:"urn:xmpp:forward:0 forwarded"`
 }
 
+// ComponentPrivilege is from XEP-0356
+type ComponentPrivilege2 struct {
+	XMLName   xml.Name         `xml:"urn:xmpp:privilege:2 privilege"`
+	Perms     []ComponentPerm  `xml:"perm"`
+	Forwarded stanza.Forwarded `xml:"urn:xmpp:forward:0 forwarded"`
+}
+
 // ComponentPerm is from XEP-0356
 type ComponentPerm struct {
 	XMLName xml.Name `xml:"perm"`
@@ -180,6 +187,32 @@ type ClientMessage struct {
 	Extensions []stanza.MsgExtension `xml:",omitempty"`
 }
 
+// Replace is from XEP-0308
+type Replace struct {
+	XMLName xml.Name `xml:"urn:xmpp:message-correct:0 replace"`
+	Id      string   `xml:"id,attr"`
+}
+
+// QueryRegister is from XEP-0077
+type QueryRegister struct {
+	XMLName      xml.Name                 `xml:"jabber:iq:register query"`
+	Instructions string                   `xml:"instructions"`
+	Username     string                   `xml:"username"`
+	Registered   *QueryRegisterRegistered `xml:"registered"`
+	Remove       *QueryRegisterRemove     `xml:"remove"`
+	ResultSet    *stanza.ResultSet        `xml:"set,omitempty"`
+}
+
+// QueryRegisterRegistered is a child element from XEP-0077
+type QueryRegisterRegistered struct {
+	XMLName xml.Name `xml:"registered"`
+}
+
+// QueryRegisterRemove is a child element from XEP-0077
+type QueryRegisterRemove struct {
+	XMLName xml.Name `xml:"remove"`
+}
+
 // Namespace is a namespace!
 func (c PresenceNickExtension) Namespace() string {
 	return c.XMLName.Space
@@ -221,10 +254,30 @@ func (c CarbonSent) Namespace() string {
 }
 
 // Namespace is a namespace!
-func (c ComponentPrivilege) Namespace() string {
+func (c ComponentPrivilege1) Namespace() string {
 	return c.XMLName.Space
 }
 
+// Namespace is a namespace!
+func (c ComponentPrivilege2) Namespace() string {
+	return c.XMLName.Space
+}
+
+// Namespace is a namespace!
+func (c Replace) Namespace() string {
+	return c.XMLName.Space
+}
+
+// Namespace is a namespace!
+func (c QueryRegister) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c QueryRegister) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
 // Name is a packet name
 func (ClientMessage) Name() string {
 	return "message"
@@ -286,9 +339,27 @@ func init() {
 		"sent",
 	}, CarbonSent{})
 
-	// component privilege
+	// component privilege v1
 	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
 		"urn:xmpp:privilege:1",
 		"privilege",
-	}, ComponentPrivilege{})
+	}, ComponentPrivilege1{})
+
+	// component privilege v2
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:privilege:2",
+		"privilege",
+	}, ComponentPrivilege2{})
+
+	// message edit
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:message-correct:0",
+		"replace",
+	}, Replace{})
+
+	// register query
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"jabber:iq:register",
+		"query",
+	}, QueryRegister{})
 }

xmpp/gateway/gateway.go

@@ -3,11 +3,14 @@ package gateway
 import (
 	"encoding/xml"
 	"github.com/pkg/errors"
+	"strconv"
 	"strings"
 	"sync"
 
+	"dev.narayana.im/narayana/telegabber/badger"
 	"dev.narayana.im/narayana/telegabber/xmpp/extensions"
 
+	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 	"github.com/soheilhy/args"
 	"gosrc.io/xmpp"
@@ -21,6 +24,18 @@ type Reply struct {
 	End    uint64
 }
 
+type MarkerType byte
+
+const (
+	MarkerTypeReceived MarkerType = iota
+	MarkerTypeDisplayed
+)
+
+type marker struct {
+	Type MarkerType
+	Id   string
+}
+
 const NSNick string = "http://jabber.org/protocol/nick"
 
 // Queue stores presences to send later
@@ -30,34 +45,53 @@ var QueueLock = sync.Mutex{}
 // Jid stores the component's JID object
 var Jid *stanza.Jid
 
+// IdsDB provides a disk-backed bidirectional dictionary of Telegram and XMPP ids
+var IdsDB badger.IdsDB
+
 // DirtySessions denotes that some Telegram session configurations
 // were changed and need to be re-flushed to the YamlDB
 var DirtySessions = false
 
-// MessageOutgoingPermission allows to fake outgoing messages by foreign JIDs
+// MessageOutgoingPermissionVersion contains a XEP-0356 version to fake outgoing messages by foreign JIDs
-var MessageOutgoingPermission = false
+var MessageOutgoingPermissionVersion = 0
 
 // SendMessage creates and sends a message stanza
-func SendMessage(to string, from string, body string, id string, component *xmpp.Component, reply *Reply, isOutgoing bool) {
+func SendMessage(to string, from string, body string, id string, component *xmpp.Component, reply *Reply, replaceId string, isCarbon, requestReceipt bool) {
-	sendMessageWrapper(to, from, body, id, component, reply, "", isOutgoing)
+	sendMessageWrapper(to, from, body, id, component, reply, nil, "", replaceId, isCarbon, requestReceipt)
 }
 
 // SendServiceMessage creates and sends a simple message stanza from transport
 func SendServiceMessage(to string, body string, component *xmpp.Component) {
-	sendMessageWrapper(to, "", body, "", component, nil, "", false)
+	var id string
+	if uuid, err := uuid.NewRandom(); err == nil {
+		id = uuid.String()
+	}
+	sendMessageWrapper(to, "", body, id, component, nil, nil, "", "", false, false)
 }
 
 // SendTextMessage creates and sends a simple message stanza
 func SendTextMessage(to string, from string, body string, component *xmpp.Component) {
-	sendMessageWrapper(to, from, body, "", component, nil, "", false)
+	var id string
+	if uuid, err := uuid.NewRandom(); err == nil {
+		id = uuid.String()
+	}
+	sendMessageWrapper(to, from, body, id, component, nil, nil, "", "", false, false)
 }
 
 // SendMessageWithOOB creates and sends a message stanza with OOB URL
-func SendMessageWithOOB(to string, from string, body string, id string, component *xmpp.Component, reply *Reply, oob string, isOutgoing bool) {
+func SendMessageWithOOB(to string, from string, body string, id string, component *xmpp.Component, reply *Reply, oob, replaceId string, isCarbon, requestReceipt bool) {
-	sendMessageWrapper(to, from, body, id, component, reply, oob, isOutgoing)
+	sendMessageWrapper(to, from, body, id, component, reply, nil, oob, replaceId, isCarbon, requestReceipt)
 }
 
-func sendMessageWrapper(to string, from string, body string, id string, component *xmpp.Component, reply *Reply, oob string, isOutgoing bool) {
+// SendMessageMarker creates and sends a message stanza with a XEP-0333 marker
+func SendMessageMarker(to string, from string, component *xmpp.Component, markerType MarkerType, markerId string) {
+	sendMessageWrapper(to, from, "", "", component, nil, &marker{
+		Type: markerType,
+		Id:   markerId,
+	}, "", "", false, false)
+}
+
+func sendMessageWrapper(to string, from string, body string, id string, component *xmpp.Component, reply *Reply, marker *marker, oob, replaceId string, isCarbon, requestReceipt bool) {
 	toJid, err := stanza.NewJid(to)
 	if err != nil {
 		log.WithFields(log.Fields{
@@ -79,7 +113,7 @@ func sendMessageWrapper(to string, from string, body string, id string, componen
 		logFrom = from
 		messageFrom = from + "@" + componentJid
 	}
-	if isOutgoing {
+	if isCarbon {
 		messageTo = messageFrom
 		messageFrom = bareTo + "/" + Jid.Resource
 	} else {
@@ -115,8 +149,25 @@ func sendMessageWrapper(to string, from string, body string, id string, componen
 			message.Extensions = append(message.Extensions, extensions.NewReplyFallback(reply.Start, reply.End))
 		}
 	}
+	if marker != nil {
+		if marker.Type == MarkerTypeReceived {
+			message.Extensions = append(message.Extensions, stanza.MarkReceived{ID: marker.Id})
+		} else if marker.Type == MarkerTypeDisplayed {
+			message.Extensions = append(message.Extensions, stanza.MarkDisplayed{ID: marker.Id})
+			message.Extensions = append(message.Extensions, stanza.ReceiptReceived{ID: marker.Id})
+		}
+	}
+	if !isCarbon && toJid.Resource != "" {
+		message.Extensions = append(message.Extensions, stanza.HintNoCopy{})
+	}
+	if requestReceipt {
+		message.Extensions = append(message.Extensions, stanza.Markable{})
+	}
+	if replaceId != "" {
+		message.Extensions = append(message.Extensions, extensions.Replace{Id: replaceId})
+	}
 
-	if isOutgoing {
+	if isCarbon {
 		carbonMessage := extensions.ClientMessage{
 			Attrs: stanza.Attrs{
 				From: bareTo,
@@ -135,11 +186,19 @@ func sendMessageWrapper(to string, from string, body string, id string, componen
 				To:   toJid.Domain,
 			},
 		}
-		privilegeMessage.Extensions = append(privilegeMessage.Extensions, extensions.ComponentPrivilege{
+		if MessageOutgoingPermissionVersion == 2 {
-			Forwarded: stanza.Forwarded{
+			privilegeMessage.Extensions = append(privilegeMessage.Extensions, extensions.ComponentPrivilege2{
-				Stanza: carbonMessage,
+				Forwarded: stanza.Forwarded{
-			},
+					Stanza: carbonMessage,
-		})
+				},
+			})
+		} else {
+			privilegeMessage.Extensions = append(privilegeMessage.Extensions, extensions.ComponentPrivilege1{
+				Forwarded: stanza.Forwarded{
+					Stanza: carbonMessage,
+				},
+			})
+		}
 		sendMessage(&privilegeMessage, component)
 	} else {
 		sendMessage(&message, component)
@@ -328,6 +387,20 @@ func SendPresence(component *xmpp.Component, to string, args ...args.V) error {
 	return nil
 }
 
+// SPAppendFrom appends numeric from and resource to varargs
+func SPAppendFrom(oldArgs []args.V, id int64) []args.V {
+	newArgs := append(oldArgs, SPFrom(strconv.FormatInt(id, 10)))
+	newArgs = append(newArgs, SPResource(Jid.Resource))
+	return newArgs
+}
+
+// SimplePresence crafts simple presence varargs
+func SimplePresence(from int64, typ string) []args.V {
+	args := []args.V{SPType(typ)}
+	args = SPAppendFrom(args, from)
+	return args
+}
+
 // ResumableSend tries to resume the connection once and sends the packet again
 func ResumableSend(component *xmpp.Component, packet stanza.Packet) error {
 	err := component.Send(packet)
@@ -345,6 +418,12 @@ func ResumableSend(component *xmpp.Component, packet stanza.Packet) error {
 	return err
 }
 
+// SubscribeToTransport ensures a two-way subscription to the transport
+func SubscribeToTransport(component *xmpp.Component, jid string) {
+	SendPresence(component, jid, SPType("subscribe"))
+	SendPresence(component, jid, SPType("subscribed"))
+}
+
 // SplitJID tokenizes a JID string to bare JID and resource
 func SplitJID(from string) (string, string, bool) {
 	fromJid, err := stanza.NewJid(from)

xmpp/handlers.go

@@ -4,16 +4,19 @@ import (
 	"bytes"
 	"encoding/base64"
 	"encoding/xml"
+	"fmt"
 	"github.com/pkg/errors"
 	"io"
 	"strconv"
 	"strings"
 
 	"dev.narayana.im/narayana/telegabber/persistence"
+	"dev.narayana.im/narayana/telegabber/telegram"
 	"dev.narayana.im/narayana/telegabber/xmpp/extensions"
 	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
 
 	log "github.com/sirupsen/logrus"
+	"github.com/soheilhy/args"
 	"gosrc.io/xmpp"
 	"gosrc.io/xmpp/stanza"
 )
@@ -55,6 +58,22 @@ func HandleIq(s xmpp.Sender, p stanza.Packet) {
 			go handleGetDiscoInfo(s, iq)
 			return
 		}
+		_, ok = iq.Payload.(*stanza.DiscoItems)
+		if ok {
+			go handleGetDiscoItems(s, iq)
+			return
+		}
+		_, ok = iq.Payload.(*extensions.QueryRegister)
+		if ok {
+			go handleGetQueryRegister(s, iq)
+			return
+		}
+	} else if iq.Type == "set" {
+		query, ok := iq.Payload.(*extensions.QueryRegister)
+		if ok {
+			go handleSetQueryRegister(s, iq, query)
+			return
+		}
 	}
 }
 
@@ -89,8 +108,7 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 		session, ok := sessions[bare]
 		if !ok {
 			if msg.To == gatewayJid {
-				gateway.SendPresence(component, msg.From, gateway.SPType("subscribe"))
+				gateway.SubscribeToTransport(component, msg.From)
-				gateway.SendPresence(component, msg.From, gateway.SPType("subscribed"))
 			} else {
 				log.Error("Message from stranger")
 			}
@@ -101,22 +119,35 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 		if ok {
 			var reply extensions.Reply
 			var fallback extensions.Fallback
+			var replace extensions.Replace
 			msg.Get(&reply)
 			msg.Get(&fallback)
+			msg.Get(&replace)
 			log.Debugf("reply: %#v", reply)
 			log.Debugf("fallback: %#v", fallback)
+			log.Debugf("replace: %#v", replace)
 
 			var replyId int64
 			var err error
 			text := msg.Body
 			if len(reply.Id) > 0 {
-				id := reply.Id
+				chatId, msgId, err := gateway.IdsDB.GetByXmppId(session.Session.Login, bare, reply.Id)
-				if id[0] == 'e' {
+				if err == nil {
-					id = id[1:]
+					if chatId != toID {
-				}
+						log.Warnf("Chat mismatch: %v ≠ %v", chatId, toID)
-				replyId, err = strconv.ParseInt(id, 10, 64)
+					} else {
-				if err != nil {
+						replyId = msgId
-					log.Warn(errors.Wrap(err, "Failed to parse message ID!"))
+						log.Debugf("replace tg: %#v %#v", chatId, msgId)
+					}
+				} else {
+					id := reply.Id
+					if id[0] == 'e' {
+						id = id[1:]
+					}
+					replyId, err = strconv.ParseInt(id, 10, 64)
+					if err != nil {
+						log.Warn(errors.Wrap(err, "Failed to parse message ID!"))
+					}
 				}
 
 				if replyId != 0 && fallback.For == "urn:xmpp:reply:0" && len(fallback.Body) > 0 {
@@ -134,11 +165,60 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 							"end": body.End,
 						}).Warn(errors.Wrap(err, "Failed to parse fallback end!"))
 					}
-					text = text[:start] + text[end:]
+
+					fullRunes := []rune(text)
+					cutRunes := make([]rune, 0, len(text)-int(end-start))
+					cutRunes = append(cutRunes, fullRunes[:start]...)
+					cutRunes = append(cutRunes, fullRunes[end:]...)
+					text = string(cutRunes)
+				}
+			}
+			var replaceId int64
+			if replace.Id != "" {
+				chatId, msgId, err := gateway.IdsDB.GetByXmppId(session.Session.Login, bare, replace.Id)
+				if err == nil {
+					if chatId != toID {
+						gateway.SendTextMessage(msg.From, strconv.FormatInt(toID, 10), "<ERROR: Chat mismatch>", component)
+						return
+					}
+					replaceId = msgId
+					log.Debugf("replace tg: %#v %#v", chatId, msgId)
+				} else {
+					gateway.SendTextMessage(msg.From, strconv.FormatInt(toID, 10), "<ERROR: Could not find matching message to edit>", component)
+					return
 				}
 			}
 
-			session.ProcessOutgoingMessage(toID, text, msg.From, replyId)
+			session.SendMessageLock.Lock()
+			defer session.SendMessageLock.Unlock()
+			tgMessageId := session.ProcessOutgoingMessage(toID, text, msg.From, replyId, replaceId)
+			if tgMessageId != 0 {
+				if replaceId != 0 {
+					// not needed (is it persistent among clients though?)
+					/* err = gateway.IdsDB.ReplaceIdPair(session.Session.Login, bare, replace.Id, msg.Id, tgMessageId)
+					if err != nil {
+						log.Errorf("Failed to replace id %v with %v %v", replace.Id, msg.Id, tgMessageId)
+					} */
+					session.AddToEditOutbox(replace.Id, resource)
+				} else {
+					err = gateway.IdsDB.Set(session.Session.Login, bare, toID, tgMessageId, msg.Id)
+					if err == nil {
+						// session.AddToOutbox(msg.Id, resource)
+						session.UpdateLastChatMessageId(toID, msg.Id)
+					} else {
+						log.Errorf("Failed to save ids %v/%v %v", toID, tgMessageId, msg.Id)
+					}
+				}
+			} else {
+				/*
+					// if a message failed to edit on Telegram side, match new XMPP ID with old Telegram ID anyway
+					if replaceId != 0 {
+						err = gateway.IdsDB.ReplaceXmppId(session.Session.Login, bare, replace.Id, msg.Id)
+						if err != nil {
+							log.Errorf("Failed to replace id %v with %v", replace.Id, msg.Id)
+						}
+					} */
+			}
 			return
 		} else {
 			toJid, err := stanza.NewJid(msg.To)
@@ -154,16 +234,51 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 	}
 
 	if msg.Body == "" {
-		var privilege extensions.ComponentPrivilege
+		var privilege1 extensions.ComponentPrivilege1
-		if ok := msg.Get(&privilege); ok {
+		if ok := msg.Get(&privilege1); ok {
-			log.Debugf("privilege: %#v", privilege)
+			log.Debugf("privilege1: %#v", privilege1)
 		}
 
-		for _, perm := range privilege.Perms {
+		for _, perm := range privilege1.Perms {
 			if perm.Access == "message" && perm.Type == "outgoing" {
-				gateway.MessageOutgoingPermission = true
+				gateway.MessageOutgoingPermissionVersion = 1
 			}
 		}
+
+		var privilege2 extensions.ComponentPrivilege2
+		if ok := msg.Get(&privilege2); ok {
+			log.Debugf("privilege2: %#v", privilege2)
+		}
+
+		for _, perm := range privilege2.Perms {
+			if perm.Access == "message" && perm.Type == "outgoing" {
+				gateway.MessageOutgoingPermissionVersion = 2
+			}
+		}
+
+		var displayed stanza.MarkDisplayed
+		msg.Get(&displayed)
+		if displayed.ID != "" {
+			log.Debugf("displayed: %#v", displayed)
+
+			bare, _, ok := gateway.SplitJID(msg.From)
+			if !ok {
+				return
+			}
+			session, ok := sessions[bare]
+			if !ok {
+				return
+			}
+			toID, ok := toToID(msg.To)
+			if !ok {
+				return
+			}
+			msgId, err := strconv.ParseInt(displayed.ID, 10, 64)
+			if err == nil {
+				session.MarkAsRead(toID, msgId)
+			}
+			return
+		}
 	}
 
 	if msg.Type == "error" {
@@ -173,7 +288,7 @@ func HandleMessage(s xmpp.Sender, p stanza.Packet) {
 			suffix := "@" + msg.From
 			for bare := range sessions {
 				if strings.HasSuffix(bare, suffix) {
-					gateway.SendServiceMessage(bare, "Your server \"" + msg.From + "\" does not allow to send carbons", component)
+					gateway.SendServiceMessage(bare, "Your server \""+msg.From+"\" does not allow to send carbons", component)
 				}
 			}
 		}
@@ -283,13 +398,21 @@ func handlePresence(s xmpp.Sender, p stanza.Presence) {
 				log.Error(errors.Wrap(err, "TDlib connection failure"))
 			} else {
 				for status := range session.StatusesRange() {
+					show, description, typ := status.Destruct()
+					newArgs := []args.V{
+						gateway.SPImmed(false),
+					}
+					if typ != "" {
+						newArgs = append(newArgs, gateway.SPType(typ))
+					}
 					go session.ProcessStatusUpdate(
 						status.ID,
-						status.Description,
+						description,
-						status.XMPP,
+						show,
-						gateway.SPImmed(false),
+						newArgs...,
 					)
 				}
+				session.UpdateChatNicknames()
 			}
 		}()
 	}
@@ -319,45 +442,12 @@ func handleGetVcardIq(s xmpp.Sender, iq *stanza.IQ, typ byte) {
 		log.Error("Invalid IQ to")
 		return
 	}
-	chat, user, err := session.GetContactByID(toID, nil)
+	info, err := session.GetVcardInfo(toID)
 	if err != nil {
 		log.Error(err)
 		return
 	}
 
-	var fn, photo, nickname, given, family, tel, info string
-	if chat != nil {
-		fn = chat.Title
-
-		if chat.Photo != nil {
-			file, path, err := session.OpenPhotoFile(chat.Photo.Small, 32)
-			if err == nil {
-				defer file.Close()
-
-				buf := new(bytes.Buffer)
-				binval := base64.NewEncoder(base64.StdEncoding, buf)
-				_, err = io.Copy(binval, file)
-				binval.Close()
-				if err == nil {
-					photo = 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())
-			}
-		}
-		info = session.GetChatDescription(chat)
-	}
-	if user != nil {
-		nickname = user.Username
-		given = user.FirstName
-		family = user.LastName
-		tel = user.PhoneNumber
-	}
-
 	answer := stanza.IQ{
 		Attrs: stanza.Attrs{
 			From: iq.To,
@@ -365,7 +455,7 @@ func handleGetVcardIq(s xmpp.Sender, iq *stanza.IQ, typ byte) {
 			Id:   iq.Id,
 			Type: "result",
 		},
-		Payload: makeVCardPayload(typ, iq.To, fn, photo, nickname, given, family, tel, info),
+		Payload: makeVCardPayload(typ, iq.To, info, session),
 	}
 	log.Debugf("%#v", answer)
 
@@ -395,8 +485,11 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ) {
 	_, ok := toToID(iq.To)
 	if ok {
 		disco.AddIdentity("", "account", "registered")
+		disco.AddFeatures(stanza.NSMsgChatMarkers)
+		disco.AddFeatures(stanza.NSMsgReceipts)
 	} else {
 		disco.AddIdentity("Telegram Gateway", "gateway", "telegram")
+		disco.AddFeatures("jabber:iq:register")
 	}
 	answer.Payload = disco
 
@@ -411,6 +504,189 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ) {
 	_ = gateway.ResumableSend(component, answer)
 }
 
+func handleGetDiscoItems(s xmpp.Sender, iq *stanza.IQ) {
+	answer, err := stanza.NewIQ(stanza.Attrs{
+		Type: stanza.IQTypeResult,
+		From: iq.To,
+		To:   iq.From,
+		Id:   iq.Id,
+		Lang: "en",
+	})
+	if err != nil {
+		log.Errorf("Failed to create answer IQ: %v", err)
+		return
+	}
+
+	answer.Payload = answer.DiscoItems()
+
+	component, ok := s.(*xmpp.Component)
+	if !ok {
+		log.Error("Not a component")
+		return
+	}
+
+	_ = gateway.ResumableSend(component, answer)
+}
+
+func handleGetQueryRegister(s xmpp.Sender, iq *stanza.IQ) {
+	component, ok := s.(*xmpp.Component)
+	if !ok {
+		log.Error("Not a component")
+		return
+	}
+
+	answer, err := stanza.NewIQ(stanza.Attrs{
+		Type: stanza.IQTypeResult,
+		From: iq.To,
+		To:   iq.From,
+		Id:   iq.Id,
+		Lang: "en",
+	})
+	if err != nil {
+		log.Errorf("Failed to create answer IQ: %v", err)
+		return
+	}
+
+	var login string
+	bare, _, ok := gateway.SplitJID(iq.From)
+	if ok {
+		session, ok := sessions[bare]
+		if ok {
+			login = session.Session.Login
+		}
+	}
+
+	var query stanza.IQPayload
+	if login == "" {
+		query = extensions.QueryRegister{
+			Instructions: fmt.Sprintf("Authorization in Telegram is a multi-step process, so please accept %v to your contacts and follow further instructions (provide the authentication code there, etc.).\nFor now, please provide your login.", iq.To),
+		}
+	} else {
+		query = extensions.QueryRegister{
+			Instructions: "Already logged in",
+			Username:     login,
+			Registered:   &extensions.QueryRegisterRegistered{},
+		}
+	}
+	answer.Payload = query
+
+	log.Debugf("%#v", query)
+
+	_ = gateway.ResumableSend(component, answer)
+
+	if login == "" {
+		gateway.SubscribeToTransport(component, iq.From)
+	}
+}
+
+func handleSetQueryRegister(s xmpp.Sender, iq *stanza.IQ, query *extensions.QueryRegister) {
+	component, ok := s.(*xmpp.Component)
+	if !ok {
+		log.Error("Not a component")
+		return
+	}
+
+	answer, err := stanza.NewIQ(stanza.Attrs{
+		Type: stanza.IQTypeResult,
+		From: iq.To,
+		To:   iq.From,
+		Id:   iq.Id,
+		Lang: "en",
+	})
+	if err != nil {
+		log.Errorf("Failed to create answer IQ: %v", err)
+		return
+	}
+
+	defer gateway.ResumableSend(component, answer)
+
+	if query.Remove != nil {
+		iqAnswerSetError(answer, query, 405)
+		return
+	}
+
+	var login string
+	var session *telegram.Client
+	bare, resource, ok := gateway.SplitJID(iq.From)
+	if ok {
+		session, ok = sessions[bare]
+		if ok {
+			login = session.Session.Login
+		}
+	}
+
+	if login == "" {
+		if !ok {
+			session, ok = getTelegramInstance(bare, &persistence.Session{}, component)
+			if !ok {
+				iqAnswerSetError(answer, query, 500)
+				return
+			}
+		}
+
+		err := session.TryLogin(resource, query.Username)
+		if err != nil {
+			if err.Error() == telegram.TelegramAuthDone {
+				iqAnswerSetError(answer, query, 406)
+			} else {
+				iqAnswerSetError(answer, query, 500)
+			}
+			return
+		}
+
+		err = session.SetPhoneNumber(query.Username)
+		if err != nil {
+			iqAnswerSetError(answer, query, 500)
+			return
+		}
+
+		// everything okay, the response should be empty with no payload/error at this point
+		gateway.SubscribeToTransport(component, iq.From)
+	} else {
+		iqAnswerSetError(answer, query, 406)
+	}
+}
+
+func iqAnswerSetError(answer *stanza.IQ, payload *extensions.QueryRegister, code int) {
+	answer.Type = stanza.IQTypeError
+	answer.Payload = *payload
+	switch code {
+	case 400:
+		answer.Error = &stanza.Err{
+			Code:   code,
+			Type:   stanza.ErrorTypeModify,
+			Reason: "bad-request",
+		}
+	case 405:
+		answer.Error = &stanza.Err{
+			Code:   code,
+			Type:   stanza.ErrorTypeCancel,
+			Reason: "not-allowed",
+			Text:   "Logging out is dangerous. If you are sure you would be able to receive the authentication code again, issue the /logout command to the transport",
+		}
+	case 406:
+		answer.Error = &stanza.Err{
+			Code:   code,
+			Type:   stanza.ErrorTypeModify,
+			Reason: "not-acceptable",
+			Text:   "Phone number already provided, chat with the transport for further instruction",
+		}
+	case 500:
+		answer.Error = &stanza.Err{
+			Code:   code,
+			Type:   stanza.ErrorTypeWait,
+			Reason: "internal-server-error",
+		}
+	default:
+		log.Error("Unknown error code, falling back with empty reason")
+		answer.Error = &stanza.Err{
+			Code:   code,
+			Type:   stanza.ErrorTypeCancel,
+			Reason: "undefined-condition",
+		}
+	}
+}
+
 func toToID(to string) (int64, bool) {
 	toParts := strings.Split(to, "@")
 	if len(toParts) < 2 {
@@ -426,47 +702,69 @@ func toToID(to string) (int64, bool) {
 	return toID, true
 }
 
-func makeVCardPayload(typ byte, id, fn, photo, nickname, given, family, tel, info string) stanza.IQPayload {
+func makeVCardPayload(typ byte, id string, info telegram.VCardInfo, session *telegram.Client) stanza.IQPayload {
+	var base64Photo string
+	if info.Photo != nil {
+		file, path, err := session.ForceOpenFile(info.Photo, 32)
+		if err == nil {
+			defer file.Close()
+
+			buf := new(bytes.Buffer)
+			binval := base64.NewEncoder(base64.StdEncoding, buf)
+			_, err = io.Copy(binval, file)
+			binval.Close()
+			if err == nil {
+				base64Photo = 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())
+		}
+	}
+
 	if typ == TypeVCardTemp {
 		vcard := &extensions.IqVcardTemp{}
 
-		vcard.Fn.Text = fn
+		vcard.Fn.Text = info.Fn
-		if photo != "" {
+		if base64Photo != "" {
 			vcard.Photo.Type.Text = "image/jpeg"
-			vcard.Photo.Binval.Text = photo
+			vcard.Photo.Binval.Text = base64Photo
 		}
-		vcard.Nickname.Text = nickname
+		vcard.Nickname.Text = strings.Join(info.Nicknames, ",")
-		vcard.N.Given.Text = given
+		vcard.N.Given.Text = info.Given
-		vcard.N.Family.Text = family
+		vcard.N.Family.Text = info.Family
-		vcard.Tel.Number.Text = tel
+		vcard.Tel.Number.Text = info.Tel
-		vcard.Desc.Text = info
+		vcard.Desc.Text = info.Info
 
 		return vcard
 	} else if typ == TypeVCard4 {
 		nodes := []stanza.Node{}
-		if fn != "" {
+		if info.Fn != "" {
 			nodes = append(nodes, stanza.Node{
 				XMLName: xml.Name{Local: "fn"},
 				Nodes: []stanza.Node{
 					stanza.Node{
 						XMLName: xml.Name{Local: "text"},
-						Content: fn,
+						Content: info.Fn,
 					},
 				},
 			})
 		}
-		if photo != "" {
+		if base64Photo != "" {
 			nodes = append(nodes, stanza.Node{
 				XMLName: xml.Name{Local: "photo"},
 				Nodes: []stanza.Node{
 					stanza.Node{
 						XMLName: xml.Name{Local: "uri"},
-						Content: "data:image/jpeg;base64," + photo,
+						Content: "data:image/jpeg;base64," + base64Photo,
 					},
 				},
 			})
 		}
-		if nickname != "" {
+		for _, nickname := range info.Nicknames {
 			nodes = append(nodes, stanza.Node{
 				XMLName: xml.Name{Local: "nickname"},
 				Nodes: []stanza.Node{
@@ -485,39 +783,39 @@ func makeVCardPayload(typ byte, id, fn, photo, nickname, given, family, tel, inf
 				},
 			})
 		}
-		if family != "" || given != "" {
+		if info.Family != "" || info.Given != "" {
 			nodes = append(nodes, stanza.Node{
 				XMLName: xml.Name{Local: "n"},
 				Nodes: []stanza.Node{
 					stanza.Node{
 						XMLName: xml.Name{Local: "surname"},
-						Content: family,
+						Content: info.Family,
 					},
 					stanza.Node{
 						XMLName: xml.Name{Local: "given"},
-						Content: given,
+						Content: info.Given,
 					},
 				},
 			})
 		}
-		if tel != "" {
+		if info.Tel != "" {
 			nodes = append(nodes, stanza.Node{
 				XMLName: xml.Name{Local: "tel"},
 				Nodes: []stanza.Node{
 					stanza.Node{
 						XMLName: xml.Name{Local: "uri"},
-						Content: "tel:" + tel,
+						Content: "tel:" + info.Tel,
 					},
 				},
 			})
 		}
-		if info != "" {
+		if info.Info != "" {
 			nodes = append(nodes, stanza.Node{
 				XMLName: xml.Name{Local: "note"},
 				Nodes: []stanza.Node{
 					stanza.Node{
 						XMLName: xml.Name{Local: "text"},
-						Content: info,
+						Content: info.Info,
 					},
 				},
 			})