XEP-0158: Use the correct FORM_TYPE for extended IBR, and use a proper MUC join as an example

[linkmauve]

This was found while implementing IBR CAPTCHA in Renga at the Stockholm sprint.

[Ppjet6]

Merged as b107617. Thanks!

[zinid]

Well, putting 'jabber:iq:register' there is also wrong, because CAPTCHA related fields are not registered in its form type: https://xmpp.org/extensions/xep-0077.html#registrar-formtypes

[linkmauve]

https://xmpp.org/extensions/xep-0158.xml#registrar-formtypes-register is the process to add new fields to an existing FORM_TYPE’s registrar, you should be looking at the registrar instead of the original XEP (which shouldn’t get modified every time an extension adds something to its form).

It was present before this change, so you already should have used it.

[zinid]

@linkmauve well I think this is just plain wrong of course.

[linkmauve]

Well, according to XEP-0001 §14, it definitely is the registrar’s function to register form fields, and in this case they have done so already: https://xmpp.org/registrar/formtypes.html#jabber:iq:register