Commits February 2019

commits@gajim.org

1 participants
58 discussions

[Git][gajim/gajim][master] Refactor UserAvatar
by Philipp Hörist 02 Feb '19

02 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: cef5b04d by Philipp Hörist at 2019-02-02T23:08:28Z Refactor UserAvatar - Simplify modules because nbxmpp handles more stuff - - - - - 1 changed file: - gajim/common/modules/user_avatar.py Changes: ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -15,134 +15,67 @@ # XEP-0084: User Avatar import logging -import base64 -import binascii import nbxmpp from gajim.common import app -from gajim.common.const import PEPEventType -from gajim.common.exceptions import StanzaMalformed -from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData +from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import event_node log = logging.getLogger('gajim.c.m.user_avatar') -class UserAvatarData(AbstractPEPData): +class UserAvatar(BaseModule): - type_ = PEPEventType.AVATAR + _nbxmpp_extends = 'UserAvatar' + _nbxmpp_methods = [ + 'request_avatar' + ] + def __init__(self, con): + BaseModule.__init__(self, con) + self._register_pubsub_handler(self._avatar_metadata_received) -class UserAvatar(AbstractPEPModule): + @event_node(nbxmpp.NS_AVATAR_METADATA) + def _avatar_metadata_received(self, _con, _stanza, properties): + data = properties.pubsub_event.data + empty = properties.pubsub_event.empty + jid = str(properties.jid) + own_jid = self._con.get_own_jid().getBare() - name = 'user-avatar' - namespace = 'urn:xmpp:avatar:metadata' - pep_class = UserAvatarData - store_publish = False - _log = log - - def get_pubsub_avatar(self, jid, item_id): - log.info('Request: %s %s', jid, item_id) - self._con.get_module('PubSub').send_pb_retrieve( - jid, 'urn:xmpp:avatar:data', item_id, self._avatar_received) - - def _validate_avatar_node(self, stanza): - jid = stanza.getFrom() - if jid is None: - jid = self._con.get_own_jid().getStripped() - else: - jid = jid.getStripped() - - if nbxmpp.isErrorNode(stanza): - raise StanzaMalformed(stanza.getErrorMsg()) - - pubsub_node = stanza.getTag('pubsub') - if pubsub_node is None: - raise StanzaMalformed('No pubsub node', stanza) - - items_node = pubsub_node.getTag('items') - if items_node is None: - raise StanzaMalformed('No items node', stanza) - - if items_node.getAttr('node') != 'urn:xmpp:avatar:data': - raise StanzaMalformed('Wrong namespace', stanza) - - item = items_node.getTag('item') - if item is None: - raise StanzaMalformed('No item node', stanza) - - sha = item.getAttr('id') - data_tag = item.getTag('data', namespace='urn:xmpp:avatar:data') - if sha is None or data_tag is None: - raise StanzaMalformed('No id attr or data node found', stanza) - - data = data_tag.getData() - if data is None: - raise StanzaMalformed('Data node empty', stanza) - - data = base64.b64decode(data.encode('utf-8')) - - return jid, sha, data - - def _avatar_received(self, _con, stanza): - try: - jid, sha, data = self._validate_avatar_node(stanza) - except (StanzaMalformed, binascii.Error) as error: - log.warning('Error: %s %s', stanza.getFrom(), error) - return - - log.info('Received Avatar: %s %s', jid, sha) - app.interface.save_avatar(data) - - if self._con.get_own_jid().bareMatch(jid): - app.config.set_per('accounts', self._account, 'avatar_sha', sha) - else: - own_jid = self._con.get_own_jid().getStripped() - app.logger.set_avatar_sha(own_jid, jid, sha) - - app.contacts.set_avatar(self._account, jid, sha) - app.interface.update_avatar(self._account, jid) - - def _extract_info(self, item): - metadata = item.getTag('metadata', namespace=self.namespace) - if metadata is None: - raise StanzaMalformed('No metadata node') - - info = metadata.getTags('info', one=True) - if not info: - return None - - avatar = info.getAttrs() - return avatar or None - - def _notification_received(self, jid, user_pep): - avatar = user_pep.data - own_jid = self._con.get_own_jid() - if avatar is None: + if empty: # Remove avatar log.info('Remove: %s', jid) - app.contacts.set_avatar(self._account, str(jid), None) - app.logger.set_avatar_sha(own_jid.getStripped(), str(jid), None) - app.interface.update_avatar(self._account, str(jid)) + app.contacts.set_avatar(self._account, jid, None) + app.logger.set_avatar_sha(own_jid, jid, None) + app.interface.update_avatar(self._account, jid) else: - if own_jid.bareMatch(jid): + if properties.is_self_message: sha = app.config.get_per( 'accounts', self._account, 'avatar_sha') else: - sha = app.contacts.get_avatar_sha(self._account, str(jid)) + sha = app.contacts.get_avatar_sha(self._account, jid) - if sha == avatar['id']: - log.info('Avatar already known: %s %s', - jid, avatar['id']) + if sha == data.id: + log.info('Avatar already known: %s %s', jid, data.id) return - self.get_pubsub_avatar(jid, avatar['id']) - def _build_node(self, data): - raise NotImplementedError + log.info('Request: %s %s', jid, data.id) + self._nbxmpp('UserAvatar').request_avatar( + jid, data.id, callback=self._avatar_received) + + def _avatar_received(self, result): + log.info('Received Avatar: %s %s', result.jid, result.sha) + app.interface.save_avatar(result.data) + + if self._con.get_own_jid().bareMatch(result.jid): + app.config.set_per('accounts', self._account, 'avatar_sha', result.sha) + else: + own_jid = self._con.get_own_jid().getBare() + app.logger.set_avatar_sha(own_jid, str(result.jid), result.sha) - def send(self, data): - # Not implemented yet - return + app.contacts.set_avatar(self._account, str(result.jid), result.sha) + app.interface.update_avatar(self._account, str(result.jid)) def get_instance(*args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cef5b04d82b9c3c9ab57379102511916f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cef5b04d82b9c3c9ab57379102511916f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add UserAvatar (XEP-0084) module
by Philipp Hörist 02 Feb '19

