| ... |
... |
@@ -26,7 +26,8 @@ class UserAvatar(BaseModule): |
|
26
|
26
|
|
|
27
|
27
|
_nbxmpp_extends = 'UserAvatar'
|
|
28
|
28
|
_nbxmpp_methods = [
|
|
29
|
|
- 'request_avatar',
|
|
|
29
|
+ 'request_avatar_metadata',
|
|
|
30
|
+ 'request_avatar_data',
|
|
30
|
31
|
'set_avatar',
|
|
31
|
32
|
]
|
|
32
|
33
|
|
| ... |
... |
@@ -60,14 +61,14 @@ def _avatar_metadata_received(self, _con, _stanza, properties): |
|
60
|
61
|
|
|
61
|
62
|
avatar_info = metadata.infos[0]
|
|
62
|
63
|
self._log.info('Request: %s %s', jid, avatar_info.id)
|
|
63
|
|
- self._request_avatar(jid, avatar_info)
|
|
|
64
|
+ self._request_avatar_data(jid, avatar_info)
|
|
64
|
65
|
|
|
65
|
66
|
@as_task
|
|
66
|
|
- def _request_avatar(self, jid, avatar_info):
|
|
|
67
|
+ def _request_avatar_data(self, jid, avatar_info):
|
|
67
|
68
|
_task = yield
|
|
68
|
69
|
|
|
69
|
|
- avatar = yield self._nbxmpp('UserAvatar').request_avatar(
|
|
70
|
|
- avatar_info, jid=jid)
|
|
|
70
|
+ avatar = yield self._nbxmpp('UserAvatar').request_avatar_data(
|
|
|
71
|
+ avatar_info.id, jid=jid)
|
|
71
|
72
|
|
|
72
|
73
|
if is_error(avatar):
|
|
73
|
74
|
self._log.warning(avatar)
|
| ... |
... |
@@ -77,10 +78,9 @@ def _request_avatar(self, jid, avatar_info): |
|
77
|
78
|
app.interface.save_avatar(avatar.data)
|
|
78
|
79
|
|
|
79
|
80
|
if self._con.get_own_jid().bare_match(jid):
|
|
80
|
|
- app.config.set_per('accounts',
|
|
81
|
|
- self._account,
|
|
82
|
|
- 'avatar_sha',
|
|
83
|
|
- avatar.sha)
|
|
|
81
|
+ app.settings.set_account_setting(self._account,
|
|
|
82
|
+ 'avatar_sha',
|
|
|
83
|
+ avatar.sha)
|
|
84
|
84
|
else:
|
|
85
|
85
|
self._con.get_module('Roster').set_avatar_sha(
|
|
86
|
86
|
str(jid), avatar.sha)
|