comparison sat/plugins/plugin_misc_identity.py @ 2682:466c9690c43a

plugin identity: fixed nick when there is no user part in entity
author Goffi <goffi@goffi.org>
date Wed, 03 Oct 2018 20:37:12 +0200
parents 56f94936df1e
children 003b8b4b56a7
comparison
equal deleted inserted replaced
2681:263a00e90174 2682:466c9690c43a
88 elif jid_.resource and self._v.isRoom(client, jid_): 88 elif jid_.resource and self._v.isRoom(client, jid_):
89 id_data[u"nick"] = jid_.resource 89 id_data[u"nick"] = jid_.resource
90 else: 90 else:
91 #  and finally then vcard 91 #  and finally then vcard
92 nick = yield self._v.getNick(client, jid_) 92 nick = yield self._v.getNick(client, jid_)
93 id_data[u"nick"] = nick if nick else jid_.user.capitalize() 93 if nick:
94 id_data[u"nick"] = nick
95 elif jid_.user:
96 id_data[u"nick"] = jid_.user.capitalize()
97 else:
98 id_data[u"nick"] = jid_.userhost()
94 99
95 try: 100 try:
96 avatar_path = id_data[u"avatar"] = yield self._v.getAvatar( 101 avatar_path = id_data[u"avatar"] = yield self._v.getAvatar(
97 client, jid_, cache_only=False 102 client, jid_, cache_only=False
98 ) 103 )