02 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4a7ecc26 by Philipp Hörist at 2019-02-02T23:06:33Z Add UserAvatar (XEP-0084) module - - - - - 4 changed files: - nbxmpp/dispatcher_nb.py - nbxmpp/modules/pubsub.py - + nbxmpp/modules/user_avatar.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -61,6 +61,7 @@ from nbxmpp.modules.activity import Activity from nbxmpp.modules.tune import Tune from nbxmpp.modules.mood import Mood from nbxmpp.modules.location import Location +from nbxmpp.modules.user_avatar import UserAvatar from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -189,6 +190,7 @@ class XMPPDispatcher(PlugIn): self._modules['Activity'] = Activity(self._owner) self._modules['Tune'] = Tune(self._owner) self._modules['Location'] = Location(self._owner) + self._modules['UserAvatar'] = UserAvatar(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -76,3 +76,14 @@ class PubSub: return CommonResult(jid=stanza.getFrom(), error=stanza.getError()) return CommonResult(jid=stanza.getFrom()) + + +def get_pubsub_request(jid, node, id_=None, max_items=None): + query = Iq('get', to=jid) + pubsub = query.addChild('pubsub', namespace=NS_PUBSUB) + items = pubsub.addChild('items', {'node': node}) + if max_items is not None: + items.setAttr('max_items', max_items) + if id_ is not None: + items.addChild('item', {'id': id_}) + return query ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -0,0 +1,108 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging +import base64 + +from nbxmpp.protocol import NS_AVATAR_DATA +from nbxmpp.protocol import NS_AVATAR_METADATA +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import NodeProcessed +from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import JID +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import AvatarMetaData +from nbxmpp.structs import AvatarData +from nbxmpp.util import call_on_response +from nbxmpp.util import callback +from nbxmpp.modules.pubsub import get_pubsub_request + +log = logging.getLogger('nbxmpp.m.user_avatar') + + +class UserAvatar: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_avatar, + ns=NS_PUBSUB_EVENT, + priority=16), + ] + + def _process_pubsub_avatar(self, _con, stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_AVATAR_METADATA: + return + + item = properties.pubsub_event.item + + metadata = item.getTag('metadata', namespace=NS_AVATAR_METADATA) + if not metadata.getChildren(): + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received avatar metadata: %s - no avatar set', + properties.jid) + else: + info = metadata.getTags('info', one=True) + try: + data = AvatarMetaData(**info.getAttrs()) + except Exception: + log.warning('Malformed user avatar data') + log.warning(stanza) + raise NodeProcessed + + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received avatar metadata: %s - %s', properties.jid, data) + + properties.pubsub_event = pubsub_event + + @call_on_response('_avatar_data_received') + def request_avatar(self, jid, id_): + return get_pubsub_request(jid, NS_AVATAR_DATA, id_=id_) + + @callback + def _avatar_data_received(self, stanza): + jid = stanza.getFrom() + if jid is None: + jid = JID(self._client.get_bound_jid().getBare()) + + if not isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + raise NodeProcessed + + pubsub_node = stanza.getTag('pubsub') + items_node = pubsub_node.getTag('items') + item = items_node.getTag('item') + + sha = item.getAttr('id') + data_node = item.getTag('data', namespace=NS_AVATAR_DATA) + if data_node is None: + log.warning('No data node found') + log.warning(stanza) + raise NodeProcessed + + data = data_node.getData() + if data is None: + log.warning('Data node empty') + log.warning(stanza) + raise NodeProcessed + + data = base64.b64decode(data.encode('utf-8')) + log.info('Received avatar data: %s %s', jid, sha) + return AvatarData(jid, sha, data) ===================================== nbxmpp/structs.py ===================================== @@ -68,6 +68,12 @@ ActivityData = namedtuple('ActivityData', 'activity subactivity text') LocationData = namedtuple('LocationData', LOCATION_DATA) LocationData.__new__.__defaults__ = (None,) * len(LocationData._fields) +AvatarMetaData = namedtuple('AvatarMetaData', 'bytes height width id type url') +AvatarMetaData.__new__.__defaults__ = (None,) * len(AvatarMetaData._fields) + +AvatarData = namedtuple('AvatarData', 'jid sha data') +AvatarData.__new__.__defaults__ = (None,) * len(AvatarData._fields) + class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4a7ecc26df815af67f0fc7987b… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/4a7ecc26df815af67f0fc7987b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused import
by Philipp Hörist 02 Feb '19

