Commits September 2020

commits@gajim.org

1 participants
105 discussions

[Git][gajim/gajim][avatars] 2 commits: Refactor VCard and VCardAvatars code
by Philipp Hörist 23 Sep '20

23 Sep '20

Philipp Hörist pushed to branch avatars at gajim / gajim Commits: 7488efa4 by lovetox at 2020-09-23T22:56:44+02:00 Refactor VCard and VCardAvatars code - Move XEP-0153 code from VCard into VCardAvatars - Rely on new nbxmpp module VCardTemp - Don’t advertise avatar with XEP-0153 - - - - - f0c45711 by lovetox at 2020-09-23T22:57:09+02:00 Refactor UserAvatar module - Adapt to nbxmpp changes - - - - - 14 changed files: - gajim/common/client.py - gajim/common/connection.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/discovery.py - gajim/common/modules/presence.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_avatars.py - gajim/common/modules/vcard_temp.py - gajim/dialog_messages.py - gajim/groupchat_control.py - gajim/gtk/profile.py - gajim/gtk/server_info.py - gajim/vcard.py Changes: ===================================== gajim/common/client.py ===================================== @@ -57,7 +57,6 @@ class Client(ConnectionHandlers): self._priority = 0 self._connect_machine_calls = 0 - self.avatar_conversion = False self.addressing_supported = False self.is_zeroconf = False @@ -451,10 +450,6 @@ class Client(ConnectionHandlers): # We did not resume the stream, so we are not joined any MUCs self.update_presence(include_muc=False) - if not self.avatar_conversion: - # ask our VCard - self.get_module('VCardTemp').request_vcard() - self.get_module('Bookmarks').request_bookmarks() self.get_module('SoftwareVersion').set_enabled(True) self.get_module('Annotations').request_annotations() ===================================== gajim/common/connection.py ===================================== @@ -71,7 +71,6 @@ class CommonConnection: self.pep = {} self.roster_supported = True - self.avatar_conversion = False self._stun_servers = [] # STUN servers of our jabber server ===================================== gajim/common/const.py ===================================== @@ -128,13 +128,6 @@ class IdleState(Enum): AWAKE = 'online' -@unique -class RequestAvatar(IntEnum): - SELF = 0 - ROOM = 1 - USER = 2 - - @unique class PEPEventType(IntEnum): ABSTRACT = 0 ===================================== gajim/common/helpers.py ===================================== @@ -824,13 +824,7 @@ def get_subscription_request_msg(account=None): s = _('I would like to add you to my contact list.') if account: s = _('Hello, I am $name.') + ' ' + s - name = app.connections[account].get_module('VCardTemp').get_vard_name() - nick = app.nicks[account] - if name and nick: - name += ' (%s)' % nick - elif nick: - name = nick - s = Template(s).safe_substitute({'name': name}) + s = Template(s).safe_substitute({'name': app.nicks[account]}) return s def get_user_proxy(account): ===================================== gajim/common/modules/discovery.py ===================================== @@ -112,9 +112,7 @@ class Discovery(BaseModule): self._con.get_module('PEP').pass_disco(result) self._con.get_module('PubSub').pass_disco(result) self._con.get_module('Bookmarks').pass_disco(result) - - if 'urn:xmpp:pep-vcard-conversion:0' in result.features: - self._con.avatar_conversion = True + self._con.get_module('VCardAvatars').pass_disco(result) self._con.get_module('Caps').update_caps() ===================================== gajim/common/modules/presence.py ===================================== @@ -362,11 +362,6 @@ class Presence(BaseModule): nick_tag = presence.setTag('nick', namespace=Namespace.NICK) nick_tag.setData(nick) - if not self._con.avatar_conversion: - # XEP-0398 not supported by server so - # we add the avatar sha to our presence - self._con.get_module('VCardAvatars').add_update_node(presence) - if (idle_time and app.is_installed('IDLE') and app.settings.get('autoaway')): ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -15,18 +15,19 @@ # XEP-0084: User Avatar from nbxmpp.namespaces import Namespace -from nbxmpp.util import is_error_result +from nbxmpp.modules.util import is_error from gajim.common import app from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node - +from gajim.common.modules.util import task class UserAvatar(BaseModule): _nbxmpp_extends = 'UserAvatar' _nbxmpp_methods = [ - 'request_avatar' + 'request_avatar', + 'set_avatar', ] def __init__(self, con): @@ -38,12 +39,11 @@ class UserAvatar(BaseModule): if properties.pubsub_event.retracted: return - data = properties.pubsub_event.data + metadata = properties.pubsub_event.data jid = str(properties.jid) - if data is None: - # Remove avatar - self._log.info('Remove: %s', jid) + if metadata is None or not metadata.infos: + self._log.info('No avatar published: %s', jid) app.contacts.set_avatar(self._account, jid, None) self._con.get_module('Roster').set_avatar_sha(jid, None) app.interface.update_avatar(self._account, jid) @@ -54,32 +54,39 @@ class UserAvatar(BaseModule): else: sha = app.contacts.get_avatar_sha(self._account, jid) - if sha == data.id: - self._log.info('Avatar already known: %s %s', jid, data.id) + if sha in metadata.avatar_shas: + self._log.info('Avatar already known: %s %s', jid, sha) return - self._log.info('Request: %s %s', jid, data.id) - self._nbxmpp('UserAvatar').request_avatar( - jid, data.id, callback=self._avatar_received) + avatar_info = metadata.infos[0] + self._log.info('Request: %s %s', jid, avatar_info.id) + self._request_avatar(jid, avatar_info) + + @task + def _request_avatar(self, jid, avatar_info): + _task = yield + + avatar = yield self._nbxmpp('UserAvatar').request_avatar( + avatar_info, jid=jid) - def _avatar_received(self, result): - if is_error_result(result): - self._log.info(result) + if is_error(avatar): + self._log.warning(avatar) return - self._log.info('Received Avatar: %s %s', result.jid, result.sha) - app.interface.save_avatar(result.data) + self._log.info('Received Avatar: %s %s', jid, avatar.sha) + app.interface.save_avatar(avatar.data) - if self._con.get_own_jid().bare_match(result.jid): - app.settings.set_account_setting(self._account, - 'avatar_sha', - result.sha) + if self._con.get_own_jid().bare_match(jid): + app.config.set_per('accounts', + self._account, + 'avatar_sha', + avatar.sha) else: - self._con.get_module('Roster').set_avatar_sha(str(result.jid), - result.sha) + self._con.get_module('Roster').set_avatar_sha( + str(jid), avatar.sha) - app.contacts.set_avatar(self._account, str(result.jid), result.sha) - app.interface.update_avatar(self._account, str(result.jid)) + app.contacts.set_avatar(self._account, str(jid), avatar.sha) + app.interface.update_avatar(self._account, str(jid)) def get_instance(*args, **kwargs): ===================================== gajim/common/modules/vcard_avatars.py ===================================== @@ -14,16 +14,14 @@ # XEP-0153: vCard-Based Avatars -from pathlib import Path - from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler from nbxmpp.const import AvatarState +from nbxmpp.modules.util import is_error from gajim.common import app -from gajim.common import configpaths -from gajim.common.const import RequestAvatar from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import task class VCardAvatars(BaseModule): @@ -38,17 +36,55 @@ class VCardAvatars(BaseModule): priority=51), ] - self.avatar_advertised = False - self._find_own_avatar() + self.avatar_conversion_available = False + + def pass_disco(self, info): + is_available = Namespace.VCARD_CONVERSION in info.features + self.avatar_conversion_available = is_available + self._log.info('Discovered Avatar Conversion') + + @task + def _request_vcard(self, jid, expected_sha, type_): + _task = yield + + vcard = yield self._con.get_module('VCardTemp').request_vcard(jid=jid) + + if is_error(vcard): + self._log.warning(vcard) + return + + avatar, avatar_sha = vcard.get_avatar() + if avatar is None: + self._log.warning('Avatar missing: %s %s', jid, expected_sha) + return - def _find_own_avatar(self): - sha = app.settings.get_account_setting(self._account, 'avatar_sha') - if not sha: + if expected_sha != avatar_sha: + self._log.warning('Avatar mismatch: %s %s != %s', + jid, + expected_sha, + avatar_sha) return - path = Path(configpaths.get('AVATAR')) / sha - if not path.exists(): - self._log.info('Missing own avatar, reset sha') - app.settings.set_account_setting(self._account, 'avatar_sha', '') + + self._log.info('Received: %s %s', jid, avatar_sha) + app.interface.save_avatar(avatar) + + if type_ == 'contact': + self._con.get_module('Roster').set_avatar_sha(jid, avatar_sha) + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.interface.update_avatar(self._account, jid) + + elif type_ == 'muc': + app.storage.cache.set_muc_avatar_sha(jid, avatar_sha) + app.contacts.set_avatar(self._account, jid, avatar_sha) + app.interface.update_avatar(self._account, jid, room_avatar=True) + + elif type_ == 'muc-user': + contact = app.contacts.get_gc_contact(self._account, + jid.bare, + jid.resource) + if contact is not None: + contact.avatar_sha = avatar_sha + app.interface.update_avatar(contact=contact) def _presence_received(self, _con, _stanza, properties): if not properties.type.is_available: @@ -59,15 +95,6 @@ class VCardAvatars(BaseModule): return if self._con.get_own_jid().bare_match(properties.jid): - if self._con.get_own_jid() == properties.jid: - # Initial presence reflection - if self._con.avatar_conversion: - # XEP-0398: Tells us the current avatar sha on the - # initial presence reflection - self._self_update_received(properties) - else: - # Presence from another resource of ours - self._self_update_received(properties) return if properties.from_muc: @@ -78,38 +105,6 @@ class VCardAvatars(BaseModule): str(properties.jid)) self._update_received(properties, room=contact is not None) - def _self_update_received(self, properties): - jid = properties.jid.bare - if properties.avatar_state == AvatarState.EMPTY: - # Empty <photo/> tag, means no avatar is advertised - self._log.info('%s has no avatar published', properties.jid) - app.settings.set_account_setting(self._account, 'avatar_sha', '') - app.contacts.set_avatar(self._account, jid, None) - app.interface.update_avatar(self._account, jid) - return - - self._log.info('Update: %s %s', jid, properties.avatar_sha) - current_sha = app.settings.get_account_setting(self._account, - 'avatar_sha') - - if properties.avatar_sha != current_sha: - path = Path(configpaths.get('AVATAR')) / properties.avatar_sha - if path.exists(): - app.settings.set_account_setting(self._account, - 'avatar_sha', - properties.avatar_sha) - app.contacts.set_avatar(self._account, - jid, - properties.avatar_sha) - app.interface.update_avatar(self._account, jid) - else: - self._log.info('Request : %s', jid) - self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.SELF) - else: - self._log.info('Avatar already known: %s %s', - jid, properties.avatar_sha) - def muc_disco_info_update(self, disco_info): if not disco_info.supports(Namespace.VCARD): return @@ -135,9 +130,6 @@ class VCardAvatars(BaseModule): if state == AvatarState.EMPTY: # Empty <photo/> tag, means no avatar is advertised self._log.info('%s has no avatar published', jid) - - # Remove avatar - self._log.debug('Remove: %s', jid) app.contacts.set_avatar(self._account, jid, None) if room: @@ -169,11 +161,9 @@ class VCardAvatars(BaseModule): if avatar_sha not in self._requested_shas: self._requested_shas.append(avatar_sha) if room: - self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.ROOM, jid, sha=avatar_sha) + self._request_vcard(jid, avatar_sha, 'muc') else: - self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.USER, jid, sha=avatar_sha) + self._request_vcard(jid, avatar_sha, 'contact') def _gc_update_received(self, properties): nick = properties.jid.resource @@ -186,9 +176,8 @@ class VCardAvatars(BaseModule): return if properties.avatar_state == AvatarState.EMPTY: - # Empty <photo/> tag, means no avatar is advertised, remove avatar + # Empty <photo/> tag, means no avatar is advertised self._log.info('%s has no avatar published', nick) - self._log.debug('Remove: %s', nick) gc_contact.avatar_sha = None app.interface.update_avatar(contact=gc_contact) else: @@ -197,9 +186,9 @@ class VCardAvatars(BaseModule): if properties.avatar_sha not in self._requested_shas: app.log('avatar').info('Request: %s', nick) self._requested_shas.append(properties.avatar_sha) - self._con.get_module('VCardTemp').request_vcard( - RequestAvatar.USER, str(properties.jid), - room=True, sha=properties.avatar_sha) + self._request_vcard(properties.jid, + properties.avatar_sha, + 'muc-user') return if gc_contact.avatar_sha != properties.avatar_sha: @@ -210,29 +199,6 @@ class VCardAvatars(BaseModule): else: self._log.info('Avatar already known: %s', nick) - def send_avatar_presence(self, force=False, after_publish=False): - if self._con.avatar_conversion: - if not after_publish: - # XEP-0398: We only resend presence after we publish a - # new avatar - return - else: - if self.avatar_advertised and not force: - self._log.debug('Avatar already advertised') - return - - self._con.update_presence() - self.avatar_advertised = True - - def add_update_node(self, node): - update = node.setTag('x', namespace=Namespace.VCARD_UPDATE) - if self._con.get_module('VCardTemp').own_vcard_received: - sha = app.settings.get_account_setting(self._account, 'avatar_sha') - own_jid = self._con.get_own_jid() - self._log.info('Send avatar presence to: %s %s', - node.getTo() or own_jid, sha or 'no sha advertised') - update.setTagData('photo', sha) - def get_instance(*args, **kwargs): return VCardAvatars(*args, **kwargs), 'VCardAvatars' ===================================== gajim/common/modules/vcard_temp.py ===================================== @@ -14,27 +14,25 @@ # XEP-0054: vcard-temp -import hashlib -import binascii -import base64 - -import nbxmpp from nbxmpp.namespaces import Namespace from gajim.common import app -from gajim.common.const import RequestAvatar from gajim.common.nec import NetworkEvent from gajim.common.modules.base import BaseModule -from gajim.common.connection_handlers_events import InformationEvent class VCardTemp(BaseModule): + + _nbxmpp_extends = 'VCardTemp' + _nbxmpp_methods = [ + 'request_vcard', + 'set_vcard', + ] + def __init__(self, con): BaseModule.__init__(self, con) self._own_vcard = None - self.own_vcard_received = False - self.room_jids = [] self.supported = False def pass_disco(self, info): @@ -48,267 +46,6 @@ class VCardTemp(BaseModule): account=self._account, feature=Namespace.VCARD)) - @staticmethod - def _node_to_dict(node): - dict_ = {} - for info in node.getChildren(): - name = info.getName() - if name in ('ADR', 'TEL', 'EMAIL'): # we can have several - dict_.setdefault(name, []) - entry = {} - for child in info.getChildren(): - entry[child.getName()] = child.getData() - dict_[name].append(entry) - elif info.getChildren() == []: - dict_[name] = info.getData() - else: - dict_[name] = {} - for child in info.getChildren(): - dict_[name][child.getName()] = child.getData() - return dict_ - - def request_vcard(self, callback=RequestAvatar.SELF, jid=None, - room=False, sha=None): - if not app.account_is_available(self._account): - return - - if isinstance(callback, RequestAvatar): - if callback == RequestAvatar.SELF: - if not self.supported: - return - callback = self._on_own_avatar_received - elif callback == RequestAvatar.ROOM: - callback = self._on_room_avatar_received - elif callback == RequestAvatar.USER: - callback = self._on_avatar_received - - if room: - room_jid = app.get_room_from_fjid(jid) - if room_jid not in self.room_jids: - self.room_jids.append(room_jid) - - iq = nbxmpp.Iq(typ='get') - if jid: - iq.setTo(jid) - iq.setQuery('vCard').setNamespace(Namespace.VCARD) - - own_jid = self._con.get_own_jid().bare - self._log.info('Request: %s, expected sha: %s', jid or own_jid, sha) - - self._con.connection.SendAndCallForResponse( - iq, self._parse_vcard, {'callback': callback, 'expected_sha': sha}) - - def send_vcard(self, vcard, sha): - if not app.account_is_available(self._account): - return - - iq = nbxmpp.Iq(typ='set') - iq2 = iq.setTag(Namespace.VCARD + ' vCard') - for i in vcard: - if i == 'jid': - continue - if isinstance(vcard[i], dict): - iq3 = iq2.addChild(i) - for j in vcard[i]: - iq3.addChild(j).setData(vcard[i][j]) - elif isinstance(vcard[i], list): - for j in vcard[i]: - iq3 = iq2.addChild(i) - for k in j: - iq3.addChild(k).setData(j[k]) - else: - iq2.addChild(i).setData(vcard[i]) - - self._log.info('Upload avatar: %s %s', self._account, sha) - - self._con.connection.SendAndCallForResponse( - iq, self._avatar_publish_result, {'sha': sha}) - - def upload_room_avatar(self, room_jid, data): - iq = nbxmpp.Iq(typ='set', to=room_jid) - vcard = iq.addChild('vCard', namespace=Namespace.VCARD) - photo = vcard.addChild('PHOTO') - photo.addChild('TYPE', payload='image/png') - photo.addChild('BINVAL', payload=data) - - self._log.info('Upload avatar: %s', room_jid) - self._con.connection.SendAndCallForResponse( - iq, self._upload_room_avatar_result) - - @staticmethod - def _upload_room_avatar_result(_nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - reason = stanza.getErrorMsg() or stanza.getError() - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='avatar-upload-error', args=reason)) - - def _avatar_publish_result(self, _nbxmpp_client, stanza, sha): - if stanza.getType() == 'result': - current_sha = app.settings.get_account_setting(self._account, - 'avatar_sha') - if current_sha != sha: - if not app.account_is_connected(self._account): - return - app.settings.set_account_setting( - self._account, 'avatar_sha', sha or '') - own_jid = self._con.get_own_jid().bare - app.contacts.set_avatar(self._account, own_jid, sha) - app.interface.update_avatar( - self._account, self._con.get_own_jid().bare) - self._con.get_module('VCardAvatars').send_avatar_presence( - after_publish=True) - self._log.info('%s: Published: %s', self._account, sha) - self._con.get_module('MUC').update_presence() - app.nec.push_incoming_event( - NetworkEvent('vcard-published', account=self._account)) - - elif stanza.getType() == 'error': - app.nec.push_incoming_event( - NetworkEvent('vcard-not-published', account=self._account)) - - def _get_vcard_photo(self, vcard, jid): - try: - photo = vcard['PHOTO']['BINVAL'] - except (KeyError, AttributeError, TypeError): - avatar_sha = None - photo_decoded = None - else: - if photo == '': - avatar_sha = None - photo_decoded = None - else: - try: - photo_decoded = base64.b64decode(photo.encode('utf-8')) - except binascii.Error as error: - self._log.warning('Invalid avatar for %s: %s', jid, error) - return None, None - avatar_sha = hashlib.sha1(photo_decoded).hexdigest() - - return avatar_sha, photo_decoded - - def _parse_vcard(self, _nbxmpp_client, stanza, callback, expected_sha): - frm_jid = stanza.getFrom() - room = False - if frm_jid is None: - frm_jid = self._con.get_own_jid() - elif frm_jid.bare in self.room_jids: - room = True - - resource = frm_jid.resource - jid = frm_jid.bare - - stanza_error = stanza.getError() - if stanza_error in ('service-unavailable', 'item-not-found', - 'not-allowed'): - self._log.info('vCard not available: %s %s', frm_jid, stanza_error) - callback(jid, resource, room, {}, expected_sha) - return - - vcard_node = stanza.getTag('vCard', namespace=Namespace.VCARD) - if vcard_node is None: - self._log.info('vCard not available: %s', frm_jid) - self._log.debug(stanza) - return - vcard = self._node_to_dict(vcard_node) - - if self._con.get_own_jid().bare_match(jid): - if 'NICKNAME' in vcard: - app.nicks[self._account] = vcard['NICKNAME'] - elif 'FN' in vcard: - app.nicks[self._account] = vcard['FN'] - - app.nec.push_incoming_event(NetworkEvent('vcard-received', - account=self._account, - jid=jid, - vcard_dict=vcard)) - - callback(jid, resource, room, vcard, expected_sha) - - def _on_own_avatar_received(self, jid, _resource, _room, vcard, *args): - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) - - self._log.info('Received own vcard, avatar sha is: %s', avatar_sha) - - self._own_vcard = vcard - self.own_vcard_received = True - - if avatar_sha is None: - # No avatar found in vcard - self._log.info('No avatar found') - app.settings.set_account_setting(self._account, 'avatar_sha', '') - app.contacts.set_avatar(self._account, jid, avatar_sha) - self._con.get_module('VCardAvatars').send_avatar_presence( - force=True) - return - - # Avatar found in vcard - current_sha = app.settings.get_account_setting(self._account, - 'avatar_sha') - if current_sha == avatar_sha: - self._con.get_module('VCardAvatars').send_avatar_presence() - else: - app.interface.save_avatar(photo_decoded) - app.contacts.set_avatar(self._account, jid, avatar_sha) - app.settings.set_account_setting( - self._account, 'avatar_sha', avatar_sha) - self._con.get_module('VCardAvatars').send_avatar_presence( - force=True) - - app.interface.update_avatar(self._account, jid) - - def _on_room_avatar_received(self, jid, _resource, _room, vcard, - expected_sha): - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, jid) - if expected_sha != avatar_sha: - self._log.warning('Avatar mismatch: %s %s', jid, avatar_sha) - return - - app.interface.save_avatar(photo_decoded) - - self._log.info('Received: %s %s', jid, avatar_sha) - app.storage.cache.set_muc_avatar_sha(jid, avatar_sha) - app.contacts.set_avatar(self._account, jid, avatar_sha) - app.interface.update_avatar(self._account, jid, room_avatar=True) - - def _on_avatar_received(self, jid, resource, room, vcard, expected_sha): - request_jid = jid - if room: - request_jid = '%s/%s' % (jid, resource) - - avatar_sha, photo_decoded = self._get_vcard_photo(vcard, request_jid) - if expected_sha != avatar_sha: - self._log.warning('Received: avatar mismatch: %s %s', - request_jid, avatar_sha) - return - - app.interface.save_avatar(photo_decoded) - - # Received vCard from a contact - if room: - self._log.info('Received: %s %s', resource, avatar_sha) - contact = app.contacts.get_gc_contact(self._account, jid, resource) - if contact is not None: - contact.avatar_sha = avatar_sha - app.interface.update_avatar(contact=contact) - else: - self._log.info('Received: %s %s', jid, avatar_sha) - self._con.get_module('Roster').set_avatar_sha(jid, avatar_sha) - app.contacts.set_avatar(self._account, jid, avatar_sha) - app.interface.update_avatar(self._account, jid) - - def get_vard_name(self): - name = '' - vcard = self._own_vcard - if not vcard: - return name - - if 'N' in vcard: - if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: - name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] - if not name and 'FN' in vcard: - name = vcard['FN'] - return name - def get_instance(*args, **kwargs): return VCardTemp(*args, **kwargs), 'VCardTemp' ===================================== gajim/dialog_messages.py ===================================== @@ -133,10 +133,6 @@ messages = { 'for the chosen encryption.'), ErrorDialog), - 'avatar-upload-error': Message( - _('Avatar Upload Failed'), - '%s', - ErrorDialog), } ===================================== gajim/groupchat_control.py ===================================== @@ -35,6 +35,7 @@ from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation from nbxmpp.const import PresenceType from nbxmpp.util import is_error_result +from nbxmpp.modules.vcard_temp import VCard from gi.repository import Gtk from gi.repository import Gdk @@ -43,7 +44,7 @@ from gi.repository import Gio from gajim import gtkgui_helpers from gajim import gui_menu_builder -from gajim import vcard +from gajim.vcard import VcardWindow from gajim.common import events from gajim.common import app @@ -65,7 +66,6 @@ from gajim.command_system.implementation.hosts import GroupChatCommands from gajim.gtk.dialogs import DialogButton from gajim.gtk.dialogs import ConfirmationCheckDialog -from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.filechoosers import AvatarChooserDialog from gajim.gtk.groupchat_config import GroupchatConfig @@ -573,20 +573,32 @@ class GroupchatControl(ChatControlBase): data, sha = app.interface.avatar_storage.prepare_for_publish( filename) if sha is None: - ErrorDialog( - _('Could not load image'), - transient_for=self.parent_win.window) + self.add_info_message(_('Loading avatar failed')) return avatar = base64.b64encode(data).decode('utf-8') + vcard = VCard() + vcard.set_avatar(avatar, 'image/png') + con = app.connections[self.account] - con.get_module('VCardTemp').upload_room_avatar( - self.room_jid, avatar) + con.get_module('VCardTemp').set_vcard( + vcard, + jid=self.room_jid, + callback=self._on_upload_avatar_result) AvatarChooserDialog(_on_accept, transient_for=self.parent_win.window, modal=True) + def _on_upload_avatar_result(self, task): + try: + task.finish() + except Exception as error: + self.add_info_message(_(f'Avatar upload failed: {error}')) + + else: + self.add_info_message(_('Avatar upload successful')) + def _on_contact_information(self, _action, param): nick = param.get_string() gc_contact = app.contacts.get_gc_contact(self.account, @@ -598,7 +610,7 @@ class GroupchatControl(ChatControlBase): window.present() else: app.interface.instances[self.account]['infos'][contact.jid] = \ - vcard.VcardWindow(contact, self.account, gc_contact) + VcardWindow(contact, self.account, gc_contact) def _on_kick(self, _action, param): nick = param.get_string() ===================================== gajim/gtk/profile.py ===================================== @@ -16,37 +16,35 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import base64 import time import logging -import hashlib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib +from nbxmpp.errors import is_error +from nbxmpp.modules.vcard_temp import VCard + from gajim.common import app -from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import AvatarSize -from gajim.common.helpers import event_filter +from gajim.common.modules.util import task from gajim import gtkgui_helpers from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import InformationDialog from gajim.gtk.util import get_builder -from gajim.gtk.util import EventHelper from gajim.gtk.filechoosers import AvatarChooserDialog log = logging.getLogger('gajim.profile') -class ProfileWindow(Gtk.ApplicationWindow, EventHelper): +class ProfileWindow(Gtk.ApplicationWindow): def __init__(self, account): Gtk.ApplicationWindow.__init__(self) - EventHelper.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) @@ -69,8 +67,7 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): self.dialog = None self.avatar_mime_type = None - self.avatar_encoded = None - self.avatar_sha = None + self._avatar_bytes = None self.message_id = self.statusbar.push(self.context_id, _('Retrieving profile…')) self.update_progressbar_timeout_id = GLib.timeout_add( @@ -78,15 +75,10 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): self.remove_statusbar_timeout_id = None self.xml.connect_signals(self) - self.register_events([ - ('vcard-published', ged.GUI1, self._nec_vcard_published), - ('vcard-not-published', ged.GUI1, self._nec_vcard_not_published), - ]) self.show_all() self.xml.get_object('ok_button').grab_focus() - app.connections[account].get_module('VCardTemp').request_vcard( - self._nec_vcard_received, self.jid) + self._request_vcard() def on_information_notebook_switch_page(self, widget, page, page_num): GLib.idle_add(self.xml.get_object('ok_button').grab_focus) @@ -100,6 +92,7 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): self.remove_statusbar_timeout_id = None def on_profile_window_destroy(self, widget): + app.cancel_tasks(self) if self.update_progressbar_timeout_id is not None: GLib.source_remove(self.update_progressbar_timeout_id) if self.remove_statusbar_timeout_id is not None: @@ -120,8 +113,7 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): button.hide() text_button = self.xml.get_object('NOPHOTO_button') text_button.show() - self.avatar_encoded = None - self.avatar_sha = None + self._avatar_bytes = None self.avatar_mime_type = None def _on_set_avatar_clicked(self, _button): @@ -144,8 +136,7 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): text_button = self.xml.get_object('NOPHOTO_button') text_button.hide() - self.avatar_sha = sha - self.avatar_encoded = base64.b64encode(data).decode('utf-8') + self._avatar_bytes = data self.avatar_mime_type = 'image/png' AvatarChooserDialog(on_ok, transient_for=self) @@ -176,37 +167,43 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): except AttributeError: pass - def set_values(self, vcard_): + def _set_avatar(self, vcard): + avatar, _ = vcard.get_avatar() + button = self.xml.get_object('PHOTO_button') image = self.xml.get_object('PHOTO_image') text_button = self.xml.get_object('NOPHOTO_button') - if 'PHOTO' not in vcard_: - # set default image + + if avatar is None: + image.set_from_pixbuf(None) + button.hide() + text_button.show() + return + + try: + surface = self._get_surface_from_data(avatar) + except Exception: + log.exception('Error while loading avatar') image.set_from_pixbuf(None) button.hide() text_button.show() + return + + self._avatar_bytes = avatar + self.avatar_mime_type = vcard.data['PHOTO']['TYPE'] + + image.set_from_surface(surface) + button.show() + text_button.hide() + + def _get_surface_from_data(self, data): + scale = self.get_scale_factor() + pixbuf = gtkgui_helpers.scale_pixbuf_from_data(data, AvatarSize.VCARD) + return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + + def set_values(self, vcard_): for i in vcard_.keys(): if i == 'PHOTO': - photo_encoded = vcard_[i]['BINVAL'] - if photo_encoded == '': - continue - self.avatar_encoded = photo_encoded - photo_decoded = base64.b64decode(photo_encoded.encode('utf-8')) - self.avatar_sha = hashlib.sha1(photo_decoded).hexdigest() - if 'TYPE' in vcard_[i]: - self.avatar_mime_type = vcard_[i]['TYPE'] - - scale = self.get_scale_factor() - surface = app.interface.avatar_storage.surface_from_filename( - self.avatar_sha, AvatarSize.VCARD, scale) - if surface is None: - pixbuf = gtkgui_helpers.scale_pixbuf_from_data( - photo_decoded, AvatarSize.VCARD) - surface = Gdk.cairo_surface_create_from_pixbuf(pixbuf, - scale) - image.set_from_surface(surface) - button.show() - text_button.hide() continue if i in ('ADR', 'TEL', 'EMAIL'): for entry in vcard_[i]: @@ -236,9 +233,6 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): self.progressbar.set_fraction(0) self.update_progressbar_timeout_id = None - def _nec_vcard_received(self, jid, resource, room, vcard_, *args): - self.set_values(vcard_) - def add_to_vcard(self, vcard_, entry, txt): """ Add an information to the vCard dictionary @@ -291,11 +285,10 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): vcard_['DESC'] = txt # Avatar - if self.avatar_encoded: - vcard_['PHOTO'] = {'BINVAL': self.avatar_encoded} - if self.avatar_mime_type: - vcard_['PHOTO']['TYPE'] = self.avatar_mime_type - return vcard_, self.avatar_sha + vcard = VCard(vcard_) + if self._avatar_bytes: + vcard.set_avatar(self._avatar_bytes, self.avatar_mime_type) + return vcard def on_ok_button_clicked(self, widget): if self.update_progressbar_timeout_id: @@ -308,43 +301,69 @@ class ProfileWindow(Gtk.ApplicationWindow, EventHelper): 'information.'), transient_for=self) return - vcard_, sha = self.make_vcard() - nick = vcard_.get('NICKNAME') or None - app.connections[self.account].get_module('UserNickname').set_nickname(nick) - if not nick: - nick = app.settings.get_account_setting(self.account, 'name') - app.nicks[self.account] = nick - app.connections[self.account].get_module('VCardTemp').send_vcard( - vcard_, sha) + + vcard_ = self.make_vcard() + + client = app.get_client(self.account) + client.get_module('VCardTemp').set_vcard( + vcard_, callback=self._on_set_vcard_result) + self._set_nickname(vcard_) + self.message_id = self.statusbar.push( self.context_id, _('Sending profile…')) self.progressbar.show() self.update_progressbar_timeout_id = GLib.timeout_add( 100, self.update_progressbar) - @event_filter(['account']) - def _nec_vcard_published(self, _event): - if self.update_progressbar_timeout_id is not None: - GLib.source_remove(self.update_progressbar_timeout_id) - self.update_progressbar_timeout_id = None - self.destroy() + @task + def _request_vcard(self): + _task = yield - @event_filter(['account']) - def _nec_vcard_not_published(self, _event): - if self.message_id: - self.statusbar.remove(self.context_id, self.message_id) - self.message_id = self.statusbar.push( - self.context_id, _('Information NOT published')) - self.remove_statusbar_timeout_id = GLib.timeout_add_seconds( - 3, self.remove_statusbar, self.message_id) - if self.update_progressbar_timeout_id is not None: - GLib.source_remove(self.update_progressbar_timeout_id) - self.progressbar.set_fraction(0) - self.update_progressbar_timeout_id = None - InformationDialog( - _('vCard publication failed'), - _('There was an error while publishing your personal information, ' - 'try again later.'), transient_for=self) + client = app.get_client(self.account) + vcard = yield client.get_module('VCardTemp').request_vcard() + + if is_error(vcard): + return + + self._set_avatar(vcard) + self.set_values(vcard.data) + + def _on_set_vcard_result(self, task_): + try: + task_.finish() + except Exception as error: + log.warning(error) + + if self.message_id: + self.statusbar.remove(self.context_id, self.message_id) + self.message_id = self.statusbar.push( + self.context_id, _('Information NOT published')) + self.remove_statusbar_timeout_id = GLib.timeout_add_seconds( + 3, self.remove_statusbar, self.message_id) + if self.update_progressbar_timeout_id is not None: + GLib.source_remove(self.update_progressbar_timeout_id) + self.progressbar.set_fraction(0) + self.update_progressbar_timeout_id = None + InformationDialog( + _('vCard publication failed'), + _('There was an error while publishing your personal information, ' + 'try again later.'), transient_for=self) + + else: + if self.update_progressbar_timeout_id is not None: + GLib.source_remove(self.update_progressbar_timeout_id) + self.update_progressbar_timeout_id = None + self.destroy() + + def _set_nickname(self, vcard): + nick = vcard.data.get('NICKNAME') or None + + client = app.get_client(self.account) + client.get_module('UserNickname').set_nickname(nick) + + if not nick: + nick = app.config.get_per('accounts', self.account, 'name') + app.nicks[self.account] = nick def on_cancel_button_clicked(self, widget): self.destroy() ===================================== gajim/gtk/server_info.py ===================================== @@ -299,7 +299,7 @@ class ServerInfo(Gtk.ApplicationWindow, EventHelper): con.get_module('HTTPUpload').available, http_upload_info), Feature('XEP-0398: Avatar Conversion', - con.avatar_conversion), + con.get_module('VCardAvatars').avatar_conversion_available), Feature('XEP-0411: Bookmarks Conversion', con.get_module('Bookmarks').conversion) ] ===================================== gajim/vcard.py ===================================== @@ -26,8 +26,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import base64 -import binascii +import logging from gi.repository import Gtk from gi.repository import GLib @@ -35,6 +34,7 @@ from gi.repository import Gdk from nbxmpp.structs import AnnotationNote from nbxmpp.util import is_error_result from nbxmpp.protocol import JID +from nbxmpp.errors import is_error from gajim import gtkgui_helpers from gajim.common import helpers @@ -45,10 +45,12 @@ from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.const import AvatarSize from gajim.common.nec import EventHelper +from gajim.common.modules.util import task from gajim.gtk.util import get_builder -# log = logging.getLogger('gajim.vcard') + +log = logging.getLogger('gajim.vcard') class VcardWindow(EventHelper): @@ -181,31 +183,7 @@ class VcardWindow(EventHelper): def _set_values(self, vcard, jid): for i in vcard.keys(): - if i == 'PHOTO' and self.xml.get_object('information_notebook').\ - get_n_pages() > 4: - if 'BINVAL' not in vcard[i]: - continue - photo_encoded = vcard[i]['BINVAL'] - if photo_encoded == '': - continue - try: - photo_decoded = base64.b64decode( - photo_encoded.encode('utf-8')) - except binascii.Error as error: - app.log('avatar').warning('Invalid avatar for %s: %s', jid, error) - continue - - pixbuf = gtkgui_helpers.get_pixbuf_from_data(photo_decoded) - if pixbuf is None: - continue - self.avatar = pixbuf - pixbuf = gtkgui_helpers.scale_pixbuf(pixbuf, AvatarSize.VCARD) - surface = Gdk.cairo_surface_create_from_pixbuf( - pixbuf, self.window.get_scale_factor()) - image = self.xml.get_object('PHOTO_image') - image.set_from_surface(surface) - image.show() - self.xml.get_object('user_avatar_label').show() + if i == 'PHOTO': continue if i in ('ADR', 'TEL', 'EMAIL'): for entry in vcard[i]: @@ -225,6 +203,32 @@ class VcardWindow(EventHelper): self.set_value(i + '_label', vcard[i]) self.vcard_arrived = True + def _load_avatar(self, vcard): + if not self.xml.get_object('information_notebook').get_n_pages() > 4: + # TODO: why? + return + + try: + avatar, _ = vcard.get_avatar() + except Exception as error: + log.warning('Failed to load avatar: %s', error) + return + + if avatar is None: + return + + pixbuf = gtkgui_helpers.get_pixbuf_from_data(avatar) + pixbuf = gtkgui_helpers.scale_pixbuf(pixbuf, AvatarSize.VCARD) + + surface = Gdk.cairo_surface_create_from_pixbuf( + pixbuf, self.window.get_scale_factor()) + image = self.xml.get_object('PHOTO_image') + image.set_from_surface(surface) + image.show() + + self.avatar = pixbuf + self.xml.get_object('user_avatar_label').show() + def clear_values(self): for l in ('FN', 'NICKNAME', 'N_FAMILY', 'N_GIVEN', 'N_MIDDLE', 'N_PREFIX', 'N_SUFFIX', 'EMAIL_HOME_USERID', 'TEL_HOME_NUMBER', 'BDAY', @@ -242,9 +246,19 @@ class VcardWindow(EventHelper): widget.set_text('') self.xml.get_object('DESC_textview').get_buffer().set_text('') - def _nec_vcard_received(self, jid, resource, room, vcard, *args): + @task + def _request_vcard(self, jid): + _task = yield + + con = app.connections[self.account] + vcard = yield con.get_module('VCardTemp').request_vcard(jid=jid) + + if is_error(vcard): + return + self.clear_values() - self._set_values(vcard, jid) + self._set_values(vcard.data, str(jid)) + self._load_avatar(vcard) def set_os_info(self, result, jid): if self.xml.get_object('information_notebook').get_n_pages() < 5: @@ -448,14 +462,11 @@ class VcardWindow(EventHelper): self.fill_status_label() + jid = self.contact.jid if self.gc_contact: - con.get_module('VCardTemp').request_vcard( - self._nec_vcard_received, - self.gc_contact.get_full_jid(), - room=True) - else: - con.get_module('VCardTemp').request_vcard( - self._nec_vcard_received, self.contact.jid) + jid = self.gc_contact.get_full_jid() + + self._request_vcard(jid) def on_close_button_clicked(self, widget): self.window.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/19aeeeb8cde13f95d659330019d27dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/19aeeeb8cde13f95d659330019d27dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch avatars
by Philipp Hörist 23 Sep '20

