Merge branch 'muc' into calls

( and finished Caps support, sorry for the mess :-' )

.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 := "v2.0.0-dev"
+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")
+	}
+}

config.yml.example

@@ -7,6 +7,7 @@
         :user: 'www-data' # owner of content files
         :quota: '256MB' # maximum storage size
     :tdlib_verbosity: 1
+    :mam_threshold: 7 # in days
     :tdlib:
         :datadir: './sessions/'
         :client:

config/config.go

@@ -30,6 +30,7 @@ type TelegramConfig struct {
 	Loglevel     string                `yaml:":loglevel"`
 	Content      TelegramContentConfig `yaml:":content"`
 	Verbosity    uint8                 `yaml:":tdlib_verbosity"`
+	MAMThreshold uint32                `yaml:":mam_threshold"`
 	Tdlib        TelegramTdlibConfig   `yaml:":tdlib"`
 }
 

config_schema.json

@@ -33,6 +33,9 @@
         ":tdlib_verbosity": {
           "type": "integer"
         },
+        ":mam_threshold": {
+          "type": "integer"
+        },
         ":tdlib": {
           "required": [":client"],
           "type": "object",

go.mod

@@ -1,16 +1,40 @@
 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/google/uuid v1.1.1
+	github.com/pkg/errors v0.9.1
 	github.com/santhosh-tekuri/jsonschema v1.2.4
 	github.com/sirupsen/logrus v1.4.2
 	github.com/soheilhy/args v0.0.0-20150720134047-6bcf4c78e87e
+	github.com/xdg-go/stringprep v1.0.4
 	github.com/zelenin/go-tdlib v0.5.2
 	gopkg.in/yaml.v2 v2.2.4
 	gosrc.io/xmpp v0.5.2-0.20211214110136-5f99e1cd06e1
 )
 
-replace gosrc.io/xmpp => dev.narayana.im/narayana/go-xmpp v0.0.0-20220524203317-306b4ff58e8f
+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/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/text v0.7.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-20250823114312-ed4011fc17e4
+
+replace github.com/zelenin/go-tdlib => dev.narayana.im/narayana/go-tdlib v0.0.0-20240124222245-b4c12addb061

go.sum

@@ -1,34 +1,43 @@
-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=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20240131013505-18c46e6c59fd h1:+UW+E7JjI88aH4beDn1cw6D8rs1I061hN91HU4Y4pT8=
-github.com/Arman92/go-tdlib v0.0.0-20191002071913-526f4e1d15f7/go.mod h1:ZzkRfuaFj8etIYMj/ECtXtgfz72RE6U+dos27b3XIwk=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20240131013505-18c46e6c59fd/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20240512132113-6725c3862314 h1:29/NjOGOUDceO73Hk4Nj4uVa1je8MULJlsDSvKxSN/k=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20240512132113-6725c3862314/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20250818040038-376b5d77528a h1:9PPqmhy6HbhhCS5EZzw+sdi4EpWW+LOwnz+/JXTcHjQ=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20250818040038-376b5d77528a/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20250823114312-ed4011fc17e4 h1:HQT33Zp3iRkbCiijWDo943K//wQgzoMccIP7Vb2uEfY=
+dev.narayana.im/narayana/go-xmpp v0.0.0-20250823114312-ed4011fc17e4/go.mod h1:L3NFMqYOxyLz3JGmgFyWf7r9htE91zVGiK40oW4RwdY=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/agnivade/wasmbrowsertest v0.3.1/go.mod h1:zQt6ZTdl338xxRaMW395qccVE2eQm0SjC/SDz0mPWQI=
-github.com/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 +47,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 +99,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 +115,114 @@ 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/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8=
-github.com/zelenin/go-tdlib v0.1.0/go.mod h1:Xs8fXbk5n7VaPyrSs9DP7QYoBScWYsjX+lUcWmx1DIU=
+github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+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/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+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.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+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/sync v0.0.0-20220722155255-886fb9371eb4/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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 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/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+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/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 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 +230,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"
@@ -39,30 +40,73 @@ type Session struct {
 	KeepOnline      bool           `yaml:":keeponline"`
 	RawMessages     bool           `yaml:":rawmessages"`
 	AsciiArrows     bool           `yaml:":asciiarrows"`
+	MUC             bool           `yaml:":muc"`
 	OOBMode         bool           `yaml:":oobmode"`
 	Carbons         bool           `yaml:":carbons"`
 	HideIds         bool           `yaml:":hideids"`
+	Receipts        bool           `yaml:":receipts"`
+	NativeEdits     bool           `yaml:":nativeedits"`
+	IgnoredChats    []int64        `yaml:":ignoredchats"`
+	ignoredChatsMap map[int64]bool `yaml:"-"`
+
+	IgnoreGroupDeletions bool `yaml:":ignoregroupdeletions"`
 }
 