02 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: dfc3749a by Philipp Hörist at 2019-02-02T17:03:57Z Remove unused import - - - - - 15dc059b by Philipp Hörist at 2019-02-02T18:12:06Z Use css value for message input placeholder - - - - - 3 changed files: - gajim/data/style/default.css - gajim/gtkgui_helpers.py - gajim/message_textview.py Changes: ===================================== gajim/data/style/default.css ===================================== @@ -1 +1 @@ - .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-restored-message { color: rgb(85, 87, 83) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } \ No newline at end of file + .gajim-incoming-nickname { color: rgb(164, 0, 0) } .gajim-outgoing-nickname { color: rgb(52, 101, 164) } .gajim-outgoing-message-text { color: rgb(85, 87, 83) } .gajim-status-message { color: rgb(78, 154, 6) } .gajim-url { color: rgb(32, 74, 135) } .gajim-highlight-message { color: rgb(255, 128, 128) } .gajim-restored-message { color: rgb(85, 87, 83) } .gajim-roster-disconnected { background: rgb(171 ,97 ,97) } .gajim-roster-connected { background: rgb(173, 195, 198) } .gajim-state-composing { color: rgb(0, 139, 0) } .gajim-state-inactive { color: rgb(158, 158, 158) } .gajim-state-gone { color: rgb(128, 128, 128) } .gajim-state-paused { color: rgb(0, 0, 205) } .gajim-message-placeholder { color: rgb(195, 195, 192) } \ No newline at end of file ===================================== gajim/gtkgui_helpers.py ===================================== @@ -41,7 +41,6 @@ except Exception: from gajim.common.i18n import _ from gajim.common import app -from gajim.common.const import PEPEventType HAS_PYWIN32 = True if os.name == 'nt': @@ -55,14 +54,6 @@ if os.name == 'nt': log = logging.getLogger('gajim.gtkgui_helpers') -class Color: - BLACK = Gdk.RGBA(red=0, green=0, blue=0, alpha=1) - GREEN = Gdk.RGBA(red=115/255, green=210/255, blue=22/255, alpha=1) - RED = Gdk.RGBA(red=204/255, green=0, blue=0, alpha=1) - GREY = Gdk.RGBA(red=195/255, green=195/255, blue=192/255, alpha=1) - ORANGE = Gdk.RGBA(red=245/255, green=121/255, blue=0/255, alpha=1) - - def get_pixbuf_from_data(file_data): """ Get image data and returns GdkPixbuf.Pixbuf ===================================== gajim/message_textview.py ===================================== @@ -24,10 +24,9 @@ from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango -from gajim import gtkgui_helpers - from gajim.common import app from gajim.common.i18n import _ +from gajim.common.const import StyleAttr from gajim.gtk.util import scroll_to_end @@ -76,9 +75,12 @@ class MessageTextView(Gtk.TextView): self.color_tags = [] self.fonts_tags = [] self.other_tags = {} + + color = app.css_config.get_value( + '.gajim-message-placeholder', StyleAttr.COLOR) self.placeholder_tag = buffer_.create_tag('placeholder') - self.placeholder_tag.set_property('foreground_rgba', - gtkgui_helpers.Color.GREY) + self.placeholder_tag.set_property('foreground', color) + self.other_tags['bold'] = buffer_.create_tag('bold') self.other_tags['bold'].set_property('weight', Pango.Weight.BOLD) self.begin_tags['bold'] = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3f03e6e0a4440d9addcd1df73d7258997… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/3f03e6e0a4440d9addcd1df73d7258997… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Refactor UserTune
by Philipp Hörist 02 Feb '19

02 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: d37b95e4 by Philipp Hörist at 2019-02-02T11:51:24Z Refactor UserTune - Simplify modules because nbxmpp handles more stuff - - - - - 59b39b04 by Philipp Hörist at 2019-02-02T11:51:28Z Refactor UserLocation - Simplify modules because nbxmpp handles more stuff - - - - - 3f03e6e0 by Philipp Hörist at 2019-02-02T11:55:07Z Better handle disable notifitcations - - - - - 12 changed files: - gajim/chat_control.py - gajim/common/dbus/location.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_tune.py - gajim/common/types.py - gajim/gtk/tooltips.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -61,6 +61,8 @@ from gajim.gtk.util import get_cursor from gajim.gtk.util import ensure_proper_control from gajim.gtk.util import format_mood from gajim.gtk.util import format_activity +from gajim.gtk.util import format_tune +from gajim.gtk.util import format_location from gajim.gtk.util import get_activity_icon_name from gajim.command_system.implementation.hosts import ChatCommands @@ -131,12 +133,7 @@ class ChatControl(ChatControlBase): self.video_available = False self.update_toolbar() - - self._pep_images = {} - self._pep_images['tune'] = self.xml.get_object('tune_image') - self._pep_images['geoloc'] = self.xml.get_object('location_image') self.update_all_pep_types() - self.show_avatar() # Hook up signals @@ -228,14 +225,16 @@ class ChatControl(ChatControlBase): self.restore_conversation() self.msg_textview.grab_focus() - app.ged.register_event_handler('pep-received', ged.GUI1, - self._nec_pep_received) app.ged.register_event_handler('nickname-received', ged.GUI1, self._on_nickname_received) app.ged.register_event_handler('mood-received', ged.GUI1, self._on_mood_received) app.ged.register_event_handler('activity-received', ged.GUI1, self._on_activity_received) + app.ged.register_event_handler('tune-received', ged.GUI1, + self._on_tune_received) + app.ged.register_event_handler('location-received', ged.GUI1, + self._on_location_received) if self.TYPE_ID == message_control.TYPE_CHAT: # Dont connect this when PrivateChatControl is used app.ged.register_event_handler('update-roster-avatar', ged.GUI1, @@ -416,36 +415,10 @@ class ChatControl(ChatControlBase): self.audio_available = False def update_all_pep_types(self): - for pep_type in self._pep_images: - self.update_pep(pep_type) + self._update_pep(PEPEventType.LOCATION) self._update_pep(PEPEventType.MOOD) self._update_pep(PEPEventType.ACTIVITY) - - def update_pep(self, pep_type): - if isinstance(self.contact, GC_Contact): - return - if pep_type not in self._pep_images: - return - pep = self.contact.pep - img = self._pep_images[pep_type] - if pep_type in pep: - icon = gtkgui_helpers.get_pep_icon(pep[pep_type]) - if isinstance(icon, str): - img.set_from_icon_name(icon, Gtk.IconSize.MENU) - else: - img.set_from_pixbuf(icon) - img.set_tooltip_markup(pep[pep_type].as_markup_text()) - img.show() - else: - img.hide() - - def _nec_pep_received(self, obj): - if obj.conn.name != self.account: - return - if obj.jid != self.contact.jid: - return - - self.update_pep(obj.pep_type) + self._update_pep(PEPEventType.TUNE) def _update_pep(self, type_): image = self._get_pep_widget(type_) @@ -460,6 +433,12 @@ class ChatControl(ChatControlBase): elif type_ == PEPEventType.ACTIVITY: icon = get_activity_icon_name(data.activity, data.subactivity) formated_text = format_activity(*data) + elif type_ == PEPEventType.TUNE: + icon = 'audio-x-generic' + formated_text = format_tune(*data) + elif type_ == PEPEventType.LOCATION: + icon = 'applications-internet' + formated_text = format_location(data) image.set_from_icon_name(icon, Gtk.IconSize.MENU) image.set_tooltip_markup(formated_text) @@ -470,6 +449,10 @@ class ChatControl(ChatControlBase): return self.xml.get_object('mood_image') if type_ == PEPEventType.ACTIVITY: return self.xml.get_object('activity_image') + if type_ == PEPEventType.TUNE: + return self.xml.get_object('tune_image') + if type_ == PEPEventType.LOCATION: + return self.xml.get_object('location_image') @ensure_proper_control def _on_mood_received(self, _event): @@ -479,6 +462,14 @@ class ChatControl(ChatControlBase): def _on_activity_received(self, _event): self._update_pep(PEPEventType.ACTIVITY) + @ensure_proper_control + def _on_tune_received(self, _event): + self._update_pep(PEPEventType.TUNE) + + @ensure_proper_control + def _on_location_received(self, _event): + self._update_pep(PEPEventType.LOCATION) + @ensure_proper_control def _on_nickname_received(self, _event): self.update_ui() @@ -1092,15 +1083,16 @@ class ChatControl(ChatControlBase): # PluginSystem: removing GUI extension points connected with ChatControl # instance object app.plugin_manager.remove_gui_extension_point('chat_control', self) - - app.ged.remove_event_handler('pep-received', ged.GUI1, - self._nec_pep_received) app.ged.remove_event_handler('nickname-received', ged.GUI1, self._on_nickname_received) app.ged.remove_event_handler('mood-received', ged.GUI1, self._on_mood_received) app.ged.remove_event_handler('activity-received', ged.GUI1, self._on_activity_received) + app.ged.remove_event_handler('tune-received', ged.GUI1, + self._on_tune_received) + app.ged.remove_event_handler('location-received', ged.GUI1, + self._on_location_received) if self.TYPE_ID == message_control.TYPE_CHAT: app.ged.remove_event_handler('update-roster-avatar', ged.GUI1, self._nec_update_avatar) ===================================== gajim/common/dbus/location.py ===================================== @@ -18,6 +18,7 @@ import logging from datetime import datetime from gi.repository import GLib +from nbxmpp.structs import LocationData from gajim.common import app @@ -93,7 +94,8 @@ class LocationListener: del new_data['timestamp'] if last_data == new_data: continue - app.connections[acct].get_module('UserLocation').send(self._data) + app.connections[acct].get_module('UserLocation').set_location( + LocationData(**self._data)) self.location_info = self._data.copy() def _timestamp_to_utc(self, timestamp): ===================================== gajim/common/modules/user_activity.py ===================================== @@ -45,17 +45,17 @@ class UserActivity(BaseModule): @event_node(nbxmpp.NS_ACTIVITY) def _activity_received(self, _con, _stanza, properties): data = properties.pubsub_event.data - if data is None: - return + empty = properties.pubsub_event.empty + for contact in app.contacts.get_contacts(self._account, str(properties.jid)): - if data.activity is not None: + if not empty: contact.pep[PEPEventType.ACTIVITY] = data else: contact.pep.pop(PEPEventType.ACTIVITY, None) if properties.is_self_message: - if data.activity is not None: + if not empty: self._con.pep[PEPEventType.ACTIVITY] = data else: self._con.pep.pop(PEPEventType.ACTIVITY, None) ===================================== gajim/common/modules/user_location.py ===================================== @@ -17,64 +17,57 @@ import logging import nbxmpp -from gi.repository import GLib -from gajim.common.const import PEPEventType, LOCATION_DATA -from gajim.common.exceptions import StanzaMalformed -from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import event_node +from gajim.common.modules.util import store_publish +from gajim.common.const import PEPEventType log = logging.getLogger('gajim.c.m.user_location') -class UserLocationData(AbstractPEPData): - - type_ = PEPEventType.LOCATION - - def as_markup_text(self): - location = self.data - location_string = '' - - for entry in location.keys(): - text = location[entry] - text = GLib.markup_escape_text(text) - # Translate standard location tag - tag = LOCATION_DATA.get(entry, entry) - location_string += '\n%(tag)s: %(text)s' % { - 'tag': tag.capitalize(), 'text': text} - - return location_string.strip() - - -class UserLocation(AbstractPEPModule): - - name = 'geoloc' - namespace = nbxmpp.NS_LOCATION - pep_class = UserLocationData - store_publish = True - _log = log - - def _extract_info(self, item): - location_dict = {} - location_tag = item.getTag('geoloc', namespace=nbxmpp.NS_LOCATION) - if location_tag is None: - raise StanzaMalformed('No geoloc node') - - for child in location_tag.getChildren(): - name = child.getName().strip() - data = child.getData().strip() - if child.getName() in LOCATION_DATA: - location_dict[name] = data - - return location_dict or None - - def _build_node(self, data): - item = nbxmpp.Node('geoloc', {'xmlns': nbxmpp.NS_LOCATION}) - if data is None: - return item - for field in LOCATION_DATA: - if data.get(field, False): - item.addChild(field, payload=data[field]) - return item +class UserLocation(BaseModule): + + _nbxmpp_extends = 'Location' + _nbxmpp_methods = [ + 'set_location', + ] + + def __init__(self, con): + BaseModule.__init__(self, con) + self._register_pubsub_handler(self._location_received) + + @event_node(nbxmpp.NS_LOCATION) + def _location_received(self, _con, _stanza, properties): + data = properties.pubsub_event.data + empty = properties.pubsub_event.empty + + for contact in app.contacts.get_contacts(self._account, + str(properties.jid)): + if not empty: + contact.pep[PEPEventType.LOCATION] = data + else: + contact.pep.pop(PEPEventType.LOCATION, None) + + if properties.is_self_message: + if not empty: + self._con.pep[PEPEventType.LOCATION] = data + else: + self._con.pep.pop(PEPEventType.LOCATION, None) + + app.nec.push_incoming_event( + NetworkEvent('location-received', + account=self._account, + jid=properties.jid.getBare(), + location=data, + is_self_message=properties.is_self_message)) + + @store_publish + def set_location(self, location): + log.info('Send %s', location) + self._nbxmpp('Location').set_location(location) def get_instance(*args, **kwargs): ===================================== gajim/common/modules/user_mood.py ===================================== @@ -45,17 +45,17 @@ class UserMood(BaseModule): @event_node(nbxmpp.NS_MOOD) def _mood_received(self, _con, _stanza, properties): data = properties.pubsub_event.data - if data is None: - return + empty = properties.pubsub_event.empty + for contact in app.contacts.get_contacts(self._account, str(properties.jid)): - if data.mood is not None: + if not empty: contact.pep[PEPEventType.MOOD] = data else: contact.pep.pop(PEPEventType.MOOD, None) if properties.is_self_message: - if data.mood is not None: + if not empty: self._con.pep[PEPEventType.MOOD] = data else: self._con.pep.pop(PEPEventType.MOOD, None) ===================================== gajim/common/modules/user_tune.py ===================================== @@ -15,90 +15,62 @@ # XEP-0118: User Tune from typing import Any -from typing import List # pylint: disable=unused-import -from typing import Dict -from typing import Optional from typing import Tuple import logging import nbxmpp -from gi.repository import GLib -from gajim.common.i18n import _ +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import event_node +from gajim.common.modules.util import store_publish from gajim.common.const import PEPEventType -from gajim.common.exceptions import StanzaMalformed -from gajim.common.modules.pep import AbstractPEPModule, AbstractPEPData -from gajim.common.types import UserTuneDataT log = logging.getLogger('gajim.c.m.user_tune') -class UserTuneData(AbstractPEPData): - - type_ = PEPEventType.TUNE - - def as_markup_text(self) -> str: - if self.data is None: - return '' - - tune = self.data - - artist = tune.get('artist', _('Unknown Artist')) - artist = GLib.markup_escape_text(artist) - - title = tune.get('title', _('Unknown Title')) - title = GLib.markup_escape_text(title) - - source = tune.get('source', _('Unknown Source')) - source = GLib.markup_escape_text(source) - - tune_string = _('"%(title)s" by %(artist)s\n' - 'from %(source)s') % {'title': title, - 'artist': artist, - 'source': source} - return tune_string - - -class UserTune(AbstractPEPModule): - - name = 'tune' - namespace = nbxmpp.NS_TUNE - pep_class = UserTuneData - store_publish = True - _log = log - - def _extract_info(self, item: nbxmpp.Node) -> Optional[Dict[str, str]]: - tune_dict = {} - tune_tag = item.getTag('tune', namespace=self.namespace) - if tune_tag is None: - raise StanzaMalformed('No tune node') - - for child in tune_tag.getChildren(): - name = child.getName().strip() - data = child.getData().strip() - if child.getName() in ['artist', 'title', 'source', - 'track', 'length']: - tune_dict[name] = data - - return tune_dict or None - - def _build_node(self, data: UserTuneDataT) -> nbxmpp.Node: - item = nbxmpp.Node('tune', {'xmlns': nbxmpp.NS_TUNE}) - if data is None: - return item - artist, title, source, track, length = data - if artist: - item.addChild('artist', payload=artist) - if title: - item.addChild('title', payload=title) - if source: - item.addChild('source', payload=source) - if track: - item.addChild('track', payload=track) - if length: - item.addChild('length', payload=length) - return item +class UserTune(BaseModule): + + _nbxmpp_extends = 'Tune' + _nbxmpp_methods = [ + 'set_tune', + ] + + def __init__(self, con): + BaseModule.__init__(self, con) + self._register_pubsub_handler(self._tune_received) + + @event_node(nbxmpp.NS_TUNE) + def _tune_received(self, _con, _stanza, properties): + data = properties.pubsub_event.data + empty = properties.pubsub_event.empty + + for contact in app.contacts.get_contacts(self._account, + str(properties.jid)): + if not empty: + contact.pep[PEPEventType.TUNE] = data + else: + contact.pep.pop(PEPEventType.TUNE, None) + + if properties.is_self_message: + if not empty: + self._con.pep[PEPEventType.TUNE] = data + else: + self._con.pep.pop(PEPEventType.TUNE, None) + + app.nec.push_incoming_event( + NetworkEvent('tune-received', + account=self._account, + jid=properties.jid.getBare(), + tune=data, + is_self_message=properties.is_self_message)) + + @store_publish + def set_tune(self, tune): + log.info('Send %s', tune) + self._nbxmpp('Tune').set_tune(tune) def get_instance(*args: Any, **kwargs: Any) -> Tuple[UserTune, str]: ===================================== gajim/common/types.py ===================================== @@ -47,8 +47,6 @@ ConnectionT = Union['Connection', 'ConnectionZeroconf'] ContactsT = Union['Contact', 'GC_Contact'] ContactT = Union['Contact'] -UserTuneDataT = Optional[Tuple[str, str, str, str, str]] - # PEP PEPNotifyCallback = Callable[[nbxmpp.JID, nbxmpp.Node], None] PEPHandlersDict = Dict[str, List[PEPNotifyCallback]] ===================================== gajim/gtk/tooltips.py ===================================== @@ -44,6 +44,8 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import format_mood from gajim.gtk.util import format_activity +from gajim.gtk.util import format_tune +from gajim.gtk.util import format_location log = logging.getLogger('gajim.gtk.tooltips') @@ -487,14 +489,14 @@ class RosterTooltip(StatusTable): self._ui.activity.show() self._ui.activity_label.show() - if 'tune' in contact.pep: - tune = contact.pep['tune'].as_markup_text() + if PEPEventType.TUNE in contact.pep: + tune = format_tune(*contact.pep[PEPEventType.TUNE]) self._ui.tune.set_markup(tune) self._ui.tune.show() self._ui.tune_label.show() - if 'geoloc' in contact.pep: - location = contact.pep['geoloc'].as_markup_text() + if PEPEventType.LOCATION in contact.pep: + location = format_location(contact.pep[PEPEventType.LOCATION]) self._ui.location.set_markup(location) self._ui.location.show() self._ui.location_label.show() ===================================== gajim/gtk/util.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.const import MOODS from gajim.common.const import ACTIVITIES +from gajim.common.const import LOCATION_DATA from gajim.gtk.const import GajimIconSet @@ -546,3 +547,34 @@ def get_activity_icon_name(activity, subactivity=None): if subactivity is not None: icon_name += '-%s' % subactivity.replace('_', '-') return icon_name + + +def format_tune(artist, length, rating, source, title, track, uri): + if artist is None and title is None and source is None: + return + artist = GLib.markup_escape_text(artist or _('Unknown Artist')) + title = GLib.markup_escape_text(title or _('Unknown Title')) + source = GLib.markup_escape_text(source or _('Unknown Source')) + + tune_string = _('"%(title)s" by %(artist)s\n' + 'from %(source)s') % {'title': title, + 'artist': artist, + 'source': source} + return tune_string + + +def format_location(location): + location = location._asdict() + location_string = '' + for attr, value in location.items(): + if value is None: + continue + text = GLib.markup_escape_text(value) + # Translate standard location tag + tag = LOCATION_DATA.get(attr) + if tag is None: + continue + location_string += '\n%(tag)s: %(text)s' % { + 'tag': tag.capitalize(), 'text': text} + + return location_string.strip() ===================================== gajim/gtkgui_helpers.py ===================================== @@ -264,15 +264,6 @@ def create_list_multi(value_list, selected_values=None): treeview.show_all() return treeview -def get_pep_icon(pep_class): - if pep_class == PEPEventType.TUNE: - return 'audio-x-generic' - - if pep_class == PEPEventType.LOCATION: - return 'applications-internet' - - return None - def label_set_autowrap(widget): """ Make labels automatically re-wrap if their containers are resized. ===================================== gajim/gui_interface.py ===================================== @@ -47,6 +47,7 @@ from gi.repository import Gio from gi.repository import Gdk from nbxmpp import idlequeue from nbxmpp import Hashes2 +from nbxmpp.structs import TuneData import OpenSSL try: @@ -1942,8 +1943,8 @@ class Interface: continue if app.connections[acct].music_track_info == music_track_info: continue - app.connections[acct].get_module('UserTune').send( - (artist, title, source, '', '')) + app.connections[acct].get_module('UserTune').set_tune( + TuneData(artist=artist, title=title, source=source)) app.connections[acct].music_track_info = music_track_info def read_sleepy(self): ===================================== gajim/roster_window.py ===================================== @@ -1058,16 +1058,13 @@ class RosterWindow: else: self.model[child_iter][Column.ACTIVITY_PIXBUF] = None - if app.config.get('show_tunes_in_roster') and 'tune' in pep_dict: - self.model[child_iter][Column.TUNE_ICON] = \ - gtkgui_helpers.get_pep_icon(pep_dict['tune']) + if app.config.get('show_tunes_in_roster') and PEPEventType.TUNE in pep_dict: + self.model[child_iter][Column.TUNE_ICON] = 'audio-x-generic' else: self.model[child_iter][Column.TUNE_ICON] = None - if app.config.get('show_location_in_roster') and 'geoloc' in \ - pep_dict: - self.model[child_iter][Column.LOCATION_ICON] = \ - gtkgui_helpers.get_pep_icon(pep_dict['geoloc']) + if app.config.get('show_location_in_roster') and PEPEventType.LOCATION in pep_dict: + self.model[child_iter][Column.LOCATION_ICON] = 'applications-internet' else: self.model[child_iter][Column.LOCATION_ICON] = None @@ -1319,39 +1316,19 @@ class RosterWindow: if pep_type == PEPEventType.ACTIVITY: return app.config.get('show_activity_in_roster') - if pep_type == 'tune': + if pep_type == PEPEventType.TUNE: return app.config.get('show_tunes_in_roster') - if pep_type == 'geoloc': + if pep_type == PEPEventType.LOCATION: return app.config.get('show_location_in_roster') return False def draw_all_pep_types(self, jid, account, contact=None): - for pep_type in self._pep_type_to_model_column: - self.draw_pep(jid, account, pep_type, contact=contact) self._draw_pep(account, jid, PEPEventType.MOOD) self._draw_pep(account, jid, PEPEventType.ACTIVITY) - - def draw_pep(self, jid, account, pep_type, contact=None): - if pep_type not in self._pep_type_to_model_column: - return - if not self._is_pep_shown_in_roster(pep_type): - return - - model_column = self._pep_type_to_model_column[pep_type] - iters = self._get_contact_iter(jid, account, model=self.model) - if not iters: - return - if not contact: - contact = app.contacts.get_contact(account, jid) - - pixbuf = None - if pep_type in contact.pep: - pixbuf = gtkgui_helpers.get_pep_icon(contact.pep[pep_type]) - - for child_iter in iters: - self.model[child_iter][model_column] = pixbuf + self._draw_pep(account, jid, PEPEventType.TUNE) + self._draw_pep(account, jid, PEPEventType.LOCATION) def _draw_pep(self, account, jid, type_): if not self._is_pep_shown_in_roster(type_): @@ -1373,6 +1350,14 @@ class RosterWindow: column = Column.ACTIVITY_PIXBUF if data is not None: icon = get_activity_icon_name(data.activity, data.subactivity) + elif type_ == PEPEventType.TUNE: + column = Column.TUNE_ICON + if data is not None: + icon = 'audio-x-generic' + elif type_ == PEPEventType.LOCATION: + column = Column.LOCATION_ICON + if data is not None: + icon = 'applications-internet' for child_iter in iters: self.model[child_iter][column] = icon @@ -2636,8 +2621,7 @@ class RosterWindow: self.remove_contact(jid, obj.conn.name, backend=True) def _nec_pep_received(self, obj): - if obj.user_pep.type_ not in (PEPEventType.TUNE, - PEPEventType.LOCATION): + if obj.user_pep.type_ != PEPEventType.LOCATION: return if obj.jid == app.get_jid_from_account(obj.conn.name): @@ -2655,6 +2639,16 @@ class RosterWindow: self.draw_account(event.account) self._draw_pep(event.account, event.jid, PEPEventType.ACTIVITY) + def _on_tune_received(self, event): + if event.is_self_message: + self.draw_account(event.account) + self._draw_pep(event.account, event.jid, PEPEventType.TUNE) + + def _on_location_received(self, event): + if event.is_self_message: + self.draw_account(event.account) + self._draw_pep(event.account, event.jid, PEPEventType.LOCATION) + def _on_nickname_received(self, event): self.draw_contact(event.jid, event.account) @@ -3595,7 +3589,7 @@ class RosterWindow: if active: app.interface.enable_music_listener() else: - app.connections[account].get_module('UserTune').send(None) + app.connections[account].get_module('UserTune').set_tune(None) # disable music listener only if no other account uses it for acc in app.connections: if app.config.get_per('accounts', acc, 'publish_tune'): @@ -3611,7 +3605,7 @@ class RosterWindow: if active: location.enable() else: - app.connections[account].get_module('UserLocation').send(None) + app.connections[account].get_module('UserLocation').set_location(None) helpers.update_optional_features(account) @@ -5591,9 +5585,8 @@ class RosterWindow: # [icon, name, type, jid, account, editable, mood_pixbuf, # activity_pixbuf, TUNE_ICON, LOCATION_ICON, avatar_img, # padlock_pixbuf, visible] - self.columns = [str, str, str, str, str, - str, str, str, str, - Gtk.Image, str, bool] + self.columns = [str, str, str, str, str, str, str, str, str, + Gtk.Image, str, bool] self.xml = get_builder('roster_window.ui') self.window = self.xml.get_object('roster_window') @@ -5692,8 +5685,6 @@ class RosterWindow: # cell_data_func, func_arg) self.renderers_list = [] self.renderers_propertys = {} - self._pep_type_to_model_column = {'tune': Column.TUNE_ICON, - 'geoloc': Column.LOCATION_ICON} renderer_text = Gtk.CellRendererText() self.renderers_propertys[renderer_text] = ('ellipsize', @@ -5847,6 +5838,10 @@ class RosterWindow: self._on_mood_received) app.ged.register_event_handler('activity-received', ged.GUI1, self._on_activity_received) + app.ged.register_event_handler('tune-received', ged.GUI1, + self._on_tune_received) + app.ged.register_event_handler('location-received', ged.GUI1, + self._on_location_received) app.ged.register_event_handler('update-roster-avatar', ged.GUI1, self._nec_update_avatar) app.ged.register_event_handler('update-room-avatar', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/18c422d843a60bccf6dcc43ba3a9e9561… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/18c422d843a60bccf6dcc43ba3a9e9561… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 4 commits: Add UserLocation (XEP-0080) module
by Philipp Hörist 02 Feb '19