23 Sep '20

Philipp Hörist pushed new branch avatars at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/avatars You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][tasks] 9 commits: Add error module
by Philipp Hörist 23 Sep '20

23 Sep '20

Philipp Hörist pushed to branch tasks at gajim / python-nbxmpp Commits: 190ce1ec by lovetox at 2020-09-22T23:21:15+02:00 Add error module - - - - - 8bd67f6f by lovetox at 2020-09-22T23:21:15+02:00 Add task module Module provides a decorator which wraps a generator in a Task The Task iterates the generator until it ends and processes the yielded values. Example: ``` @iq_request_task request_something(self, jid): task = yield response = yield get_request_iq() result = process(response) if is_error_result(result): raise StanzaError(result) yield result ``` - - - - - 192e8093 by lovetox at 2020-09-22T23:21:15+02:00 Add util module - - - - - ddb5134f by lovetox at 2020-09-22T23:21:15+02:00 Protocol: Add isError() and isResult() methods - - - - - 397d7c5a by lovetox at 2020-09-22T23:21:15+02:00 Add Namespace - - - - - 1b5bfca9 by lovetox at 2020-09-22T23:28:00+02:00 Add VCard Temp (XEP-0054) support - - - - - b1cb21dd by lovetox at 2020-09-22T23:36:19+02:00 PubSub: Rewrite and use Tasks - - - - - 13022658 by lovetox at 2020-09-22T23:37:05+02:00 Rewrite UserAvatar module - Add set_avatar() - - - - - 4d55d9a2 by lovetox at 2020-09-23T13:15:40+02:00 Connection: Add necessary methods to implement - - - - - 22 changed files: - nbxmpp/client.py - nbxmpp/connection.py - nbxmpp/dispatcher.py - + nbxmpp/errors.py - nbxmpp/modules/activity.py - nbxmpp/modules/base.py - nbxmpp/modules/bookmarks.py - nbxmpp/modules/location.py - nbxmpp/modules/mood.py - nbxmpp/modules/nickname.py - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/pubsub.py - nbxmpp/modules/tune.py - nbxmpp/modules/user_avatar.py - + nbxmpp/modules/util.py - + nbxmpp/modules/vcard_temp.py - nbxmpp/namespaces.py - nbxmpp/protocol.py - nbxmpp/structs.py - + nbxmpp/task.py - test/unit/test_avatar.py Changes: ===================================== nbxmpp/client.py ===================================== @@ -119,6 +119,7 @@ class Client(Observable): self._mode = Mode.CLIENT self._ping_source_id = None + self._tasks = [] self._dispatcher = StanzaDispatcher(self) self._dispatcher.subscribe('before-dispatch', self._on_before_dispatch) @@ -130,6 +131,15 @@ class Client(Observable): self._state = StreamState.DISCONNECTED + def add_task(self, task): + self._tasks.append(task) + + def remove_task(self, task, _context): + try: + self._tasks.remove(task) + except Exception: + pass + @property def log_context(self): return self._log_context @@ -447,6 +457,8 @@ class Client(Observable): def _on_disconnected(self, _connection, _signal_name): self.state = StreamState.DISCONNECTED + for task in self._tasks: + task.cancel() self._remove_ping_timer() self._dispatcher.remove_ping_callback(self._ping_id) self._reset_stream() @@ -833,6 +845,8 @@ class Client(Observable): self._dispatcher.unregister_handler(*args, **kwargs) def destroy(self): + for task in self._tasks: + task.cancel() self._remove_ping_timer() self._smacks = None self._sasl = None ===================================== nbxmpp/connection.py ===================================== @@ -134,6 +134,12 @@ class Connection(Observable): def start_tls_negotiation(self): raise NotImplementedError + def shutdown_output(self): + raise NotImplementedError + + def shutdown_input(self): + raise NotImplementedError + def destroy(self): self.remove_subscriptions() self._peer_certificate = None ===================================== nbxmpp/dispatcher.py ===================================== @@ -75,6 +75,7 @@ from nbxmpp.modules.chatstates import Chatstates from nbxmpp.modules.register import Register from nbxmpp.modules.http_upload import HTTPUpload from nbxmpp.modules.mam import MAM +from nbxmpp.modules.vcard_temp import VCardTemp from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.structs import StanzaTimeoutError @@ -180,6 +181,7 @@ class StanzaDispatcher(Observable): self._modules['Register'] = Register(self._client) self._modules['HTTPUpload'] = HTTPUpload(self._client) self._modules['MAM'] = MAM(self._client) + self._modules['VCardTemp'] = VCardTemp(self._client) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/errors.py ===================================== @@ -0,0 +1,115 @@ +# Copyright (C) 2020 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/>. + +from nbxmpp.namespaces import Namespace + + +def is_error(error): + return isinstance(error, BaseError) + + +class BaseError(Exception): + def __init__(self, is_fatal=False): + self.is_fatal = is_fatal + + +class StanzaError(BaseError): + + log_level = 'info' + app_namespace = None + + def __init__(self, stanza): + BaseError.__init__(self) + self.stanza = stanza + self._stanza_name = stanza.getName() + self._error_node = stanza.getTag('error') + self.condition = stanza.getError() + self.condition_data = self._error_node.getTagData(self.condition) + self.app_condition = self._get_app_condition() + self.type = stanza.getErrorType() + self.jid = stanza.getFrom() + self.id = stanza.getID() + self._text = {} + + text_elements = self._error_node.getTags('text', + namespace=Namespace.STANZAS) + for element in text_elements: + lang = element.getXmlLang() + text = element.getData() + self._text[lang] = text + + def _get_app_condition(self): + if self.app_namespace is None: + return None + + for node in self._error_node.getChildren(): + if node.getNamespace() == self.app_namespace: + return node.getName() + return None + + def get_text(self, pref_lang=None): + if pref_lang is not None: + text = self._text.get(pref_lang) + if text is not None: + return text + + if self._text: + text = self._text.get('en') + if text is not None: + return text + + text = self._text.get(None) + if text is not None: + return text + return self._text.popitem()[1] + return '' + + def set_text(self, lang, text): + self._text[lang] = text + + def __str__(self): + condition = self.condition + if self.app_condition is not None: + condition = '%s (%s)' % (self.condition, self.app_condition) + text = self.get_text('en') or '' + if text: + text = ' - %s' % text + return 'Error from %s: %s%s' % (self.jid, condition, text) + + +class PubSubStanzaError(StanzaError): + + app_namespace = Namespace.PUBSUB_ERROR + + +class MalformedStanzaError(BaseError): + + log_level = 'warning' + + def __init__(self, text, stanza, is_fatal=True): + BaseError.__init__(self, is_fatal=is_fatal) + self.stanza = stanza + self.text = str(text) + + +class CancelledError(BaseError): + + log_level = 'info' + + def __init__(self): + BaseError.__init__(self, is_fatal=True) + self.text = 'Task has been cancelled' ===================================== nbxmpp/modules/activity.py ===================================== @@ -25,6 +25,11 @@ from nbxmpp.modules.base import BaseModule class Activity(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -91,6 +96,4 @@ class Activity(BaseModule): if data.text: item.addChild('text', payload=data.text) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.ACTIVITY, item, id_='current') + self.publish(Namespace.ACTIVITY, item, id_='current') ===================================== nbxmpp/modules/base.py ===================================== @@ -21,7 +21,17 @@ from nbxmpp.util import LogAdapter class BaseModule: + + _depends = {} + def __init__(self, client): logger_name = 'nbxmpp.m.%s' % self.__class__.__name__.lower() self._log = LogAdapter(logging.getLogger(logger_name), {'context': client.log_context}) + + def __getattr__(self, name): + if name not in self._depends: + raise AttributeError + + module = self._client.get_module(self._depends[name]) + return getattr(module, name) ===================================== nbxmpp/modules/bookmarks.py ===================================== @@ -30,11 +30,9 @@ from nbxmpp.util import to_xs_boolean from nbxmpp.util import call_on_response from nbxmpp.util import callback from nbxmpp.util import raise_error -from nbxmpp.util import is_error_result from nbxmpp.modules.pubsub import get_pubsub_item from nbxmpp.modules.pubsub import get_pubsub_items from nbxmpp.modules.pubsub import get_pubsub_request -from nbxmpp.modules.pubsub import get_publish_options from nbxmpp.modules.base import BaseModule @@ -47,13 +45,19 @@ BOOKMARK_2_OPTIONS = { 'pubsub#notify_delete': 'true', 'pubsub#notify_retract': 'true', 'pubsub#persist_items': 'true', - 'pubsub#max_items': '128', + 'pubsub#max_items': 'max', 'pubsub#access_model': 'whitelist', 'pubsub#send_last_published_item': 'never', } class Bookmarks(BaseModule): + + _depends = { + 'retract': 'PubSub', + 'publish': 'PubSub', + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -71,8 +75,6 @@ class Bookmarks(BaseModule): self._bookmark_2_queue = {} self._bookmark_1_queue = [] - self._node_configuration_in_progress = False - self._node_configuration_not_possible = False def _process_pubsub_bookmarks(self, _client, stanza, properties): if not properties.is_pubsub_event: @@ -315,115 +317,44 @@ class Bookmarks(BaseModule): def retract_bookmark(self, bookmark_jid): self._log.info('Retract Bookmark: %s', bookmark_jid) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').retract(jid, - Namespace.BOOKMARKS_2, - str(bookmark_jid)) + + self.retract(Namespace.BOOKMARKS_2, str(bookmark_jid)) def _store_bookmark_1(self, bookmarks): self._log.info('Store Bookmarks 1 (PubSub)') - jid = self._client.get_bound_jid().bare + self._bookmark_1_queue = bookmarks item = self._build_storage_node(bookmarks) - options = get_publish_options(BOOKMARK_1_OPTIONS) - self._client.get_module('PubSub').publish( - jid, - Namespace.BOOKMARKS, - item, - id_='current', - options=options, - callback=self._on_store_bookmark_result, - user_data=Namespace.BOOKMARKS) + self.publish(Namespace.BOOKMARKS, + item, + id_='current', + options=BOOKMARK_1_OPTIONS, + force_node_options=True, + callback=self._on_store_bookmark_result, + user_data=Namespace.BOOKMARKS) def _store_bookmark_2(self, bookmarks): - if self._node_configuration_not_possible: - self._log.warning('Node configuration not possible') - return - self._log.info('Store Bookmarks 2 (PubSub)') - jid = self._client.get_bound_jid().bare + for bookmark in bookmarks: self._bookmark_2_queue[bookmark.jid] = bookmark item = self._build_conference_node(bookmark) - options = get_publish_options(BOOKMARK_2_OPTIONS) - self._client.get_module('PubSub').publish( - jid, - Namespace.BOOKMARKS_2, - item, - id_=str(bookmark.jid), - options=options, - callback=self._on_store_bookmark_result, - user_data=Namespace.BOOKMARKS_2) - - def _on_store_bookmark_result(self, result, node): - if not is_error_result(result): - self._bookmark_1_queue = [] - self._bookmark_2_queue.pop(result.id, None) - return - - if (result.condition == 'conflict' and - result.app_condition == 'precondition-not-met'): - if self._node_configuration_in_progress: - return - - self._node_configuration_in_progress = True - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').get_node_configuration( - jid, - node, - callback=self._on_node_configuration_received) - - else: - self._bookmark_1_queue = [] - self._bookmark_2_queue.pop(result.id, None) - self._log.warning(result) - - def _on_node_configuration_received(self, result): - if is_error_result(result): - self._log.warning(result) - self._bookmark_1_queue = [] - self._bookmark_2_queue.clear() - return - - if result.node == Namespace.BOOKMARKS: - config = BOOKMARK_1_OPTIONS - else: - config = BOOKMARK_2_OPTIONS - self._apply_config(result.form, config) - self._client.get_module('PubSub').set_node_configuration( - result.jid, - result.node, - result.form, - callback=self._on_node_configuration_finished) - - def _on_node_configuration_finished(self, result): - self._node_configuration_in_progress = False - if is_error_result(result): - self._log.warning(result) - self._bookmark_2_queue.clear() - self._bookmark_1_queue = [] - self._node_configuration_not_possible = True - return - - self._log.info('Republish bookmarks') - if self._bookmark_2_queue: - bookmarks = self._bookmark_2_queue.copy() - self._bookmark_2_queue.clear() - self._store_bookmark_2(bookmarks.values()) - else: - bookmarks = self._bookmark_1_queue.copy() - self._bookmark_1_queue.clear() - self._store_bookmark_1(bookmarks) + self.publish(Namespace.BOOKMARKS_2, + item, + id_=str(bookmark.jid), + options=BOOKMARK_2_OPTIONS, + force_node_options=True, + callback=self._on_store_bookmark_result, + user_data=Namespace.BOOKMARKS_2) + + def _on_store_bookmark_result(self, task): + try: + result = task.finish() + except Exception as error: + self._log.warning(error) - @staticmethod - def _apply_config(form, config): - for var, value in config.items(): - try: - field = form[var] - except KeyError: - pass - else: - field.value = value + self._bookmark_1_queue = [] + self._bookmark_2_queue.pop(result.id, None) @call_on_response('_on_private_store_result') def _store_with_private(self, bookmarks): ===================================== nbxmpp/modules/location.py ===================================== @@ -24,6 +24,11 @@ from nbxmpp.modules.base import BaseModule class Location(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -70,6 +75,4 @@ class Location(BaseModule): if value is not None: item.addChild(tag, payload=value) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.LOCATION, item, id_='current') + self.publish(Namespace.LOCATION, item, id_='current') ===================================== nbxmpp/modules/mood.py ===================================== @@ -25,6 +25,11 @@ from nbxmpp.modules.base import BaseModule class Mood(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -80,6 +85,4 @@ class Mood(BaseModule): if data.text: item.addChild('text', payload=data.text) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.MOOD, item, id_='current') + self.publish(Namespace.MOOD, item, id_='current') ===================================== nbxmpp/modules/nickname.py ===================================== @@ -23,6 +23,11 @@ from nbxmpp.modules.base import BaseModule class Nickname(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -87,6 +92,5 @@ class Nickname(BaseModule): item = Node('nick', {'xmlns': Namespace.NICK}) if nickname is not None: item.addData(nickname) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.NICK, item, id_='current') + + self.publish(Namespace.NICK, item, id_='current') ===================================== nbxmpp/modules/omemo.py ===================================== @@ -35,6 +35,11 @@ from nbxmpp.modules.base import BaseModule class OMEMO(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -192,9 +197,8 @@ class OMEMO(BaseModule): item.addChild('device').setAttr('id', device) self._log.info('Set devicelist: %s', devicelist) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.OMEMO_TEMP_DL, item, id_='current') + + self.publish(Namespace.OMEMO_TEMP_DL, item, id_='current') @call_on_response('_devicelist_received') def request_devicelist(self, jid=None): @@ -225,9 +229,8 @@ class OMEMO(BaseModule): self._log.info('Set bundle') node = '%s:%s' % (Namespace.OMEMO_TEMP_BUNDLE, device_id) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, node, item, id_='current') + + self.publish(node, item, id_='current') @staticmethod def _create_bundle(bundle): ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -38,6 +38,11 @@ from nbxmpp.modules.base import BaseModule class OpenPGP(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -154,9 +159,8 @@ class OpenPGP(BaseModule): item.addChild('pubkey-metadata', attrs=attrs) self._log.info('Set keylist: %s', keylist) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.OPENPGP_PK, item, id_='current') + + self.publish(Namespace.OPENPGP_PK, item, id_='current') def set_public_key(self, key, fingerprint, date): date = time.strftime( @@ -168,9 +172,8 @@ class OpenPGP(BaseModule): node = '%s:%s' % (Namespace.OPENPGP_PK, fingerprint) self._log.info('Set public key') - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, node, item, id_='current') + + self.publish(node, item, id_='current') @call_on_response('_public_key_received') def request_public_key(self, jid, fingerprint): @@ -274,9 +277,8 @@ class OpenPGP(BaseModule): item.setData(b64encode(secret_key)) self._log.info('Set secret key') - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.OPENPGP_SK, item, id_='current') + + self.publish(Namespace.OPENPGP_SK, item, id_='current') def parse_signcrypt(stanza): ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# Copyright (C) 2020 Philipp Hörist <philipp AT hoerist.com> # # This file is part of nbxmpp. # @@ -15,20 +15,20 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. -from nbxmpp.namespaces import Namespace -from nbxmpp.protocol import Node -from nbxmpp.protocol import Iq -from nbxmpp.protocol import isResultNode +from collections import namedtuple + +from nbxmpp.task import iq_request_task +from nbxmpp.errors import is_error +from nbxmpp.errors import PubSubStanzaError +from nbxmpp.errors import MalformedStanzaError from nbxmpp.structs import StanzaHandler from nbxmpp.structs import PubSubEventData -from nbxmpp.structs import CommonResult -from nbxmpp.structs import PubSubConfigResult -from nbxmpp.structs import PubSubPublishResult -from nbxmpp.modules.dataforms import extend_form -from nbxmpp.util import call_on_response -from nbxmpp.util import callback -from nbxmpp.util import raise_error +from nbxmpp.protocol import Iq +from nbxmpp.protocol import Node +from nbxmpp.namespaces import Namespace from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response +from nbxmpp.modules.dataforms import extend_form class PubSub(BaseModule): @@ -84,107 +84,101 @@ class PubSub(BaseModule): id_ = item.getAttr('id') properties.pubsub_event = PubSubEventData(node, id_, item) - @call_on_response('_publish_result_received') - def publish(self, jid, node, item, id_=None, options=None): - query = Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) - publish = pubsub.addChild('publish', {'node': node}) - attrs = {} - if id_ is not None: - attrs = {'id': id_} - publish.addChild('item', attrs, [item]) - if options: - publish = pubsub.addChild('publish-options') - publish.addChild(node=options) - return query - - @callback - def _publish_result_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.warning, stanza) - - jid = stanza.getFrom() - pubsub = stanza.getTag('pubsub', namespace=Namespace.PUBSUB) - if pubsub is None: - # XEP-0060: IQ payload is not mandatory on result - return PubSubPublishResult(jid, None, None) - - publish = pubsub.getTag('publish') - if publish is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') - - node = publish.getAttr('node') - item = publish.getTag('item') - if item is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed') - - id_ = item.getAttr('id') - return PubSubPublishResult(jid, node, id_) - - @call_on_response('_default_response') - def retract(self, jid, node, id_, notify=True): - query = Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) - attrs = {'node': node} - if notify: - attrs['notify'] = 'true' - retract = pubsub.addChild('retract', attrs=attrs) - retract.addChild('item', {'id': id_}) - return query - - @call_on_response('_default_response') - def set_node_configuration(self, jid, node, form): - self._log.info('Set configuration for %s %s', node, jid) - query = Iq('set', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) - configure = pubsub.addChild('configure', {'node': node}) - form.setAttr('type', 'submit') - configure.addChild(node=form) - return query - - @call_on_response('_node_configuration_received') - def get_node_configuration(self, jid, node): - self._log.info('Request node configuration') - query = Iq('get', to=jid) - pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) - pubsub.addChild('configure', {'node': node}) - return query - - @callback - def _node_configuration_received(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.warning, stanza) - - jid = stanza.getFrom() - pubsub = stanza.getTag('pubsub', namespace=Namespace.PUBSUB_OWNER) - if pubsub is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No pubsub node found') - - configure = pubsub.getTag('configure') - if configure is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No configure node found') - - node = configure.getAttr('node') - - forms = configure.getTags('x', namespace=Namespace.DATA) - for form in forms: - dataform = extend_form(node=form) - form_type = dataform.vars.get('FORM_TYPE') - if form_type is None or form_type.value != Namespace.PUBSUB_CONFIG: - continue - self._log.info('Node configuration received from: %s', jid) - return PubSubConfigResult(jid=jid, node=node, form=dataform) - - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No valid form type found') - - @callback - def _default_response(self, stanza): - if not isResultNode(stanza): - return raise_error(self._log.info, stanza) - return CommonResult(jid=stanza.getFrom()) + @iq_request_task + def request_item(self, node, id_, jid=None): + task = yield + + response = yield _make_pubsub_request(node, id_=id_, jid=jid) + + if response.isError(): + raise PubSubStanzaError(response) + + item = _get_pubsub_item(response, node, id_) + yield task.set_result(item) + + @iq_request_task + def request_items(self, node, max_items=None, jid=None): + _task = yield + + response = yield _make_pubsub_request(node, + max_items=max_items, + jid=jid) + + if response.isError(): + raise PubSubStanzaError(response) + + yield _get_pubsub_items(response, node) + + @iq_request_task + def publish(self, + node, + item, + id_=None, + options=None, + jid=None, + force_node_options=False): + + _task = yield + + request = _make_publish_request(node, item, id_, options, jid) + response = yield request + + if response.isError(): + error = PubSubStanzaError(response) + if (not force_node_options or + error.app_condition != 'precondition-not-met'): + raise error + + result = yield self.reconfigure_node(node, options, jid) + if is_error(result): + raise result + + response = yield request + if response.isError(): + raise PubSubStanzaError(response) + + jid = response.getFrom() + item_id = _get_published_item_id(response, node, id_) + yield PubSubPublishResult(jid, node, item_id) + + @iq_request_task + def retract(self, node, id_, jid=None, notify=True): + _task = yield + + response = yield _make_retract_request(node, id_, jid, notify) + yield process_response(response) + + @iq_request_task + def reconfigure_node(self, node, options, jid=None): + _task = yield + + result = yield self.get_node_configuration(node, jid) + if is_error(result): + raise result + + _apply_options(result.form, options) + result = yield self.set_node_configuration(node, result.form, jid) + yield result + + @iq_request_task + def set_node_configuration(self, node, form, jid=None): + _task = yield + + response = yield _make_node_configuration(node, form, jid) + yield process_response(response) + + @iq_request_task + def get_node_configuration(self, node, jid=None): + _task = yield + + response = yield _make_node_configuration_request(node, jid) + + if response.isError(): + raise PubSubStanzaError(response) + + jid = response.getFrom() + form = _get_configure_form(response, node) + yield PubSubNodeConfigurationResult(jid=jid, node=node, form=form) def get_pubsub_request(jid, node, id_=None, max_items=None): @@ -225,3 +219,171 @@ def get_publish_options(config): field = options.addChild('field', attrs={'var': var}) field.setTagData('value', value) return options + + +def _get_pubsub_items(response, node): + pubsub_node = response.getTag('pubsub', namespace=Namespace.PUBSUB) + if pubsub_node is None: + raise MalformedStanzaError('pubsub node missing', response) + + items_node = pubsub_node.getTag('items') + if items_node is None: + raise MalformedStanzaError('items node missing', response) + + if items_node.getAttr('node') != node: + raise MalformedStanzaError('invalid node attr', response) + + return items_node.getTags('item') + + +def _get_pubsub_item(response, node, id_): + items = _get_pubsub_items(response, node) + + if len(items) > 1: + raise MalformedStanzaError('multiple items found', response) + + if not items: + return None + + item = items[0] + if item.getAttr('id') != id_: + raise MalformedStanzaError('invalid item id', response) + + return item + + +def _make_pubsub_request(node, id_=None, max_items=None, jid=None): + query = Iq('get', to=jid) + pubsub = query.addChild('pubsub', namespace=Namespace.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 + + +def _get_configure_form(response, node): + pubsub = response.getTag('pubsub', namespace=Namespace.PUBSUB_OWNER) + if pubsub is None: + raise MalformedStanzaError('pubsub node missing', response) + + configure = pubsub.getTag('configure') + if configure is None: + raise MalformedStanzaError('configure node missing', response) + + if node != configure.getAttr('node'): + raise MalformedStanzaError('invalid node attribute', response) + + forms = configure.getTags('x', namespace=Namespace.DATA) + for form in forms: + dataform = extend_form(node=form) + form_type = dataform.vars.get('FORM_TYPE') + if form_type is None or form_type.value != Namespace.PUBSUB_CONFIG: + continue + + return dataform + + raise MalformedStanzaError('no valid form type found', response) + + +def _get_published_item_id(response, node, id_): + pubsub = response.getTag('pubsub', namespace=Namespace.PUBSUB) + if pubsub is None: + # https://xmpp.org/extensions/xep-0060.html#publisher-publish-success + # If the publish request did not include an ItemID, + # the IQ-result SHOULD include an empty <item/> element + # that specifies the ItemID of the published item. + # + # If the server did not add a payload we assume the item was + # published with the id we requested + return id_ + + publish = pubsub.getTag('publish') + if publish is None: + raise MalformedStanzaError('publish node missing', response) + + if node != publish.getAttr('node'): + raise MalformedStanzaError('invalid node attribute', response) + + item = publish.getTag('item') + if item is None: + raise MalformedStanzaError('item node missing', response) + + item_id = item.getAttr('id') + if id_ is not None and item_id != id_: + raise MalformedStanzaError('invalid item id', response) + + return item_id + + +def _make_publish_request(node, item, id_, options, jid): + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) + publish = pubsub.addChild('publish', {'node': node}) + attrs = {} + if id_ is not None: + attrs = {'id': id_} + publish.addChild('item', attrs, [item]) + if options: + publish = pubsub.addChild('publish-options') + publish.addChild(node=_make_publish_options(options)) + return query + + +def _make_publish_options(options): + data = Node(Namespace.DATA + ' x', attrs={'type': 'submit'}) + field = data.addChild('field', attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) + field.setTagData('value', Namespace.PUBSUB_PUBLISH_OPTIONS) + + for var, value in options.items(): + field = data.addChild('field', attrs={'var': var}) + field.setTagData('value', value) + return data + + +def _make_retract_request(node, id_, jid, notify): + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB) + attrs = {'node': node} + if notify: + attrs['notify'] = 'true' + retract = pubsub.addChild('retract', attrs=attrs) + retract.addChild('item', {'id': id_}) + return query + + +def _make_node_configuration(node, form, jid): + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) + configure = pubsub.addChild('configure', {'node': node}) + form.setAttr('type', 'submit') + configure.addChild(node=form) + return query + + +def _make_node_configuration_request(node, jid): + query = Iq('get', to=jid) + pubsub = query.addChild('pubsub', namespace=Namespace.PUBSUB_OWNER) + pubsub.addChild('configure', {'node': node}) + return query + + +def _apply_options(form, options): + for var, value in options.items(): + try: + field = form[var] + except KeyError: + pass + else: + field.value = value + + +PubSubNodeConfigurationResult = namedtuple('PubSubConfigResult', + 'jid node form') + +PubSubConfigResult = namedtuple('PubSubConfigResult', + 'jid node form') + +PubSubPublishResult = namedtuple('PubSubPublishResult', + 'jid node id') ===================================== nbxmpp/modules/tune.py ===================================== @@ -24,6 +24,11 @@ from nbxmpp.modules.base import BaseModule class Tune(BaseModule): + + _depends = { + 'publish': 'PubSub' + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -70,6 +75,4 @@ class Tune(BaseModule): if value is not None: item.addChild(tag, payload=value) - jid = self._client.get_bound_jid().bare - self._client.get_module('PubSub').publish( - jid, Namespace.TUNE, item, id_='current') + self.publish(Namespace.TUNE, item, id_='current') ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -15,22 +15,37 @@ # 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 base64 +from typing import List +from typing import Dict + +import hashlib +from dataclasses import dataclass +from dataclasses import asdict +from dataclasses import field from nbxmpp.namespaces import Namespace from nbxmpp.protocol import NodeProcessed -from nbxmpp.protocol import isResultNode +from nbxmpp.protocol import Node 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.util import raise_error -from nbxmpp.modules.pubsub import get_pubsub_request +from nbxmpp.structs import CommonResult +from nbxmpp.util import b64encode +from nbxmpp.util import b64decode +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import raise_if_error +from nbxmpp.modules.util import finalize class UserAvatar(BaseModule): + + _depends = { + 'get_node_configuration': 'PubSub', + 'set_node_configuration': 'PubSub', + 'publish': 'PubSub', + 'request_item': 'PubSub', + } + def __init__(self, client): BaseModule.__init__(self, client) @@ -65,11 +80,10 @@ class UserAvatar(BaseModule): properties.jid) return - info = metadata.getTags('info', one=True) try: - data = AvatarMetaData(**info.getAttrs()) - except Exception: - self._log.warning('Malformed user avatar data') + data = AvatarMetaData.from_node(metadata) + except Exception as error: + self._log.warning('Malformed user avatar data: %s', error) self._log.warning(stanza) raise NodeProcessed @@ -79,42 +93,255 @@ class UserAvatar(BaseModule): properties.pubsub_event = pubsub_event - @call_on_response('_avatar_data_received') - def request_avatar(self, jid, id_): - return get_pubsub_request(jid, Namespace.AVATAR_DATA, id_=id_) + @iq_request_task + def request_avatar(self, avatar_info, jid=None): + task = yield - @callback - def _avatar_data_received(self, stanza): - jid = stanza.getFrom() - if jid is None: - jid = self._client.get_bound_jid().bare + item = yield self.request_item(Namespace.AVATAR_DATA, + id_=avatar_info.id, + jid=jid) - if not isResultNode(stanza): - return raise_error(self._log.warning, stanza) + raise_if_error(item) - pubsub_node = stanza.getTag('pubsub') - items_node = pubsub_node.getTag('items') - item = items_node.getTag('item') if item is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No item in node found') + yield task.set_result(None) + + yield _get_avatar_data(item, avatar_info.id) + + @iq_request_task + def set_avatar(self, avatar, public=False): + + task = yield + + if avatar is None: + result = yield self._publish_avatar_metadata(None) + yield finalize(task, result) + + access_model = 'open' if public else 'presence' + + result = yield self._publish_avatar(avatar, access_model) + + yield finalize(task, result) + + @iq_request_task + def _publish_avatar(self, avatar, access_model): + task = yield + + options = { + 'pubsub#persist_items': 'true', + 'pubsub#access_model': access_model, + } + + for info, data in avatar.pubsub_avatar_info(): + item = _make_avatar_data_node(data) + self._log.info('Publish avatar data: %s, %s', info, access_model) + + result = yield self.publish(Namespace.AVATAR_DATA, + item, + id_=info.id, + options=options, + force_node_options=True) + + raise_if_error(result) + + result = yield self._publish_avatar_metadata(avatar.metadata) - sha = item.getAttr('id') - data_node = item.getTag('data', namespace=Namespace.AVATAR_DATA) - if data_node is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'No data node found') + yield finalize(task, result) - data = data_node.getData() - if data is None: - return raise_error(self._log.warning, stanza, 'stanza-malformed', - 'Data node empty') + @iq_request_task + def _publish_avatar_metadata(self, metadata): + task = yield + + self._log.info('Publish avatar meta data: %s', metadata) + + result = yield self.publish(Namespace.AVATAR_METADATA, + metadata.to_node(), + id_='current') + + yield finalize(task, result) + + @iq_request_task + def get_access_model(self): + _task = yield + + self._log.info('Request access model') + + result = yield self.get_node_configuration(Namespace.AVATAR_DATA) + + raise_if_error(result) + + yield result.form['pubsub#access_model'].value + + @iq_request_task + def set_access_model(self, model): + task = yield + + if model not in ('open', 'presence'): + raise ValueError('Invalid access model') + + result = yield self.get_node_configuration(Namespace.AVATAR_DATA) + + raise_if_error(result) try: - data = base64.b64decode(data.encode('utf-8')) - except Exception as error: - return raise_error(self._log.warning, stanza, - 'stanza-malformed', str(error)) + access_model = result.form['pubsub#access_model'].value + except Exception: + yield task.set_error('warning', + condition='access-model-not-supported') + + if access_model == model: + jid = self._client.get_bound_jid().new_as_bare() + yield CommonResult(jid=jid) + + result.form['pubsub#access_model'].value = model + + self._log.info('Set access model %s', model) + + result = yield self.set_node_configuration(Namespace.AVATAR_DATA, + result.form) + + yield finalize(task, result) + + +def _get_avatar_data(item, id_): + data_node = item.getTag('data', namespace=Namespace.AVATAR_DATA) + if data_node is None: + raise MalformedStanzaError('data node missing', item) + + data = data_node.getData() + if not data: + raise MalformedStanzaError('data node empty', item) + + try: + avatar = b64decode(data, return_type=bytes) + except Exception as error: + raise MalformedStanzaError(f'decoding error: {error}', item) + + avatar_sha = hashlib.sha1(avatar).hexdigest() + if avatar_sha != id_: + raise MalformedStanzaError(f'avatar does not match sha', item) + + return AvatarData(data=avatar, sha=avatar_sha) + + +def _make_metadata_node(infos): + item = Node('metadata', attrs={'xmlns': Namespace.AVATAR_METADATA}) + for info in infos: + item.addChild('info', attrs=info.to_dict()) + return item + + +def _make_avatar_data_node(avatar): + item = Node('data', attrs={'xmlns': Namespace.AVATAR_DATA}) + item.setData(b64encode(avatar.data)) + return item + + +def _get_info_attrs(avatar, avatar_sha, height, width): + info_attrs = { + 'id': avatar_sha, + 'bytes': len(avatar), + 'type': 'image/png', + } + + if height is not None: + info_attrs['height'] = height + + if width is not None: + info_attrs['width'] = width + + return info_attrs + + +@dataclass +class AvatarInfo: + bytes: int + id: str + type: str + url: str = None + height: int = None + width: int = None + + def __post_init__(self): + if self.bytes is None: + raise ValueError + if self.id is None: + raise ValueError + if self.type is None: + raise ValueError + + self.bytes = int(self.bytes) + + if self.height is not None: + self.height = int(self.height) + if self.width is not None: + self.width = int(self.width) + + def to_dict(self): + info_dict = asdict(self) + if self.height is None: + info_dict.pop('height') + if self.width is None: + info_dict.pop('width') + if self.url is None: + info_dict.pop('url') + return info_dict + + +@dataclass +class AvatarData: + data: bytes + sha: str + + +@dataclass +class AvatarMetaData: + infos: List[AvatarInfo] = field(default_factory=list) + + @classmethod + def from_node(cls, node): + infos = [] + info_nodes = node.getTags('info') + for info in info_nodes: + infos.append(AvatarInfo( + bytes=info.getAttr('bytes'), + id=info.getAttr('id'), + type=info.getAttr('type'), + url=info.getAttr('url'), + height=info.getAttr('height'), + width=info.getAttr('width') + )) + return cls(infos=infos) + + def add_avatar_info(self, avatar_info): + self.infos.append(avatar_info) + + def to_node(self): + return _make_metadata_node(self.infos) + + @property + def avatar_shas(self): + return [info.id for info in self.infos] + + +@dataclass +class Avatar: + metadata: AvatarMetaData = field(default_factory=AvatarMetaData) + data: Dict[AvatarInfo, bytes] = field(init=False, default_factory=dict) + + def add_image_source(self, data, type_, height, width, url=None): + sha = hashlib.sha1(data).hexdigest() + info = AvatarInfo(bytes=len(data), + id=sha, + type=type_, + height=height, + width=width, + url=url) + self.metadata.add_avatar_info(info) + self.data[info] = AvatarData(data=data, sha=sha) - self._log.info('Received avatar data: %s %s', jid, sha) - return AvatarData(jid, sha, data) + def pubsub_avatar_info(self): + for info, data in self.data.items(): + if info.url is not None: + continue + yield info, data ===================================== nbxmpp/modules/util.py ===================================== @@ -0,0 +1,41 @@ +# Copyright (C) 2020 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/>. + +from nbxmpp.structs import CommonResult +from nbxmpp.errors import StanzaError +from nbxmpp.errors import is_error +from nbxmpp.simplexml import Node + + +def process_response(response): + if response.isError(): + raise StanzaError(response) + + return CommonResult(jid=response.getFrom()) + + +def raise_if_error(result): + if is_error(result): + raise result + + +def finalize(task, result): + if is_error(result): + raise result + if isinstance(result, Node): + return task.set_result(result) + return result ===================================== nbxmpp/modules/vcard_temp.py ===================================== @@ -0,0 +1,143 @@ +# Copyright (C) 2020 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 hashlib +from dataclasses import dataclass +from dataclasses import field + +from nbxmpp.task import iq_request_task +from nbxmpp.util import b64decode +from nbxmpp.util import b64encode +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.protocol import Iq +from nbxmpp.simplexml import Node +from nbxmpp.namespaces import Namespace +from nbxmpp.modules.base import BaseModule +from nbxmpp.modules.util import process_response + + +class VCardTemp(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [] + + @iq_request_task + def request_vcard(self, jid=None): + _task = yield + + response = yield _make_vcard_request(jid) + + if response.isError(): + raise StanzaError(response) + + vcard_node = _get_vcard_node(response) + yield VCard.from_node(vcard_node) + + @iq_request_task + def set_vcard(self, vcard, jid=None): + _task = yield + + response = yield _make_vcard_publish(jid, vcard) + yield process_response(response) + + +def _make_vcard_request(jid): + iq = Iq(typ='get', to=jid) + iq.addChild('vCard', namespace=Namespace.VCARD) + return iq + + +def _get_vcard_node(response): + vcard_node = response.getTag('vCard', namespace=Namespace.VCARD) + if vcard_node is None: + raise MalformedStanzaError('vCard node missing', response) + return vcard_node + + +def _make_vcard_publish(jid, vcard): + iq = Iq(typ='set', to=jid) + iq.addChild(node=vcard.to_node()) + return iq + + +@dataclass +class VCard: + data: dict = field(default_factory=dict) + + @classmethod + def from_node(cls, node): + dict_ = {} + for info in node.getChildren(): + name = info.getName() + if name in ('ADR', 'TEL', 'EMAIL'): + dict_.setdefault(name, []) + entry = {} + for child in info.getChildren(): + entry[child.getName()] = child.getData() + dict_[name].append(entry) + elif info.getChildren() == []: + dict_[name] = info.getData() + else: + dict_[name] = {} + for child in info.getChildren(): + dict_[name][child.getName()] = child.getData() + + return cls(data=dict_) + + def to_node(self): + vcard = Node(tag='vCard', attrs={'xmlns': Namespace.VCARD}) + for i in self.data: + if i == 'jid': + continue + if isinstance(self.data[i], dict): + child = vcard.addChild(i) + for j in self.data[i]: + child.addChild(j).setData(self.data[i][j]) + elif isinstance(self.data[i], list): + for j in self.data[i]: + child = vcard.addChild(i) + for k in j: + child.addChild(k).setData(j[k]) + else: + vcard.addChild(i).setData(self.data[i]) + return vcard + + def set_avatar(self, avatar, type_=None): + avatar = b64encode(avatar) + if 'PHOTO' not in self.data: + self.data['PHOTO'] = {} + + self.data['PHOTO']['BINVAL'] = avatar + + if type_ is not None: + self.data['PHOTO']['TYPE'] = type_ + + def get_avatar(self): + try: + avatar = self.data['PHOTO']['BINVAL'] + except Exception: + return None, None + + if not avatar: + return None, None + + avatar = b64decode(avatar, return_type=bytes) + avatar_sha = hashlib.sha1(avatar).hexdigest() + return avatar, avatar_sha ===================================== nbxmpp/namespaces.py ===================================== @@ -121,6 +121,7 @@ class _Namespaces: PUBKEY_PUBKEY: str = 'urn:xmpp:pubkey:2' PUBKEY_REVOKE: str = 'urn:xmpp:revoke:2' PUBSUB: str = 'http://jabber.org/protocol/pubsub' + PUBSUB_ERROR: str = 'http://jabber.org/protocol/pubsub#errors' PUBSUB_CONFIG: str = 'http://jabber.org/protocol/pubsub#node_config' PUBSUB_EVENT: str = 'http://jabber.org/protocol/pubsub#event' PUBSUB_OWNER: str = 'http://jabber.org/protocol/pubsub#owner' ===================================== nbxmpp/protocol.py ===================================== @@ -1072,6 +1072,12 @@ class Protocol(Node): if timestamp is not None: self.setTimestamp(timestamp) + def isError(self): + return self.getAttr('type') == 'error' + + def isResult(self): + return self.getAttr('type') == 'result' + def getTo(self): """ Return value of the 'to' attribute ===================================== nbxmpp/structs.py ===================================== @@ -73,10 +73,6 @@ StanzaIDData.__new__.__defaults__ = (None, None) PubSubEventData = namedtuple('PubSubEventData', 'node id item data deleted retracted purged') PubSubEventData.__new__.__defaults__ = (None, None, None, False, False, False) -PubSubConfigResult = namedtuple('PubSubConfigResult', 'jid node form') - -PubSubPublishResult = namedtuple('PubSubPublishResult', 'jid node id') - MoodData = namedtuple('MoodData', 'mood text') ActivityData = namedtuple('ActivityData', 'activity subactivity text') @@ -84,12 +80,6 @@ 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) - BookmarkData = namedtuple('BookmarkData', 'jid name nick autojoin password') BookmarkData.__new__.__defaults__ = (None, None, None, None) ===================================== nbxmpp/task.py ===================================== @@ -0,0 +1,283 @@ +# Copyright (C) 2020 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 weakref +import inspect +import logging +from enum import IntEnum +from functools import wraps + +from nbxmpp.errors import is_error +from nbxmpp.errors import CancelledError +from nbxmpp.simplexml import Node + + +log = logging.getLogger('nbxmpp.task') + + +class _ResultSet: + pass + +ResultSet = _ResultSet() + + +class NoType: + pass + + +class TaskState(IntEnum): + INIT = 0 + RUNNING = 1 + FINISHED = 2 + CANCELLED = 3 + + @property + def is_init(self): + return self == TaskState.INIT + + @property + def is_running(self): + return self == TaskState.RUNNING + + @property + def is_finished(self): + return self == TaskState.FINISHED + + @property + def is_cancelled(self): + return self == TaskState.CANCELLED + + +def iq_request_task(func): + @wraps(func) + def func_wrapper(self, *args, + callback=None, user_data=None, **kwargs): + task = IqRequestTask(func(self, *args, **kwargs), + self._log, + self._client) + self._client.add_task(task) + task.set_finalize_func(self._client.remove_task) + task.set_user_data(user_data) + if callback is not None: + task.add_done_callback(callback) + task.start() + return task + return func_wrapper + + +def is_fatal_error(error): + if is_error(error): + return error.is_fatal + return isinstance(error, Exception) + + +class Task: + + ''' + Base class for wrapping a generator method. + + It runs the generator depending on what the generator yields. If the + generator yields another generator a sub task is created. If it yields + a type defined in _process_types, _run_async() is called which needs to + be implemented by classes. + + the implementation of _run_async() must be really async, means it should + not call _async_finished() in the same mainloop cycle. Otherwise sub tasks + may break. _async_finished() needs to call _next_step(result). + ''' + + _process_types = (NoType,) + + def __init__(self, gen, logger=log): + self._logger = logger + self._gen = gen + self._done_callbacks = [] + self._sub_task = None + self._result = None + self._error = None + self._user_data = None + self._finalize_func = None + self._finalize_context = None + self._state = TaskState.INIT + + @property + def state(self): + return self._state + + def add_done_callback(self, callback, weak=True): + if self._state in (TaskState.FINISHED, TaskState.CANCELLED): + raise RuntimeError('Task is finished') + + if weak: + if inspect.ismethod(callback): + callback = weakref.WeakMethod(callback) + elif inspect.isfunction(callback): + callback = weakref.ref(callback) + else: + ValueError('Unknown callback object') + + self._done_callbacks.append(callback) + + def start(self): + if not self._state.is_init: + raise RuntimeError('Task already started') + + self._state = TaskState.RUNNING + next(self._gen) + self._next_step(self) + + def _run_async(self, data): + raise NotImplementedError + + def _async_finished(self, *args, **kwargs): + raise NotImplementedError + + def _sub_task_completed(self, task): + self._sub_task = None + if self._state.is_cancelled: + return + + result = task.get_result() + if is_fatal_error(result): + self._error = result + self._set_finished() + else: + self._next_step(result) + + def _next_step(self, result): + try: + res = self._gen.send(result) + except StopIteration: + self._set_finished() + return + + except Exception as error: + self._log_if_fatal(error) + self._error = error + self._set_finished() + return + + if isinstance(res, self._process_types): + self._run_async(res) + + elif isinstance(res, Task): + if self._sub_task is not None: + RuntimeError('Only one sub task can be active') + + self._sub_task = res + self._sub_task.add_done_callback(self._sub_task_completed, + weak=False) + + else: + if res is not ResultSet: + self._result = res + self._set_finished() + + def _set_finished(self): + self._state = TaskState.FINISHED + self._invoke_callbacks() + self._finalize() + + def _log_if_fatal(self, error): + if is_error(error): + if error.is_fatal: + self._logger.log(error.log_level, error) + + elif isinstance(error, Exception): + self._logger.exception('Fatal Exception') + + def _invoke_callbacks(self): + for callback in self._done_callbacks: + if isinstance(callback, weakref.WeakMethod): + callback = callback() + if callback is None: + return + + callback(self) + + def set_result(self, result): + self._result = result + return ResultSet + + def get_result(self): + # if self._error is None, there was no error + # but None is a valid value for self._result + if self._error is not None: + return self._error + return self._result + + def finish(self): + if self._error is not None: + raise self._error # pylint: disable=raising-bad-type + return self._result + + def set_user_data(self, user_data): + self._user_data = user_data + + def get_user_data(self): + return self._user_data + + def set_finalize_func(self, func, context=None): + self._finalize_func = func + self._finalize_context = context + + def cancel(self): + if self._state.is_cancelled: + return + + self._state = TaskState.CANCELLED + if self._sub_task is not None: + self._sub_task.cancel() + + self._error = CancelledError() + self._invoke_callbacks() + self._finalize() + + def _finalize(self): + self._done_callbacks.clear() + self._sub_task = None + self._error = None + self._result = None + self._user_data = None + self._gen.close() + if self._finalize_func is not None: + self._finalize_func(self, self._finalize_context) + + +class IqRequestTask(Task): + + ''' + A Task for running IQ requests + + ''' + + _process_types = (Node,) + + def __init__(self, gen, logger, client): + super().__init__(gen, logger) + self._client = client + + def _run_async(self, stanza): + self._client.send_stanza(stanza, callback=self._async_finished) + + def _async_finished(self, _client, result, *args, **kwargs): + if self._state != TaskState.CANCELLED: + self._next_step(result) + + def _finalize(self): + self._client = None + super()._finalize() ===================================== test/unit/test_avatar.py ===================================== @@ -2,27 +2,27 @@ from test.lib.util import StanzaHandlerTest from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler -from nbxmpp.structs import AvatarMetaData from nbxmpp.structs import PubSubEventData - +from nbxmpp.modules.user_avatar import AvatarMetaData +from nbxmpp.modules.user_avatar import AvatarInfo class AvatarTest(StanzaHandlerTest): def test_avatar_parsing(self): def _on_message(_con, _stanza, properties): - - data = AvatarMetaData(bytes='12345', - height='64', - width='64', - id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f', - type='image/png', - url='http://avatars.example.org/happy.gif') - + info = AvatarInfo(bytes='12345', + height='64', + width='64', + id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f', + type='image/png', + url='http://avatars.example.org/happy.gif') + + metadata = AvatarMetaData(infos=[info]) pubsub_event = PubSubEventData( node='urn:xmpp:avatar:metadata', id='111f4b3c50d7b0df729d299bc6f8e9ef9066971f', item=None, - data=data, + data=metadata, deleted=False, retracted=False, purged=False) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e59383ae5d02c29e8d3cff8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e59383ae5d02c29e8d3cff8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dataform: Don’t make boolean field selectable in read-only mode
by Philipp Hörist 21 Sep '20

