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

Fix returning MUC join errors

Browse source
This commit is contained in:
Bohdan Horbeshko 2023-09-18 01:49:31 -04:00
parent 93abbe834e
commit c1887e5a1e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
xmpp/handlers.go
View file

@ -420,7 +420,9 @@ func handleMUCPresence(s xmpp.Sender, p stanza.Presence) {
return return
} }
reply := stanza.Presence{Attrs: stanza.Attrs{ // separate declaration is crucial for passing as pointer to defer
var reply *stanza.Presence
reply = &stanza.Presence{Attrs: stanza.Attrs{
From: toBare, From: toBare,
To: p.From, To: p.From,
Id: p.Id, Id: p.Id,
@ -428,31 +430,31 @@ func handleMUCPresence(s xmpp.Sender, p stanza.Presence) {
defer gateway.ResumableSend(component, reply) defer gateway.ResumableSend(component, reply)
if nickname == "" { if nickname == "" {
presenceReplySetError(&reply, 400) presenceReplySetError(reply, 400)
return return
} }
chatId, ok := toToID(toBare) chatId, ok := toToID(toBare)
if !ok { if !ok {
presenceReplySetError(&reply, 404) presenceReplySetError(reply, 404)
return return
} }
fromBare, _, ok := gateway.SplitJID(p.From) fromBare, _, ok := gateway.SplitJID(p.From)
if !ok { if !ok {
presenceReplySetError(&reply, 400) presenceReplySetError(reply, 400)
return return
} }
session, ok := sessions[fromBare] session, ok := sessions[fromBare]
if !ok || !session.Session.MUC { if !ok || !session.Session.MUC {
presenceReplySetError(&reply, 401) presenceReplySetError(reply, 401)
return return
} }
chat, _, err := session.GetContactByID(chatId, nil) chat, _, err := session.GetContactByID(chatId, nil)
if err != nil || !session.IsGroup(chat) { if err != nil || !session.IsGroup(chat) {
presenceReplySetError(&reply, 404) presenceReplySetError(reply, 404)
return return
} }