a3x/whatsxmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Don't differentiate between account and resource in disco#info

Browse source 
- So the entity caps stuff didn't actually work, because we don't implement
  XEP-0030 properly and don't honour the "node" attribute on the query.
- To hack around this, we misimplement XEP-0030 some more, and always return the
  bridged user disco info list, even if they ask for the bare JID instead of the
  full JID. That way, the caps stuff works as it should.
This commit is contained in:
eta 2020-08-01 17:54:37 +01:00
parent 912c09edc4
commit 99df4a56fe
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
stuff.lisp
View file

@ -44,7 +44,7 @@
,@(multiple-value-bind ,@(multiple-value-bind
(to-hostname to-localpart to-resource) (to-hostname to-localpart to-resource)
(parse-jid to) (parse-jid to)
(declare (ignore to-hostname)) (declare (ignore to-hostname to-resource))
(let* ((uid (get-user-id from)) (let* ((uid (get-user-id from))
(user-name (get-contact-name uid to-localpart)) (user-name (get-contact-name uid to-localpart))
(chat-subject (get-user-chat-subject uid to-localpart))) (chat-subject (get-user-chat-subject uid to-localpart)))
@ -53,9 +53,7 @@
`((disco-identity "whatsxmpp bridge" "xmpp" "gateway") `((disco-identity "whatsxmpp bridge" "xmpp" "gateway")
(disco-feature ,+disco-items-ns+) (disco-feature ,+disco-items-ns+)
(disco-feature ,+muc-ns+))) (disco-feature ,+muc-ns+)))
((and user-name (not to-resource)) (user-name
`((disco-identity ,user-name "registered" "account")))
((and user-name (equal to-resource "whatsapp"))
+whatsapp-user-disco-info-list+) +whatsapp-user-disco-info-list+)
(chat-subject (chat-subject
`((disco-identity ,chat-subject "text" "conference") `((disco-identity ,chat-subject "text" "conference")