21 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12ff88ef by lovetox at 2020-09-21T15:13:08+02:00 Dataform: Don’t make boolean field selectable in read-only mode - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -314,7 +314,6 @@ class BooleanField(Field): if self.read_only: label = _('Yes') if field.value else _('No') self._widget = Gtk.Label(label=label) - self._widget.set_selectable(True) self._widget.set_xalign(0) else: self._widget = Gtk.CheckButton() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12ff88ef08fbaaf50650682b7e3ed22a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/12ff88ef08fbaaf50650682b7e3ed22a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dataform: Make labels selectable in read-only mode
by Philipp Hörist 21 Sep '20

21 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d35fac41 by lovetox at 2020-09-21T15:03:41+02:00 Dataform: Make labels selectable in read-only mode - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -314,6 +314,7 @@ class BooleanField(Field): if self.read_only: label = _('Yes') if field.value else _('No') self._widget = Gtk.Label(label=label) + self._widget.set_selectable(True) self._widget.set_xalign(0) else: self._widget = Gtk.CheckButton() @@ -529,6 +530,7 @@ class TextSingleField(Field): if self.read_only: self._widget = Gtk.Label(label=field.value) self._widget.set_xalign(0) + self._widget.set_selectable(True) else: self._widget = Gtk.Entry() self._widget.set_text(field.value) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d35fac412950e0bfc17ed85cd54320ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d35fac412950e0bfc17ed85cd54320ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Bookmarks: Use Toolbar for Add/Remove buttons
by Philipp Hörist 20 Sep '20