-var configKeys = []string{
+const (
+	PropertyTypeUnknown byte = iota
+	PropertyTypeString
+	PropertyTypeBool
+)
+
+var ConfigKeys = []string{
 	"timezone",
 	"keeponline",
 	"rawmessages",
 	"asciiarrows",
+	"muc",
 	"oobmode",
 	"carbons",
 	"hideids",
+	"receipts",
+	"nativeedits",
+	"ignoregroupdeletions",
+}
+
+var Presets = map[string][][]string{
+	"modern": [][]string{
+		{"asciiarrows", "false"},
+		{"oobmode", "true"},
+		{"carbons", "true"},
+		{"hideids", "true"},
+		{"receipts", "true"},
+		{"nativeedits", "true"},
+	},
+	"classic": [][]string{
+		{"asciiarrows", "true"},
+		{"oobmode", "false"},
+		{"carbons", "false"},
+		{"hideids", "false"},
+		{"receipts", "false"},
+		{"nativeedits", "false"},
+	},
 }
 
 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 +148,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 +169,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
@@ -124,12 +185,20 @@ func (s *Session) Get(key string) (string, error) {
 		return fromBool(s.RawMessages), nil
 	case "asciiarrows":
 		return fromBool(s.AsciiArrows), nil
+	case "muc":
+		return fromBool(s.MUC), nil
 	case "oobmode":
 		return fromBool(s.OOBMode), nil
 	case "carbons":
 		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
+	case "ignoregroupdeletions":
+		return fromBool(s.IgnoreGroupDeletions), nil
 	}
 
 	return "", errors.New("Unknown session property")
@@ -137,9 +206,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 {
+	for _, configKey := range ConfigKeys {
-		value, _ := s.Get(configKey)
+		value, _ := s.get(configKey)
 		m[configKey] = value
 	}
 
@@ -148,6 +220,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
@@ -173,6 +248,13 @@ func (s *Session) Set(key string, value string) (string, error) {
 		}
 		s.AsciiArrows = b
 		return value, nil
+	case "muc":
+		b, err := toBool(value)
+		if err != nil {
+			return "", err
+		}
+		s.MUC = b
+		return value, nil
 	case "oobmode":
 		b, err := toBool(value)
 		if err != nil {
@@ -194,11 +276,44 @@ 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
+	case "ignoregroupdeletions":
+		b, err := toBool(value)
+		if err != nil {
+			return "", err
+		}
+		s.IgnoreGroupDeletions = b
+		return value, nil
 	}
 
 	return "", errors.New("Unknown session property")
 }
 
+// PropertyType determines the property type
+func PropertyType(key string) byte {
+	switch key {
+	case "timezone":
+		return PropertyTypeString
+	case "keeponline", "rawmessages", "asciiarrows", "muc", "oobmode", "carbons", "hideids",
+		"receipts", "nativeedits", "ignoregroupdeletions":
+		return PropertyTypeBool
+	}
+	return PropertyTypeUnknown
+}
+
 // TimezoneToLocation tries to convert config timezone to location
 func (s *Session) TimezoneToLocation() *time.Location {
 	time, err := time.Parse("-07:00", s.Timezone)
@@ -210,6 +325,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"
@@ -228,3 +388,16 @@ func toBool(s string) (bool, error) {
 
 	return false, errors.New("Invalid boolean value")
 }
+
+// NormalizeProperty converts typed properties with uncertain values to certain ones
+func NormalizeProperty(key, value string) string {
+	if PropertyType(key) == PropertyTypeBool {
+		if value == "0" {
+			value = "false"
+		}
+		if value == "1" {
+			value = "true"
+		}
+	}
+	return value
+}

persistence/sessions_test.go

@@ -47,17 +47,23 @@ func TestSessionToMap(t *testing.T) {
 	session := Session{
 		Timezone:    "klsf",
 		RawMessages: true,
+		MUC:         true,
 		OOBMode:     true,
+		Receipts:    true,
 	}
 	m := session.ToMap()
 	sample := map[string]string{
 		"timezone":             "klsf",
 		"keeponline":           "false",
+		"muc":                  "true",
 		"rawmessages":          "true",
 		"asciiarrows":          "false",
 		"oobmode":              "true",
 		"carbons":              "false",
 		"hideids":              "false",
+		"receipts":             "true",
+		"nativeedits":          "false",
+		"ignoregroupdeletions": "false",
 	}
 	if !reflect.DeepEqual(m, sample) {
 		t.Errorf("Map does not match the sample: %v", m)
@@ -85,3 +91,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,rw \
+    /bin/bash -c 'go mod tidy; go get'
+
+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 = "2.0.0-dev"
 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, version)
 	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

@@ -4,6 +4,7 @@ import (
 	"sync"
 
 	"github.com/zelenin/go-tdlib/client"
+	"gosrc.io/xmpp/stanza"
 )
 
 // Status stores formatted data for XMPP presence
@@ -16,10 +17,12 @@ type Status struct {
 // Cache allows operating the chats and users cache in
 // a thread-safe manner
 type Cache struct {
-	chats        map[int64]*client.Chat
+	ownChats     map[int64]*client.Chat
+	auxChats     map[int64]*client.Chat
 	users        map[int64]*client.User
 	statuses     map[int64]*Status
 	capsVers     map[int64]string
+	verDiscos    map[string]*stanza.DiscoInfo
 	chatsLock    sync.Mutex
 	usersLock    sync.Mutex
 	statusesLock sync.Mutex
@@ -29,9 +32,12 @@ type Cache struct {
 // NewCache initializes a cache
 func NewCache() *Cache {
 	return &Cache{
-		chats:    map[int64]*client.Chat{},
+		ownChats:  map[int64]*client.Chat{},
+		auxChats:  map[int64]*client.Chat{},
 		users:     map[int64]*client.User{},
 		statuses:  map[int64]*Status{},
+		capsVers:  map[int64]string{},
+		verDiscos: map[string]*stanza.DiscoInfo{},
 	}
 }
 
@@ -42,7 +48,23 @@ func (cache *Cache) ChatsKeys() []int64 {
 	defer cache.chatsLock.Unlock()
 
 	var keys []int64
-	for id := range cache.chats {
+	for id := range cache.ownChats {
+		keys = append(keys, id)
+	}
+	for id := range cache.auxChats {
+		keys = append(keys, id)
+	}
+	return keys
+}
+
+// OwnChatsKeys grabs only own chat ids synchronously to avoid lockups
+// while they are used
+func (cache *Cache) OwnChatsKeys() []int64 {
+	cache.chatsLock.Lock()
+	defer cache.chatsLock.Unlock()
+
+	var keys []int64
+	for id := range cache.ownChats {
 		keys = append(keys, id)
 	}
 	return keys
@@ -86,7 +108,10 @@ func (cache *Cache) GetChat(id int64) (*client.Chat, bool) {
 	cache.chatsLock.Lock()
 	defer cache.chatsLock.Unlock()
 
-	chat, ok := cache.chats[id]
+	chat, ok := cache.ownChats[id]
+	if !ok {
+		chat, ok = cache.auxChats[id]
+	}
 	return chat, ok
 }
 
@@ -109,20 +134,43 @@ func (cache *Cache) GetStatus(id int64) (*Status, bool) {
 }
 
 // GetCapsVer retrieves capabilities verification string by id if it's present in the cache
-func (cache *Cache) GetCapsVer(id int64) (string, bool) {
+func (cache *Cache) GetCapsVer(id int64) (string, *stanza.DiscoInfo, bool) {
 	cache.capsVersLock.Lock()
 	defer cache.capsVersLock.Unlock()
 
 	ver, ok := cache.capsVers[id]
-	return ver, ok
+	var di *stanza.DiscoInfo
+	if ok {
+		di, ok = cache.verDiscos[ver]
+	}
+	return ver, di, ok
+}
+
+// GetVerDisco retrieves disco info by capability verification string if it's present in the cache
+func (cache *Cache) GetVerDisco(ver string) (*stanza.DiscoInfo, bool) {
+	cache.capsVersLock.Lock()
+	defer cache.capsVersLock.Unlock()
+
+	di, ok := cache.verDiscos[ver]
+	return di, ok
 }
 
 // SetChat stores a chat in the cache
-func (cache *Cache) SetChat(id int64, chat *client.Chat) {
+func (cache *Cache) SetChat(id int64, chat *client.Chat, own bool) {
 	cache.chatsLock.Lock()
 	defer cache.chatsLock.Unlock()
 
-	cache.chats[id] = chat
+	if own {
+		cache.ownChats[id] = chat
+		// move from aux to own, but not vice versa
+		// (own: true means that presences for the chat are needed
+		// for sure, false means just "not necessarily")
+		if _, ok := cache.auxChats[id]; ok {
+			delete(cache.auxChats, id)
+		}
+	} else {
+		cache.auxChats[id] = chat
+	}
 }
 
 // SetUser stores a user in the cache
@@ -146,9 +194,20 @@ func (cache *Cache) SetStatus(id int64, show string, status string) {
 }
 
 // SetCapsVer stores a capabilities verification string in the cache
-func (cache *Cache) SetCapsVer(id int64, ver string) {
+func (cache *Cache) SetCapsVer(id int64, ver string, di *stanza.DiscoInfo) {
 	cache.capsVersLock.Lock()
 	defer cache.capsVersLock.Unlock()
 
 	cache.capsVers[id] = ver
+	cache.verDiscos[ver] = di
+}
+
+// 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

@@ -10,41 +10,111 @@ import (
 	"dev.narayana.im/narayana/telegabber/config"
 	"dev.narayana.im/narayana/telegabber/persistence"
 	"dev.narayana.im/narayana/telegabber/telegram/cache"
+	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
 
 	"github.com/zelenin/go-tdlib/client"
 	"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
 	TimestampExpired int64
 }
 
+// IntPair holds two int64 values
+type IntPair struct {
+	ChatId    int64
+	MessageId int64
+}
+
+type barrier struct {
+	mu        sync.Mutex
+	open      bool
+	released  bool
+	releaseCh chan struct{}
+}
+
+// Wait blocks until the barrier is released.
+func (b *barrier) Wait() {
+	b.mu.Lock()
+
+	if b.released {
+		b.mu.Unlock()
+		return
+	}
+
+	if !b.open {
+		b.open = true
+		b.releaseCh = make(chan struct{}) // Reinitialize the channel
+	}
+	b.mu.Unlock()
+
+	// Wait for the barrier to be released
+	<-b.releaseCh
+}
+
+// Done releases the barrier.
+func (b *barrier) Done() {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	if b.open {
+		close(b.releaseCh) // Close the channel to release waiting goroutines
+		b.open = false     // Mark the barrier as closed
+	} else {
+		b.released = true
+	}
+}
+
+// IsPending checks if the barrier is currently being waited
+func (b *barrier) IsPending() bool {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	return b.open
+}
+
+// NewId stores message ids and timestamps of their additions so old ones can be truncated to save memory
+type newId struct {
+	Id      int64
+	Ts      int64
+	lock    sync.Mutex
+	ownLock sync.Mutex
+	locked  bool
+	fired   bool
+}
+
+func newNewId() *newId {
+	return &newId{Ts: time.Now().Unix()}
+}
+
+func (i *newId) Lock() {
+	i.ownLock.Lock()
+	if i.fired {
+		i.ownLock.Unlock()
+		return
+	}
+	i.locked = true
+	i.ownLock.Unlock()
+	i.lock.Lock()
+}
+
+func (i *newId) Unlock() {
+	i.ownLock.Lock()
+	if i.locked {
+		i.lock.Unlock()
+		i.locked = false
+		i.fired = true
+	}
+	i.ownLock.Unlock()
+}
+
 // Client stores the metadata for lazily invoked TDlib instance
 type Client struct {
 	client     *client.Client
 	authorizer *clientAuthorizer
-	parameters *client.TdlibParameters
+	parameters *client.SetTdlibParametersRequest
 	options    []client.Option
 	me         *client.User
 
@@ -56,26 +126,70 @@ type Client struct {
 	cache     *cache.Cache
 	online    bool
 
+	loginWizard *loginWizardMetadata
+	loginStage  LoginStage
+
+	lastAuthorizationStateType string
+
+	outbox     map[string]string
+	editOutbox map[string]string
+	pinOutbox  map[IntPair]chan int64
+
 	DelayedStatuses     map[int64]*DelayedStatus
 	DelayedStatusesLock sync.Mutex
 
+	lastMsgHashes map[int64]uint64
+	lastMsgIds    map[int64]string
+
+	mucCache map[int64]*MUCState
+
+	uploadingFiles map[int32]string
+
+	LastBotCmdString string
+
+	XmppClientFeatures     map[string]*[]string
+	XmppClientFeaturesLock sync.Mutex
+
+	avatarHashes     map[int64]*gateway.HashedAvatar
+	avatarHashesLock sync.Mutex
+
+	MessageIdChanges     map[int64]map[int64]*newId
+	MessageIdChangesLock sync.Mutex
+
 	locks           clientLocks
+	SendMessageLock sync.Mutex
 }
 
 type clientLocks struct {
 	authorizationReady sync.Mutex
 	chatMessageLocks   map[int64]*sync.Mutex
 	resourcesLock      sync.Mutex
+	outboxLock         sync.Mutex
+	mucCacheLock       sync.Mutex
+	editOutboxLock     sync.Mutex
+	pinOutboxLock      sync.Mutex
+	lastMsgHashesLock  sync.Mutex
+	lastMsgIdsLock     sync.RWMutex
+	loginFinish        barrier
+	uploadingFilesLock sync.Mutex
+
+	authorizerReadLock  sync.Mutex
+	authorizerWriteLock sync.Mutex
+
+	loginWizardReadLock  sync.Mutex
+	loginWizardWriteLock sync.Mutex
+}
+
+type loginWizardMetadata struct {
+	nextStage   chan LoginStage
+	chanBusy    bool
+	commandSent bool
 }
 
 // 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 +206,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,10 +237,25 @@ 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),
+		pinOutbox:          make(map[IntPair]chan int64),
+		mucCache:           make(map[int64]*MUCState),
+		uploadingFiles:     make(map[int32]string),
 		options:            options,
 		DelayedStatuses:    make(map[int64]*DelayedStatus),
+		lastMsgHashes:      make(map[int64]uint64),
+		lastMsgIds:         make(map[int64]string),
+		XmppClientFeatures: make(map[string]*[]string),
+		avatarHashes:       make(map[int64]*gateway.HashedAvatar),
+		MessageIdChanges:   make(map[int64]map[int64]*newId),
 		locks: clientLocks{
 			chatMessageLocks: make(map[int64]*sync.Mutex),
 		},
 	}, nil
 }
+
+// GetPersistenceSession retrieves the internal session configuration
+func (c *Client) GetPersistenceSession() *persistence.Session {
+	return c.Session
+}

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/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)
@@ -95,7 +95,7 @@ func (stateHandler *clientAuthorizer) Close() {
 }
 
 // Connect starts TDlib connection
-func (c *Client) Connect(resource string) error {
+func (c *Client) Connect(resource string, wasSessionLoginEmpty bool) error {
 	log.Warn("Attempting to connect to Telegram network...")
 
 	// avoid conflict if another authorization is pending already
@@ -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,12 +121,15 @@ 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 {
 		c.locks.authorizationReady.Unlock()
+		c.wizardStageOrPrompt(LoginStageCancel, "")
 		return errors.Wrap(err, "Couldn't initialize a Telegram client instance")
 	}
 
@@ -141,27 +145,81 @@ func (c *Client) Connect(resource string) error {
 		c.Session.Login = c.me.PhoneNumber
 	}
 
+	log.Debug("waiting for loginFinish")
+	c.locks.loginFinish.Wait()
+
 	go c.updateHandler()
+	log.Warn("Going online")
 	c.online = true
 	c.locks.authorizationReady.Unlock()
 	c.addResource(resource)
 
 	go func() {
-		_, err = c.client.GetChats(&client.GetChatsRequest{
+		chats, err := c.client.GetChats(&client.GetChatsRequest{
 			Limit: chatsLimit,
 		})
 		if err != nil {
 			log.Errorf("Could not retrieve chats: %v", err)
+		} else {
+			log.Infof("Obtained ≈%v chats for initialization", chats.TotalCount)
 		}
 
-		gateway.SendPresence(c.xmpp, c.jid, gateway.SPType("subscribe"))
+		gateway.SubscribeToTransport(c.xmpp, c.jid)
-		gateway.SendPresence(c.xmpp, c.jid, gateway.SPType("subscribed"))
+		loggedInString := "Logged in as: " + c.Session.Login
-		gateway.SendPresence(c.xmpp, c.jid, gateway.SPStatus("Logged in as: "+c.Session.Login))
+		c.sendPresence(gateway.SPStatus(loggedInString))
+		if wasSessionLoginEmpty {
+			for _, jid := range c.GetCarbonFullJids(true, "", false) {
+				gateway.SendServiceMessage(jid, loggedInString, c.xmpp)
+			}
+		}
 	}()
+	log.Warn("Client connected!")
 
 	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, wasSessionLoginEmpty)
+			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 {
@@ -182,36 +240,46 @@ func (c *Client) Disconnect(resource string, quit bool) bool {
 	log.Warn("Disconnecting from Telegram network...")
 
 	// we're offline (unsubscribe if logout)
-	for _, id := range c.cache.ChatsKeys() {
+	for _, id := range c.cache.OwnChatsKeys() {
-		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()
+	if c.Session.MUC {
-	if err != nil {
+		c.locks.mucCacheLock.Lock()
-		log.Errorf("Couldn't close the Telegram instance: %v; %#v", err, c)
+		for chatID := range c.mucCache {
+			c.kickMeFromMUC(chatID, []uint16{110, 332}, false, c.mucCache[chatID])
 		}
-	c.forceClose()
+		c.locks.mucCacheLock.Unlock()
+	}
+
+	c.close()
 
 	return true
 }
 
 func (c *Client) interactor() {
+	wasSessionLoginEmpty := c.Session.Login == ""
 	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")
-			return
+			c.locks.authorizerReadLock.Unlock()
+			break
 		}
 
 		stateType := state.AuthorizationStateType()
 		log.Infof("Telegram authorization state: %#v", stateType)
 		log.Debugf("%#v", state)
 
+		c.lastAuthorizationStateType = stateType
+
 		switch stateType {
 		// stage 0: set login
 		case client.TypeAuthorizationStateWaitPhoneNumber:
@@ -219,12 +287,12 @@ func (c *Client) interactor() {
 			if c.Session.Login != "" {
 				c.authorizer.PhoneNumber <- c.Session.Login
 			} else {
-				gateway.SendServiceMessage(c.jid, "Please, enter your Telegram login via /login 12345", c.xmpp)
+				c.wizardStageOrPrompt(LoginStageLogin, "Please, enter your Telegram login via /login 12345, or use the Login Wizard via Ad-Hoc commands")
 			}
 		// stage 1: wait for auth code
 		case client.TypeAuthorizationStateWaitCode:
 			log.Warn("Waiting for authorization code...")
-			gateway.SendServiceMessage(c.jid, "Please, enter authorization code via /code 12345", c.xmpp)
+			c.wizardStageOrPrompt(LoginStageCode, "Please, enter authorization code via /code 12345")
 		// stage 1b: wait for registration
 		case client.TypeAuthorizationStateWaitRegistration:
 			log.Warn("Waiting for full name...")
@@ -232,16 +300,53 @@ func (c *Client) interactor() {
 		// stage 2: wait for 2fa
 		case client.TypeAuthorizationStateWaitPassword:
 			log.Warn("Waiting for 2FA password...")
-			gateway.SendServiceMessage(c.jid, "Please, enter 2FA passphrase via /password 12345", c.xmpp)
+			c.wizardStageOrPrompt(LoginStagePassword, "Please, enter 2FA passphrase via /password 12345")
+		}
+		c.locks.authorizerReadLock.Unlock()
+	}
+	if c.loginStage != LoginStageCancel {
+		if wasSessionLoginEmpty {
+			c.wizardStageOrPrompt(LoginStagePreset, "Do you want to use a config preset? `/preset modern` enables brand new XMPP features, `/preset classic` targets legacy clients stuck in 00s. /pass proceeds to the next stage.")
+		} else {
+			c.wizardStageOrPrompt(LoginStageSuccess, "")
 		}
 	}
 }
 
 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 {
+		log.Debug("Closing authorizer")
+		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.wizardStageOrPrompt(LoginStageCancel, "")
+	c.StopLoginWizard()
+	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

@@ -2,21 +2,39 @@ package formatter
 
 import (
 	"sort"
+	"strings"
 	"unicode"
 
 	log "github.com/sirupsen/logrus"
 	"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
+	Replacing bool
 }
 
-// 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 +42,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 +64,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]
@@ -53,6 +76,14 @@ func (s InsertionStack) NewIterator() func() *Insertion {
 	}
 }
 
+func isReplacing(entity *client.TextEntity) bool {
+	switch entity.Type.TextEntityTypeType() {
+	case client.TypeTextEntityTypeMention, client.TypeTextEntityTypeMentionName:
+		return true
+	}
+	return false
+}
+
 // SortEntities arranges the entities in traversal-ready order
 func SortEntities(entities []*client.TextEntity) []*client.TextEntity {
 	sortedEntities := make([]*client.TextEntity, len(entities))
@@ -64,6 +95,9 @@ func SortEntities(entities []*client.TextEntity) []*client.TextEntity {
 		if entity1.Offset < entity2.Offset {
 			return true
 		} else if entity1.Offset == entity2.Offset {
+			if entity1.Length == entity2.Length {
+				return !isReplacing(entity1) && isReplacing(entity2)
+			}
 			return entity1.Length > entity2.Length
 		}
 		return false
@@ -120,21 +154,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 +190,105 @@ func ClaspDirectives(text string, entities []*client.TextEntity) []*client.TextE
 	return alignedEntities
 }
 
-func markupBraces(entity *client.TextEntity, lbrace, rbrace []rune) (*Insertion, *Insertion) {
+func mentionBraces(entity *client.TextEntity, nickname string) []*insertion {
-	return &Insertion{
+	return []*insertion{
+		&insertion{
 			Offset:    entity.Offset,
-			Runes:  lbrace,
+			Runes:     []rune("@" + nickname),
-		}, &Insertion{
+			Type:      insertionOpening,
+			Replacing: true,
+		},
+		&insertion{
 			Offset:    entity.Offset + entity.Length,
-			Runes:  rbrace,
+			Type:      insertionClosing,
+			Replacing: true,
+		},
 	}
 }
 
-// EntityToMarkdown generates the wrapping Markdown tags
+func markupBraces(entity *client.TextEntity, lbrace, rbrace []rune) []*insertion {
-func EntityToMarkdown(entity *client.TextEntity) (*Insertion, *Insertion) {
+	return []*insertion{
+		&insertion{
+			Offset: entity.Offset,
+			Runes:  lbrace,
+			Type:   insertionOpening,
+		},
+		&insertion{
+			Offset: entity.Offset + entity.Length,
+			Runes:  rbrace,
+			Type:   insertionClosing,
+		},
+	}
+}
+
+func quotePrependNewlines(entity *client.TextEntity, doubledRunes []rune, markupMode MarkupModeType) []*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 +299,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 +329,85 @@ 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
+}
+
+// cuts a substring back from doubled runes
+func cutTextFromDoubledRunes(doubledRunes []rune, offset, length int32) string {
+	runeSlice := doubledRunes[offset:offset+length]
+	var str strings.Builder
+	var skipNext bool
+	for _, cp := range runeSlice {
+		if skipNext {
+			skipNext = false
+			continue
+		}
+
+		str.WriteRune(cp)
+
+		if cp > bmpCeil {
+			skipNext = true
+		}
+	}
+	return str.String()
+}
+
+type MentionRetriever interface {
+	GetMUCNicknameByUsername(username string) (string, error)
+	GetMUCNickname(id int64) string
 }
 
 // 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,
+	mentionRetriever MentionRetriever,
 ) 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,40 +424,115 @@ func Format(
 
 		startStack, endStack = startStack.rebalance(endStack, entity.Offset)
 
-		startInsertion, endInsertion := entityToMarkup(entity)
+		var insertions []*insertion
-		if startInsertion != nil {
+		if entity != nil && entity.Type != nil {
-			startStack = append(startStack, startInsertion)
+			switch entity.Type.TextEntityTypeType() {
+			case client.TypeTextEntityTypeMention:
+				username := cutTextFromDoubledRunes(doubledRunes, entity.Offset, entity.Length)
+				nickname, err := mentionRetriever.GetMUCNicknameByUsername(username)
+				if err == nil {
+					insertions = mentionBraces(entity, nickname)
 				}
-		if endInsertion != nil {
+			case client.TypeTextEntityTypeMentionName:
-			endStack = append(endStack, endInsertion)
+				mentionName, _ := entity.Type.(*client.TextEntityTypeMentionName)
+				nickname := mentionRetriever.GetMUCNickname(mentionName.UserId)
+				insertions = mentionBraces(entity, nickname)
+			default:
+				insertions = entityToMarkup(entity, doubledRunes, markupMode)
+			}
+		}
+		if len(insertions) > 1 {
+			startStack = append(startStack, insertions[0:len(insertions)-1]...)
+		}
+		if len(insertions) > 0 {
+			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
+	var insideReplacingEntity bool
 
-	for _, cp := range sourceText {
+	for i, cp := range doubledRunes {
-		for insertion != nil && insertion.Offset <= runeI {
+		if skipNext {
+			skipNext = false
+			continue
+		}
+
+		// loop through possible multiple insertions at this point
+		for insertion != nil && int(insertion.Offset) <= i {
+			if !insideReplacingEntity {
 				markupRunes = append(markupRunes, insertion.Runes...)
+			}
+
+			// if replacing entity encountered, ignore all entities inside it until it's closed
+			// (replacing entities are assumed to be not nested or overlapped)
+			if insertion.Replacing {
+				if insertion.Type == insertionOpening {
+					insideReplacingEntity = true
+				} else if insertion.Type == insertionClosing {
+					insideReplacingEntity = false
+				}
+			}
+
 			insertion = nextInsertion()
 		}
 
+		if insideReplacingEntity {
+			continue
+		}
+
 		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++
 		}
 	}
+	// flush closing insertions
 	for insertion != nil {
+		if !insideReplacingEntity {
 			markupRunes = append(markupRunes, insertion.Runes...)
+		}
+		if insertion.Replacing && insertion.Type == insertionClosing {
+			insideReplacingEntity = false
+		}
 		insertion = nextInsertion()
 	}
 

telegram/formatter/formatter_test.go

@@ -1,13 +1,28 @@
 package formatter
 
 import (
+	"errors"
+	"strings"
 	"testing"
 
 	"github.com/zelenin/go-tdlib/client"
 )
 
+type MentionRetrieverMock struct {}
+
+func (m *MentionRetrieverMock) GetMUCNicknameByUsername(username string) (string, error) {
+	if strings.HasPrefix(username, "@") {
+		return username[1:], nil
+	}
+	return "", errors.New("Я@ТЫ@Я@ТЫ@Я@ТЫ@Я@ТЫ@Я@ТЫ@")
+}
+
+func (m *MentionRetrieverMock) GetMUCNickname(id int64) (string) {
+	return "42"
+}
+
 func TestNoFormatting(t *testing.T) {
-	markup := Format("abc\ndef", []*client.TextEntity{}, EntityToMarkdown)
+	markup := Format("abc\ndef", []*client.TextEntity{}, MarkupModeMarkdown, &MentionRetrieverMock{})
 	if markup != "abc\ndef" {
 		t.Errorf("No formatting expected, but: %v", markup)
 	}
@@ -20,7 +35,7 @@ func TestFormattingSimple(t *testing.T) {
 			Length: 4,
 			Type:   &client.TextEntityTypeBold{},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown, &MentionRetrieverMock{})
 	if markup != "👙**🐧🐖**" {
 		t.Errorf("Wrong simple formatting: %v", markup)
 	}
@@ -40,7 +55,7 @@ func TestFormattingAdjacent(t *testing.T) {
 				Url: "https://narayana.im/",
 			},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown, &MentionRetrieverMock{})
 	if markup != "a👙_🐧_[🐖](https://narayana.im/)" {
 		t.Errorf("Wrong adjacent formatting: %v", markup)
 	}
@@ -63,18 +78,18 @@ func TestFormattingAdjacentAndNested(t *testing.T) {
 			Length: 2,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown, &MentionRetrieverMock{})
 	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 +97,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 +114,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 +131,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 +148,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 +157,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 +223,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, &MentionRetrieverMock{})
 	if markup != "abc\ndef" {
 		t.Errorf("No formatting expected, but: %v", markup)
 	}
@@ -221,7 +236,7 @@ func TestFormattingXEP0393Simple(t *testing.T) {
 			Length: 4,
 			Type:   &client.TextEntityTypeBold{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "👙*🐧🐖*" {
 		t.Errorf("Wrong simple formatting: %v", markup)
 	}
@@ -241,7 +256,7 @@ func TestFormattingXEP0393Adjacent(t *testing.T) {
 				Url: "https://narayana.im/",
 			},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "a👙_🐧_🐖 <https://narayana.im/>" {
 		t.Errorf("Wrong adjacent formatting: %v", markup)
 	}
@@ -264,7 +279,7 @@ func TestFormattingXEP0393AdjacentAndNested(t *testing.T) {
 			Length: 2,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "```\n*👙*🐧\n```_🐖_" {
 		t.Errorf("Wrong adjacent&nested formatting: %v", markup)
 	}
@@ -287,7 +302,7 @@ func TestFormattingXEP0393AdjacentItalicBoldItalic(t *testing.T) {
 			Length: 69,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "_раса двуногих крысолюдей, *которую так редко замечают, что многие отрицают само их существование*_" {
 		t.Errorf("Wrong adjacent italic/bold-italic formatting: %v", markup)
 	}
@@ -315,7 +330,7 @@ func TestFormattingXEP0393MultipleAdjacent(t *testing.T) {
 			Length: 1,
 			Type:   &client.TextEntityTypeItalic{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "a*bcd*_e_" {
 		t.Errorf("Wrong multiple adjacent formatting: %v", markup)
 	}
@@ -343,7 +358,7 @@ func TestFormattingXEP0393Intersecting(t *testing.T) {
 			Length: 1,
 			Type:   &client.TextEntityTypeBold{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "a*b*_*cd*e_" {
 		t.Errorf("Wrong intersecting formatting: %v", markup)
 	}
@@ -361,7 +376,7 @@ func TestFormattingXEP0393InlineCode(t *testing.T) {
 			Length: 25,
 			Type:   &client.TextEntityTypePre{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	if markup != "Is `Gajim` a thing?\n\n```\necho 'Hello'\necho 'world'\n```\n\nhruck(" {
 		t.Errorf("Wrong intersecting formatting: %v", markup)
 	}
@@ -374,7 +389,7 @@ func TestFormattingMarkdownStrikethrough(t *testing.T) {
 			Length: 3,
 			Type:   &client.TextEntityTypeStrikethrough{},
 		},
-	}, EntityToMarkdown)
+	}, MarkupModeMarkdown, &MentionRetrieverMock{})
 	if markup != "Everyone ~~dis~~likes cake." {
 		t.Errorf("Wrong strikethrough formatting: %v", markup)
 	}
@@ -387,14 +402,14 @@ func TestFormattingXEP0393Strikethrough(t *testing.T) {
 			Length: 3,
 			Type:   &client.TextEntityTypeStrikethrough{},
 		},
-	}, EntityToXEP0393)
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
 	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 +424,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 +439,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 +454,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 +474,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 +487,186 @@ 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, &MentionRetrieverMock{})
+	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, &MentionRetrieverMock{})
+	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, &MentionRetrieverMock{})
+	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, &MentionRetrieverMock{})
+	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, &MentionRetrieverMock{})
+	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, &MentionRetrieverMock{})
+	if markup != "> **_hruck\np~~uc~~k_\nshuck**\n\ntext" {
+		t.Errorf("Wrong blockquote formatting: %v", markup)
+	}
+}
+
+func TestUsernameMention(t *testing.T) {
+	markup := Format("a @b c", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 2,
+			Length: 2,
+			Type:   &client.TextEntityTypeMention{},
+		},
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
+	if markup != "a @b c" {
+		t.Errorf("Wrong mention formatting: %v", markup)
+	}
+}
+
+func TestUsernameMentionName(t *testing.T) {
+	markup := Format("a bb c", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 2,
+			Length: 2,
+			Type:   &client.TextEntityTypeMentionName{UserId: 100500},
+		},
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
+	if markup != "a @42 c" {
+		t.Errorf("Wrong mention name formatting: %v", markup)
+	}
+}
+
+func TestUsernameMentionNested(t *testing.T) {
+	markup := Format("a @b c", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 2,
+			Length: 2,
+			Type:   &client.TextEntityTypeMention{},
+		},
+		&client.TextEntity{
+			Offset: 2,
+			Length: 1,
+			Type:   &client.TextEntityTypeBold{},
+		},
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
+	if markup != "a @b c" {
+		t.Errorf("Wrong formatting of mention with nested entity: %v", markup)
+	}
+}
+
+func TestUsernameMentionNestedEven(t *testing.T) {
+	markup := Format("a @b c", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 2,
+			Length: 2,
+			Type:   &client.TextEntityTypeMention{},
+		},
+		&client.TextEntity{
+			Offset: 2,
+			Length: 2,
+			Type:   &client.TextEntityTypeBold{},
+		},
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
+	if markup != "a *@b* c" {
+		t.Errorf("Wrong formatting of mention with even nested entity: %v", markup)
+	}
+}
+
+func TestUsernameMentionError(t *testing.T) {
+	markup := Format("a bb c", []*client.TextEntity{
+		&client.TextEntity{
+			Offset: 2,
+			Length: 2,
+			Type:   &client.TextEntityTypeMention{},
+		},
+	}, MarkupModeXEP0393, &MentionRetrieverMock{})
+	if markup != "a bb c" {
+		t.Errorf("Wrong formatting of erroneous mention: %v", markup)
+	}
+}

telegram/handlers.go

@@ -11,14 +11,11 @@ import (
 	"dev.narayana.im/narayana/telegabber/telegram/formatter"
 	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
 
+	"github.com/google/uuid"
 	log "github.com/sirupsen/logrus"
 	"github.com/zelenin/go-tdlib/client"
 )
 
-func uhOh() {
-	log.Fatal("Update type mismatch")
-}
-
 func int64SliceToStringSlice(ints []int64) []string {
 	strings := make([]string, len(ints))
 	wg := sync.WaitGroup{}
@@ -55,6 +52,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,
+		gateway.CHATNODE(chatId),
+		c.xmpp,
+		typ,
+		xmppId,
+	)
+}
+
 func (c *Client) updateHandler() {
 	listener := c.client.GetListener()
 	defer listener.Close()
@@ -63,84 +85,60 @@ func (c *Client) updateHandler() {
 		if update.GetClass() == client.ClassUpdate {
 			switch update.GetType() {
 			case client.TypeUpdateUser:
-				typedUpdate, ok := update.(*client.UpdateUser)
+				typedUpdate, _ := update.(*client.UpdateUser)
-				if !ok {
-					uhOh()
-				}
 				c.updateUser(typedUpdate)
 				log.Debugf("%#v", typedUpdate.User)
 			case client.TypeUpdateUserStatus:
-				typedUpdate, ok := update.(*client.UpdateUserStatus)
+				typedUpdate, _ := update.(*client.UpdateUserStatus)
-				if !ok {
-					uhOh()
-				}
 				c.updateUserStatus(typedUpdate)
 				log.Debugf("%#v", typedUpdate.Status)
 			case client.TypeUpdateNewChat:
-				typedUpdate, ok := update.(*client.UpdateNewChat)
+				typedUpdate, _ := update.(*client.UpdateNewChat)
-				if !ok {
-					uhOh()
-				}
 				c.updateNewChat(typedUpdate)
 				log.Debugf("%#v", typedUpdate.Chat)
 			case client.TypeUpdateChatPosition:
-				typedUpdate, ok := update.(*client.UpdateChatPosition)
+				typedUpdate, _ := update.(*client.UpdateChatPosition)
-				if !ok {
-					uhOh()
-				}
 				c.updateChatPosition(typedUpdate)
 				log.Debugf("%#v", typedUpdate)
 			case client.TypeUpdateChatLastMessage:
-				typedUpdate, ok := update.(*client.UpdateChatLastMessage)
+				typedUpdate, _ := update.(*client.UpdateChatLastMessage)
-				if !ok {
-					uhOh()
-				}
 				c.updateChatLastMessage(typedUpdate)
 				log.Debugf("%#v", typedUpdate)
 			case client.TypeUpdateNewMessage:
-				typedUpdate, ok := update.(*client.UpdateNewMessage)
+				typedUpdate, _ := update.(*client.UpdateNewMessage)
-				if !ok {
-					uhOh()
-				}
 				c.updateNewMessage(typedUpdate)
 				log.Debugf("%#v", typedUpdate.Message)
 			case client.TypeUpdateMessageContent:
-				typedUpdate, ok := update.(*client.UpdateMessageContent)
+				typedUpdate, _ := update.(*client.UpdateMessageContent)
-				if !ok {
-					uhOh()
-				}
 				c.updateMessageContent(typedUpdate)
 				log.Debugf("%#v", typedUpdate.NewContent)
 			case client.TypeUpdateDeleteMessages:
-				typedUpdate, ok := update.(*client.UpdateDeleteMessages)
+				typedUpdate, _ := update.(*client.UpdateDeleteMessages)
-				if !ok {
-					uhOh()
-				}
 				c.updateDeleteMessages(typedUpdate)
 			case client.TypeUpdateAuthorizationState:
-				typedUpdate, ok := update.(*client.UpdateAuthorizationState)
+				typedUpdate, _ := update.(*client.UpdateAuthorizationState)
-				if !ok {
-					uhOh()
-				}
 				c.updateAuthorizationState(typedUpdate)
 			case client.TypeUpdateMessageSendSucceeded:
-				typedUpdate, ok := update.(*client.UpdateMessageSendSucceeded)
+				typedUpdate, _ := update.(*client.UpdateMessageSendSucceeded)
-				if !ok {
-					uhOh()
-				}
 				c.updateMessageSendSucceeded(typedUpdate)
 			case client.TypeUpdateMessageSendFailed:
-				typedUpdate, ok := update.(*client.UpdateMessageSendFailed)
+				typedUpdate, _ := update.(*client.UpdateMessageSendFailed)
-				if !ok {
-					uhOh()
-				}
 				c.updateMessageSendFailed(typedUpdate)
 			case client.TypeUpdateChatTitle:
-				typedUpdate, ok := update.(*client.UpdateChatTitle)
+				typedUpdate, _ := update.(*client.UpdateChatTitle)
-				if !ok {
-					uhOh()
-				}
 				c.updateChatTitle(typedUpdate)
+			case client.TypeUpdateChatReadOutbox:
+				typedUpdate, _ := update.(*client.UpdateChatReadOutbox)
+				c.updateChatReadOutbox(typedUpdate)
+			case client.TypeUpdateBasicGroupFullInfo:
+				typedUpdate, _ := update.(*client.UpdateBasicGroupFullInfo)
+				c.updateBasicGroupFullInfo(typedUpdate)
+			case client.TypeUpdateChatPermissions:
+				typedUpdate, _ := update.(*client.UpdateChatPermissions)
+				c.updateChatPermissions(typedUpdate)
+			case client.TypeUpdateFile:
+				typedUpdate, _ := update.(*client.UpdateFile)
+				c.updateFile(typedUpdate)
 			default:
 				// log only handled types
 				continue
@@ -153,15 +151,22 @@ func (c *Client) updateHandler() {
 
 // new user discovered
 func (c *Client) updateUser(update *client.UpdateUser) {
+	// check if MUC nicknames should be updated
+	oldCacheUser, ok := c.cache.GetUser(update.User.Id)
 	c.cache.SetUser(update.User.Id, update.User)
+	if ok && (oldCacheUser.FirstName != update.User.FirstName || oldCacheUser.LastName != update.User.LastName) {
+		newNickname := c.GetMUCNickname(update.User.Id)
+		c.updateMUCsNickname(update.User.Id, newNickname)
+	}
+
 	show, status, presenceType := c.userStatusToText(update.User.Status, update.User.Id)
-	go c.ProcessStatusUpdate(update.User.Id, status, show, gateway.SPType(presenceType))
+	go c.ProcessStatusUpdate(update.User.Id, status, show, false, gateway.SPType(presenceType))
 }
 
 // user status changed
 func (c *Client) updateUserStatus(update *client.UpdateUserStatus) {
 	show, status, presenceType := c.userStatusToText(update.Status, update.UserId)
-	go c.ProcessStatusUpdate(update.UserId, status, show, gateway.SPImmed(false), gateway.SPType(presenceType))
+	go c.ProcessStatusUpdate(update.UserId, status, show, false, gateway.SPImmed(false), gateway.SPType(presenceType))
 }
 
 // new chat discovered
@@ -175,14 +180,14 @@ func (c *Client) updateNewChat(update *client.UpdateNewChat) {
 			}
 		}
 
-		c.cache.SetChat(update.Chat.Id, update.Chat)
+		c.cache.SetChat(update.Chat.Id, update.Chat, true)
 
 		if update.Chat.Positions != nil && len(update.Chat.Positions) > 0 {
-			c.subscribeToID(update.Chat.Id, update.Chat)
+			c.subscribeToID(update.Chat.Id, update.Chat, false)
 		}
 
 		if update.Chat.Id < 0 {
-			c.ProcessStatusUpdate(update.Chat.Id, update.Chat.Title, "chat")
+			c.ProcessStatusUpdate(update.Chat.Id, update.Chat.Title, "chat", true)
 		}
 	}()
 }
@@ -190,31 +195,47 @@ func (c *Client) updateNewChat(update *client.UpdateNewChat) {
 // chat position is updated
 func (c *Client) updateChatPosition(update *client.UpdateChatPosition) {
 	if update.Position != nil && update.Position.Order != 0 {
-		go c.subscribeToID(update.ChatId, nil)
+		go c.subscribeToID(update.ChatId, nil, false)
 	}
 }
 
 // chat last message is updated
 func (c *Client) updateChatLastMessage(update *client.UpdateChatLastMessage) {
 	if update.Positions != nil && len(update.Positions) > 0 {
-		go c.subscribeToID(update.ChatId, nil)
+		go c.subscribeToID(update.ChatId, nil, false)
 	}
 }
 
 // message received
 func (c *Client) updateNewMessage(update *client.UpdateNewMessage) {
-	go func() {
 	chatId := update.Message.ChatId
+	if c.Session.IsChatIgnored(chatId) {
+		return
+	}
 
 	// guarantee sequential message delivering per chat
 	lock := c.getChatMessageLock(chatId)
+	go func() {
 		lock.Lock()
 		defer lock.Unlock()
 
+		var forceCmd bool
+		if c.LastBotCmdString != "" && update.Message.IsOutgoing {
+			if update.Message.Content.MessageContentType() == client.TypeMessageText {
+				textMessage, _ := update.Message.Content.(*client.MessageText)
+
+				if textMessage.Text != nil && textMessage.Text.Text == c.LastBotCmdString {
+					forceCmd = true
+					c.LastBotCmdString = ""
+				}
+			}
+		}
+
 		// ignore self outgoing messages
 		if update.Message.IsOutgoing &&
 			update.Message.SendingState != nil &&
-			update.Message.SendingState.MessageSendingStateType() == client.TypeMessageSendingStatePending {
+			update.Message.SendingState.MessageSendingStateType() == client.TypeMessageSendingStatePending &&
+			!forceCmd {
 			return
 		}
 
@@ -228,27 +249,203 @@ 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) {
+		return
+	}
+
+	markupFunction := c.getFormatter()
+
+	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)
+
+	chat, _, _ := c.GetContactByID(update.ChatId, nil, true)
+	isMUC := c.Session.MUC && c.IsGroup(chat)
+
+	var jids []string
+	if isMUC {
+		_, jids = c.getMUCJoinedJIDs(update.ChatId, nil, true)
+	} else {
+		jids = c.GetCarbonFullJids(true, ignoredResource, true)
+	}
+	if len(jids) == 0 {
+		log.Info("The only resource is ignored, aborting")
+		return
+	}
+
 	if update.NewContent.MessageContentType() == client.TypeMessageText {
+		safeToSend := true
+
 		textContent := update.NewContent.(*client.MessageText)
+		log.Debugf("textContent: %#v", textContent.Text)
+
+		var replaceId string
+		sId := strconv.FormatInt(update.MessageId, 10)
+		var isCarbon bool
+
+		go func() {
+			message, messageErr := c.client.GetMessage(&client.GetMessageRequest{
+				ChatId:    update.ChatId,
+				MessageId: update.MessageId,
+			})
+			if messageErr != nil {
+				// odnako za vremya puti
+				// sobaka mogla podrasti
+				c.MessageIdChangesLock.Lock()
+				idsMap, idsMapOk := c.MessageIdChanges[update.ChatId]
+				hadNoId := false
+				if idsMapOk {
+					newId, newIdOk := idsMap[update.MessageId]
+					if newIdOk {
+						if newId.Id == 0 {
+							hadNoId = true
+							c.MessageIdChangesLock.Unlock()
+							newId.Lock()
+						}
+						log.Infof("falling back to updated message id: %v/%v->%v", update.ChatId, update.MessageId, newId.Id)
+						message, messageErr = c.client.GetMessage(&client.GetMessageRequest{
+							ChatId:    update.ChatId,
+							MessageId: newId.Id,
+						})
+					}
+				}
+				if !hadNoId {
+					c.MessageIdChangesLock.Unlock()
+				}
+			}
+
+			var prefix string
+			if messageErr == nil {
+				if message.EditDate == 0 {
+					return
+				}
+				log.Debugf("editDate: %v", message.EditDate)
+
+				isCarbon = c.isCarbonsEnabled() && message.IsOutgoing && !isMUC
+				// reply correction support in clients is suboptimal yet, so cut them out for now
+				prefix, _ = c.messageToPrefix(message, "", "", true)
+			} else {
+				log.Errorf("No message %v/%v found, cannot reliably determine if it is a carbon and if it is edited: %v", update.ChatId, update.MessageId, messageErr.Error())
+			}
+
+			// use XEP-0308 edits only if the last message is edited for sure, fallback otherwise
+			if c.Session.NativeEdits {
+				lastXmppId, ok := c.getLastChatMessageId(update.ChatId)
+				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)
+				}
+			}
+
+			var forceFallback bool
+
+			var from string
+			var originalFrom string
+			var nickname string
+			if isMUC {
+				if messageErr == nil {
+					senderId := c.getMessageSenderId(message)
+					nickname = c.GetMUCNickname(senderId)
+					originalFrom = gateway.CHATJID(senderId, true)
+
+					safeToSend = c.assureMUCOccupant(update.ChatId, senderId, message.SenderId, chat)
+					from = gateway.MUCJID(update.ChatId) + "/" + nickname
+				} else {
+					nickname = "#ERROR#"
+					forceFallback = true
+					from = gateway.MUCJID(update.ChatId)
+				}
+			} else {
+				from = gateway.CHATNODE(update.ChatId)
+			}
+
+			var text strings.Builder
+
+			if replaceId == "" || forceFallback {
 				var editChar string
 				if c.Session.AsciiArrows {
 					editChar = "e"
 				} else {
 					editChar = "✎"
 				}
-		text := editChar + fmt.Sprintf("%v | %s", update.MessageId, formatter.Format(
+				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,
+				c,
 			))
-		gateway.SendMessage(c.jid, strconv.FormatInt(update.ChatId, 10), text, "e"+strconv.FormatInt(update.MessageId, 10), c.xmpp, nil, false)
+
+			id := "e"+sId
+			uuid, err := uuid.NewRandom()
+			if err == nil {
+				id = id+":"+uuid.String()
+			}
+			for _, jid := range jids {
+				if safeToSend {
+					gateway.SendMessage(jid, from, text.String(), id, c.xmpp, nil, 0, replaceId, isCarbon, isMUC, false, originalFrom, "", "", "", nil)
+				} else {
+					gateway.SendMUCAnnouncement(jid, from, text.String(), nickname, id, c.xmpp)
+				}
+			}
+		}()
 	}
 }
 
 // message(s) deleted
 func (c *Client) updateDeleteMessages(update *client.UpdateDeleteMessages) {
+	c.locks.pinOutboxLock.Lock()
+	for _, messageId := range update.MessageIds {
+		ch, chOk := c.pinOutbox[IntPair{update.ChatId, messageId}]
+		if chOk {
+			ch <-0
+		}
+	}
+	c.locks.pinOutboxLock.Unlock()
+
 	if update.IsPermanent {
+		for _, deleteId := range update.MessageIds {
+			c.tryUnlockMessageId(update.ChatId, deleteId)
+		}
+
+		if c.Session.IsChatIgnored(update.ChatId) {
+			return
+		}
+		if c.Session.IgnoreGroupDeletions {
+			chatType, _, chatTypeErr := c.GetChatType(update.ChatId, false)
+			if chatTypeErr == nil && (chatType == gateway.ChatTypeBasicGroup || chatType == gateway.ChatTypeSupergroup) {
+				return
+			}
+		}
+
+		var isGroupchat bool
+		chat, _, _ := c.GetContactByID(update.ChatId, nil, false)
+		if c.Session.MUC && c.IsGroup(chat) {
+			isGroupchat = true
+		}
+
 		var deleteChar string
 		if c.Session.AsciiArrows {
 			deleteChar = "X "
@@ -256,7 +453,26 @@ func (c *Client) updateDeleteMessages(update *client.UpdateDeleteMessages) {
 			deleteChar = "✗ "
 		}
 		text := deleteChar + strings.Join(int64SliceToStringSlice(update.MessageIds), ",")
-		gateway.SendTextMessage(c.jid, strconv.FormatInt(update.ChatId, 10), text, c.xmpp)
+
+		var fromJid string
+		var jids []string
+		if isGroupchat {
+			fromJid = gateway.MUCJID(update.ChatId)
+			_, jids = c.getMUCJoinedJIDs(update.ChatId, nil, true)
+			var nickname string
+			if chat != nil {
+				nickname = chat.Title
+			}
+			for _, jid := range jids {
+				gateway.SendMUCAnnouncement(jid, fromJid, text, nickname, "", c.xmpp)
+			}
+		} else {
+			fromJid = gateway.CHATNODE(update.ChatId)
+			jids = c.GetCarbonFullJids(true, "", false)
+			for _, jid := range jids {
+				gateway.SendTextMessage(jid, fromJid, text, c.xmpp, isGroupchat)
+			}
+		}
 	}
 }
 
@@ -270,14 +486,53 @@ func (c *Client) updateAuthorizationState(update *client.UpdateAuthorizationStat
 	}
 }
 
-// clean uploaded files
 func (c *Client) updateMessageSendSucceeded(update *client.UpdateMessageSendSucceeded) {
+	c.locks.pinOutboxLock.Lock()
+	ch, chOk := c.pinOutbox[IntPair{update.Message.ChatId, update.OldMessageId}]
+	if chOk {
+		ch <-update.Message.Id
+	}
+	c.locks.pinOutboxLock.Unlock()
+
+	// 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.MessageIdChangesLock.Lock()
+	idsMap, ok := c.MessageIdChanges[update.Message.ChatId]
+	if !ok {
+		idsMap = make(map[int64]*newId)
+		c.MessageIdChanges[update.Message.ChatId] = idsMap
+	}
+	id, ok := idsMap[update.OldMessageId]
+	if !ok {
+		id = newNewId()
+		idsMap[update.OldMessageId] = id
+	}
+	id.Id = update.Message.Id
+	c.MessageIdChangesLock.Unlock()
+
+	c.sendMarker(update.Message.ChatId, update.Message.Id, gateway.MarkerTypeReceived)
+
+	// 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) {
+	c.tryUnlockMessageId(update.Message.ChatId, update.OldMessageId)
+
+	c.locks.pinOutboxLock.Lock()
+	ch, chOk := c.pinOutbox[IntPair{update.Message.ChatId, update.OldMessageId}]
+	if chOk {
+		ch <-0
+	}
+	c.locks.pinOutboxLock.Unlock()
+
+	// clean uploaded files
 	file, _ := c.contentToFile(update.Message.Content)
 	if file != nil && file.Local != nil {
 		c.cleanTempFile(file.Local.Path)
@@ -286,11 +541,104 @@ func (c *Client) updateMessageSendFailed(update *client.UpdateMessageSendFailed)
 
 // chat title changed
 func (c *Client) updateChatTitle(update *client.UpdateChatTitle) {
-	gateway.SetNickname(c.jid, strconv.FormatInt(update.ChatId, 10), update.Title, c.xmpp)
+	chat, user, _ := c.GetContactByID(update.ChatId, nil, false)
+	if c.Session.MUC && c.IsGroup(chat) {
+		return
+	}
+
+	gateway.SetNickname(c.jid, gateway.CHATNODE(update.ChatId), update.Title, c.xmpp)
 
 	// set also the status (for group chats only)
-	_, user, _ := c.GetContactByID(update.ChatId, nil)
 	if user == nil {
-		c.ProcessStatusUpdate(update.ChatId, update.Title, "chat", gateway.SPImmed(true))
+		c.ProcessStatusUpdate(update.ChatId, update.Title, "chat", false, 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)
+}
+
+func (c *Client) updateBasicGroupFullInfo(update *client.UpdateBasicGroupFullInfo) {
+	if c.Session.MUC && update.BasicGroupFullInfo != nil {
+		chatID := -update.BasicGroupId
+
+		c.locks.mucCacheLock.Lock()
+
+		mucState, ok := c.mucCache[chatID]
+		if ok && mucState != nil {
+			mucState.Occupants.Clear()
+			c.updateMUCOccupants(mucState, chatID, update.BasicGroupFullInfo.Members)
+		}
+
+		c.locks.mucCacheLock.Unlock()
+	}
+}
+
+func (c *Client) updateChatPermissions(update *client.UpdateChatPermissions) {
+	chat, _, _ := c.GetContactByID(update.ChatId, nil, false)
+
+	// update chat permissions in the cache
+	if chat != nil {
+		chat.Permissions = update.Permissions
+	}
+
+	if c.Session.MUC {
+		c.locks.mucCacheLock.Lock()
+
+		mucState, ok := c.mucCache[update.ChatId]
+		if ok && mucState != nil {
+			_, toJids := c.getMUCJoinedJIDs(update.ChatId, mucState, false)
+			for occupant := range mucState.Occupants.Range() {
+				affiliation, role := c.memberStatusToAffiliationAndRole(occupant.Status, chat)
+				if affiliation != occupant.Affiliation || role != occupant.Role {
+					occupant.Affiliation = affiliation
+					occupant.Role = role
+
+					c.sendPresence(
+						gateway.SPFrom(gateway.MUCNODE(update.ChatId)),
+						gateway.SPResource(occupant.Nickname),
+						gateway.SPImmed(true),
+						gateway.SPMUCJid(gateway.CHATJID(occupant.id, true)),
+						gateway.SPMUCAffiliation(affiliation),
+						gateway.SPMUCRole(role),
+						gateway.SPToJids(toJids),
+					)
+				}
+			}
+		}
+
+		c.locks.mucCacheLock.Unlock()
+	}
+}
+
+func (c *Client) updateFile(update *client.UpdateFile) {
+	if update.File != nil && update.File.Local != nil {
+		// not really needed, why did I even write this then lol (TODO: maybe clean by some heur anyway)
+		/* c.locks.uploadingFilesLock.Lock()
+		if _, ok := c.uploadingFiles[update.File.Id]; ok && update.File.Local.CanBeDeleted && update.File.Local.Path != "" {
+			err := os.Remove(update.File.Local.Path)
+			if err != nil {
+				log.Warningf("Couldn't delete uploaded file: %v", err.Error())
+			}
+			delete(c.uploadingFiles, update.File.Id)
+		}
+		c.locks.uploadingFilesLock.Unlock() */
+	}
+}
+
+func (c *Client) tryUnlockMessageId(chatId, messageId int64) {
+	c.MessageIdChangesLock.Lock()
+	idsMap, ok := c.MessageIdChanges[chatId]
+	if ok {
+		id, ok := idsMap[messageId]
+		if ok {
+			id.Unlock()
+		}
+	}
+	c.MessageIdChangesLock.Unlock()
+}

telegram/loginwizard.go

@@ -0,0 +1,121 @@
+package telegram
+
+import (
+	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
+
+	log "github.com/sirupsen/logrus"
+	"github.com/zelenin/go-tdlib/client"
+)
+
+type LoginStage string
+const (
+	LoginStageNone     LoginStage = ""
+	LoginStageLogin    LoginStage = "login"
+	LoginStageCode     LoginStage = "code"
+	LoginStagePassword LoginStage = "password"
+	LoginStagePreset   LoginStage = "preset"
+	LoginStageMUC      LoginStage = "muc"
+	LoginStageSuccess  LoginStage = "success"
+	LoginStageCancel   LoginStage = "cancel"
+)
+
+// setLoginStage updates loginState and triggers session initialization on login sucess
+func (c *Client) setLoginStage(stage LoginStage) {
+	c.loginStage = stage
+	switch c.loginStage {
+	case LoginStageSuccess, LoginStageCancel:
+		c.locks.loginFinish.Done()
+	}
+	log.Debugf("set loginStage %v", stage)
+}
+
+// StartLoginWizard initiates a loginWizard object
+func (c *Client) StartLoginWizard(inCommand bool) {
+	if c.loginWizard == nil {
+		c.loginWizard = &loginWizardMetadata{
+			nextStage:   make(chan LoginStage, 1),
+			commandSent: inCommand,
+		}
+	} else {
+		c.loginWizard.commandSent = inCommand
+	}
+}
+
+// StopLoginWizard safely destroys the loginWizard object
+func (c *Client) StopLoginWizard() {
+	c.locks.loginWizardReadLock.Lock()
+	c.locks.loginWizardWriteLock.Lock()
+	if c.loginWizard != nil {
+		close(c.loginWizard.nextStage)
+		c.loginWizard = nil
+	}
+	c.locks.loginWizardReadLock.Unlock()
+	c.locks.loginWizardWriteLock.Unlock()
+}
+
+// GetLoginWizardNextStage waits for the next stage from the channel
+func (c *Client) GetLoginWizardNextStage() LoginStage {
+	c.locks.loginWizardReadLock.Lock()
+	defer c.locks.loginWizardReadLock.Unlock()
+
+	if c.loginWizard != nil {
+		if c.loginWizard.commandSent {
+			log.Debugf("waiting for nextStage...")
+			nextStage := <-c.loginWizard.nextStage
+			c.loginWizard.commandSent = false
+			c.loginWizard.chanBusy = false
+			log.Debugf("yielded stage %v", nextStage)
+			return nextStage
+		} else {
+			log.Debugf("commandSent is false")
+
+			if c.lastAuthorizationStateType == client.TypeAuthorizationStateWaitPhoneNumber ||
+				c.lastAuthorizationStateType == client.TypeAuthorizationStateClosing ||
+				c.Session.Login == "" {
+				return LoginStageLogin
+			}
+			switch c.lastAuthorizationStateType {
+			case client.TypeAuthorizationStateWaitCode:
+				return LoginStageCode
+			case client.TypeAuthorizationStateWaitPassword:
+				return LoginStagePassword
+			}
+
+			switch c.loginStage {
+			case LoginStagePreset:
+				return LoginStageMUC
+			case LoginStageMUC:
+				return LoginStageNone
+			}
+		}
+	}
+
+	return LoginStageNone
+}
+
+func (c *Client) wizardStageOrPrompt(stage LoginStage, message string) {
+	log.Debugf("loginStage: %v stage: %v", c.loginStage, stage)
+	if c.loginStage == stage {
+		return
+	}
+
+	c.locks.loginWizardWriteLock.Lock()
+	c.setLoginStage(stage)
+	if c.loginWizard == nil {
+		c.locks.loginWizardWriteLock.Unlock()
+		if message != "" {
+			for _, jid := range c.GetCarbonFullJids(true, "", false) {
+				gateway.SendServiceMessage(jid, message, c.xmpp)
+			}
+		}
+	} else {
+		if !c.loginWizard.chanBusy {
+			log.Debugf("writing wizard stage %v", stage)
+			c.loginWizard.nextStage <- stage
+		} else {
+			log.Warnf("Skipping stage %v, wizard cannot keep up", stage)
+		}
+		c.loginWizard.chanBusy = true
+		c.locks.loginWizardWriteLock.Unlock()
+	}
+}

telegram/muc.go

@@ -0,0 +1,205 @@
+package telegram
+
+import (
+	"sync"
+
+	"github.com/zelenin/go-tdlib/client"
+	log "github.com/sirupsen/logrus"
+)
+
+const MUCOccupantsLimit int32 = 200
+
+// MUCState holds MUC metadata
+type MUCState struct {
+	Resources map[string]bool
+	Occupants *MUCOccupantsLRU
+}
+
+// MUCOccupant represents a MUC occupant
+type MUCOccupant struct {
+	Nickname    string
+	Affiliation string
+	Role        string
+	Status      client.ChatMemberStatus
+	prev        *MUCOccupant
+	next        *MUCOccupant
+	id          int64
+}
+
+func (o *MUCOccupant) cutOut() (prev, next *MUCOccupant) {
+	prev = o.prev
+	next = o.next
+
+	// -- * --- * -X- * -X- * --- * --
+	o.prev = nil
+	o.next = nil
+	if prev != nil {
+		prev.next = next
+	}
+	if next != nil {
+		next.prev = prev
+	}
+
+	return
+}
+
+func NewMUCState() *MUCState {
+	return &MUCState{
+		Resources: make(map[string]bool),
+		Occupants: NewMUCOccupantsLRU(),
+	}
+}
+
+type MUCOccupantsLRU struct {
+	m      map[int64]*MUCOccupant
+	rev    map[string]int64
+	oldest *MUCOccupant
+	newest *MUCOccupant
+	lock   sync.Mutex
+}
+
+func NewMUCOccupantsLRU() *MUCOccupantsLRU {
+	return &MUCOccupantsLRU{
+		m:   make(map[int64]*MUCOccupant),
+		rev: make(map[string]int64),
+	}
+}
+
+func (lru *MUCOccupantsLRU) Get(id int64) (*MUCOccupant, bool) {
+	lru.lock.Lock()
+	defer lru.lock.Unlock()
+
+	occupant, ok := lru.m[id]
+	return occupant, ok
+}
+
+func (lru *MUCOccupantsLRU) GetIdByNickname(nickname string) (int64, bool) {
+	lru.lock.Lock()
+	defer lru.lock.Unlock()
+
+	id, ok := lru.rev[nickname]
+	return id, ok
+}
+
+func (lru *MUCOccupantsLRU) cutOut(oldOccupant *MUCOccupant) (prev, next *MUCOccupant) {
+	prev, next = oldOccupant.cutOut()
+	if lru.oldest == oldOccupant {
+		lru.oldest = next
+	}
+	if lru.newest == oldOccupant {
+		lru.newest = prev
+	}
+
+	return
+}
+
+func (lru *MUCOccupantsLRU) insertNewest(occupant *MUCOccupant) {
+	lru.newest.next = occupant
+	occupant.prev = lru.newest
+	occupant.next = nil
+	lru.newest = occupant
+}
+
+// Set adds or replaces an occupant and possibly returns an occupant removed instead because of overflow
+func (lru *MUCOccupantsLRU) Set(id int64, occupant *MUCOccupant) (deleted *MUCOccupant) {
+	lru.lock.Lock()
+	defer lru.lock.Unlock()
+
+	occupant.id = id
+
+	oldOccupant, oldOk := lru.m[id]
+	lru.m[id] = occupant
+
+	if oldOk {
+		lru.cutOut(oldOccupant)
+
+		delete(lru.rev, oldOccupant.Nickname)
+		lru.rev[occupant.Nickname] = id
+	}
+
+	if (lru.oldest == nil) != (lru.newest == nil) {
+		log.Fatal("MRD MUDAQ")
+	}
+
+	if lru.oldest == nil && lru.newest == nil {
+		lru.oldest = occupant
+		lru.newest = occupant
+		occupant.prev = nil
+		occupant.next = nil
+	} else {
+		lru.insertNewest(occupant)
+	}
+
+	if len(lru.m) > int(MUCOccupantsLimit) && lru.oldest != nil {
+		deleted = lru.oldest
+		delete(lru.m, lru.oldest.id)
+		delete(lru.rev, lru.oldest.Nickname)
+		lru.cutOut(lru.oldest)
+	}
+
+	return
+}
+
+// Delete occupant by member ID
+func (lru *MUCOccupantsLRU) Delete(id int64) {
+	lru.lock.Lock()
+	defer lru.lock.Unlock()
+
+	oldOccupant, oldOk := lru.m[id]
+	delete(lru.m, id)
+
+	if oldOk {
+		lru.cutOut(oldOccupant)
+		delete(lru.rev, oldOccupant.Nickname)
+	}
+}
+
+// Bump raises the occupant in LRU
+func (lru *MUCOccupantsLRU) Bump(occupant *MUCOccupant) {
+	lru.lock.Lock()
+	defer lru.lock.Unlock()
+
+	if lru.newest == occupant {
+		// already at the top, nothing to do
+		return
+	}
+
+	lru.cutOut(occupant)
+	lru.insertNewest(occupant)
+}
+
+// Range loops over all occupants
+func (lru *MUCOccupantsLRU) Range() chan *MUCOccupant {
+	lru.lock.Lock()
+
+	occupantChan := make(chan *MUCOccupant, 1)
+
+	go func() {
+		defer func() {
+			lru.lock.Unlock()
+			close(occupantChan)
+		}()
+
+		for _, occupant := range lru.m {
+			occupantChan <- occupant
+		}
+	}()
+
+	return occupantChan
+}
+
+// Clear properly removes all occupants and their possible mutual references (not necessary in Golang, yet still)
+func (lru *MUCOccupantsLRU) Clear() {
+	lru.lock.Lock()
+	defer lru.lock.Unlock()
+
+	for _, occupant := range lru.m {
+		occupant.prev = nil
+		occupant.next = nil
+	}
+	lru.m = make(map[int64]*MUCOccupant)
+	lru.rev = make(map[string]int64)
+
+	lru.oldest = nil
+	lru.newest = nil
+}

telegram/muc_test.go

@@ -0,0 +1,419 @@
+package telegram
+
+import (
+	"testing"
+)
+
+// -x->[]-x-> +(.)
+func TestSetMUCOccupantsLRUSetInitiallyEmpty(t *testing.T) {
+	// init
+	occupants := NewMUCOccupantsLRU()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(1, newOccupant)
+
+	// checks
+	if occupants.oldest != newOccupant || newOccupant.prev != nil || newOccupant.next != nil || occupants.newest != newOccupant {
+		t.Error("Broken")
+	}
+}
+
+func testMUCOccupantsLRUChainOfOne() (occupants *MUCOccupantsLRU, occupant1 *MUCOccupant) {
+	occupants = NewMUCOccupantsLRU()
+	occupant1 = &MUCOccupant{}
+	occupants.m[1] = occupant1
+	occupants.oldest = occupant1
+	occupants.newest = occupant1
+
+	return
+}
+
+func testMUCOccupantsLRUChainOfThree() (occupants *MUCOccupantsLRU, occupant1, occupant2, occupant3 *MUCOccupant) {
+	occupants = NewMUCOccupantsLRU()
+	occupant1 = &MUCOccupant{}
+	occupant2 = &MUCOccupant{}
+	occupant3 = &MUCOccupant{}
+	occupants.m[1] = occupant1
+	occupants.m[2] = occupant2
+	occupants.m[3] = occupant3
+	occupants.oldest = occupant1
+	occupants.newest = occupant3
+	occupant1.next = occupant2
+	occupant2.prev = occupant1
+	occupant2.next = occupant3
+	occupant3.prev = occupant2
+
+	return
+}
+
+// ->[]->()-> +(.)
+func TestSetMUCOccupantsLRUSetOneOther(t *testing.T) {
+	// init
+	occupants, occupant1 := testMUCOccupantsLRUChainOfOne()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(2, newOccupant)
+
+	// checks
+	if occupants.oldest != occupant1 || occupant1.prev != nil || occupant1.next != newOccupant || newOccupant.prev != occupant1 || newOccupant.next != nil || occupants.newest != newOccupant {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->()->()-> +(.)
+func TestSetMUCOccupantsLRUSetThreeOthers(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(4, newOccupant)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant2 ||
+		occupant2.prev != occupant1 ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != newOccupant ||
+		newOccupant.prev != occupant3 ||
+		newOccupant.next != nil ||
+		occupants.newest != newOccupant {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(.)->()->()-> +(.)
+func TestSetMUCOccupantsLRUSetReplaceFirst(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(1, newOccupant)
+
+	// checks
+	if occupants.oldest != occupant2 ||
+		occupant2.prev != nil ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != newOccupant ||
+		newOccupant.prev != occupant3 ||
+		newOccupant.next != nil ||
+		occupants.newest != newOccupant ||
+		occupant1.prev != nil ||
+		occupant1.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->(.)->()-> +(.)
+func TestSetMUCOccupantsLRUSetReplaceMiddle(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(2, newOccupant)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant3 ||
+		occupant3.prev != occupant1 ||
+		occupant3.next != newOccupant ||
+		newOccupant.prev != occupant3 ||
+		newOccupant.next != nil ||
+		occupants.newest != newOccupant ||
+		occupant2.prev != nil ||
+		occupant2.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->()->(.)-> +(.)
+func TestSetMUCOccupantsLRUSetReplaceLast(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(3, newOccupant)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant2 ||
+		occupant2.prev != occupant1 ||
+		occupant2.next != newOccupant ||
+		newOccupant.prev != occupant2 ||
+		newOccupant.next != nil ||
+		occupants.newest != newOccupant ||
+		occupant3.prev != nil ||
+		occupant3.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(.)-> +(.)
+func TestSetMUCOccupantsLRUSetReplaceOnly(t *testing.T) {
+	// init
+	occupants, occupant1 := testMUCOccupantsLRUChainOfOne()
+
+	// addition
+	newOccupant := &MUCOccupant{}
+	occupants.Set(1, newOccupant)
+
+	// checks
+	if occupants.oldest != newOccupant ||
+		occupants.newest != newOccupant ||
+		newOccupant.prev != nil ||
+		newOccupant.next != nil ||
+		occupant1.prev != nil ||
+		occupant1.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(.)->()->()-> +s(.)
+func TestSetMUCOccupantsLRUSetReplaceFirstWithSame(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	occupants.Set(1, occupant1)
+
+	// checks
+	if occupants.oldest != occupant2 ||
+		occupant2.prev != nil ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != occupant1 ||
+		occupant1.prev != occupant3 ||
+		occupant1.next != nil ||
+		occupants.newest != occupant1 {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->(.)->()-> +s(.)
+func TestSetMUCOccupantsLRUSetReplaceMiddleWithSame(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	occupants.Set(2, occupant2)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant3 ||
+		occupant3.prev != occupant1 ||
+		occupant3.next != occupant2 ||
+		occupant2.prev != occupant3 ||
+		occupant2.next != nil ||
+		occupants.newest != occupant2 {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->()->(.)-> +s(.)
+func TestSetMUCOccupantsLRUSetReplaceLastWithSame(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// addition
+	occupants.Set(3, occupant3)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant2 ||
+		occupant2.prev != occupant1 ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != nil ||
+		occupants.newest != occupant3 {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(.)-> +(.)
+func TestSetMUCOccupantsLRUSetReplaceOnlyWithSame(t *testing.T) {
+	// init
+	occupants, occupant1 := testMUCOccupantsLRUChainOfOne()
+
+	// addition
+	occupants.Set(1, occupant1)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupants.newest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(X)->
+func TestSetMUCOccupantsLRUDeleteOnly(t *testing.T) {
+	// init
+	occupants, occupant1 := testMUCOccupantsLRUChainOfOne()
+
+	// deletion
+	occupants.Delete(1)
+
+	// checks
+	if occupants.oldest != nil ||
+		occupants.newest != nil ||
+		occupant1.prev != nil ||
+		occupant1.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(X)->()->()->
+func TestSetMUCOccupantsLRUDeleteFirst(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// deletion
+	occupants.Delete(1)
+
+	// checks
+	if occupants.oldest != occupant2 ||
+		occupant2.prev != nil ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != nil ||
+		occupants.newest != occupant3 ||
+		occupant1.prev != nil ||
+		occupant1.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->(X)->()->
+func TestSetMUCOccupantsLRUDeleteMiddle(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// deletion
+	occupants.Delete(2)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant3 ||
+		occupant3.prev != occupant1 ||
+		occupant3.next != nil ||
+		occupants.newest != occupant3 ||
+		occupant2.prev != nil ||
+		occupant2.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->()->(X)->
+func TestSetMUCOccupantsLRUDeleteLast(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// deletion
+	occupants.Delete(3)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant2 ||
+		occupant2.prev != occupant1 ||
+		occupant2.next != nil ||
+		occupants.newest != occupant2 ||
+		occupant3.prev != nil ||
+		occupant3.next != nil {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(.)->
+func TestSetMUCOccupantsLRUBumpOnly(t *testing.T) {
+	// init
+	occupants, occupant1 := testMUCOccupantsLRUChainOfOne()
+
+	// bump
+	occupants.Bump(occupant1)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != nil ||
+		occupants.newest != occupant1 {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->(.)->()->()->
+func TestSetMUCOccupantsLRUBumpFirst(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// bump
+	occupants.Bump(occupant1)
+
+	// checks
+	if occupants.oldest != occupant2 ||
+		occupant2.prev != nil ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != occupant1 ||
+		occupant1.prev != occupant3 ||
+		occupant1.next != nil ||
+		occupants.newest != occupant1 {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->(.)->()->
+func TestSetMUCOccupantsLRUBumpMiddle(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// bump
+	occupants.Bump(occupant2)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant3 ||
+		occupant3.prev != occupant1 ||
+		occupant3.next != occupant2 ||
+		occupant2.prev != occupant3 ||
+		occupant2.next != nil ||
+		occupants.newest != occupant2 {
+		t.Error("Broken")
+	}
+}
+
+// ->[]->()->()->(.)->
+func TestSetMUCOccupantsLRUBumpLast(t *testing.T) {
+	// init
+	occupants, occupant1, occupant2, occupant3 := testMUCOccupantsLRUChainOfThree()
+
+	// bump
+	occupants.Bump(occupant3)
+
+	// checks
+	if occupants.oldest != occupant1 ||
+		occupant1.prev != nil ||
+		occupant1.next != occupant2 ||
+		occupant2.prev != occupant1 ||
+		occupant2.next != occupant3 ||
+		occupant3.prev != occupant2 ||
+		occupant3.next != nil ||
+		occupants.newest != occupant3 {
+		t.Error("Broken")
+	}
+}

telegram/utils_test.go

@@ -68,12 +68,28 @@ func TestFormatMessageOneline(t *testing.T) {
 		},
 	}
 
-	text := (&Client{}).formatMessage(0, 0, true, &message)
+	text := (&Client{}).formatMessage(0, 0, true, true, &message)
 	if text != "42 |  | tist" {
 		t.Errorf("Wrong oneline message formatting: %v", text)
 	}
 }
 
+func TestFormatMessageNoSender(t *testing.T) {
+	message := client.Message{
+		Id: 42,
+		Content: &client.MessageText{
+			Text: &client.FormattedText{
+				Text: "tist",
+			},
+		},
+	}
+
+	text := (&Client{}).formatMessage(0, 0, true, false, &message)
+	if text != "42 | tist" {
+		t.Errorf("Wrong nosender message formatting: %v", text)
+	}
+}
+
 func TestFormatMessageMultiline(t *testing.T) {
 	message := client.Message{
 		Id: 42,
@@ -84,7 +100,7 @@ func TestFormatMessageMultiline(t *testing.T) {
 		},
 	}
 
-	text := (&Client{}).formatMessage(0, 0, true, &message)
+	text := (&Client{}).formatMessage(0, 0, true, true, &message)
 	if text != "42 |  | tist" {
 		t.Errorf("Wrong multiline message formatting: %v", text)
 	}
@@ -104,7 +120,7 @@ func TestFormatMessageOnelinePreview(t *testing.T) {
 	c := &Client{
 		Session: &persistence.Session{},
 	}
-	text := c.formatMessage(0, 0, false, &message)
+	text := c.formatMessage(0, 0, false, true, &message)
 	if text != "42 |  | 10 Jan 2008 21:20:00 | tist" {
 		t.Errorf("Wrong oneline preview message formatting: %v", text)
 	}
@@ -124,7 +140,7 @@ func TestFormatMessageMultilinePreview(t *testing.T) {
 	c := &Client{
 		Session: &persistence.Session{},
 	}
-	text := c.formatMessage(0, 0, false, &message)
+	text := c.formatMessage(0, 0, false, true, &message)
 	if text != "42 |  | 10 Jan 2008 21:20:00 | tist\nziz" {
 		t.Errorf("Wrong multiline preview message formatting: %v", text)
 	}
@@ -369,6 +385,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 +447,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 +465,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 +483,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 +502,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,52 +515,101 @@ 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,
+		ChatId:     25,
 		IsOutgoing: true,
-		ReplyToMessageId: 42,
+		ReplyTo: &client.MessageReplyToMessage{
+			ChatId: 41,
+			Quote: &client.TextQuote{
+				Text: &client.FormattedText{
+					Text: "tist\nuz\niz",
+				},
+			},
+			Origin: &client.MessageOriginHiddenUser{
+				SenderName: "ziz",
+			},
+		},
 	}
-	reply := client.Message{
+	prefix, gatewayReply := (&Client{Session: &persistence.Session{AsciiArrows: true}}).messageToPrefix(&message, "", "", false)
-		Id: 42,
+	if prefix != "> 23 | reply: ziz @ unknown contact: TDlib instance is offline | tist uz iz" {
+		t.Errorf("Wrong prefix: %v", prefix)
+	}
+	if gatewayReply != nil {
+		t.Errorf("Reply is not nil: %v", gatewayReply)
+	}
+}
+
+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, 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:  (zaz) @ unknown contact: TDlib instance is offline | tist" {
 		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 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)
 	}
 }
 
 func GetSenderIdEmpty(t *testing.T) {
 	message := client.Message{}
-	senderId := (&Client{}).getSenderId(&message)
+	senderId := (&Client{}).getMessageSenderId(&message)
 	if senderId != 0 {
 		t.Errorf("Wrong sender id: %v", senderId)
 	}
@@ -521,7 +621,7 @@ func GetSenderIdUser(t *testing.T) {
 			UserId: 42,
 		},
 	}
-	senderId := (&Client{}).getSenderId(&message)
+	senderId := (&Client{}).getMessageSenderId(&message)
 	if senderId != 42 {
 		t.Errorf("Wrong sender id: %v", senderId)
 	}
@@ -533,7 +633,7 @@ func GetSenderIdChat(t *testing.T) {
 			ChatId: -42,
 		},
 	}
-	senderId := (&Client{}).getSenderId(&message)
+	senderId := (&Client{}).getMessageSenderId(&message)
 	if senderId != -42 {
 		t.Errorf("Wrong sender id: %v", senderId)
 	}

test/bad_config.yml

@@ -5,6 +5,7 @@
         :link: 'http://tlgrm.localhost/content' # webserver public address
         :upload: 'https:///xmppfiles.localhost' # xmpp http upload address
     :tdlib_verbosity: 1
+    :mam_threshold: 7 # in days
     :tdlib:
         :client:
             :api_id: '17349'

test/good_config.yml

@@ -5,6 +5,7 @@
         :link: '' # webserver public address
         :upload: '' # xmpp http upload address
     :tdlib_verbosity: 1
+    :tdlib_verbosity: 7 # in days
     :tdlib:
         :client:
             :api_id: '17349'

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,10 +39,11 @@ 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, version string) (*xmpp.StreamManager, *xmpp.Component, error) {
 	var err error
 
 	gateway.Jid, err = stanza.NewJid(conf.Jid)
+	gateway.Version = version
 	if err != nil {
 		return nil, nil, err
 	}
@@ -53,6 +55,8 @@ func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig) (*xmpp.Strea
 		}
 	}
 
+	gateway.IdsDB = badger.IdsDBOpen(idsPath)
+
 	tgConf = tc
 
 	if tc.Content.Quota != "" {
@@ -62,6 +66,8 @@ func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig) (*xmpp.Strea
 		}
 	}
 
+	gateway.MAMThreshold = tc.MAMThreshold
+
 	options := xmpp.ComponentOptions{
 		TransportConfiguration: xmpp.TransportConfiguration{
 			Address: conf.Host + ":" + conf.Port,
@@ -138,11 +144,24 @@ func heartbeat(component *xmpp.Component) {
 						chatID,
 						session.LastSeenStatus(delayedStatus.TimestampOnline),
 						"away",
+						true,
 					)
 					delete(session.DelayedStatuses, chatID)
 				}
 			}
 			session.DelayedStatusesLock.Unlock()
+
+			// shrink message id maps
+			session.MessageIdChangesLock.Lock()
+			for _, idsMap := range session.MessageIdChanges {
+				for oldMessageId, newId := range idsMap {
+					if newId.Ts < now - 60 {
+						newId.Unlock()
+						delete(idsMap, oldMessageId)
+					}
+				}
+			}
+			session.MessageIdChangesLock.Unlock()
 		}
 		sessionLock.Unlock()
 
@@ -163,6 +182,8 @@ func heartbeat(component *xmpp.Component) {
 			// it would be resolved on the next iteration
 			SaveSessions()
 		}
+
+		gateway.IdsDB.Gc()
 	}
 }
 
@@ -200,7 +221,7 @@ func getTelegramInstance(jid string, savedSession *persistence.Session, componen
 			return session, false
 		}
 		if savedSession.KeepOnline {
-			if err = session.Connect(""); err != nil {
+			if err = session.Connect("", false); err != nil {
 				log.Error(err)
 				return session, false
 			}
@@ -240,6 +261,9 @@ func Close(component *xmpp.Component) {
 	// save sessions
 	SaveSessions()
 
+	// flush the ids database
+	gateway.IdsDB.Close()
+
 	// close stream
 	component.Disconnect()
 }

xmpp/extensions/extensions.go

@@ -3,6 +3,7 @@ package extensions
 import (
 	"encoding/xml"
 	"strconv"
+	"time"
 
 	"gosrc.io/xmpp/stanza"
 )
@@ -154,12 +155,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 +188,308 @@ 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"`
+}
+
+// MessageXLegacyInviteExtension is from JEP-0045
+type MessageXLegacyInviteExtension struct {
+	XMLName xml.Name `xml:"jabber:x:conference x"`
+	Jid     string   `xml:"jid,attr"`
+}
+
+// MessageXMucUserExtension is from XEP-0045
+type MessageXMucUserExtension struct {
+	XMLName  xml.Name               `xml:"http://jabber.org/protocol/muc#user x"`
+	Invite   *MessageXMucUserInvite `xml:"invite,omitempty"`
+	Status   *MessageXMucUserStatus `xml:"status,omitempty"`
+	Item     PresenceXMucUserItem   `xml:"item,omitempty"`
+	Password string                 `xml:"password,omitempty"`
+}
+
+// MessageXMucUserInvite is from XEP-0045
+type MessageXMucUserInvite struct {
+	XMLName  xml.Name                      `xml:"invite"`
+	From     string                        `xml:"from,attr"`
+	Reason   string                        `xml:"reason,omitempty"`
+	Continue MessageXMucUserInviteContinue
+}
+
+// MessageXMucUserInviteContinue is from XEP-0045
+type MessageXMucUserInviteContinue struct {
+	XMLName xml.Name `xml:"continue"`
+	Thread  string   `xml:"thread,attr,omitempty"`
+}
+
+// MessageXMucUserStatus is from XEP-0486
+type MessageXMucUserStatus struct {
+	XMLName xml.Name `xml:"status"`
+	Code    string   `xml:"code,attr"`
+}
+
+// PresenceXMucUserExtension is from XEP-0045
+type PresenceXMucUserExtension struct {
+	XMLName  xml.Name               `xml:"http://jabber.org/protocol/muc#user x"`
+	Item     PresenceXMucUserItem
+	Destroy  *MucDestroy
+	Statuses []PresenceXMucUserStatus
+}
+
+// PresenceXMucUserItem is from XEP-0045
+type PresenceXMucUserItem struct {
+	XMLName     xml.Name `xml:"item"`
+	Affiliation	string   `xml:"affiliation,attr"`
+	Jid         *string  `xml:"jid,attr"`
+	Nick        string   `xml:"nick,attr,omitempty"`
+	Role       	string   `xml:"role,attr"`
+}
+
+// PresenceXMucUserStatus is from XEP-0045
+type PresenceXMucUserStatus struct {
+	XMLName xml.Name `xml:"status"`
+	Code    uint16   `xml:"code,attr"`
+}
+
+// MessageDelay is from XEP-0203
+type MessageDelay struct {
+	XMLName xml.Name `xml:"urn:xmpp:delay delay"`
+	From    string   `xml:"from,attr,omitempty"`
+	Stamp   string   `xml:"stamp,attr"`
+}
+
+func NewMessageDelay(timestamp int64, from string) MessageDelay {
+	return MessageDelay{
+		From:  from,
+		Stamp: TimestampToRFC3339(timestamp),
+	}
+}
+
+func TimestampToRFC3339(timestamp int64) string {
+	return time.Unix(timestamp, 0).UTC().Format(time.RFC3339)
+}
+
+// MessageDelayLegacy is from XEP-0203
+type MessageDelayLegacy struct {
+	XMLName xml.Name `xml:"jabber:x:delay x"`
+	From    string   `xml:"from,attr"`
+	Stamp   string   `xml:"stamp,attr"`
+}
+
+func NewMessageDelayLegacy(timestamp int64, from string) MessageDelayLegacy {
+	return MessageDelayLegacy{
+		From:  from,
+		Stamp: time.Unix(timestamp, 0).UTC().Format("20060102T15:04:05"),
+	}
+}
+
+// MessageAddresses is from XEP-0033
+type MessageAddresses struct {
+	XMLName   xml.Name  `xml:"http://jabber.org/protocol/address addresses"`
+	Addresses []MessageAddress
+}
+
+// MessageAddress is from XEP-0033
+type MessageAddress struct {
+	XMLName xml.Name `xml:"address"`
+	Type    string   `xml:"type,attr"`
+	Jid     string   `xml:"jid,attr"`
+}
+
+// MessageStanzaId is from XEP-0359
+type MessageStanzaId struct {
+	XMLName xml.Name  `xml:"urn:xmpp:sid:0 stanza-id"`
+	Id      string    `xml:"id,attr"`
+	By      string    `xml:"by,attr"`
+}
+
+// MessageOriginId is from XEP-0359
+type MessageOriginId struct {
+	XMLName xml.Name  `xml:"urn:xmpp:sid:0 origin-id"`
+	Id      string    `xml:"id,attr"`
+}
+
+// EmptySubject is a dummy for MUCs to circumvent omitempty. Not registered as it would conflict with Subject field
+type EmptySubject struct {
+	XMLName xml.Name `xml:"subject"`
+}
+
+// QueryMucAdmin is from XEP-0045
+type QueryMucAdmin struct {
+	XMLName   xml.Name             `xml:"http://jabber.org/protocol/muc#admin query"`
+	Items     []*QueryMucAdminItem `xml:"item"`
+	ResultSet *stanza.ResultSet    `xml:"set,omitempty"`
+}
+
+// QueryMucAdminItem is a child element from XEP-0045
+type QueryMucAdminItem struct {
+	XMLName     xml.Name `xml:"item"`
+	Jid         string   `xml:"jid,attr,omitempty"`
+	Nick        string   `xml:"nick,attr,omitempty"`
+	Role        string   `xml:"role,attr,omitempty"`
+	Affiliation string   `xml:"affiliation,attr,omitempty"`
+	Reason      string   `xml:"reason,omitempty"`
+}
+
+// QueryMucOwner is from XEP-0045
+type QueryMucOwner struct {
+	XMLName   xml.Name          `xml:"http://jabber.org/protocol/muc#owner query"`
+	Form      *stanza.Form      `xml:"jabber:x:data x,omitempty"`
+	Destroy   *MucDestroy       `xml:"destroy,omitempty"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+}
+
+// MucDestroy is a child element from XEP-0045
+type MucDestroy struct {
+	XMLName  xml.Name `xml:"destroy"`
+	Jid      string   `xml:"jid,attr,omitempty"`
+	Reason   string   `xml:"reason,omitempty"`
+}
+
+// MAM2Query is from XEP-0313
+type MAM2Query struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:2 query"`
+	Form      *stanza.Form      `xml:"jabber:x:data x"`
+	QueryId   string            `xml:"queryid,attr,omitempty"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+	FlipPage  *FlipPage         `xml:"flip-page"`
+}
+
+// MAM1Query is from XEP-0313
+type MAM1Query struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:1 query"`
+	Form      *stanza.Form      `xml:"jabber:x:data x"`
+	QueryId   string            `xml:"queryid,attr,omitempty"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+}
+
+// MAM0Query is from XEP-0313
+type MAM0Query struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:0 query"`
+	Form      *stanza.Form      `xml:"jabber:x:data x"`
+	QueryId   string            `xml:"queryid,attr,omitempty"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+}
+
+type MAMQuery interface {
+	Namespace() string
+	GetForm() *stanza.Form
+	GetQueryId() string
+	GetSet() *stanza.ResultSet
+	GetFlipPage() *FlipPage
+}
+
+// FlipPage is an extended element from XEP-0313
+type FlipPage struct {
+	XMLName xml.Name `xml:"flip-page"`
+}
+
+// ForwardedMessage is from XEP-0297 (go-xmpp lacks Delay)
+type ForwardedMessage struct {
+	XMLName  xml.Name        `xml:"urn:xmpp:forward:0 forwarded"`
+	Message  *ClientMessage  `xml:"jabber:client message"`
+	Delay    *MessageDelay   `xml:"urn:xmpp:delay delay,omitempty"`
+}
+
+// MAM2MessageResult is from XEP-0313
+type MAM2MessageResult struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:2 result"`
+	Forwarded *ForwardedMessage `xml:"urn:xmpp:forward:0 forwarded,omitempty"`
+	QueryId   string            `xml:"queryid,attr,omitempty"`
+	Id        string            `xml:"id,attr,omitempty"`
+}
+
+// MAM1MessageResult is from XEP-0313
+type MAM1MessageResult struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:1 result"`
+	Forwarded *ForwardedMessage `xml:"urn:xmpp:forward:0 forwarded,omitempty"`
+	QueryId   string            `xml:"queryid,attr,omitempty"`
+	Id        string            `xml:"id,attr,omitempty"`
+}
+
+// MAM0MessageResult is from XEP-0313
+type MAM0MessageResult struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:0 result"`
+	Forwarded *ForwardedMessage `xml:"urn:xmpp:forward:0 forwarded,omitempty"`
+	QueryId   string            `xml:"queryid,attr,omitempty"`
+	Id        string            `xml:"id,attr,omitempty"`
+}
+
+// MAM2Fin is from XEP-0313
+type MAM2Fin struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:2 fin"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+	Complete  bool              `xml:"complete,attr,omitempty"`
+	Stable    bool              `xml:"stable,attr"`
+}
+
+// MAM1Fin is from XEP-0313
+type MAM1Fin struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:1 fin"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+	Complete  bool              `xml:"complete,attr,omitempty"`
+	Stable    bool              `xml:"stable,attr"`
+}
+
+// MAM0Fin is from XEP-0313
+type MAM0Fin struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:mam:0 fin"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+	Complete  bool              `xml:"complete,attr,omitempty"`
+	Stable    bool              `xml:"stable,attr"`
+}
+
+// MAM2Metadata is from XEP-0313
+type MAM2Metadata struct {
+	XMLName   xml.Name           `xml:"urn:xmpp:mam:2 metadata"`
+	Start     *MAM2MetadataStart `xml:"start"`
+	End       *MAM2MetadataEnd   `xml:"end"`
+	ResultSet *stanza.ResultSet  `xml:"set,omitempty"`
+}
+
+// MAM2MetadataStart is from XEP-0313
+type MAM2MetadataStart struct {
+	XMLName   xml.Name `xml:"start"`
+	Id        string   `xml:"id,attr,omitempty"`
+	Timestamp string   `xml:"timestamp,attr,omitempty"`
+}
+
+// MAM2MetadataEnd is from XEP-0313
+type MAM2MetadataEnd struct {
+	XMLName   xml.Name `xml:"end"`
+	Id        string   `xml:"id,attr,omitempty"`
+	Timestamp string   `xml:"timestamp,attr,omitempty"`
+}
+
+// EntityTime is from XEP-0202
+type EntityTime struct {
+	XMLName   xml.Name          `xml:"urn:xmpp:time time"`
+	Tzo       string            `xml:"tzo"`
+	Utc       string            `xml:"utc"`
+	ResultSet *stanza.ResultSet `xml:"set,omitempty"`
+}
+
 // Namespace is a namespace!
 func (c PresenceNickExtension) Namespace() string {
 	return c.XMLName.Space
@@ -221,15 +531,195 @@ 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
+}
+
+// Namespace is a namespace!
+func (c PresenceXMucUserExtension) Namespace() string {
+	return c.XMLName.Space
+}
+
+// Namespace is a namespace!
+func (c MessageDelay) Namespace() string {
+	return c.XMLName.Space
+}
+
+// Namespace is a namespace!
+func (c MessageDelayLegacy) Namespace() string {
+	return c.XMLName.Space
+}
+
+// Namespace is a namespace!
+func (c EntityTime) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c EntityTime) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
 // Name is a packet name
 func (ClientMessage) Name() string {
 	return "message"
 }
 
+// Namespace is a namespace!
+func (c QueryMucAdmin) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c QueryMucAdmin) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// Namespace is a namespace!
+func (c QueryMucOwner) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c QueryMucOwner) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// Namespace is a namespace!
+func (c MAM2Query) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetForm obtains the query form
+func (c MAM2Query) GetForm() *stanza.Form {
+	return c.Form
+}
+
+// GetQueryId obtains the query id
+func (c MAM2Query) GetQueryId() string {
+	return c.QueryId
+}
+
+// GetSet getsets!
+func (c MAM2Query) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// GetFlipPage obtains the flip-page element
+func (c MAM2Query) GetFlipPage() *FlipPage {
+	return c.FlipPage
+}
+
+// Namespace is a namespace!
+func (c MAM1Query) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetForm obtains the query form
+func (c MAM1Query) GetForm() *stanza.Form {
+	return c.Form
+}
+
+// GetQueryId obtains the query id
+func (c MAM1Query) GetQueryId() string {
+	return c.QueryId
+}
+
+// GetSet getsets!
+func (c MAM1Query) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// GetFlipPage is a stub as it's not supported in this MAM version
+func (c MAM1Query) GetFlipPage() *FlipPage {
+	return nil
+}
+
+// Namespace is a namespace!
+func (c MAM0Query) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetForm obtains the query form
+func (c MAM0Query) GetForm() *stanza.Form {
+	return c.Form
+}
+
+// GetQueryId obtains the query id
+func (c MAM0Query) GetQueryId() string {
+	return c.QueryId
+}
+
+// GetSet getsets!
+func (c MAM0Query) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// GetFlipPage is a stub as it's not supported in this MAM version
+func (c MAM0Query) GetFlipPage() *FlipPage {
+	return nil
+}
+
+// Namespace is a namespace!
+func (c MAM2Fin) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c MAM2Fin) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// Namespace is a namespace!
+func (c MAM1Fin) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c MAM1Fin) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// Namespace is a namespace!
+func (c MAM0Fin) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c MAM0Fin) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
+// Namespace is a namespace!
+func (c MAM2Metadata) Namespace() string {
+	return c.XMLName.Space
+}
+
+// GetSet getsets!
+func (c MAM2Metadata) GetSet() *stanza.ResultSet {
+	return c.ResultSet
+}
+
 // NewReplyFallback initializes a fallback range
 func NewReplyFallback(start uint64, end uint64) Fallback {
 	return Fallback{
@@ -286,9 +776,147 @@ 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{})
+
+	// message muc user
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"http://jabber.org/protocol/muc#user",
+		"x",
+	}, MessageXMucUserExtension{})
+
+	// presence muc user
+	stanza.TypeRegistry.MapExtension(stanza.PKTPresence, xml.Name{
+		"http://jabber.org/protocol/muc#user",
+		"x",
+	}, PresenceXMucUserExtension{})
+
+	// message delay
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:delay",
+		"delay",
+	}, MessageDelay{})
+
+	// legacy message delay
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"jabber:x:delay",
+		"x",
+	}, MessageDelayLegacy{})
+
+	// message addresses
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"http://jabber.org/protocol/address",
+		"addresses",
+	}, MessageAddresses{})
+
+	// stable stanza id
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:sid:0",
+		"stanza-id",
+	}, MessageStanzaId{})
+
+	// message addresses
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:sid:0",
+		"origin-id",
+	}, MessageOriginId{})
+
+	// muc admin query
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"http://jabber.org/protocol/muc#admin",
+		"query",
+	}, QueryMucAdmin{})
+
+	// muc owner query
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"http://jabber.org/protocol/muc#owner",
+		"query",
+	}, QueryMucOwner{})
+
+	// MAM2 query
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:2",
+		"query",
+	}, MAM2Query{})
+
+	// MAM1 query
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:1",
+		"query",
+	}, MAM1Query{})
+
+	// MAM0 query
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:0",
+		"query",
+	}, MAM0Query{})
+
+	// MAM2 message result
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:mam:2",
+		"result",
+	}, MAM2MessageResult{})
+
+	// MAM1 message result
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:mam:1",
+		"result",
+	}, MAM1MessageResult{})
+
+	// MAM0 message result
+	stanza.TypeRegistry.MapExtension(stanza.PKTMessage, xml.Name{
+		"urn:xmpp:mam:0",
+		"result",
+	}, MAM0MessageResult{})
+
+	// MAM2 fin
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:2",
+		"fin",
+	}, MAM2Fin{})
+
+	// MAM1 fin
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:1",
+		"fin",
+	}, MAM1Fin{})
+
+	// MAM0 fin
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:0",
+		"fin",
+	}, MAM0Fin{})
+
+	// MAM2 metadata
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:mam:2",
+		"metadata",
+	}, MAM2Metadata{})
+
+	// entity time
+	stanza.TypeRegistry.MapExtension(stanza.PKTIQ, xml.Name{
+		"urn:xmpp:time",
+		"time",
+	}, EntityTime{})
 }

