Commit 7c531eee authored by louiz’'s avatar louiz’

Fix on_user_join issue, and displays the jid if available on /info

parent d8f92a67
...@@ -387,7 +387,7 @@ class Core(object): ...@@ -387,7 +387,7 @@ class Core(object):
When a new user joins a groupchat When a new user joins a groupchat
""" """
room.users.append(User(from_nick, affiliation, room.users.append(User(from_nick, affiliation,
show, status, role)) show, status, role, jid))
hide_exit_join = config.get('hide_exit_join', -1) hide_exit_join = config.get('hide_exit_join', -1)
if hide_exit_join != 0: if hide_exit_join != 0:
if not jid.full: if not jid.full:
......
...@@ -390,12 +390,11 @@ class MucTab(ChatTab): ...@@ -390,12 +390,11 @@ class MucTab(ChatTab):
user = self.get_room().get_user_by_name(args[0]) user = self.get_room().get_user_by_name(args[0])
if not user: if not user:
return self.core.information("Unknown user: %s" % args[0]) return self.core.information("Unknown user: %s" % args[0])
self.get_room().add_message("%s%s: show: %s, affiliation: %s, role: %s\n%s"% (args[0], user.user.show or 'Available', user.role or 'None', user.affiliation or 'None', user.status)) self.get_room().add_message("%s%s: show: %s, affiliation: %s, role: %s\n%s"% (args[0], ' (%s)'%user.jid if user.jid else '', user.show or 'Available', user.role or 'None', user.affiliation or 'None', user.status))
self.core.refresh_window() self.core.refresh_window()
def command_configure(self, arg): def command_configure(self, arg):
form = self.core.xmpp.plugin['xep_0045'].getRoomForm(self.get_name()) form = self.core.xmpp.plugin['xep_0045'].getRoomForm(self.get_name())
self.core.information('%s' % form)
if not form: if not form:
return return
self.core.open_new_form(form, self.cancel_config, self.send_config) self.core.open_new_form(form, self.cancel_config, self.send_config)
......
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