20 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 055a59eb by Daniel Brötzmann at 2020-09-20T20:18:38+02:00 Bookmarks: Use Toolbar for Add/Remove buttons - - - - - b87e0ac7 by Daniel Brötzmann at 2020-09-20T20:18:39+02:00 BlockingList: Use toolbar buttons - - - - - 3e85c28f by Daniel Brötzmann at 2020-09-20T20:18:40+02:00 MamPreferences: Improve layout - - - - - 111a8bb4 by Daniel Brötzmann at 2020-09-20T20:18:41+02:00 GroupchatConfig: Fix deprecated properties, simplify styles - - - - - 438d3e05 by Daniel Brötzmann at 2020-09-20T20:18:42+02:00 Remove obsolete blocked_contacts_window.ui - - - - - 6 changed files: - − gajim/data/gui/blocked_contacts_window.ui - gajim/data/gui/blocking_list.ui - gajim/data/gui/bookmarks.ui - gajim/data/gui/groupchat_config.ui - gajim/data/gui/mam_preferences.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/blocked_contacts_window.ui deleted ===================================== @@ -1,72 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - <object class="GtkWindow" id="blocked_contacts_window"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Blocked Contacts</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_blocked_contacts_window_destroy" swapped="no"/> - <child> - <object class="GtkBox" id="vbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkScrolledWindow" id="contacts_scrolledwindow"> - <property name="width_request">250</property> - <property name="height_request">300</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="contacts_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <signal name="row-activated" handler="on_contacts_treeview_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="label" translatable="yes">_Unblock</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="border_width">3</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_remove_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - <child type="titlebar"> - <placeholder/> - </child> - </object> -</interface> ===================================== gajim/data/gui/blocking_list.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="blocking_store"> <columns>  @@ -14,85 +14,13 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">18</property> - <property name="row_spacing">5</property> <property name="column_spacing">10</property> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="spacing">5</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="add_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_add" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - <property name="non_homogeneous">True</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_remove" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - <property name="non_homogeneous">True</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="save_button"> - <property name="label">Save</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="always_show_image">True</property> - <signal name="clicked" handler="_on_save" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> <child> <object class="GtkOverlay" id="overlay"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <child> <object class="GtkScrolledWindow"> <property name="height_request">150</property> @@ -108,17 +36,17 @@ <property name="model">blocking_store</property> <property name="search_column">0</property> <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection2"/> + <object class="GtkTreeSelection"/> </child> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <object class="GtkTreeViewColumn"> <property name="title" translatable="yes">XMPP Address</property> <property name="expand">True</property> <property name="clickable">True</property> <property name="sort_indicator">True</property> <property name="sort_column_id">0</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext3"> + <object class="GtkCellRendererText"> <property name="editable">True</property> <property name="placeholder_text">user(a)example.org</property> <signal name="edited" handler="_jid_edited" swapped="no"/> @@ -143,5 +71,67 @@ <property name="width">2</property> </packing> </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">4</property> + <child> + <object class="GtkToolButton" id="add_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_on_add" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_remove" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="save_button"> + <property name="label">_Save</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_save" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> </object> </interface> ===================================== gajim/data/gui/bookmarks.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="bookmarks_store"> <columns>  @@ -19,62 +19,6 @@ <object class="GtkGrid" id="bookmarks_grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <signal name="clicked" handler="_on_add_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-add-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="remove_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <signal name="clicked" handler="_on_remove_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">list-remove-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> @@ -174,7 +118,6 @@ <object class="GtkTreeViewColumn"> <property name="sizing">fixed</property> <property name="title" translatable="yes">Autojoin</property> - <property name="alignment">0.5</property> <property name="sort_indicator">True</property> <property name="sort_column_id">4</property> <child> @@ -203,25 +146,61 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkToolbar"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">4</property> <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Apply</property> + <object class="GtkToolButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> - <signal name="clicked" handler="_on_apply_clicked" swapped="no"/> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="_on_add_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="homogeneous">True</property> </packing> </child> + <child> + <object class="GtkToolButton" id="remove_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="_on_remove_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <style> + <class name="inline-toolbar"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Apply</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="halign">end</property> + <property name="valign">end</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_apply_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="left_attach">1</property> ===================================== gajim/data/gui/groupchat_config.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="affiliation_store"> <columns>  @@ -48,10 +48,6 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> - <property name="margin_right">12</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> <property name="label" translatable="yes"><b>XMPP Address</b> &lt;user@domain/resource&gt; (only that resource matches) &lt;user@domain&gt; (any resource matches) @@ -59,6 +55,9 @@ &lt;domain&gt; (the domain itself matches, as does any user@domain or domain/resource) </property> <property name="use_markup">True</property> + <style> + <class name="padding-6"/> + </style> </object> </child> </object> @@ -86,18 +85,16 @@ <property name="height_request">500</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="hexpand">False</property> + <property name="spacing">12</property> <child> <object class="GtkBox" id="treeview_buttonbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="valign">start</property> - <property name="margin_left">12</property> <property name="vexpand">False</property> <property name="spacing">6</property> <child> @@ -113,9 +110,6 @@ <property name="icon_name">dialog-information-symbolic</property> </object> </child> - <style> - <class name="suggested-action"/> - </style> </object> <packing> <property name="expand">False</property> @@ -148,16 +142,19 @@ </child> <child> <object class="GtkButton" id="remove_button"> - <property name="label" translatable="yes">Remove</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Only Admins and Owners can modify the affiliation</property> <signal name="clicked" handler="_on_remove" swapped="no"/> - <style> - <class name="destructive-action"/> - </style> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">list-remove-symbolic</property> + </object> + </child> </object> <packing> <property name="expand">False</property> @@ -173,51 +170,43 @@ </packing> </child> <child> - <object class="GtkButtonBox" id="close_ok_button_box"> + <object class="GtkButton" id="ok_button"> + <property name="label">_Apply</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_cancel" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_ok" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_ok" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="pack_type">end</property> - <property name="position">1</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label">_Cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cancel" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack_type">end</property> + <property name="position">3</property> </packing> </child> + <style> + <class name="margin-12"/> + </style> </object> <packing> <property name="left_attach">1</property> @@ -230,7 +219,6 @@ <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="transition_duration">300</property> <property name="transition_type">crossfade</property> <signal name="notify::visible-child-name" handler="_on_switch_page" swapped="no"/> <child> ===================================== gajim/data/gui/mam_preferences.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.22"/> <object class="GtkListStore" id="default_store"> <columns>  @@ -135,7 +135,6 @@ <object class="GtkTreeViewColumn"> <property name="title" translatable="yes">Archive</property> <property name="clickable">True</property> - <property name="alignment">0.5</property> <property name="sort_indicator">True</property> <property name="sort_column_id">1</property> <child> @@ -177,7 +176,6 @@ <object class="GtkToolButton" id="add"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Add</property> <property name="use_underline">True</property> <property name="icon_name">list-add-symbolic</property> <signal name="clicked" handler="_on_add" swapped="no"/> @@ -191,7 +189,6 @@ <object class="GtkToolButton" id="remove"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Remove</property> <property name="use_underline">True</property> <property name="icon_name">list-remove-symbolic</property> <signal name="clicked" handler="_on_remove" swapped="no"/> @@ -217,7 +214,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="valign">center</property> + <property name="valign">end</property> <property name="use_underline">True</property> <signal name="clicked" handler="_on_save" swapped="no"/> <style> ===================================== gajim/data/style/gajim.css ===================================== @@ -195,12 +195,12 @@ infobar.error > revealer > box { .groupchat-roster treeview { padding-left: 4px; } /* GroupchatConfig */ -#GroupchatConfig > box > buttonbox { margin: 0px 12px 12px 12px; } #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} #GroupchatConfig stacksidebar > scrolledwindow { - background-color:@theme_base_color; + background-color: @theme_base_color; border-bottom: 1px solid; - border-color: @borders;} + border-color: @borders; +} #GroupchatConfig treeview { padding: 5px; } /* Popover Treeview */ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d1f5ba5c7e5c99284e6314ce2070d77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d1f5ba5c7e5c99284e6314ce2070d77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: GroupChatJoin: Set NickChooser sensitiviy depending on state
by Philipp Hörist 20 Sep '20

20 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: c1e1c5f0 by Daniel Brötzmann at 2020-09-20T16:23:10+02:00 GroupChatJoin: Set NickChooser sensitiviy depending on state - - - - - e20c298f by Daniel Brötzmann at 2020-09-20T17:08:04+02:00 GroupChatControl: Improve strings and layout - - - - - 7ecb2136 by Daniel Brötzmann at 2020-09-20T17:09:04+02:00 GroupChatSettingsScrolled: Improve string - - - - - d1f5ba5c by Daniel Brötzmann at 2020-09-20T17:11:49+02:00 Remove obsolete join_groupchat_window.ui - - - - - 4 changed files: - gajim/data/gui/groupchat_control.ui - − gajim/data/gui/join_groupchat_window.ui - gajim/gtk/groupchat_join.py - gajim/gtk/groupchat_settings.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -33,7 +33,7 @@ <property name="can_focus">False</property> <property name="valign">start</property> <property name="vexpand">True</property> - <property name="label" translatable="yes">Drop files or contacts</property> + <property name="label" translatable="yes">Drop Files or Contacts</property> <property name="wrap">True</property> <property name="max_width_chars">40</property> <style> @@ -563,6 +563,7 @@ <property name="can_focus">False</property> <property name="halign">center</property> <property name="valign">center</property> + <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="row_spacing">6</property> <child> @@ -639,7 +640,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Enter new nickname</property> + <property name="label" translatable="yes">Enter Nickname</property> <property name="xalign">0</property> <style> <class name="bold16"/> @@ -818,7 +819,11 @@ <object class="GtkTextView" id="subject_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="wrap_mode">word</property> + <property name="wrap_mode">word-char</property> + <property name="left_margin">3</property> + <property name="right_margin">3</property> + <property name="top_margin">3</property> + <property name="bottom_margin">3</property> </object> </child> </object> @@ -858,7 +863,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Enter password</property> + <property name="label" translatable="yes">Enter Password</property> <property name="xalign">0</property> <style> <class name="bold16"/> @@ -1096,7 +1101,7 @@ </child> <child> <object class="GtkButton" id="retry_button"> - <property name="label" translatable="yes">_Retry</property> + <property name="label" translatable="yes">T_ry Again</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -1150,7 +1155,7 @@ <object class="GtkLabel" id="error_heading"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">An error occurred</property> + <property name="label" translatable="yes">An Error Occurred</property> <property name="justify">center</property> <property name="wrap">True</property> <property name="max_width_chars">40</property> @@ -1215,7 +1220,7 @@ </child> <child> <object class="GtkButton" id="captcha_try_again_button"> - <property name="label" translatable="yes">_Try again</property> + <property name="label" translatable="yes">_Try Again</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -1363,7 +1368,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Kick participant</property> + <property name="label" translatable="yes">Kick Participant</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> <property name="max_width_chars">22</property> @@ -1489,7 +1494,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Ban participant</property> + <property name="label" translatable="yes">Ban Participant</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> <property name="max_width_chars">22</property> @@ -1615,7 +1620,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="margin_bottom">6</property> - <property name="label" translatable="yes">Destroy group chat</property> + <property name="label" translatable="yes">Destroy This Chat</property> <property name="ellipsize">end</property> <property name="single_line_mode">True</property> <property name="max_width_chars">22</property> @@ -1773,7 +1778,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Enter a new name for this group chat</property> + <property name="label" translatable="yes">Rename This Chat</property> <property name="xalign">0</property> <style> <class name="bold16"/> ===================================== gajim/data/gui/join_groupchat_window.ui deleted ===================================== @@ -1,461 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkListStore" id="account_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkListStore" id="recently_liststorex"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkPopoverMenu" id="recently_popover"> - <property name="can_focus">False</property> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="margin_left">6</property> - <property name="margin_right">6</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="max_content_width">300</property> - <property name="max_content_height">300</property> - <property name="propagate_natural_width">True</property> - <property name="propagate_natural_height">True</property> - <child> - <object class="GtkTreeView" id="recently_treeview"> - <property name="name">recently_treeview</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">recently_liststorex</property> - <property name="headers_visible">False</property> - <property name="enable_search">False</property> - <property name="hover_selection">True</property> - <property name="show_expanders">False</property> - <property name="activate_on_single_click">True</property> - <signal name="row-activated" handler="_on_recent_selected" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">column</property> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">3</attribute> - </attributes> - </child> - </object> - </child> - <style> - <class name="popover_treeview"/> - </style> - </object> - </child> - </object> - <packing> - <property name="submenu">main</property> - <property name="position">1</property> - </packing> - </child> - </object> - <object class="GtkBox" id="main_box"> - <property name="width_request">400</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> - <child> - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkSwitch" id="autojoin_switch"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Join group chat every time Gajim is started</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="active">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="label" translatable="yes">Join Automatically</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="account_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="margin_bottom">12</property> - <property name="label" translatable="yes">Account</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="room_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Group chat</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="server_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Server</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="password_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Password</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nick_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Nickname</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="height_request">6</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="height_request">6</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="bookmark_switch"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Bookmark group chat</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="active">True</property> - <signal name="notify::active" handler="_on_bookmark_activate" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="label" translatable="yes">Bookmark</property> - <property name="justify">right</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="account_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin_bottom">12</property> - <property name="model">account_liststore</property> - <property name="id_column">0</property> - <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkEntry" id="room_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <signal name="changed" handler="_on_jid_detection_changed" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="recently_button"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Recently used group chats</property> - <property name="popover">recently_popover</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-open-recent-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="search_button"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Search group chats on selected server</property> - <signal name="clicked" handler="_on_search_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-search-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="server_combo"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="can_focus">True</property> - <property name="caps_lock_warning">False</property> - <signal name="changed" handler="_on_jid_detection_changed" swapped="no"/> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="button_box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_cancel_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="join_button"> - <property name="label" translatable="yes">Join</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_join_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -94,6 +94,7 @@ class GroupchatJoin(Gtk.ApplicationWindow): def _on_page_changed(self, stack, _param): name = stack.get_visible_child_name() self._join_button.set_sensitive(name == 'info') + self._nick_chooser.set_sensitive(name == 'info') @ensure_not_destroyed def _disco_info_received(self, result): ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -34,7 +34,7 @@ class GroupChatSettingsScrolled(Gtk.ScrolledWindow): box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) box.set_valign(Gtk.Align.CENTER) - label = Gtk.Label(label=_('Settings for this Chat')) + label = Gtk.Label(label=_('Settings For This Chat')) label.get_style_context().add_class('bold16') label.set_halign(Gtk.Align.CENTER) box.add(label) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/922cfc64e287653b1ebc3226077d4a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/922cfc64e287653b1ebc3226077d4a0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Preferences: Remove not needed callback
by Philipp Hörist 20 Sep '20

