narayana/telegabber
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactoring: merge handleGetDiscoInfo/handleGetDiscoItems back into one function

Browse source
This commit is contained in:
Bohdan Horbeshko 2022-07-08 07:54:30 -04:00
parent 6abb7ff9c2
commit 63f12202d0
1 changed files with 39 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
xmpp/handlers.go
View file

@ -24,6 +24,12 @@ const (
) )
const NodeVCard4 string = "urn:xmpp:vcard4" const NodeVCard4 string = "urn:xmpp:vcard4"
type discoType int
const (
discoTypeInfo discoType = iota
discoTypeItems
)
func logPacketType(p stanza.Packet) { func logPacketType(p stanza.Packet) {
log.Warnf("Ignoring packet: %T\n", p) log.Warnf("Ignoring packet: %T\n", p)
} }
@ -52,12 +58,12 @@ func HandleIq(s xmpp.Sender, p stanza.Packet) {
} }
_, ok = iq.Payload.(*stanza.DiscoInfo) _, ok = iq.Payload.(*stanza.DiscoInfo)
if ok { if ok {
go handleGetDiscoInfo(s, iq) go handleGetDisco(discoTypeInfo, s, iq)
return return
} }
_, ok = iq.Payload.(*stanza.DiscoItems) _, ok = iq.Payload.(*stanza.DiscoItems)
if ok { if ok {
go handleGetDiscoItems(s, iq) go handleGetDisco(discoTypeItems, s, iq)
return return
} }
} }
@ -318,7 +324,7 @@ func handleGetVcardIq(s xmpp.Sender, iq *stanza.IQ, typ byte) {
_ = gateway.ResumableSend(component, &answer) _ = gateway.ResumableSend(component, &answer)
} }
func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ) { func handleGetDisco(dt discoType, s xmpp.Sender, iq *stanza.IQ) {
answer, err := stanza.NewIQ(stanza.Attrs{ answer, err := stanza.NewIQ(stanza.Attrs{
Type: stanza.IQTypeResult, Type: stanza.IQTypeResult,
From: iq.To, From: iq.To,
@ -331,6 +337,7 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ) {
return return
} }
if dt == discoTypeInfo {
disco := answer.DiscoInfo() disco := answer.DiscoInfo()
_, ok := toToID(iq.To) _, ok := toToID(iq.To)
if ok { if ok {
@ -347,31 +354,7 @@ func handleGetDiscoInfo(s xmpp.Sender, iq *stanza.IQ) {
} }
} }
answer.Payload = disco answer.Payload = disco
} else if dt == discoTypeItems {
log.Debugf("%#v", answer)
component, ok := s.(*xmpp.Component)
if !ok {
log.Error("Not a component")
return
}
_ = gateway.ResumableSend(component, answer)
}
func handleGetDiscoItems(s xmpp.Sender, iq *stanza.IQ) {
answer, err := stanza.NewIQ(stanza.Attrs{
Type: stanza.IQTypeResult,
From: iq.To,
To: iq.From,
Id: iq.Id,
Lang: "en",
})
if err != nil {
log.Errorf("Failed to create answer IQ: %v", err)
return
}
disco := answer.DiscoItems() disco := answer.DiscoItems()
_, ok := toToID(iq.To) _, ok := toToID(iq.To)
@ -392,6 +375,7 @@ func handleGetDiscoItems(s xmpp.Sender, iq *stanza.IQ) {
} }
answer.Payload = disco answer.Payload = disco
}
log.Debugf("%#v", answer) log.Debugf("%#v", answer)