Mercurial > libervia-backend
comparison sat_frontends/bridge/pb.py @ 3254:6cf4bd6972c2
core, frontends: avatar refactoring:
/!\ huge commit
Avatar logic has been reworked around the IDENTITY plugin: plugins able to handle avatar
or other identity related metadata (like nicknames) register to IDENTITY plugin in the
same way as for other features like download/upload. Once registered, IDENTITY plugin will
call them when suitable in order of priority, and handle caching.
Methods to manage those metadata from frontend now use serialised data.
For now `avatar` and `nicknames` are handled:
- `avatar` is now a dict with `path` + metadata like `media_type`, instead of just a string
path
- `nicknames` is now a list of nicknames in order of priority. This list is never empty,
and `nicknames[0]` should be the preferred nickname to use by frontends in most cases.
In addition to contact specified nicknames, user set nickname (the one set in roster) is
used in priority when available.
Among the side changes done with this commit, there are:
- a new `contactGet` bridge method to get roster metadata for a single contact
- SatPresenceProtocol.send returns a Deferred to check when it has actually been sent
- memory's methods to handle entities data now use `client` as first argument
- metadata filter can be specified with `getIdentity`
- `getAvatar` and `setAvatar` are now part of the IDENTITY plugin instead of XEP-0054 (and
there signature has changed)
- `isRoom` and `getBareOrFull` are now part of XEP-0045 plugin
- jp avatar/get command uses `xdg-open` first when available for `--show` flag
- `--no-cache` has been added to jp avatar/get and identity/get
- jp identity/set has been simplified, explicit options (`--nickname` only for now) are
used instead of `--field`. `--field` may come back in the future if necessary for extra
data.
- QuickContactList `SetContact` now handle None as a value, and doesn't use it to delete the
metadata anymore
- improved cache handling for `metadata` and `nicknames` in quick frontend
- new `default` argument in QuickContactList `getCache`
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Tue, 14 Apr 2020 21:00:33 +0200 |
| parents | f2e30aa031e9 |
| children | f300d78f08f3 |
comparison
equal
deleted
inserted
replaced
| 3253:1af840e84af7 | 3254:6cf4bd6972c2 |
|---|---|
| 1 #!/usr/bin/env python3 | 1 #!/usr/bin/env python3 |
| 2 | 2 |
| 3 | 3 # SàT communication bridge |
| 4 # SAT communication bridge | |
| 5 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) | 4 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org) |
| 6 | 5 |
| 7 # This program is free software: you can redistribute it and/or modify | 6 # This program is free software: you can redistribute it and/or modify |
| 8 # it under the terms of the GNU Affero General Public License as published by | 7 # it under the terms of the GNU Affero General Public License as published by |
| 9 # the Free Software Foundation, either version 3 of the License, or | 8 # the Free Software Foundation, either version 3 of the License, or |
| 204 if errback is None: | 203 if errback is None: |
| 205 d.addErrback(self._generic_errback) | 204 d.addErrback(self._generic_errback) |
| 206 else: | 205 else: |
| 207 d.addErrback(self._errback, ori_errback=errback) | 206 d.addErrback(self._errback, ori_errback=errback) |
| 208 | 207 |
| 208 def contactGet(self, arg_0, profile_key="@DEFAULT@", callback=None, errback=None): | |
| 209 d = self.root.callRemote("contactGet", arg_0, profile_key) | |
| 210 if callback is not None: | |
| 211 d.addCallback(callback) | |
| 212 if errback is None: | |
| 213 d.addErrback(self._generic_errback) | |
| 214 else: | |
| 215 d.addErrback(self._errback, ori_errback=errback) | |
| 216 | |
| 209 def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): | 217 def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): |
| 210 d = self.root.callRemote("delContact", entity_jid, profile_key) | 218 d = self.root.callRemote("delContact", entity_jid, profile_key) |
| 211 if callback is not None: | 219 if callback is not None: |
| 212 d.addCallback(lambda __: callback()) | 220 d.addCallback(lambda __: callback()) |
| 213 if errback is None: | 221 if errback is None: |
| 786 def connect(self, profile_key="@DEFAULT@", password='', options={}): | 794 def connect(self, profile_key="@DEFAULT@", password='', options={}): |
| 787 d = self.root.callRemote("connect", profile_key, password, options) | 795 d = self.root.callRemote("connect", profile_key, password, options) |
| 788 d.addErrback(self._errback) | 796 d.addErrback(self._errback) |
| 789 return d.asFuture(asyncio.get_event_loop()) | 797 return d.asFuture(asyncio.get_event_loop()) |
| 790 | 798 |
| 799 def contactGet(self, arg_0, profile_key="@DEFAULT@"): | |
| 800 d = self.root.callRemote("contactGet", arg_0, profile_key) | |
| 801 d.addErrback(self._errback) | |
| 802 return d.asFuture(asyncio.get_event_loop()) | |
| 803 | |
| 791 def delContact(self, entity_jid, profile_key="@DEFAULT@"): | 804 def delContact(self, entity_jid, profile_key="@DEFAULT@"): |
| 792 d = self.root.callRemote("delContact", entity_jid, profile_key) | 805 d = self.root.callRemote("delContact", entity_jid, profile_key) |
| 793 d.addErrback(self._errback) | 806 d.addErrback(self._errback) |
| 794 return d.asFuture(asyncio.get_event_loop()) | 807 return d.asFuture(asyncio.get_event_loop()) |
| 795 | 808 |