Commit cf50ef2c authored by Maxime Buquet's avatar Maxime Buquet

Use identites from server for muc service

Signed-off-by: Maxime Buquet's avatarMaxime “pep” Buquet <pep@bouah.net>
parent dc2808cd
......@@ -877,27 +877,41 @@ class Core:
contacts to join in.
"""
# Use config.default_muc_service as muc component if available,
# otherwise find muc component by disco#items-ing the user domain. If
# not, give up
default_muc = config.get('default_muc_service')
if not default_muc:
self.information(
"Error finding a MUC service to join. If your server does not "
"provide one, set 'default_muc_service' manually to a MUC "
"service that allows room creation.",
'Error'
)
return
def callback(results):
muc_from_identity = ''
for info in results:
for identity in info['disco_info']['identities']:
if identity[0] == 'conference' and identity[1] == 'text':
muc_from_identity = info['from'].bare
# Use config.default_muc_service as muc component if available,
# otherwise find muc component by disco#items-ing the user domain.
# If not, give up
default_muc = config.get('default_muc_service', muc_from_identity)
if not default_muc:
self.information(
"Error finding a MUC service to join. If your server does not "
"provide one, set 'default_muc_service' manually to a MUC "
"service that allows room creation.",
'Error'
)
return
nick = self.own_nick
room = uuid.uuid4().hex + '@' + default_muc
nick = self.own_nick
room = uuid.uuid4().hex + '@' + default_muc
self.open_new_room(room, nick).join()
self.information('Room %s created' % room, 'Info')
self.open_new_room(room, nick).join()
self.information('Room %s created' % room, 'Info')
for jid in jids:
self.invite(jid, room)
for jid in jids:
self.invite(jid, room)
asyncio.ensure_future(
self.xmpp['xep_0030'].get_info_from_domain(
callback=callback,
)
)
def get_error_message(self, stanza, deprecated: bool = False):
"""
......
......@@ -97,6 +97,11 @@ class HandlerCore:
self.core.xmpp.plugin['xep_0030'].get_info(
jid=self.core.xmpp.boundjid.domain, callback=callback)
def find_identities(self, _):
asyncio.ensure_future(
self.core.xmpp['xep_0030'].get_info_from_domain(),
)
def on_carbon_received(self, message):
"""
Carbon <received/> received
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment