pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'affiliation-ui' into 'master'

Browse source 
affiliations: display all relevant pieces of information we get

See merge request poezio/poezio!83
This commit is contained in:
Maxime Buquet 2020-04-15 00:35:51 +02:00
commit d9379a35aa
1 changed files with 48 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
poezio/tabs/muctab.py
View file

@ -1626,24 +1626,59 @@ class MucTab(ChatTab):
async def get_users_affiliations(self, jid: JID) -> None: async def get_users_affiliations(self, jid: JID) -> None:
MUC_ADMIN_NS = 'http://jabber.org/protocol/muc#admin' MUC_ADMIN_NS = 'http://jabber.org/protocol/muc#admin'
try: iqs = await asyncio.gather(
iqs = await asyncio.gather( self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'owner'),
self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'owner'), self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'admin'),
self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'admin'), self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'member'),
self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'member'), self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'outcast'),
self.core.xmpp['xep_0045'].get_users_by_affiliation(jid, 'outcast'), return_exceptions=True,
)
all_errors = functools.reduce(
lambda acc, iq: acc and isinstance(iq, (IqError, IqTimeout)),
iqs,
True,
)
theme = get_theme()
aff_colors = {
'owner': theme.CHAR_AFFILIATION_OWNER,
'admin': theme.CHAR_AFFILIATION_ADMIN,
'member': theme.CHAR_AFFILIATION_MEMBER,
'none': theme.CHAR_AFFILIATION_NONE,
}
if all_errors:
self.add_message(
'Can\'t access affiliations',
highlight=True,
nickname='Error',
nick_color=theme.COLOR_ERROR_MSG,
typ=2,
) )
except (IqError, IqTimeout) as exn: self.core.refresh_window()
self.core.room_error(exn.iq, jid)
return None return None
self._text_buffer.add_message('Affiliations:') self._text_buffer.add_message('Affiliations')
for iq in iqs: for iq in iqs:
if isinstance(iq, (IqError, IqTimeout)):
continue
query = iq.xml.find('{%s}query' % MUC_ADMIN_NS) query = iq.xml.find('{%s}query' % MUC_ADMIN_NS)
for item in query.findall('{%s}item' % MUC_ADMIN_NS): items = query.findall('{%s}item' % MUC_ADMIN_NS)
self._text_buffer.add_message( if not items: # Nobody with this affiliation
'%s: %s' % (item.get('jid'), item.get('affiliation')) continue
)
affiliation = items[0].get('affiliation')
aff_char = aff_colors[affiliation]
self._text_buffer.add_message(
' %s%s' % (aff_char, affiliation.capitalize()),
)
items = map(lambda i: i.get('jid'), items)
for ajid in sorted(items):
self._text_buffer.add_message(' %s' % ajid)
self.core.refresh_window() self.core.refresh_window()
return None return None