Respond to jabber:version (XEP-0092) queries

This commit is contained in:
Bohdan Horbeshko 2025-10-10 07:44:44 -04:00
parent e7c6318e48
commit aaca93e66d
4 changed files with 38 additions and 2 deletions

View file

@ -68,7 +68,7 @@ func main() {
log.Infof("Starting telegabber version %v", version) log.Infof("Starting telegabber version %v", version)
sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram, *idsPath) sm, component, err = xmpp.NewComponent(config.XMPP, config.Telegram, *idsPath, version)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }

View file

@ -39,10 +39,11 @@ var sizeRegex = regexp.MustCompile("\\A([0-9]+) ?([KMGTPE]?B?)\\z")
// NewComponent starts a new component and wraps it in // NewComponent starts a new component and wraps it in
// a stream manager that you should start yourself // a stream manager that you should start yourself
func NewComponent(conf config.XMPPConfig, tc config.TelegramConfig, idsPath string) (*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 var err error
gateway.Jid, err = stanza.NewJid(conf.Jid) gateway.Jid, err = stanza.NewJid(conf.Jid)
gateway.Version = version
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

View file

@ -50,6 +50,9 @@ var QueueLock = sync.Mutex{}
// Jid stores the component's JID object // Jid stores the component's JID object
var Jid *stanza.Jid var Jid *stanza.Jid
// Version stores this software's version
var Version string
// IdsDB provides a disk-backed bidirectional dictionary of Telegram and XMPP ids // IdsDB provides a disk-backed bidirectional dictionary of Telegram and XMPP ids
var IdsDB badger.IdsDB var IdsDB badger.IdsDB

View file

@ -75,6 +75,11 @@ func HandleIq(s xmpp.Sender, p stanza.Packet) {
go handleGetQueryRegister(s, iq) go handleGetQueryRegister(s, iq)
return return
} }
_, ok = iq.Payload.(*stanza.Version)
if ok {
go handleGetVersion(s, iq)
return
}
} else if iq.Type == stanza.IQTypeSet { } else if iq.Type == stanza.IQTypeSet {
query, ok := iq.Payload.(*extensions.QueryRegister) query, ok := iq.Payload.(*extensions.QueryRegister)
if ok { if ok {
@ -643,6 +648,7 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ, di *stanza.DiscoInfo) {
disco.AddFeatures("jabber:iq:register") disco.AddFeatures("jabber:iq:register")
} }
disco.AddFeatures(gateway.NSCommand) disco.AddFeatures(gateway.NSCommand)
disco.AddFeatures("jabber:iq:version")
} else { } else {
chatType, chatTypeErr := getTelegramChatType(iq.From, iq.To) chatType, chatTypeErr := getTelegramChatType(iq.From, iq.To)
@ -801,6 +807,32 @@ func handleGetQueryRegister(s xmpp.Sender, iq *stanza.IQ) {
} }
} }
func handleGetVersion(s xmpp.Sender, iq *stanza.IQ) {
component, ok := s.(*xmpp.Component)
if !ok {
log.Error("Not a component")
return
}
answer, err := stanza.NewIQ(stanza.Attrs{
Type: stanza.IQTypeResult,
From: iq.To,
To: iq.From,
Id: iq.Id,
Lang: "en",
})
if err != nil {
log.Errorf("Failed to create answer IQ: %v", err)
return
}
answer.Version().SetInfo(gateway.Jid.Resource, gateway.Version, "")
log.Debugf("%#v", answer.Payload)
_ = gateway.ResumableSend(component, answer)
}
func handleSetQueryRegister(s xmpp.Sender, iq *stanza.IQ, query *extensions.QueryRegister) { func handleSetQueryRegister(s xmpp.Sender, iq *stanza.IQ, query *extensions.QueryRegister) {
component, ok := s.(*xmpp.Component) component, ok := s.(*xmpp.Component)
if !ok { if !ok {