Treat incoming probe presence same as available only first time after transport restart

Makefile

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

telegabber.go

@@ -16,7 +16,7 @@ import (
 	goxmpp "gosrc.io/xmpp"
 )
 
-var version string = "1.12.4"
+var version string = "1.12.5"
 var commit string
 
 var sm *goxmpp.StreamManager

xmpp/handlers.go

@@ -7,6 +7,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 
 	"dev.narayana.im/narayana/telegabber/persistence"
 	"dev.narayana.im/narayana/telegabber/telegram"
@@ -25,6 +26,10 @@ const (
 	TypeVCard4
 )
 
+// kludge for client resuming after the transport restart (by full jids)
+var probeFired = make(map[string]bool)
+var probeFiredLock = sync.Mutex{}
+
 func logPacketType(p stanza.Packet) {
 	log.Warnf("Ignoring packet: %T\n", p)
 }
@@ -410,23 +415,31 @@ func handlePresence(s xmpp.Sender, p stanza.Presence) {
 			if err != nil {
 				log.Error(errors.Wrap(err, "TDlib connection failure"))
 			} else {
-				for status := range session.StatusesRange() {
+				var probeFiredForFrom bool
-					show, description, typ := status.Destruct()
+				probeFiredLock.Lock()
-					newArgs := []args.V{
+				_, probeFiredForFrom = probeFired[p.From]
-						gateway.SPImmed(false),
+				probeFired[p.From] = true
+				probeFiredLock.Unlock()
+
+				if p.Type != "probe" || !probeFiredForFrom {
+					for status := range session.StatusesRange() {
+						show, description, typ := status.Destruct()
+						newArgs := []args.V{
+							gateway.SPImmed(false),
+						}
+						if typ != "" {
+							newArgs = append(newArgs, gateway.SPType(typ))
+						}
+						go session.ProcessStatusUpdate(
+							status.ID,
+							description,
+							show,
+							newArgs...,
+						)
 					}
-					if typ != "" {
+					probeClientFeatures(p.From, component)
-						newArgs = append(newArgs, gateway.SPType(typ))
+					session.UpdateChatNicknames()
-					}
-					go session.ProcessStatusUpdate(
-						status.ID,
-						description,
-						show,
-						newArgs...,
-					)
 				}
-				probeClientFeatures(p.From, component)
-				session.UpdateChatNicknames()
 			}
 		}()
 	}