02 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 96593877 by Philipp Hörist at 2019-02-02T15:50:13Z Add UserLocation (XEP-0080) module - - - - - 5fdfcbb7 by Philipp Hörist at 2019-02-02T15:57:07Z Set empty attr for activity and mood - - - - - 45b02fd2 by Philipp Hörist at 2019-02-02T15:57:24Z Simplify Tune module - - - - - 40ff2a82 by Philipp Hörist at 2019-02-02T16:31:12Z Improve pubsub event logging - - - - - 9 changed files: - nbxmpp/const.py - nbxmpp/dispatcher_nb.py - nbxmpp/modules/activity.py - + nbxmpp/modules/location.py - nbxmpp/modules/mood.py - nbxmpp/modules/nickname.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/tune.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -451,4 +451,41 @@ ACTIVITIES = { 'in_a_meeting', 'studying', 'writing'] -} \ No newline at end of file +} + + +LOCATION_DATA = [ + 'accuracy', + 'alt', + 'altaccuracy', + 'area', + 'bearing', + 'building', + 'country', + 'countrycode', + 'datum', + 'description', + 'error', + 'floor', + 'lat', + 'locality', + 'lon', + 'postalcode', + 'region', + 'room', + 'speed', + 'street', + 'text', + 'timestamp', + 'tzo', + 'uri'] + + +TUNE_DATA = [ + 'artist', + 'length', + 'rating', + 'source', + 'title', + 'track', + 'uri'] ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -60,6 +60,7 @@ from nbxmpp.modules.pubsub import PubSub from nbxmpp.modules.activity import Activity from nbxmpp.modules.tune import Tune from nbxmpp.modules.mood import Mood +from nbxmpp.modules.location import Location from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -187,6 +188,7 @@ class XMPPDispatcher(PlugIn): self._modules['Mood'] = Mood(self._owner) self._modules['Activity'] = Activity(self._owner) self._modules['Tune'] = Tune(self._owner) + self._modules['Location'] = Location(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/activity.py ===================================== @@ -20,6 +20,7 @@ import logging from nbxmpp.protocol import NS_ACTIVITY from nbxmpp.protocol import NS_PUBSUB_EVENT from nbxmpp.protocol import Node +from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler from nbxmpp.structs import ActivityData from nbxmpp.const import ACTIVITIES @@ -47,24 +48,29 @@ class Activity: item = properties.pubsub_event.item activity_node = item.getTag('activity', namespace=NS_ACTIVITY) + if not activity_node.getChildren(): + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received activity: %s - no activity set', properties.jid) + else: + activity, subactivity, text = None, None, None + for child in activity_node.getChildren(): + name = child.getName() + if name == 'text': + text = child.getData() + elif name in ACTIVITIES: + activity = name + subactivity = self._parse_sub_activity(child) - activity, subactivity, text = None, None, None - for child in activity_node.getChildren(): - name = child.getName() - if name == 'text': - text = child.getData() - elif name in ACTIVITIES: - activity = name - subactivity = self._parse_sub_activity(child) + if activity is None and activity_node.getPayload(): + log.warning('No valid activity value found') + log.warning(stanza) + raise NodeProcessed - if activity is None and activity_node.getPayload(): - log.warning('No valid activity value found') - log.warning(stanza) - return + data = ActivityData(activity, subactivity, text) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received activity: %s - %s', properties.jid, data) - data = ActivityData(activity, subactivity, text) - log.info('Received activity: %s - %s', properties.jid, data) - properties.pubsub_event = properties.pubsub_event._replace(data=data) + properties.pubsub_event = pubsub_event @staticmethod def _parse_sub_activity(activity): ===================================== nbxmpp/modules/location.py ===================================== @@ -0,0 +1,75 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_LOCATION +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import Node +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import LocationData +from nbxmpp.const import LOCATION_DATA + +log = logging.getLogger('nbxmpp.m.location') + + +class Location: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_location, + ns=NS_PUBSUB_EVENT, + priority=16), + ] + + def _process_pubsub_location(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_LOCATION: + return + + item = properties.pubsub_event.item + + location_node = item.getTag('geoloc', namespace=NS_LOCATION) + if not location_node.getChildren(): + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received location: %s - no location set', properties.jid) + else: + location_dict = {} + for node in LOCATION_DATA: + location_dict[node] = location_node.getTagData(node) + data = LocationData(**location_dict) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received location: %s - %s', properties.jid, data) + + properties.pubsub_event = pubsub_event + + def set_location(self, data): + item = Node('geoloc', {'xmlns': NS_LOCATION}) + if data is None: + return item + + data = data._asdict() + for tag, value in data: + if value is not None: + item.addChild(tag, payload=value) + + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, NS_LOCATION, item, id_='current') ===================================== nbxmpp/modules/mood.py ===================================== @@ -20,6 +20,7 @@ import logging from nbxmpp.protocol import NS_MOOD from nbxmpp.protocol import NS_PUBSUB_EVENT from nbxmpp.protocol import Node +from nbxmpp.protocol import NodeProcessed from nbxmpp.structs import StanzaHandler from nbxmpp.structs import MoodData from nbxmpp.const import MOODS @@ -47,23 +48,28 @@ class Mood: item = properties.pubsub_event.item mood_node = item.getTag('mood', namespace=NS_MOOD) + if not mood_node.getChildren(): + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received mood: %s - no mood set', properties.jid) + else: + mood, text = None, None + for child in mood_node.getChildren(): + name = child.getName().strip() + if name == 'text': + text = child.getData() + elif name in MOODS: + mood = name - mood, text = None, None - for child in mood_node.getChildren(): - name = child.getName().strip() - if name == 'text': - text = child.getData() - elif name in MOODS: - mood = name + if mood is None and mood_node.getPayload(): + log.warning('No valid mood value found') + log.warning(stanza) + raise NodeProcessed - if mood is None and mood_node.getPayload(): - log.warning('No valid mood value found') - log.warning(stanza) - return + data = MoodData(mood, text) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received mood: %s - %s', properties.jid, data) - data = MoodData(mood, text) - log.info('Received mood: %s - %s', properties.jid, data) - properties.pubsub_event = properties.pubsub_event._replace(data=data) + properties.pubsub_event = pubsub_event def set_mood(self, data): item = Node('mood', {'xmlns': NS_MOOD}) ===================================== nbxmpp/modules/nickname.py ===================================== @@ -65,7 +65,10 @@ class Nickname: return nick = self._parse_nickname(properties.pubsub_event.item) - log.info('Received nickname: %s - %s', properties.jid, nick) + if nick is None: + log.info('Received nickname: %s - no nickname set', properties.jid) + else: + log.info('Received nickname: %s - %s', properties.jid, nick) properties.pubsub_event = properties.pubsub_event._replace(data=nick) ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -53,7 +53,7 @@ class PubSub: if item is None: return id_ = item.getAttr('id') - properties.pubsub_event = PubSubEventData(node, id_, item, None) + properties.pubsub_event = PubSubEventData(node, id_, item, None, False) @call_on_response('_default_response') def publish(self, jid, node, item, id_=None, options=None): ===================================== nbxmpp/modules/tune.py ===================================== @@ -22,6 +22,7 @@ from nbxmpp.protocol import NS_PUBSUB_EVENT from nbxmpp.protocol import Node from nbxmpp.structs import StanzaHandler from nbxmpp.structs import TuneData +from nbxmpp.const import TUNE_DATA log = logging.getLogger('nbxmpp.m.tune') @@ -47,40 +48,28 @@ class Tune: tune_node = item.getTag('tune', namespace=NS_TUNE) if not tune_node.getChildren(): - data = TuneData() + pubsub_event = properties.pubsub_event._replace(empty=True) + log.info('Received tune: %s - no tune set', properties.jid) else: - artist = tune_node.getTagData('artist') - length = tune_node.getTagData('length') - rating = tune_node.getTagData('rating') - source = tune_node.getTagData('source') - title = tune_node.getTagData('title') - track = tune_node.getTagData('track') - uri = tune_node.getTagData('uri') + tune_dict = {} + for attr in TUNE_DATA: + tune_dict[attr] = tune_node.getTagData(attr) - data = TuneData(artist, length, rating, source, title, track, uri) + data = TuneData(**tune_dict) + pubsub_event = properties.pubsub_event._replace(data=data) + log.info('Received tune: %s - %s', properties.jid, data) - log.info('Received tune: %s - %s', properties.jid, data) - properties.pubsub_event = properties.pubsub_event._replace(data=data) + properties.pubsub_event = pubsub_event def set_tune(self, data): item = Node('tune', {'xmlns': NS_TUNE}) if data is None: return item - if data.artist: - item.addChild('artist', payload=data.artist) - if data.length: - item.addChild('length', payload=data.length) - if data.rating: - item.addChild('length', payload=data.rating) - if data.source: - item.addChild('source', payload=data.source) - if data.title: - item.addChild('title', payload=data.title) - if data.track: - item.addChild('track', payload=data.track) - if data.uri: - item.addChild('track', payload=data.uri) + data = data._asdict() + for tag, value in data: + if value is not None: + item.addChild(tag, payload=value) jid = self._client.get_bound_jid().getBare() self._client.get_module('PubSub').publish( ===================================== nbxmpp/structs.py ===================================== @@ -27,6 +27,7 @@ from nbxmpp.const import AvatarState from nbxmpp.const import StatusCode from nbxmpp.const import PresenceType from nbxmpp.const import Error +from nbxmpp.const import LOCATION_DATA StanzaHandler = namedtuple('StanzaHandler', 'name callback typ ns xmlns system priority') @@ -58,12 +59,15 @@ HTTPAuthData.__new__.__defaults__ = (None, None, None, None) StanzaIDData = namedtuple('StanzaIDData', 'id by') StanzaIDData.__new__.__defaults__ = (None, None) -PubSubEventData = namedtuple('PubSubEventData', 'node id item data') +PubSubEventData = namedtuple('PubSubEventData', 'node id item data empty') MoodData = namedtuple('MoodData', 'mood text') ActivityData = namedtuple('ActivityData', 'activity subactivity text') +LocationData = namedtuple('LocationData', LOCATION_DATA) +LocationData.__new__.__defaults__ = (None,) * len(LocationData._fields) + class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/b1cb29c0f415234f42971e722… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/b1cb29c0f415234f42971e722… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add UserTune (XEP-0118) module
by Philipp Hörist 01 Feb '19

01 Feb '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: b1cb29c0 by Philipp Hörist at 2019-02-01T17:07:48Z Add UserTune (XEP-0118) module - - - - - 3 changed files: - nbxmpp/dispatcher_nb.py - + nbxmpp/modules/tune.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -58,6 +58,7 @@ from nbxmpp.modules.entity_caps import EntityCaps from nbxmpp.modules.blocking import Blocking from nbxmpp.modules.pubsub import PubSub from nbxmpp.modules.activity import Activity +from nbxmpp.modules.tune import Tune from nbxmpp.modules.mood import Mood from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam @@ -185,6 +186,7 @@ class XMPPDispatcher(PlugIn): self._modules['PubSub'] = PubSub(self._owner) self._modules['Mood'] = Mood(self._owner) self._modules['Activity'] = Activity(self._owner) + self._modules['Tune'] = Tune(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/tune.py ===================================== @@ -0,0 +1,87 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_TUNE +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import Node +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import TuneData + +log = logging.getLogger('nbxmpp.m.tune') + + +class Tune: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_tune, + ns=NS_PUBSUB_EVENT, + priority=16), + ] + + def _process_pubsub_tune(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_TUNE: + return + + item = properties.pubsub_event.item + + tune_node = item.getTag('tune', namespace=NS_TUNE) + if not tune_node.getChildren(): + data = TuneData() + else: + artist = tune_node.getTagData('artist') + length = tune_node.getTagData('length') + rating = tune_node.getTagData('rating') + source = tune_node.getTagData('source') + title = tune_node.getTagData('title') + track = tune_node.getTagData('track') + uri = tune_node.getTagData('uri') + + data = TuneData(artist, length, rating, source, title, track, uri) + + log.info('Received tune: %s - %s', properties.jid, data) + properties.pubsub_event = properties.pubsub_event._replace(data=data) + + def set_tune(self, data): + item = Node('tune', {'xmlns': NS_TUNE}) + if data is None: + return item + + if data.artist: + item.addChild('artist', payload=data.artist) + if data.length: + item.addChild('length', payload=data.length) + if data.rating: + item.addChild('length', payload=data.rating) + if data.source: + item.addChild('source', payload=data.source) + if data.title: + item.addChild('title', payload=data.title) + if data.track: + item.addChild('track', payload=data.track) + if data.uri: + item.addChild('track', payload=data.uri) + + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, NS_TUNE, item, id_='current') ===================================== nbxmpp/structs.py ===================================== @@ -65,6 +65,22 @@ MoodData = namedtuple('MoodData', 'mood text') ActivityData = namedtuple('ActivityData', 'activity subactivity text') +class TuneData(namedtuple('TuneData', 'artist length rating source title track uri')): + + __slots__ = [] + + def __new__(cls, artist=None, length=None, rating=None, source=None, + title=None, track=None, uri=None): + return super(TuneData, cls).__new__(cls, artist, length, rating, + source, title, track, uri) + + @property + def was_removed(self): + return (self.artist is None and + self.title is None and + self.track is None) + + class MAMData(namedtuple('MAMData', 'id query_id archive namespace timestamp')): __slots__ = [] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b1cb29c0f415234f42971e722d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/b1cb29c0f415234f42971e722d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move print for debug message
by Philipp Hörist 01 Feb '19

01 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18c422d8 by Philipp Hörist at 2019-02-01T16:24:33Z Move print for debug message - - - - - 2 changed files: - gajim/common/app.py - gajim/common/i18n.py Changes: ===================================== gajim/common/app.py ===================================== @@ -44,6 +44,7 @@ import gajim from gajim.common import config as c_config from gajim.common import configpaths from gajim.common import ged as ged_module +from gajim.common.i18n import LANG from gajim.common.contacts import LegacyContactsAPI from gajim.common.events import Events from gajim.common.types import NetworkEventsControllerT # pylint: disable=unused-import @@ -337,6 +338,8 @@ def detect_dependencies(): for dep, val in _dependencies.items(): log('gajim').info('%-13s %s', dep, val) + log('gajim').info('Used language: %s', LANG) + def get_gpg_binary(): return _dependencies['GPG_BINARY'] ===================================== gajim/common/i18n.py ===================================== @@ -171,7 +171,6 @@ try: # Set the env var on Windows because gettext.find() uses it to # find the translation os.environ['LANG'] = LANG - print('Found default language: %s' % LANG) except Exception as error: print('Failed to determine default language') import traceback View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/18c422d843a60bccf6dcc43ba3a9e95610… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/18c422d843a60bccf6dcc43ba3a9e95610… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dont fail on malformed pubsub events
by Philipp Hörist 01 Feb '19

01 Feb '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0b6fac44 by Philipp Hörist at 2019-02-01T16:03:46Z Dont fail on malformed pubsub events - - - - - 3 changed files: - gajim/common/modules/user_activity.py - gajim/common/modules/user_mood.py - gajim/common/modules/util.py Changes: ===================================== gajim/common/modules/user_activity.py ===================================== @@ -45,6 +45,8 @@ class UserActivity(BaseModule): @event_node(nbxmpp.NS_ACTIVITY) def _activity_received(self, _con, _stanza, properties): data = properties.pubsub_event.data + if data is None: + return for contact in app.contacts.get_contacts(self._account, str(properties.jid)): if data.activity is not None: ===================================== gajim/common/modules/user_mood.py ===================================== @@ -45,6 +45,8 @@ class UserMood(BaseModule): @event_node(nbxmpp.NS_MOOD) def _mood_received(self, _con, _stanza, properties): data = properties.pubsub_event.data + if data is None: + return for contact in app.contacts.get_contacts(self._account, str(properties.jid)): if data.mood is not None: ===================================== gajim/common/modules/util.py ===================================== @@ -55,6 +55,8 @@ def event_node(node): def event_node_decorator(func): @wraps(func) def func_wrapper(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return if properties.pubsub_event.node != node: return func(self, _con, _stanza, properties) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0b6fac44dc4775e667ac8d956df2295c8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0b6fac44dc4775e667ac8d956df2295c8b… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2019