20 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 922cfc64 by lovetox at 2020-09-20T15:49:00+02:00 Preferences: Remove not needed callback Fixes #10275 - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -408,8 +408,7 @@ class GroupChats(PreferenceBox): SettingType.CONFIG, 'gc_sync_threshold_public_default', desc=_('Default for new public group chats'), - props={'entries': THRESHOLD_OPTIONS}, - callback=self._on_sync_threshold_changed), + props={'entries': THRESHOLD_OPTIONS}), Setting(SettingKind.SWITCH, _('Show Joined / Left'), @@ -437,10 +436,6 @@ class GroupChats(PreferenceBox): PreferenceBox.__init__(self, settings) - @staticmethod - def _on_sync_threshold_changed(value, *args): - app.settings.set('public_room_sync_threshold', int(value)) - @staticmethod def _on_sort_by_show_in_muc(*args): for ctrl in get_app_window('Preferences').get_all_muc_controls(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/922cfc64e287653b1ebc3226077d4a0b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/922cfc64e287653b1ebc3226077d4a0b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Add settings page
by Philipp Hörist 20 Sep '20

20 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 854927e0 by Daniel Brötzmann at 2020-09-20T10:34:51+02:00 GroupChatControl: Add settings page - - - - - 4 changed files: - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py - + gajim/gtk/groupchat_settings.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -1940,6 +1940,67 @@ <property name="position">13</property> </packing> </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkGrid" id="settings_grid"> + <property name="name">settings_grid</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">18</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="margin_top">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_Close</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_page_cancel_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">muc-settings</property> + <property name="position">14</property> + </packing> + </child> </object> <packing> <property name="index">-1</property> ===================================== gajim/groupchat_control.py ===================================== @@ -73,12 +73,12 @@ from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget from gajim.gtk.groupchat_info import GroupChatInfoScrolled from gajim.gtk.groupchat_invite import GroupChatInvite +from gajim.gtk.groupchat_settings import GroupChatSettingsScrolled from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_app_window from gajim.gtk.const import ControlType - log = logging.getLogger('gajim.groupchat_control') @@ -177,6 +177,12 @@ class GroupchatControl(ChatControlBase): self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) + # Groupchat settings + self._groupchat_settings_box = GroupChatSettingsScrolled( + self.account, self.room_jid, self.context) + self.xml.settings_grid.attach(self._groupchat_settings_box, 0, 0, 1, 1) + + # Groupchat invite self.xml.quick_invite_button.set_action_name( 'win.invite-%s' % self.control_id) @@ -279,6 +285,7 @@ class GroupchatControl(ChatControlBase): def add_actions(self): super().add_actions() actions = [ + ('groupchat-settings-', None, self._on_groupchat_settings), ('rename-groupchat-', None, self._on_rename_groupchat), ('change-subject-', None, self._on_change_subject), ('change-nickname-', None, self._on_change_nick), @@ -305,66 +312,6 @@ class GroupchatControl(ChatControlBase): act.connect("activate", func) self.parent_win.window.add_action(act) - minimize = self.contact.settings.get('minimize_on_close') - - act = Gio.SimpleAction.new_stateful( - 'minimize-on-close-' + self.control_id, None, - GLib.Variant.new_boolean(minimize)) - act.connect('change-state', self._on_minimize_on_close) - self.parent_win.window.add_action(act) - - minimize = self.contact.settings.get('minimize_on_autojoin') - - act = Gio.SimpleAction.new_stateful( - 'minimize-on-autojoin-' + self.control_id, None, - GLib.Variant.new_boolean(minimize)) - act.connect('change-state', self._on_minimize_on_autojoin) - self.parent_win.window.add_action(act) - - chatstate = self.contact.settings.get('send_chatstate') - - act = Gio.SimpleAction.new_stateful( - 'send-chatstate-' + self.control_id, - GLib.VariantType.new("s"), - GLib.Variant("s", chatstate)) - act.connect('change-state', self._on_send_chatstate) - self.parent_win.window.add_action(act) - - value = self.contact.settings.get('notify_on_all_messages', - context=self.context) - - act = Gio.SimpleAction.new_stateful( - 'notify-on-message-' + self.control_id, - None, GLib.Variant.new_boolean(value)) - act.connect('change-state', self._on_notify_on_all_messages) - self.parent_win.window.add_action(act) - - value = self.contact.settings.get('print_status') - - act = Gio.SimpleAction.new_stateful( - 'print-status-' + self.control_id, - None, GLib.Variant.new_boolean(value)) - act.connect('change-state', self._on_print_status) - self.parent_win.window.add_action(act) - - value = self.contact.settings.get('print_join_left') - - act = Gio.SimpleAction.new_stateful( - 'print-join-left-' + self.control_id, - None, GLib.Variant.new_boolean(value)) - act.connect('change-state', self._on_print_join_left) - self.parent_win.window.add_action(act) - - threshold = self.contact.settings.get('sync_threshold', - context=self.context) - - initial = GLib.Variant.new_string(str(threshold)) - act = Gio.SimpleAction.new_stateful( - 'choose-sync-' + self.control_id, - initial.get_type(), initial) - act.connect('change-state', self._on_sync_threshold) - self.parent_win.window.add_action(act) - def update_actions(self, *args): if self.parent_win is None: return @@ -427,16 +374,6 @@ class GroupchatControl(ChatControlBase): vcard_support and contact.affiliation.is_owner) - # Print join/left - value = self.contact.settings.get('print_join_left') - self._get_action('print-join-left-').set_state( - GLib.Variant.new_boolean(value)) - - # Print join/left - value = self.contact.settings.get('print_status') - self._get_action('print-status-').set_state( - GLib.Variant.new_boolean(value)) - self._get_action('contact-information-').set_enabled(self.is_connected) self._get_action('execute-command-').set_enabled(self.is_connected) @@ -448,6 +385,7 @@ class GroupchatControl(ChatControlBase): def remove_actions(self): super().remove_actions() actions = [ + 'groupchat-settings-', 'rename-groupchat-', 'change-subject-', 'change-nickname-', @@ -464,13 +402,6 @@ class GroupchatControl(ChatControlBase): 'kick-', 'change-role-', 'change-affiliation-', - 'minimize-on-close-', - 'minimize-on-autojoin-', - 'send-chatstate-', - 'notify-on-message-', - 'print-status-', - 'print-join-left-', - 'choose-sync-', ] for action in actions: @@ -531,19 +462,10 @@ class GroupchatControl(ChatControlBase): def _on_disco_update(self, _event): if self.parent_win is None: return - win = self.parent_win.window self.update_actions() self.draw_banner_text() - # After the room has been created, reevaluate threshold - if self.disco_info.has_mam: - threshold = self.contact.settings.get('sync_threshold', - context=self.context) - win.change_action_state('choose-sync-%s' % self.control_id, - GLib.Variant('s', str(threshold))) - # Actions - def _on_disconnect(self, _action, _param): self.leave() @@ -555,6 +477,9 @@ class GroupchatControl(ChatControlBase): self._subject_data.user_timestamp) self._show_page('muc-info') + def _on_groupchat_settings(self, _action, _param): + self._show_page('muc-settings') + def _on_invite(self, _action, _param): self._invite_box.load_contacts() self._show_page('invite') @@ -629,14 +554,6 @@ class GroupchatControl(ChatControlBase): return GroupchatConfig(self.account, result.jid, 'owner', result.form) - def _on_print_join_left(self, action, param): - action.set_state(param) - self.contact.settings.set('print_join_left', param.get_boolean()) - - def _on_print_status(self, action, param): - action.set_state(param) - self.contact.settings.set('print_status', param.get_boolean()) - def _on_request_voice(self, _action, _param): """ Request voice in the current room @@ -644,29 +561,6 @@ class GroupchatControl(ChatControlBase): con = app.connections[self.account] con.get_module('MUC').request_voice(self.room_jid) - def _on_minimize_on_close(self, action, param): - action.set_state(param) - self.contact.settings.set('minimize_on_close', param.get_boolean()) - - def _on_minimize_on_autojoin(self, action, param): - action.set_state(param) - self.contact.settings.set('minimize_on_autojoin', param.get_boolean()) - - def _on_send_chatstate(self, action, param): - action.set_state(param) - self.contact.settings.set('send_chatstate', param.get_string()) - - def _on_notify_on_all_messages(self, action, param): - action.set_state(param) - self.contact.settings.set('notify_on_all_messages', param.get_boolean()) - - def _on_sync_threshold(self, action, param): - threshold = param.get_string() - action.set_state(param) - self.contact.settings.set('sync_threshold', - int(threshold), - context=self.context) - def _on_execute_command(self, _action, param): jid = self.room_jid nick = param.get_string() ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -0,0 +1,111 @@ +# This file is part of Gajim. +# +# Gajim 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; version 3 only. +# +# Gajim 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 Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim.common.const import THRESHOLD_OPTIONS +from gajim.common.i18n import _ + +from gajim.gtk.const import Setting +from gajim.gtk.const import SettingKind +from gajim.gtk.const import SettingType +from gajim.gtk.settings import SettingsBox + + +class GroupChatSettingsScrolled(Gtk.ScrolledWindow): + def __init__(self, account, jid, context): + Gtk.ScrolledWindow.__init__(self) + self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + self.set_max_content_height(400) + self.set_propagate_natural_height(True) + self.set_hexpand(True) + self.set_vexpand(True) + + box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=18) + box.set_valign(Gtk.Align.CENTER) + label = Gtk.Label(label=_('Settings for this Chat')) + label.get_style_context().add_class('bold16') + label.set_halign(Gtk.Align.CENTER) + box.add(label) + + chat_settings = ChatSettings(account, jid, context) + box.add(chat_settings) + + self.add(box) + self.show_all() + + +class GroupchatSettingsBox(SettingsBox): + def __init__(self, account, jid, settings): + SettingsBox.__init__(self, account, jid) + + self.get_style_context().add_class('settings-border') + self.set_selection_mode(Gtk.SelectionMode.NONE) + + for setting in settings: + self.add_setting(setting) + self.update_states() + + +class ChatSettings(GroupchatSettingsBox): + def __init__(self, account, jid, context): + + chat_state = { + 'disabled': _('Disabled'), + 'composing_only': _('Composing Only'), + 'all': _('All Chat States') + } + + settings = [ + Setting(SettingKind.SWITCH, + _('Show Join/Leave'), + SettingType.GROUP_CHAT, + 'print_join_left'), + + Setting(SettingKind.SWITCH, + _('Show Status Changes'), + SettingType.GROUP_CHAT, + 'print_status'), + + Setting(SettingKind.SWITCH, + _('Notify on all Messages'), + SettingType.GROUP_CHAT, + 'notify_on_all_messages', + context=context), + + Setting(SettingKind.SWITCH, + _('Minimize on Close'), + SettingType.GROUP_CHAT, + 'minimize_on_close'), + + Setting(SettingKind.SWITCH, + _('Minimize When Joining Automatically'), + SettingType.GROUP_CHAT, + 'minimize_on_autojoin'), + + Setting(SettingKind.POPOVER, + _('Send Chat State'), + SettingType.GROUP_CHAT, + 'send_chatstate', + props={'entries': chat_state}), + + Setting(SettingKind.POPOVER, + _('Sync Threshold'), + SettingType.GROUP_CHAT, + 'sync_threshold', + context=context, + props={'entries': THRESHOLD_OPTIONS}), + ] + + GroupchatSettingsBox.__init__(self, account, jid, settings) ===================================== gajim/gui_menu_builder.py ===================================== @@ -25,7 +25,6 @@ from gajim.common.helpers import is_role_change_allowed from gajim.common.i18n import _ from gajim.common.const import URIType from gajim.common.const import URIAction -from gajim.common.const import THRESHOLD_OPTIONS from gajim.gtk.util import get_builder from gajim.gtk.const import ControlType @@ -572,6 +571,7 @@ def get_singlechat_menu(control_id, account, jid): def get_groupchat_menu(control_id, account, jid): groupchat_menu = [ ('win.information-', _('Information')), + ('win.groupchat-settings-', _('Settings…')), (_('Manage Group Chat'), [ ('win.rename-groupchat-', _('Rename…')), ('win.change-subject-', _('Change Subject…')), @@ -579,16 +579,6 @@ def get_groupchat_menu(control_id, account, jid): ('win.configure-', _('Configure…')), ('win.destroy-', _('Destroy…')), ]), - (_('Chat Settings'), [ - ('win.print-join-left-', _('Show Join/Leave')), - ('win.print-status-', _('Show Status Changes')), - ('win.notify-on-message-', _('Notify on all Messages')), - ('win.minimize-on-close-', _('Minimize on Close')), - ('win.minimize-on-autojoin-', - _('Minimize When Joining Automatically')), - (_('Send Chatstate'), ['chatstate']), - ]), - (_('Sync Threshold'), ['sync']), ('win.change-nickname-', _('Change Nickname…')), ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute Command…')), @@ -620,38 +610,10 @@ def get_groupchat_menu(control_id, account, jid): menu.append(label, action_name + control_id) else: label, sub_menu = item - if 'sync' in sub_menu: - # Sync threshold menu - submenu = build_sync_menu() - elif 'chatstate' in sub_menu: - submenu = build_chatstate_menu() - else: - # This is a submenu - submenu = build_menu(sub_menu) + submenu = build_menu(sub_menu) menu.append_submenu(label, submenu) return menu - def build_sync_menu(): - menu = Gio.Menu() - action_name = 'win.choose-sync-%s::' % control_id - for days, label in THRESHOLD_OPTIONS.items(): - menu.append(label, '%s%s' % (action_name, days)) - return menu - - def build_chatstate_menu(): - menu = Gio.Menu() - entries = [ - (_('Disabled'), 'disabled'), - (_('Composing only'), 'composing_only'), - (_('All chat states'), 'all') - ] - - for entry in entries: - label, setting = entry - action = 'win.send-chatstate-%s::%s' % (control_id, setting) - menu.append(label, action) - return menu - return build_menu(groupchat_menu) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/854927e0e69bfdac1ffb7e4f48d834e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/854927e0e69bfdac1ffb7e4f48d834e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add option to remove old chat history
by Philipp Hörist 20 Sep '20