xmpp/gateway/gateway_test.go

@@ -1,7 +1,9 @@
 package gateway
 
 import (
+	"crypto/sha1"
 	"encoding/xml"
+	"strings"
 	"testing"
 
 	"gosrc.io/xmpp/stanza"
@@ -54,6 +56,124 @@ func TestPresencePhoto(t *testing.T) {
 }
 
 func TestPresenceCaps(t *testing.T) {
-	caps := newPresence("from@test", "to@test", SPCaps("QgayPKawpkPSDYmwT/WM94uAlu0="))
+	presence := newPresence("from@test", "to@test", SPCaps("QgayPKawpkPSDYmwT/WM94uAlu0="))
-	testPresence(t, presence, "<presence from=\"from@test\" to=\"to@test\"><c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"https://dev.narayana.im/narayana/telegabber\" ver=\"QgayPKawpkPSDYmwT/WM94uAlu0=\"/></presence>")
+	testPresence(t, presence, "<presence from=\"from@test\" to=\"to@test\"><c xmlns=\"http://jabber.org/protocol/caps\" hash=\"sha-1\" node=\"https://dev.narayana.im/narayana/telegabber/\" ver=\"QgayPKawpkPSDYmwT/WM94uAlu0=\"></c></presence>")
+}
+
+func testCapsHash(t *testing.T, disco *stanza.DiscoInfo, reference string) {
+	b64 := discoToCapsHash(disco)
+	if b64 != reference {
+		hash := sha1.New()
+		discoToCaps(disco, hash)
+		sha1Hash := hash.Sum(nil)
+
+		var sb strings.Builder
+		discoToCaps(disco, &sb)
+
+		t.Errorf("%v does not match %v\nRaw hash: %v\nRaw string: %v", b64, reference, sha1Hash, sb.String())
+	}
+}
+
+func TestDiscoCapsHash1(t *testing.T) {
+	disco := stanza.DiscoInfo{
+		Identity: []stanza.Identity{
+			stanza.Identity{
+				Name:     "Exodus 0.9.1",
+				Category: "client",
+				Type:     "pc",
+			},
+		},
+		Features: []stanza.Feature{
+			stanza.Feature{ Var: "http://jabber.org/protocol/disco#info" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/disco#items" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/muc" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/caps" },
+		},
+	}
+	testCapsHash(t, &disco, "QgayPKawpkPSDYmwT/WM94uAlu0=")
+}
+
+func TestDiscoCapsHash2(t *testing.T) {
+	disco := stanza.DiscoInfo{
+		Identity: []stanza.Identity{
+			stanza.Identity{
+				Name:     "Psi 0.11",
+				Category: "client",
+				Type:     "pc",
+			},
+			stanza.Identity{
+				Name:     "Ψ 0.11",
+				Category: "client",
+				Type:     "pc",
+			},
+		},
+		Features: []stanza.Feature{
+			stanza.Feature{ Var: "http://jabber.org/protocol/disco#info" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/disco#items" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/muc" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/caps" },
+		},
+		Form: &stanza.Form{
+			Type:   stanza.FormTypeResult,
+			Fields: []*stanza.Field{
+				&stanza.Field{
+					Var:        "FORM_TYPE",
+					Type:       stanza.FieldTypeHidden,
+					ValuesList: []string{"urn:xmpp:dataforms:softwareinfo"},
+				},
+				&stanza.Field{
+					Var:        "ip_version",
+					Type:       stanza.FieldTypeTextMulti,
+					ValuesList: []string{"ipv4", "ipv6"},
+				},
+				&stanza.Field{
+					Var:        "os",
+					ValuesList: []string{"Mac"},
+				},
+				&stanza.Field{
+					Var:        "os_version",
+					ValuesList: []string{"10.5.1"},
+				},
+				&stanza.Field{
+					Var:        "software",
+					ValuesList: []string{"Psi"},
+				},
+				&stanza.Field{
+					Var:        "software_version",
+					ValuesList: []string{"0.11"},
+				},
+			},
+		},
+	}
+	testCapsHash(t, &disco, "MxdZjNKNku1+SiM9N92yqIK2HTQ=")
+}
+
+func TestDiscoCapsHash3(t *testing.T) {
+	disco := stanza.DiscoInfo{
+		Identity: []stanza.Identity{
+			stanza.Identity{
+				Name:     "BombusMod",
+				Category: "client",
+				Type:     "mobile",
+			},
+		},
+		Features: []stanza.Feature{
+			stanza.Feature{ Var: "http://jabber.org/protocol/activity" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/activity+notify" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/caps" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/commands" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/disco#info" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/disco#items" },
+			stanza.Feature{ Var: "http://jabber.org/protocol/rosterx" },
+			stanza.Feature{ Var: "jabber:iq:last" },
+			stanza.Feature{ Var: "jabber:iq:privacy" },
+			stanza.Feature{ Var: "jabber:iq:roster" },
+			stanza.Feature{ Var: "jabber:iq:time" },
+			stanza.Feature{ Var: "jabber:iq:version" },
+			stanza.Feature{ Var: "jabber:x:oob" },
+			stanza.Feature{ Var: "urn:xmpp:ping" },
+			stanza.Feature{ Var: "urn:xmpp:time" },
+		},
+	}
+	testCapsHash(t, &disco, "7Awj7pIUiI5UW/L2fdtzXZFQHsw=")
 }

xmpp/gateway/telegram_session.go

@@ -0,0 +1,222 @@
+package gateway
+
+import (
+	"sort"
+	"strings"
+
+	"dev.narayana.im/narayana/telegabber/persistence"
+
+	"github.com/zelenin/go-tdlib/client"
+	"gosrc.io/xmpp/stanza"
+)
+
+// HashedAvatar stores a SHA-1 hash and a Telegram file ID
+type HashedAvatar struct {
+	Hash string
+	File int32
+}
+
+type command struct {
+	RequiredArgs int
+	Arguments    []string
+	Description  string
+	LoginOnly    bool
+	NotFor       *[]ChatType
+	OnlineOnly   bool
+}
+
+// ChatType is an enum of chat types, roughly corresponding to TDLib's one but better
+type ChatType int
+
+const (
+	ChatTypeUnknown ChatType = iota
+	ChatTypePrivate
+	ChatTypeBasicGroup
+	ChatTypeSupergroup
+	ChatTypeSecret
+	ChatTypeChannel
+)
+
+var TransportCommands = map[string]command{
+	"help":        command{0, []string{}, "help", false, nil, false},
+	"login":       command{1, []string{"phone"}, "sign in", false, nil, false},
+	"logout":      command{0, []string{}, "sign out", true, nil, true},
+	"cleanup":     command{0, []string{}, "unsubscribe from all known chats", false, nil, false},
+	"cancelauth":  command{0, []string{}, "quit the signin wizard", false, nil, false},
+	"code":        command{1, []string{"xxxxx"}, "check one-time code", false, nil, false},
+	"password":    command{1, []string{"********"}, "check 2fa password", false, nil, false},
+	"setusername": command{0, []string{"@username"}, "update @username", true, nil, true},
+	"setname":     command{1, []string{"first", "last"}, "update name", true, nil, false},
+	"setbio":      command{0, []string{"Lorem ipsum"}, "update about", true, nil, true},
+	"setpassword": command{0, []string{"old", "new"}, "set or remove password", true, nil, true},
+	"config":      command{0, []string{"param", "value"}, "view or update configuration options", false, nil, false},
+	"status":      command{0, []string{}, "display current login stage", false, nil, false},
+	"report":      command{2, []string{"chat", "comment"}, "report a chat by id or @username", true, nil, true},
+	"add":         command{1, []string{"@username"}, "add @username to your chat list", true, nil, true},
+	"join":        command{1, []string{"https://t.me/invite_link"}, "join to chat via invite link or @publicname", true, nil, true},
+	"supergroup":  command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil, true},
+	"channel":     command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil, true},
+	"preset":      command{1, []string{"modern|classic|pass"}, "apply a config preset", false, nil, false},
+	"pass":        command{0, []string{}, "proceed to next login stage", false, nil, false},
+	"finish":      command{0, []string{}, "skip post-login configuration", false, nil, false},
+}
+
+var notForGroups = []ChatType{ChatTypeBasicGroup, ChatTypeSupergroup, ChatTypeChannel}
+var notForPM = []ChatType{ChatTypePrivate, ChatTypeSecret}
+var notForPMAndBasic = []ChatType{ChatTypePrivate, ChatTypeSecret, ChatTypeBasicGroup}
+var onlyForSecret = []ChatType{ChatTypePrivate, ChatTypeBasicGroup, ChatTypeSupergroup, ChatTypeChannel}
+
+var ChatCommands = map[string]command{
+	"help":       command{0, []string{}, "help", false, nil, false},
+	"d":          command{0, []string{"n"}, "delete your last message(s)", true, nil, true},
+	"s":          command{1, []string{"edited message"}, "edit your last message", true, nil, true},
+	"silent":     command{1, []string{"message"}, "send a message without sound", true, nil, true},
+	"schedule":   command{2, []string{"{online | 2006-01-02T15:04:05 | 15:04:05}", "message"}, "schedules a message either to timestamp or to whenever the user goes online", true, nil, true},
+	"raw":        command{1, []string{"message"}, "send a raw message not interpeted as a transport command (e.g. a bot command)", true, nil, true},
+	"forward":    command{2, []string{"message_id", "target_chat"}, "forwards a message", true, nil, true},
+	"vcard":      command{0, []string{}, "print vCard as text", true, nil, true},
+	"add":        command{1, []string{"@username"}, "add @username to your chat list", true, nil, true},
+	"join":       command{1, []string{"https://t.me/invite_link"}, "join to chat via invite link or @publicname", true, nil, true},
+	"group":      command{1, []string{"title"}, "create groupchat «title» with current user", true, &notForGroups, true},
+	"supergroup": command{1, []string{"title", "description"}, "create new supergroup «title» with «description»", true, nil, true},
+	"channel":    command{1, []string{"title", "description"}, "create new channel «title» with «description»", true, nil, true},
+	"secret":     command{0, []string{}, "create secretchat with current user", true, &notForGroups, true},
+	"search":     command{0, []string{"string", "[limit]"}, "search <string> in current chat", true, nil, true},
+	"history":    command{0, []string{"limit"}, "get last [limit] messages from current chat", true, nil, true},
+	"block":      command{0, []string{}, "blacklist current user", true, &notForGroups, true},
+	"unblock":    command{0, []string{}, "unblacklist current user", true, &notForGroups, true},
+	"invite":     command{1, []string{"id or @username"}, "add user to current chat", true, &notForPM, true},
+	"link":       command{0, []string{}, "get invite link for current chat", true, &notForPM, true},
+	"kick":       command{1, []string{"id or @username"}, "remove user from current chat", true, &notForPM, true},
+	"mute":       command{0, []string{"id or @username", "hours"}, "mute the whole chat or a user in current chat", true, &notForPMAndBasic, true},
+	"unmute":     command{0, []string{"id or @username"}, "unmute the whole chat or a user in the current chat", true, &notForPMAndBasic, true},
+	"ban":        command{1, []string{"id or @username", "hours"}, "restrict @username from current chat for [hours] or forever", true, &notForPM, true},
+	"unban":      command{1, []string{"id or @username"}, "unbans @username in current chat (and devotes from admins)", true, &notForPM, true},
+	"promote":    command{1, []string{"id or @username", "title"}, "promote user to admin in current chat", true, &notForPM, true},
+	"leave":      command{0, []string{}, "leave current chat", true, &notForPM, true},
+	"leave!":     command{0, []string{}, "leave current chat (for owners)", true, &notForPM, true},
+	"ttl":        command{0, []string{"seconds"}, "set secret chat messages TTL before self-destroying", true, &onlyForSecret, true},
+	"close":      command{0, []string{}, "close current secret chat", true, &onlyForSecret, true},
+	"delete":     command{0, []string{}, "delete current chat from chat list", true, nil, true},
+	"members":    command{0, []string{"query"}, "search members [by optional query] in current chat (requires admin rights)", true, nil, true},
+}
+
+// CommandType distinguishes command sets by chat
+type CommandType int
+
+const (
+	CommandTypeTransport CommandType = iota
+	CommandTypeChat
+)
+
+// OnlineFilter is a tri-state condition for commands selection
+type OnlineFilter int
+
+const (
+	OnlineFilterOnline OnlineFilter = iota
+	OnlineFilterNotOnline
+	OnlineFilterAny
+)
+
+// SortedCommandKeys sorts a slice with command keys
+func SortedCommandKeys(commandMap map[string]command, onlineFilter OnlineFilter) []string {
+	keys := make([]string, len(commandMap))
+
+	i := 0
+	for k := range commandMap {
+		command := commandMap[k]
+		if (onlineFilter == OnlineFilterOnline && !command.OnlineOnly) || (onlineFilter == OnlineFilterNotOnline && command.OnlineOnly) {
+			continue
+		}
+
+		keys[i] = k
+		i++
+	}
+	keys = keys[:i]
+
+	sort.Strings(keys)
+
+	return keys
+}
+
+func CommandsToHelpString(str *strings.Builder, chatType ChatType, onlineFilter OnlineFilter, commandMap map[string]command) {
+	for _, name := range SortedCommandKeys(commandMap, onlineFilter) {
+		command := commandMap[name]
+		if !IsCommandForChatType(command, chatType) {
+			continue
+		}
+		str.WriteString(CommandToHelpString(name, command))
+		str.WriteString("\n")
+	}
+}
+
+// GetCommands exposes the set of commands
+func GetCommands(typ CommandType) map[string]command {
+	var commandMap map[string]command
+
+	switch typ {
+	case CommandTypeTransport:
+		commandMap = TransportCommands
+	case CommandTypeChat:
+		commandMap = ChatCommands
+	}
+
+	return commandMap
+}
+
+// GetCommand obtains one command
+func GetCommand(typ CommandType, cmd string) (command, bool) {
+	commands := GetCommands(typ)
+	command, ok := commands[cmd]
+	return command, ok
+}
+
+// CommandToHelpString builds a text description of a command
+func CommandToHelpString(name string, cmd command) string {
+	var str strings.Builder
+
+	str.WriteString("/")
+	str.WriteString(name)
+	for i, arg := range cmd.Arguments {
+		optional := i >= cmd.RequiredArgs
+		str.WriteString(" ")
+		if optional {
+			str.WriteString("[")
+		}
+		str.WriteString(arg)
+		if optional {
+			str.WriteString("]")
+		}
+	}
+	str.WriteString(" — ")
+	str.WriteString(cmd.Description)
+
+	return str.String()
+}
+
+// IsCommandFor checks the suitability of a command for a chat type
+func IsCommandForChatType(cmd command, chatType ChatType) bool {
+	if cmd.NotFor != nil {
+		for _, typ := range *cmd.NotFor {
+			if chatType == typ {
+				return false
+			}
+		}
+	}
+
+	return true
+}
+
+// TelegramSession exists merely to circumvent a circular dependency
+type TelegramSession interface {
+	GetPersistenceSession() *persistence.Session
+	GetContactByID(int64, *client.Chat, bool) (*client.Chat, *client.User, error)
+	IsGroup(*client.Chat) bool
+	GetChatDescription(*client.Chat) string
+	GetChatMemberCount(*client.Chat) int32
+	GetHashedAvatar(int64) *HashedAvatar
+	CanBeCalled(int64) bool
+	GetMUCNickname(int64) string
+	GetChatType(int64, bool) (ChatType, *client.Chat, error)
+	GetVerDisco(string) (*stanza.DiscoInfo, bool)
+}

xmpp/loginwizard.go

@@ -0,0 +1,173 @@
+package xmpp
+
+import (
+	"fmt"
+
+	"dev.narayana.im/narayana/telegabber/persistence"
+	"dev.narayana.im/narayana/telegabber/telegram"
+	"dev.narayana.im/narayana/telegabber/xmpp/gateway"
+
+	log "github.com/sirupsen/logrus"
+	"gosrc.io/xmpp"
+	"gosrc.io/xmpp/stanza"
+)
+
+func loginWizardPayload(bare string, requestForm *stanza.Form, resource string, action string) (payload *stanza.Command, cancelSend bool, returnSession *telegram.Client) {
+	payload = &stanza.Command{
+		SessionId: "loginwizard",
+		Node:      "loginwizard",
+	}
+
+	session, ok := sessions[bare]
+	if ok {
+		returnSession = session
+
+		var command string
+
+		if requestForm == nil {
+			session.StartLoginWizard(false)
+			cancelSend = true
+		} else if action == stanza.CommandActionComplete || action == stanza.CommandActionExecute {
+			command = "/finish"
+		} else {
+			if len(requestForm.Fields) != 1 {
+				setCommandPayloadError(payload, "Hey, don't tinker with the form!")
+				return
+			}
+			field := requestForm.Fields[0]
+			if field != nil {
+				if len(field.ValuesList) < 1 {
+					setCommandPayloadError(payload, "No value")
+					return
+				}
+				value := field.ValuesList[0]
+				switch field.Var {
+				case "login", "code", "password", "preset":
+					if field.Var == "preset" && value == "" {
+						command = "/pass"
+					} else {
+						command = fmt.Sprintf("/%v %v", field.Var, value)
+					}
+				case "muc":
+					fieldValue := persistence.NormalizeProperty(field.Var, value)
+					command = fmt.Sprintf("/config muc %v", fieldValue)
+				default:
+					setCommandPayloadError(payload, "Unknown field")
+					return
+				}
+			}
+		}
+
+		if command != "" {
+			session.StartLoginWizard(true)
+			response, success := session.ProcessTransportCommand(command, resource)
+			if !success {
+				setCommandPayloadError(payload, response)
+				session.StopLoginWizard()
+				return
+			}
+
+			cancelSend = true
+		}
+	} else {
+		setCommandPayloadError(payload, fmt.Sprintf("Session is not initialized, add the transport (%v) to contacts first", gateway.Jid.Bare()))
+	}
+
+	return
+}
+
+func sendLoginWizardResponse(component *xmpp.Component, answer *stanza.IQ, session *telegram.Client) {
+	payload := &stanza.Command{
+		SessionId: "loginwizard",
+		Node:      "loginwizard",
+	}
+
+	nextStage := telegram.LoginStageLogin
+	if session != nil {
+		nextStage = session.GetLoginWizardNextStage()
+	}
+	log.Debugf("nextStage: %v", nextStage)
+
+	if nextStage == telegram.LoginStageNone || nextStage == telegram.LoginStageCancel {
+		setCommandPayloadError(payload, "Cancelled")
+		session.StopLoginWizard()
+	} else if nextStage == telegram.LoginStageSuccess {
+		payload.Status = stanza.CommandStatusCompleted
+		session.StopLoginWizard()
+	} else {
+		required := ""
+		var fieldType string
+		var finishAction bool
+		var options []stanza.Option
+		var note string
+
+		switch nextStage {
+		case telegram.LoginStagePreset:
+			fieldType = stanza.FieldTypeListSingle
+			finishAction = true
+			options = []stanza.Option{
+				stanza.Option{
+					ValuesList: []string{""},
+				},
+				stanza.Option{
+					Label:      "Modern",
+					ValuesList: []string{"modern"},
+				},
+				stanza.Option{
+					Label:      "Classic",
+					ValuesList: []string{"classic"},
+				},
+			}
+			note = "Do you want to use a config preset?\nModern enables brand new XMPP features,\nClassic targets legacy clients stuck in 00s."
+		case telegram.LoginStageMUC:
+			fieldType = stanza.FieldTypeBool
+			finishAction = true
+
+			value, err := session.Session.Get("muc")
+			if err != nil {
+				log.Error("Achtung! Programming error in retrieving MUC config option")
+				value = "false"
+			}
+
+			options = append(options, stanza.Option{
+				ValuesList: []string{value},
+			})
+			note = "Enable MUCs? Telegabber still supports the legacy group-to-PM mapping too."
+		}
+
+		form := stanza.Form{
+			Type:  stanza.FormTypeForm,
+			Title: "Login Wizard",
+			Fields: []*stanza.Field{
+				&stanza.Field{
+					Var:      string(nextStage),
+					Label:    string(nextStage),
+					Required: &required,
+					Type:     fieldType,
+					Options:  options,
+				},
+			},
+		}
+		payload.Status = stanza.CommandStatusExecuting
+		payload.CommandElements = append(payload.CommandElements, &form)
+
+		actions := stanza.Actions{
+			Next: &struct{}{},
+		}
+		if finishAction {
+			actions.Complete = &struct{}{}
+		}
+		payload.CommandElements = append(payload.CommandElements, &actions)
+
+		if note != "" {
+			payload.CommandElements = append(payload.CommandElements, &stanza.Note{
+				Text: note,
+				Type: stanza.CommandNoteTypeInfo,
+			})
+		}
+	}
+
+	answer.Payload = payload
+
+	gateway.ResumableSend(component, answer)
+}