diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core.py | 2 | ||||
| -rw-r--r-- | src/tabs.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core.py b/src/core.py index 6d05f472..8e26b355 100644 --- a/src/core.py +++ b/src/core.py @@ -387,7 +387,7 @@ class Core(object): When a new user joins a groupchat """ room.users.append(User(from_nick, affiliation, - show, status, role)) + show, status, role, jid)) hide_exit_join = config.get('hide_exit_join', -1) if hide_exit_join != 0: if not jid.full: diff --git a/src/tabs.py b/src/tabs.py index 734efb74..3370b60e 100644 --- a/src/tabs.py +++ b/src/tabs.py @@ -390,12 +390,11 @@ class MucTab(ChatTab): user = self.get_room().get_user_by_name(args[0]) if not user: 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() def command_configure(self, arg): form = self.core.xmpp.plugin['xep_0045'].getRoomForm(self.get_name()) - self.core.information('%s' % form) if not form: return self.core.open_new_form(form, self.cancel_config, self.send_config) |