20 Sep '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 50f2fa49 by Daniel Brötzmann at 2020-09-20T08:11:02+02:00 Add option to remove old chat history - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/gtk/accounts.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -251,9 +251,10 @@ ACCOUNT_SETTINGS = { 'ft_send_local_ips': True, 'opened_chat_controls': '', 'recent_groupchats': '', - 'filetransfer_preference' : 'httpupload', + 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'chat_history_max_age': -1, }, 'contact': { ===================================== gajim/common/storage/archive.py ===================================== @@ -112,6 +112,7 @@ class MessageArchiveStorage(SqliteStorage): self._con.create_function("get_timeout", 0, self._get_timeout) self._get_jid_ids_from_db() + self._cleanup_chat_history() def _namedtuple_factory(self, cursor, row): fields = [col[0] for col in cursor.description] @@ -975,3 +976,22 @@ class MessageArchiveStorage(SqliteStorage): self._con.execute(sql, (jid_id,)) log.info('Reset message archive info: %s', jid) self._delayed_commit() + + def _cleanup_chat_history(self): + """ + Remove messages from account where messages are older than max_age + """ + for account in app.settings.get_accounts(): + max_age = app.settings.get_account_setting( + account, 'chat_history_max_age') + if max_age == -1: + continue + account_id = self.get_account_id(account) + now = time.time() + point_in_time = now - int(max_age) + + sql = 'DELETE FROM logs WHERE account_id = ? AND time < ?' + + cursor = self._con.execute(sql, (account_id, point_in_time)) + self._delayed_commit() + log.info('Removed %s old messages for %s', cursor.rowcount, account) ===================================== gajim/gtk/accounts.py ===================================== @@ -654,6 +654,17 @@ class PrivacyPage(GenericSettingPage): name = 'privacy' def __init__(self, account): + self._account = account + + history_max_age = { + -1: _('Forever'), + 86400: _('1 Day'), + 604800: _('1 Week'), + 2629743: _('1 Month'), + 7889229: _('3 Months'), + 15778458: _('6 Months'), + 31556926: _('1 Year'), + } chatstate_entries = { 'all': _('Enabled'), @@ -691,7 +702,7 @@ class PrivacyPage(GenericSettingPage): 'send_chatstate_default', desc=_('Default for chats'), props={'entries': chatstate_entries, - 'button-text':_('Reset'), + 'button-text': _('Reset'), 'button-tooltip': _('Reset all chats to the ' 'current default value'), 'button-style': 'destructive-action', @@ -703,13 +714,19 @@ class PrivacyPage(GenericSettingPage): 'gc_send_chatstate_default', desc=_('Default for group chats'), props={'entries': chatstate_entries, - 'button-text':_('Reset'), + 'button-text': _('Reset'), 'button-tooltip': _('Reset all group chats to the ' 'current default value'), 'button-style': 'destructive-action', 'button-callback': self._reset_gc_send_chatstate}), - ] + Setting(SettingKind.POPOVER, + _('Keep Chat History'), + SettingType.ACCOUNT_CONFIG, + 'chat_history_max_age', + props={'entries': history_max_age}, + desc=_('How long Gajim should keep your chat history')), + ] GenericSettingPage.__init__(self, account, settings) @staticmethod View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/50f2fa49017c7ac1c39fb61a4a1616fd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/50f2fa49017c7ac1c39fb61a4a1616fd… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
...
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2020