copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify vcard avatar code 

- Use nbxmpp properties
This commit is contained in:
Philipp Hörist 2018-12-28 13:38:15 +01:00
parent 34306921ed
commit 79684d90d5
1 changed files with 63 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
gajim/common/modules/vcard_avatars.py
View File

@ -19,6 +19,8 @@ import logging
from pathlib import Path from pathlib import Path
import nbxmpp import nbxmpp
from nbxmpp.structs import StanzaHandler
from nbxmpp.const import AvatarState
from gajim.common import app from gajim.common import app
from gajim.common import helpers from gajim.common import helpers
@ -35,7 +37,10 @@ class VCardAvatars:
self._requested_shas = [] self._requested_shas = []
self.handlers = [ self.handlers = [
('presence', self._presence_received, '', nbxmpp.NS_VCARD_UPDATE), StanzaHandler(name='presence',
callback=self._presence_received,
ns=nbxmpp.NS_VCARD_UPDATE,
priority=51),
] ]
self.avatar_advertised = False self.avatar_advertised = False
@ -50,66 +55,53 @@ class VCardAvatars:
log.info('Missing own avatar, reset sha') log.info('Missing own avatar, reset sha')
app.config.set_per('accounts', self._account, 'avatar_sha', '') app.config.set_per('accounts', self._account, 'avatar_sha', '')
def _presence_received(self, _con, stanza): def _presence_received(self, _con, _stanza, properties):
if stanza.getType() in ('unavailable', 'error'): if properties.avatar_state in (AvatarState.IGNORE,
AvatarState.NOT_READY):
return return
jid = stanza.getFrom() if self._con.get_own_jid().bareMatch(properties.jid):
if self._con.get_own_jid() == properties.jid:
update = stanza.getTag('x', namespace=nbxmpp.NS_VCARD_UPDATE)
if update is None:
return
avatar_sha = update.getTagData('photo')
if avatar_sha is None:
log.info('%s is not ready to promote an avatar', jid)
# Empty update element, ignore
return
if self._con.get_own_jid().bareMatch(jid):
if self._con.get_own_jid() == jid:
# Initial presence reflection # Initial presence reflection
if self._con.avatar_conversion: if self._con.avatar_conversion:
# XEP-0398: Tells us the current avatar sha on the # XEP-0398: Tells us the current avatar sha on the
# inital presence reflection # inital presence reflection
self._self_update_received(jid, avatar_sha) self._self_update_received(properties)
else: else:
# Presence from another resource of ours # Presence from another resource of ours
self._self_update_received(jid, avatar_sha) self._self_update_received(properties)
return return
# Check if presence is from a MUC service if properties.from_muc:
contact = app.contacts.get_groupchat_contact(self._account, str(jid)) self._gc_update_received(properties)
if contact is not None:
self._update_received(jid, avatar_sha, room=True)
elif stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER):
show = stanza.getShow()
type_ = stanza.getType()
self._gc_update_received(jid, avatar_sha, show, type_)
else: else:
self._update_received(jid, avatar_sha) # Check if presence is from a MUC service
contact = app.contacts.get_groupchat_contact(self._account,
str(properties.jid))
self._update_received(properties, room=contact is not None)
def _self_update_received(self, jid, avatar_sha): def _self_update_received(self, properties):
jid = jid.getStripped() jid = properties.jid.getBare()
full_jid = jid if properties.avatar_state == AvatarState.EMPTY:
if avatar_sha == '':
# Empty <photo/> tag, means no avatar is advertised # Empty <photo/> tag, means no avatar is advertised
log.info('%s has no avatar published', full_jid) log.info('%s has no avatar published', properties.jid)
app.config.set_per('accounts', self._account, 'avatar_sha', '') app.config.set_per('accounts', self._account, 'avatar_sha', '')
app.contacts.set_avatar(self._account, jid, None) app.contacts.set_avatar(self._account, jid, None)
app.interface.update_avatar(self._account, jid) app.interface.update_avatar(self._account, jid)
return return
log.info('Update: %s %s', jid, avatar_sha) log.info('Update: %s %s', jid, properties.avatar_sha)
current_sha = app.config.get_per( current_sha = app.config.get_per(
'accounts', self._account, 'avatar_sha') 'accounts', self._account, 'avatar_sha')
if avatar_sha != current_sha: if properties.avatar_sha != current_sha:
path = Path(configpaths.get('AVATAR')) / avatar_sha path = Path(configpaths.get('AVATAR')) / properties.avatar_sha
if path.exists(): if path.exists():
app.config.set_per( app.config.set_per('accounts', self._account,
'accounts', self._account, 'avatar_sha', avatar_sha) 'avatar_sha', properties.avatar_sha)
app.contacts.set_avatar(self._account, jid, avatar_sha) app.contacts.set_avatar(self._account,
jid,
properties.avatar_sha)
app.interface.update_avatar(self._account, jid) app.interface.update_avatar(self._account, jid)
else: else:
log.info('Request : %s', jid) log.info('Request : %s', jid)
@ -117,14 +109,13 @@ class VCardAvatars:
RequestAvatar.SELF) RequestAvatar.SELF)
else: else:
log.info('Avatar already known: %s %s', log.info('Avatar already known: %s %s',
jid, avatar_sha) jid, properties.avatar_sha)
def _update_received(self, jid, avatar_sha, room=False): def _update_received(self, properties, room=False):
jid = jid.getStripped() jid = properties.jid.getBare()
full_jid = jid if properties.avatar_state == AvatarState.EMPTY:
if avatar_sha == '':
# Empty <photo/> tag, means no avatar is advertised # Empty <photo/> tag, means no avatar is advertised
log.info('%s has no avatar published', full_jid) log.info('%s has no avatar published', properties.jid)
# Remove avatar # Remove avatar
log.debug('Remove: %s', jid) log.debug('Remove: %s', jid)
@ -135,65 +126,67 @@ class VCardAvatars:
app.interface.update_avatar( app.interface.update_avatar(
self._account, jid, room_avatar=room) self._account, jid, room_avatar=room)
else: else:
log.info('Update: %s %s', full_jid, avatar_sha) log.info('Update: %s %s', properties.jid, properties.avatar_sha)
current_sha = app.contacts.get_avatar_sha(self._account, jid) current_sha = app.contacts.get_avatar_sha(self._account, jid)
if avatar_sha == current_sha: if properties.avatar_sha == current_sha:
log.info('Avatar already known: %s %s', jid, avatar_sha) log.info('Avatar already known: %s %s',
jid, properties.avatar_sha)
return return
if room: if room:
# We dont save the room avatar hash in our DB, so check # We dont save the room avatar hash in our DB, so check
# if we previously downloaded it # if we previously downloaded it
if app.interface.avatar_exists(avatar_sha): if app.interface.avatar_exists(properties.avatar_sha):
app.contacts.set_avatar(self._account, jid, avatar_sha) app.contacts.set_avatar(self._account,
jid,
properties.avatar_sha)
app.interface.update_avatar( app.interface.update_avatar(
self._account, jid, room_avatar=room) self._account, jid, room_avatar=room)
return return
if avatar_sha not in self._requested_shas: if properties.avatar_sha not in self._requested_shas:
self._requested_shas.append(avatar_sha) self._requested_shas.append(properties.avatar_sha)
if room: if room:
self._con.get_module('VCardTemp').request_vcard( self._con.get_module('VCardTemp').request_vcard(
RequestAvatar.ROOM, jid, sha=avatar_sha) RequestAvatar.ROOM, jid, sha=properties.avatar_sha)
else: else:
self._con.get_module('VCardTemp').request_vcard( self._con.get_module('VCardTemp').request_vcard(
RequestAvatar.USER, jid, sha=avatar_sha) RequestAvatar.USER, jid, sha=properties.avatar_sha)
def _gc_update_received(self, jid, avatar_sha, show, type_): def _gc_update_received(self, properties):
if show == 'offline' or type_ == 'unavailable': nick = properties.jid.getResource()
return
nick = jid.getResource()
gc_contact = app.contacts.get_gc_contact( gc_contact = app.contacts.get_gc_contact(
self._account, jid.getStripped(), nick) self._account, properties.jid.getBare(), nick)
if gc_contact is None: if gc_contact is None:
log.error('no gc contact found: %s', nick) log.error('no gc contact found: %s', nick)
return return
if avatar_sha == '': if properties.avatar_state == AvatarState.EMPTY:
# Empty <photo/> tag, means no avatar is advertised, remove avatar # Empty <photo/> tag, means no avatar is advertised, remove avatar
log.info('%s has no avatar published', nick) log.info('%s has no avatar published', nick)
log.debug('Remove: %s', nick) log.debug('Remove: %s', nick)
gc_contact.avatar_sha = None gc_contact.avatar_sha = None
app.interface.update_avatar(contact=gc_contact) app.interface.update_avatar(contact=gc_contact)
else: else:
log.info('Update: %s %s', nick, avatar_sha) log.info('Update: %s %s', nick, properties.avatar_sha)
path = os.path.join(configpaths.get('AVATAR'), avatar_sha) path = os.path.join(configpaths.get('AVATAR'),
properties.avatar_sha)
if not os.path.isfile(path): if not os.path.isfile(path):
if avatar_sha not in self._requested_shas: if properties.avatar_sha not in self._requested_shas:
app.log('avatar').info('Request: %s', nick) app.log('avatar').info('Request: %s', nick)
self._requested_shas.append(avatar_sha) self._requested_shas.append(properties.avatar_sha)
self._con.get_module('VCardTemp').request_vcard( self._con.get_module('VCardTemp').request_vcard(
RequestAvatar.USER, str(jid), RequestAvatar.USER, str(properties.jid),
room=True, sha=avatar_sha) room=True, sha=properties.avatar_sha)
return return
if gc_contact.avatar_sha != avatar_sha: if gc_contact.avatar_sha != properties.avatar_sha:
log.info('%s changed their Avatar: %s', nick, avatar_sha) log.info('%s changed their Avatar: %s',
gc_contact.avatar_sha = avatar_sha nick, properties.avatar_sha)
gc_contact.avatar_sha = properties.avatar_sha
app.interface.update_avatar(contact=gc_contact) app.interface.update_avatar(contact=gc_contact)
else: else:
log.info('Avatar already known: %s', nick) log.info('Avatar already known: %s', nick)