Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] 2 commits: Add PubSub (XEP-0060) module
by Philipp Hörist 28 Jan '19

28 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6e946d5f by Philipp Hörist at 2019-01-28T21:16:46Z Add PubSub (XEP-0060) module - - - - - 18edd864 by Philipp Hörist at 2019-01-28T21:18:17Z Handle pubsub events for XEP-0172 - - - - - 4 changed files: - nbxmpp/dispatcher_nb.py - nbxmpp/modules/nickname.py - + nbxmpp/modules/pubsub.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -56,6 +56,7 @@ from nbxmpp.modules.vcard_avatar import VCardAvatar from nbxmpp.modules.captcha import Captcha from nbxmpp.modules.entity_caps import EntityCaps from nbxmpp.modules.blocking import Blocking +from nbxmpp.modules.pubsub import PubSub from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -179,6 +180,7 @@ class XMPPDispatcher(PlugIn): self._modules['VCardAvatar'] = VCardAvatar(self._owner) self._modules['EntityCaps'] = EntityCaps(self._owner) self._modules['Blocking'] = Blocking(self._owner) + self._modules['PubSub'] = PubSub(self._owner) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/nickname.py ===================================== @@ -18,6 +18,8 @@ import logging from nbxmpp.protocol import NS_NICK +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import Node from nbxmpp.structs import StanzaHandler from nbxmpp.const import PresenceType @@ -28,6 +30,10 @@ class Nickname: def __init__(self, client): self._client = client self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_nickname, + ns=NS_PUBSUB_EVENT, + priority=16), StanzaHandler(name='message', callback=self._process_nickname, ns=NS_NICK, @@ -51,9 +57,29 @@ class Nickname: return properties.nickname = self._parse_nickname(stanza) + def _process_pubsub_nickname(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return + + if properties.pubsub_event.node != NS_NICK: + return + + nick = self._parse_nickname(properties.pubsub_event.item) + log.info('Received nickname: %s - %s', properties.jid, nick) + + properties.pubsub_event = properties.pubsub_event._replace(data=nick) + @staticmethod def _parse_nickname(stanza): nickname = stanza.getTag('nick', namespace=NS_NICK) if nickname is None: return return nickname.getData() or None + + def set_nickname(self, nickname): + item = Node('nick', {'xmlns': NS_NICK}) + if nickname is not None: + item.addData(nickname) + jid = self._client.get_bound_jid().getBare() + self._client.get_module('PubSub').publish( + jid, NS_NICK, item, id_='current') ===================================== nbxmpp/modules/pubsub.py ===================================== @@ -0,0 +1,75 @@ +# Copyright (C) 2018 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +import logging + +from nbxmpp.protocol import NS_PUBSUB +from nbxmpp.protocol import NS_PUBSUB_EVENT +from nbxmpp.protocol import Iq +from nbxmpp.protocol import isResultNode +from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import PubSubEventData +from nbxmpp.structs import CommonResult +from nbxmpp.util import call_on_response +from nbxmpp.util import callback + + +log = logging.getLogger('nbxmpp.m.pubsub') + + +class PubSub: + def __init__(self, client): + self._client = client + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_pubsub_base, + ns=NS_PUBSUB_EVENT, + priority=15), + ] + + def _process_pubsub_base(self, _con, stanza, properties): + event = stanza.getTag('event', namespace=NS_PUBSUB_EVENT) + items = event.getTag('items') + if len(items.getChildren()) != 1: + log.warning('PubSub event with more than one item') + log.warning(stanza) + node = items.getAttr('node') + item = items.getTag('item') + id_ = item.getAttr('id') + properties.pubsub_event = PubSubEventData(node, id_, item, None) + + @call_on_response('_default_response') + def publish(self, jid, node, item, id_=None, options=None): + query = Iq('set', to=jid) + pubsub = query.addChild('pubsub', namespace=NS_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 _default_response(self, stanza): + if not isResultNode(stanza): + log.info('Error: %s', stanza.getError()) + return CommonResult(jid=stanza.getFrom(), + error=stanza.getError()) + return CommonResult(jid=stanza.getFrom()) ===================================== nbxmpp/structs.py ===================================== @@ -58,6 +58,8 @@ HTTPAuthData.__new__.__defaults__ = (None, None, None, None) StanzaIDData = namedtuple('StanzaIDData', 'id by') StanzaIDData.__new__.__defaults__ = (None, None) +PubSubEventData = namedtuple('PubSubEventData', 'node id item data') + class MAMData(namedtuple('MAMData', 'id query_id archive namespace timestamp')): @@ -103,6 +105,11 @@ class MessageProperties: self.voice_request = None self.self_message = False self.mam = None + self.pubsub_event = None + + @property + def is_pubsub_event(self): + return self.pubsub_event is not None @property def is_mam_message(self): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/396c27a9462edc4fd4288b1ed… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/396c27a9462edc4fd4288b1ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Fix BOSH disconnect
by Philipp Hörist 26 Jan '19

26 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 396c27a9 by Philipp Hörist at 2019-01-26T22:54:57Z Fix BOSH disconnect - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== @@ -623,7 +623,10 @@ class XMPPDispatcher(PlugIn): continue if _id in self.on_responses: if len(self._expected) == 1: - self._owner.onreceive(None) + if hasattr(self._owner, 'onreceive'): + # With BOSH we get a terminating body with multiple stanzas + # in it, we unplug BOSH before we parse the stanzas + self._owner.onreceive(None) resp, args = self.on_responses[_id] del self.on_responses[_id] if args is None: View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/396c27a9462edc4fd4288b1ed7… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/396c27a9462edc4fd4288b1ed7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Make OpenSSL a hard dependency
by Philipp Hörist 26 Jan '19

26 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 8506f734 by André Apitzsch at 2019-01-24T21:17:44Z Make OpenSSL a hard dependency - - - - - f60eb4d2 by Philipp Hörist at 2019-01-26T22:54:49Z Merge branch 'openssl' into 'master' Make OpenSSL a hard dependency See merge request gajim/python-nbxmpp!29 - - - - - 3 changed files: - nbxmpp/tls_nb.py - nbxmpp/transports_nb.py - setup.cfg Changes: ===================================== nbxmpp/tls_nb.py ===================================== @@ -15,7 +15,6 @@ ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ## GNU General Public License for more details. -import ssl import sys import os import time @@ -26,24 +25,10 @@ from .plugin import PlugIn log = logging.getLogger('nbxmpp.tls_nb') -USE_PYOPENSSL = False - PYOPENSSL = 'PYOPENSSL' -PYSTDLIB = 'PYSTDLIB' - -try: - #raise ImportError("Manually disabled PyOpenSSL") - import OpenSSL.SSL - import OpenSSL.crypto - USE_PYOPENSSL = True - log.info("PyOpenSSL loaded") -except ImportError: - log.debug("Import of PyOpenSSL failed:", exc_info=True) - - # FIXME: Remove these prints before release, replace with a warning dialog. - print("=" * 79, file=sys.stderr) - print("PyOpenSSL not found, falling back to Python builtin SSL objects (insecure).", file=sys.stderr) - print("=" * 79, file=sys.stderr) + +import OpenSSL.SSL +import OpenSSL.crypto def gattr(obj, attr, default=None): try: @@ -209,44 +194,11 @@ class PyOpenSSLWrapper(SSLWrapper): return 0 -class StdlibSSLWrapper(SSLWrapper): - """ - Wrapper class for Python socket.ssl read() and write() methods - """ - - def __init__(self, *args): - self.parent = SSLWrapper - self.parent.__init__(self, *args) - - def recv(self, bufsize, flags=None): - # we simply ignore flags since ssl object doesn't support it - try: - return self.sslobj.read(bufsize) - except ssl.SSLError as e: - log.debug("Recv: Caught ssl.SSLError: " + repr(e), exc_info=True) - if e.args[0] not in (ssl.SSL_ERROR_WANT_READ, - ssl.SSL_ERROR_WANT_WRITE): - raise SSLWrapper.Error(self.sock or self.sslobj, e) - return None - - def send(self, data, flags=None, now=False): - # we simply ignore flags since ssl object doesn't support it - try: - return self.sslobj.write(data) - except ssl.SSLError as e: - log.debug("Send: Caught socket.sslerror:", exc_info=True) - if e.args[0] not in (ssl.SSL_ERROR_WANT_READ, - ssl.SSL_ERROR_WANT_WRITE): - raise SSLWrapper.Error(self.sock or self.sslobj, e) - return 0 - - class NonBlockingTLS(PlugIn): """ - TLS connection used to encrypts already estabilished tcp connection + TLS connection used to encrypt already estabilished tcp connection - Can be plugged into NonBlockingTCP and will make use of StdlibSSLWrapper or - PyOpenSSLWrapper. + Can be plugged into NonBlockingTCP and will make use of PyOpenSSLWrapper. """ def __init__(self, cacerts, mycerts, tls_version, cipher_list, alpn): @@ -315,10 +267,7 @@ class NonBlockingTLS(PlugIn): """ log.debug("_startSSL called") - if USE_PYOPENSSL: - result = self._startSSL_pyOpenSSL() - else: - result = self._startSSL_stdlib() + result = self._startSSL_pyOpenSSL() if result: log.debug('Synchronous handshake completed') @@ -447,34 +396,6 @@ class NonBlockingTLS(PlugIn): self._owner.ssl_lib = PYOPENSSL return True - def _startSSL_stdlib(self): - log.debug("_startSSL_stdlib called") - tcpsock=self._owner - try: - tcpsock._sslObj = ssl.wrap_socket(tcpsock._sock, - ssl_version=ssl.PROTOCOL_TLSv1, do_handshake_on_connect=False) - wrapper = StdlibSSLWrapper(tcpsock._sslObj, tcpsock._sock) - tcpsock._recv = wrapper.recv - tcpsock._send = wrapper.send - log.debug("Initiating handshake...") - try: - tcpsock._sslObj.do_handshake() - except (ssl.SSLError) as e: - if e.args[0] in (ssl.SSL_ERROR_WANT_READ, - ssl.SSL_ERROR_WANT_WRITE): - pass - else: - log.error('Error while TLS handshake: ', exc_info=True) - return False - except: - log.error('Error while TLS handshake: ', exc_info=True) - return False - except: - log.error("Exception caught in _startSSL_stdlib:", exc_info=True) - return False - self._owner.ssl_lib = PYSTDLIB - return True - def _ssl_verify_callback(self, sslconn, cert, errnum, depth, ok): # Exceptions can't propagate up through this callback, so print them here. try: @@ -500,9 +421,6 @@ class NonBlockingTLS(PlugIn): """ sslObj = self._owner._sslObj try: - if USE_PYOPENSSL: - return sslObj.get_finished() - else: - return sslObj.get_channel_binding() + return sslObj.get_finished() except AttributeError: raise NotImplementedError ===================================== nbxmpp/transports_nb.py ===================================== @@ -619,9 +619,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): errstr = 'zero bytes on recv' if (self.ssl_lib is None and received == '') or \ - (self.ssl_lib == tls_nb.PYSTDLIB and errnum == 8 ) or \ (self.ssl_lib == tls_nb.PYOPENSSL and errnum == -1 ): - # 8 in stdlib: errstr == EOF occured in violation of protocol # -1 in pyopenssl: errstr == Unexpected EOF log.info("Disconnected by remote server: #%s, %s" % (errnum, errstr)) self.on_remote_disconnect() ===================================== setup.cfg ===================================== @@ -4,7 +4,7 @@ version = attr: nbxmpp.__version__ description = Non blocking Jabber/XMPP module author = Yann Leboulanger, Philipp Hoerist author_email = gajim-devel(a)gajim.org -url = http://dev.gajim.org/gajim/python-nbxmpp +url = https://dev.gajim.org/gajim/python-nbxmpp license_file = COPYING license = GPL v3 classifiers = @@ -15,6 +15,7 @@ python_requires = >=3.5 packages = find: install_requires = precis-i18n>=1.0.0 + pyOpenSSL>=16.2 [options.packages.find] exclude = View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/1609d94a5cd7a1dd46ae4b457… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/1609d94a5cd7a1dd46ae4b457… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add annotations
by Philipp Hörist 26 Jan '19

26 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8e336311 by Philipp Hörist at 2019-01-26T20:57:22Z Add annotations - - - - - 1 changed file: - gajim/common/modules/base.py Changes: ===================================== gajim/common/modules/base.py ===================================== @@ -12,6 +12,10 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any # pylint: disable=unused-import +from typing import Dict # pylint: disable=unused-import +from typing import List # pylint: disable=unused-import + import logging from functools import partial from unittest.mock import Mock @@ -24,13 +28,13 @@ log = logging.getLogger('gajim.c.m.base') class BaseModule: _nbxmpp_extends = '' - _nbxmpp_methods = [] + _nbxmpp_methods = [] # type: List[str] def __init__(self, con): self._con = con self._account = con.name - self._nbxmpp_callbacks = {} - self.handlers = [] + self._nbxmpp_callbacks = {} # type: Dict[str, Any] + self.handlers = [] # type: List[str] def __getattr__(self, key): if key not in self._nbxmpp_methods: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e336311cc259c738e49919cd517f29aee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8e336311cc259c738e49919cd517f29aee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Count MUC members correctly
by Philipp Hörist 26 Jan '19

26 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e994b8f4 by Philipp Hörist at 2019-01-26T19:40:07Z Count MUC members correctly - Pass Affiliation enum to get_uf_affiliation - Pass Role enum to get_uf_role - - - - - d6b7916f by Philipp Hörist at 2019-01-26T20:25:33Z Prevent callbacks on destroyed objects Fixes #9560 - - - - - 7 changed files: - gajim/command_system/implementation/standard.py - gajim/common/helpers.py - gajim/groupchat_control.py - gajim/gtk/groupchat_config.py - gajim/gtk/tooltips.py - gajim/gtk/util.py - gajim/vcard.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -379,8 +379,8 @@ class StandardGroupChatCommands(CommandContainer): for nick in nicks: contact = get_contact(nick) - role = helpers.get_uf_role(contact.role.value) - affiliation = helpers.get_uf_affiliation(contact.affiliation.value) + role = helpers.get_uf_role(contact.role) + affiliation = helpers.get_uf_affiliation(contact.affiliation) self.echo("%s - %s - %s" % (nick, role, affiliation)) @command('ignore', raw=True) ===================================== gajim/common/helpers.py ===================================== @@ -327,19 +327,19 @@ def get_uf_ask(ask): def get_uf_role(role, plural=False): ''' plural determines if you get Moderators or Moderator''' - if role == 'none': + if role.value == 'none': role_name = Q_('?Group Chat Contact Role:None') - elif role == 'moderator': + elif role.value == 'moderator': if plural: role_name = _('Moderators') else: role_name = _('Moderator') - elif role == 'participant': + elif role.value == 'participant': if plural: role_name = _('Participants') else: role_name = _('Participant') - elif role == 'visitor': + elif role.value == 'visitor': if plural: role_name = _('Visitors') else: @@ -348,13 +348,13 @@ def get_uf_role(role, plural=False): def get_uf_affiliation(affiliation): '''Get a nice and translated affilition for muc''' - if affiliation == 'none': + if affiliation.value == 'none': affiliation_name = Q_('?Group Chat Contact Affiliation:None') - elif affiliation == 'owner': + elif affiliation.value == 'owner': affiliation_name = _('Owner') - elif affiliation == 'admin': + elif affiliation.value == 'admin': affiliation_name = _('Administrator') - elif affiliation == 'member': + elif affiliation.value == 'member': affiliation_name = _('Member') else: # Argl ! An unknown affiliation ! affiliation_name = affiliation.capitalize() ===================================== gajim/groupchat_control.py ===================================== @@ -1768,7 +1768,7 @@ class GroupchatControl(ChatControlBase): self.model[role_iter][Column.TEXT] = role_name def draw_all_roles(self): - for role in ('visitor', 'participant', 'moderator'): + for role in (Role.VISITOR, Role.PARTICIPANT, Role.MODERATOR): self.draw_role(role) def _change_nick(self, new_nick: str) -> None: @@ -1899,7 +1899,7 @@ class GroupchatControl(ChatControlBase): return affiliation = helpers.get_uf_affiliation( - event.properties.affiliation.value) + event.properties.affiliation) nick = event.properties.muc_nickname reason = event.properties.muc_user.reason reason = '' if reason is None else ': {reason}'.format(reason=reason) @@ -1932,7 +1932,7 @@ class GroupchatControl(ChatControlBase): if event.room_jid != self.room_jid: return - role = helpers.get_uf_role(event.properties.role.value) + role = helpers.get_uf_role(event.properties.role) nick = event.properties.muc_nickname reason = event.properties.muc_user.reason reason = '' if reason is None else ': {reason}'.format(reason=reason) @@ -2167,17 +2167,17 @@ class GroupchatControl(ChatControlBase): contact = app.contacts.get_gc_contact(self.account, self.room_jid, nick) - role_name = helpers.get_uf_role(contact.role.value, plural=True) + role_name = helpers.get_uf_role(contact.role, plural=True) # Create Role - role_iter = self.get_role_iter(contact.role.value) + role_iter = self.get_role_iter(contact.role) if not role_iter: icon_name = get_icon_name('closed') ext_columns = [None] * self.nb_ext_renderers row = [icon_name, contact.role.value, 'role', role_name, None] + ext_columns role_iter = self.model.append(None, row) - self._role_refs[contact.role.value] = Gtk.TreeRowReference( + self._role_refs[contact.role] = Gtk.TreeRowReference( self.model, self.model.get_path(role_iter)) # Avatar @@ -2262,7 +2262,7 @@ class GroupchatControl(ChatControlBase): del self._contact_refs[nick] if self.model.iter_n_children(parent_iter) == 0: role = self.model[parent_iter][Column.NICK] - del self._role_refs[role] + del self._role_refs[Role(role)] self.model.remove(parent_iter) def _message_sent(self, obj): ===================================== gajim/gtk/groupchat_config.py ===================================== @@ -15,6 +15,7 @@ import logging import nbxmpp +from gi.repository import Gdk from gi.repository import Gtk from gajim.common import app @@ -25,6 +26,7 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dataform import DataFormWidget from gajim.gtk.util import get_builder +from gajim.gtk.util import ensure_not_destroyed log = logging.getLogger('gajim.gtk.groupchat_config') @@ -36,6 +38,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Group Chat Configuration')) + self._destroyed = False self.account = account self.jid = jid @@ -77,6 +80,8 @@ class GroupchatConfig(Gtk.ApplicationWindow): self._ui.connect_signals(self) self.connect('delete-event', self._cancel) + self.connect('destroy', self._on_destroy) + self.connect('key-press-event', self._on_key_press) self.show_all() self._ui.stack.notify('visible-child-name') @@ -291,6 +296,10 @@ class GroupchatConfig(Gtk.ApplicationWindow): return add, remove, modified + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self._on_cancel() + def _on_cancel(self, *args): self._cancel() self.destroy() @@ -300,6 +309,9 @@ class GroupchatConfig(Gtk.ApplicationWindow): con = app.connections[self.account] con.get_module('MUC').cancel_config(self.jid) + def _on_destroy(self, *args): + self._destroyed = True + def _set_affiliations(self): add, remove, modified = self._get_diff() @@ -339,6 +351,7 @@ class GroupchatConfig(Gtk.ApplicationWindow): con = app.connections[self.account] con.get_module('MUC').set_affiliation(self.jid, diff_dict) + @ensure_not_destroyed def _on_affiliations_received(self, result): if result.is_error: log.info('Error while requesting %s affiliations: %s', ===================================== gajim/gtk/tooltips.py ===================================== @@ -214,7 +214,7 @@ class GCTooltip(): # Affiliation if not contact.affiliation.is_none: - uf_affiliation = helpers.get_uf_affiliation(contact.affiliation.value) + uf_affiliation = helpers.get_uf_affiliation(contact.affiliation) uf_affiliation = \ _('%(owner_or_admin_or_member)s of this group chat') \ % {'owner_or_admin_or_member': uf_affiliation} ===================================== gajim/gtk/util.py ===================================== @@ -25,6 +25,7 @@ import sys import logging import xml.etree.ElementTree as ET from pathlib import Path +from functools import wraps from gi.repository import Gdk from gi.repository import Gtk @@ -489,3 +490,12 @@ def get_hardware_key_codes(keyval): if not valid: return [] return [key.keycode for key in key_map_keys] + + +def ensure_not_destroyed(func): + @wraps(func) + def func_wrapper(self, *args, **kwargs): + if self._destroyed: + return + return func(self, *args, **kwargs) + return func_wrapper ===================================== gajim/vcard.py ===================================== @@ -372,11 +372,11 @@ class VcardWindow: ask_label = self.xml.get_object('ask_label') if self.gc_contact: self.xml.get_object('subscription_title_label').set_markup(Q_("?Role in Group Chat:<b>Role:</b>")) - uf_role = helpers.get_uf_role(self.gc_contact.role.value) + uf_role = helpers.get_uf_role(self.gc_contact.role) subscription_label.set_text(uf_role) self.xml.get_object('ask_title_label').set_markup(_("<b>Affiliation:</b>")) - uf_affiliation = helpers.get_uf_affiliation(self.gc_contact.affiliation.value) + uf_affiliation = helpers.get_uf_affiliation(self.gc_contact.affiliation) ask_label.set_text(uf_affiliation) else: uf_sub = helpers.get_uf_sub(self.contact.sub) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80e5934bb5e60b872b9b9dff72ecd096b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/80e5934bb5e60b872b9b9dff72ecd096b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add BaseModule
by Philipp Hörist 26 Jan '19

26 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: ce0abb99 by Philipp Hörist at 2019-01-26T13:34:58Z Add BaseModule - - - - - 80e5934b by Philipp Hörist at 2019-01-26T19:04:43Z Dont skip extension point - If the contact has no avatar the tooltip extension point was not executed - - - - - 4 changed files: - + gajim/common/modules/base.py - gajim/common/modules/blocking.py - gajim/common/modules/muc.py - gajim/gtk/tooltips.py Changes: ===================================== gajim/common/modules/base.py ===================================== @@ -0,0 +1,59 @@ +# 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/>. + +import logging +from functools import partial +from unittest.mock import Mock + +from gajim.common import app + +log = logging.getLogger('gajim.c.m.base') + + +class BaseModule: + + _nbxmpp_extends = '' + _nbxmpp_methods = [] + + def __init__(self, con): + self._con = con + self._account = con.name + self._nbxmpp_callbacks = {} + self.handlers = [] + + def __getattr__(self, key): + if key not in self._nbxmpp_methods: + raise AttributeError + if not app.account_is_connected(self._account): + log.warning('Account %s not connected, cant use %s', + self._account, key) + return + + module = self._con.connection.get_module(self._nbxmpp_extends) + + return partial(getattr(module, key), + callback=self._nbxmpp_callbacks.get(key)) + + def _nbxmpp(self, module_name=None): + if not app.account_is_connected(self._account): + log.warning('Account %s not connected, cant use nbxmpp method', + self._account) + return Mock() + + if module_name is None: + return self._con.connection + return self._con.connection.get_module(module_name) + + def _register_callback(self, method, callback): + self._nbxmpp_callbacks[method] = callback ===================================== gajim/common/modules/blocking.py ===================================== @@ -15,30 +15,28 @@ # XEP-0191: Blocking Command import logging -from functools import wraps import nbxmpp from gajim.common import app from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent +from gajim.common.modules.base import BaseModule log = logging.getLogger('gajim.c.m.blocking') -def ensure_online(func): - @wraps(func) - def func_wrapper(self, *args, **kwargs): - if not app.account_is_connected(self._account): - return - return func(self, *args, **kwargs) - return func_wrapper +class Blocking(BaseModule): + _nbxmpp_extends = 'Blocking' + _nbxmpp_methods = [ + 'block', + 'unblock', + 'get_blocking_list', + ] -class Blocking: def __init__(self, con): - self._con = con - self._account = con.name + BaseModule.__init__(self, con) self.blocked = [] @@ -46,22 +44,10 @@ class Blocking: ('iq', self._blocking_push_received, 'set', nbxmpp.NS_BLOCKING) ] - self.supported = False - - self._nbmxpp_methods = [ - 'block', - 'unblock', - ] + self._register_callback('get_blocking_list', + self._blocking_list_received) - def __getattr__(self, key): - if key not in self._nbmxpp_methods: - raise AttributeError - if not app.account_is_connected(self._account): - log.warning('Account %s not connected, cant use %s', - self._account, key) - return - module = self._con.connection.get_module('Blocking') - return getattr(module, key) + self.supported = False def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BLOCKING not in features: @@ -75,15 +61,6 @@ class Blocking: log.info('Discovered blocking: %s', from_) - @ensure_online - def get_blocking_list(self, callback=None): - log.info('Request list') - if callback is None: - callback = self._blocking_list_received - - self._con.connection.get_module('Blocking').get_blocking_list( - callback=callback) - def _blocking_list_received(self, result): if result.is_error: log.info('Error: %s', result.error) @@ -98,7 +75,7 @@ class Blocking: childs = reply.getChildren() for child in childs: reply.delChild(child) - self._con.connection.send(reply) + self._nbxmpp().send(reply) changed_list = [] @@ -149,7 +126,7 @@ class Blocking: log.info('Presence probe: %s', jid) # Send a presence Probe to get the current Status probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) - self._con.connection.send(probe) + self._nbxmpp().send(probe) class BlockingEvent(NetworkIncomingEvent): ===================================== gajim/common/modules/muc.py ===================================== @@ -30,14 +30,32 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data +from gajim.common.modules.base import BaseModule + log = logging.getLogger('gajim.c.m.muc') -class MUC: +class MUC(BaseModule): + + _nbxmpp_extends = 'MUC' + _nbxmpp_methods = [ + 'get_affiliation', + 'set_role', + 'set_affiliation', + 'set_config', + 'set_subject', + 'cancel_config', + 'send_captcha', + 'decline', + 'invite', + 'request_config', + 'request_voice', + 'destroy', + ] + def __init__(self, con): - self._con = con - self._account = con.name + BaseModule.__init__(self, con) self.handlers = [ StanzaHandler(name='presence', @@ -75,28 +93,7 @@ class MUC: priority=49) ] - self._nbmxpp_methods = [ - 'get_affiliation', - 'set_role', - 'set_affiliation', - 'set_config', - 'set_subject', - 'cancel_config', - 'send_captcha', - 'decline', - 'request_voice', - 'destroy', - ] - - def __getattr__(self, key): - if key not in self._nbmxpp_methods: - raise AttributeError - if not app.account_is_connected(self._account): - log.warning('Account %s not connected, cant use %s', - self._account, key) - return - module = self._con.connection.get_module('MUC') - return getattr(module, key) + self._register_callback('request_config', self._config_received) def pass_disco(self, from_, identities, features, _data, _node): for identity in identities: @@ -423,24 +420,13 @@ class MUC: raise nbxmpp.NodeProcessed def invite(self, room, to, reason=None, continue_=False): - if not app.account_is_connected(self._account): - return - type_ = InviteType.MEDIATED contact = app.contacts.get_contact_from_full_jid(self._account, to) if contact and contact.supports(nbxmpp.NS_CONFERENCE): type_ = InviteType.DIRECT password = app.gc_passwords.get(room, None) - self._con.connection.get_module('MUC').invite( - room, to, reason, password, continue_, type_) - - def request_config(self, room_jid): - if not app.account_is_connected(self._account): - return - - self._con.connection.get_module('MUC').request_config( - room_jid, callback=self._config_received) + self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) def _config_received(self, result): if result.is_error: ===================================== gajim/gtk/tooltips.py ===================================== @@ -449,10 +449,9 @@ class RosterTooltip(StatusTable): scale = self._ui.tooltip_grid.get_scale_factor() surface = app.contacts.get_avatar( account, self.prim_contact.jid, AvatarSize.TOOLTIP, scale) - if surface is None: - return - self._ui.avatar.set_from_surface(surface) - self._ui.avatar.show() + if surface is not None: + self._ui.avatar.set_from_surface(surface) + self._ui.avatar.show() app.plugin_manager.gui_extension_point( 'roster_tooltip_populate', self, contacts, self._ui.tooltip_grid) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dad99f85fccf30ab91b4c7babf2a24c1f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dad99f85fccf30ab91b4c7babf2a24c1f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Remove Python 2 compatibility code
by Philipp Hörist 24 Jan '19

24 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 4dd65f01 by André Apitzsch at 2019-01-24T21:12:40Z Remove Python 2 compatibility code - - - - - 1609d94a by Philipp Hörist at 2019-01-24T21:19:03Z Merge branch 'urllib' into 'master' Remove Python 2 compatibility code See merge request gajim/python-nbxmpp!28 - - - - - 1 changed file: - nbxmpp/transports_nb.py Changes: ===================================== nbxmpp/transports_nb.py ===================================== @@ -32,11 +32,7 @@ import base64 import sys import locale import logging - -try: - from urllib.parse import urlparse -except ImportError: - from urlparse import urlparse +from urllib.parse import urlparse from .plugin import PlugIn from .idlequeue import IdleObject View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/16cb9d5fde313c1285655c650… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/16cb9d5fde313c1285655c650… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Remove outdated documentation
by Philipp Hörist 24 Jan '19

24 Jan '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 9d999c3f by André Apitzsch at 2019-01-24T21:01:32Z Remove outdated documentation Documentation can be regenerated using 'epydoc --config doc/epydoc.conf' - - - - - 16cb9d5f by Philipp Hörist at 2019-01-24T21:18:33Z Merge branch 'removeDoc' into 'master' Remove outdated documentation See merge request gajim/python-nbxmpp!27 - - - - - 14 changed files: - − doc/apidocs/api-objects.txt - − doc/apidocs/class-tree.html - − doc/apidocs/crarr.png - − doc/apidocs/epydoc.css - − doc/apidocs/epydoc.js - − doc/apidocs/frames.html - − doc/apidocs/help.html - − doc/apidocs/identifier-index.html - − doc/apidocs/index.html - − doc/apidocs/module-tree.html - − doc/apidocs/nbxmpp-module.html - − doc/apidocs/nbxmpp-pysrc.html - − doc/apidocs/nbxmpp.auth_nb-module.html - − doc/apidocs/nbxmpp.auth_nb-pysrc.html The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f90126ecf2f9ddee0c6426aa0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/compare/f90126ecf2f9ddee0c6426aa0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Accounts: Update proxy combobox correctly
by Philipp Hörist 22 Jan '19

22 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: dad99f85 by Philipp Hörist at 2019-01-22T21:00:20Z Accounts: Update proxy combobox correctly - - - - - 1 changed file: - gajim/options_dialog.py Changes: ===================================== gajim/options_dialog.py ===================================== @@ -477,11 +477,11 @@ class ProxyComboOption(GenericOption): GenericOption.__init__(self, *args) self.combo = Gtk.ComboBoxText() - self.update_values() - - self.combo.connect('changed', self.on_value_change) self.combo.set_valign(Gtk.Align.CENTER) + self._signal_id = None + self.update_values() + button = get_image_button( 'preferences-system-symbolic', _('Manage Proxies')) button.set_action_name('app.manage-proxies') @@ -491,7 +491,18 @@ class ProxyComboOption(GenericOption): self.option_box.pack_start(button, False, True, 0) self.show_all() + def _block_signal(self, state): + if state: + if self._signal_id is None: + return + self.combo.disconnect(self._signal_id) + else: + self._signal_id = self.combo.connect('changed', + self.on_value_change) + self.combo.emit('changed') + def update_values(self): + self._block_signal(True) proxies = app.config.get_per('proxies') proxies.insert(0, _('No Proxy')) self.combo.remove_all() @@ -499,9 +510,13 @@ class ProxyComboOption(GenericOption): self.combo.insert_text(-1, value) if value == self.option_value or index == 0: self.combo.set_active(index) + self._block_signal(False) def on_value_change(self, combo): - self.set_value(combo.get_active_text()) + if combo.get_active() == 0: + self.set_value('') + else: + self.set_value(combo.get_active_text()) def on_row_activated(self): pass View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad99f85fccf30ab91b4c7babf2a24c1fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dad99f85fccf30ab91b4c7babf2a24c1fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Roster: remove asserts
by Philipp Hörist 22 Jan '19

22 Jan '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b0742377 by Philipp Hörist at 2019-01-20T13:29:48Z Roster: remove asserts - - - - - 1a7d930f by Philipp Hörist at 2019-01-21T21:45:19Z Add blocking list dialog - - - - - 8 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/modules/blocking.py - gajim/common/modules/privacylists.py - + gajim/data/gui/blocking_list.ui - + gajim/gtk/blocking.py - gajim/gui_menu_builder.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -44,6 +44,7 @@ from gajim.gtk.history import HistoryWindow from gajim.gtk.accounts import AccountsWindow from gajim.gtk.proxies import ManageProxies from gajim.gtk.discovery import ServiceDiscoveryWindow +from gajim.gtk.blocking import BlockingList # General Actions @@ -211,6 +212,15 @@ def on_mam_preferences(action, param): window.present() +def on_blocking_list(action, param): + account = param.get_string() + window = app.get_app_window(MamPreferences, account) + if window is None: + BlockingList(account) + else: + window.present() + + def on_history_sync(action, param): account = param.get_string() if 'history_sync' in interface.instances[account]: ===================================== gajim/application.py ===================================== @@ -469,6 +469,7 @@ class GajimApplication(Gtk.Application): ('-archive', a.on_mam_preferences, 'feature', 's'), ('-sync-history', a.on_history_sync, 'online', 's'), ('-privacylists', a.on_privacy_lists, 'feature', 's'), + ('-blocking', a.on_blocking_list, 'feature', 's'), ('-send-server-message', a.on_send_server_message, 'online', 's'), ('-set-motd', a.on_set_motd, 'online', 's'), ('-update-motd', a.on_update_motd, 'online', 's'), @@ -517,3 +518,6 @@ class GajimApplication(Gtk.Application): elif event.feature == nbxmpp.NS_PRIVACY: action = '%s-privacylists' % event.account self.lookup_action(action).set_enabled(True) + elif event.feature == nbxmpp.NS_BLOCKING: + action = '%s-blocking' % event.account + self.lookup_action(action).set_enabled(True) ===================================== gajim/common/modules/blocking.py ===================================== @@ -15,15 +15,26 @@ # XEP-0191: Blocking Command import logging +from functools import wraps import nbxmpp from gajim.common import app +from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.blocking') +def ensure_online(func): + @wraps(func) + def func_wrapper(self, *args, **kwargs): + if not app.account_is_connected(self._account): + return + return func(self, *args, **kwargs) + return func_wrapper + + class Blocking: def __init__(self, con): self._con = con @@ -37,37 +48,48 @@ class Blocking: self.supported = False + self._nbmxpp_methods = [ + 'block', + 'unblock', + ] + + def __getattr__(self, key): + if key not in self._nbmxpp_methods: + raise AttributeError + if not app.account_is_connected(self._account): + log.warning('Account %s not connected, cant use %s', + self._account, key) + return + module = self._con.connection.get_module('Blocking') + return getattr(module, key) + def pass_disco(self, from_, _identities, features, _data, _node): if nbxmpp.NS_BLOCKING not in features: return self.supported = True + app.nec.push_incoming_event( + NetworkEvent('feature-discovered', + account=self._account, + feature=nbxmpp.NS_BLOCKING)) + log.info('Discovered blocking: %s', from_) - def get_blocking_list(self) -> None: - if not self.supported: - return - iq = nbxmpp.Iq('get', nbxmpp.NS_BLOCKING) - iq.setQuery('blocklist') + @ensure_online + def get_blocking_list(self, callback=None): log.info('Request list') - self._con.connection.SendAndCallForResponse( - iq, self._blocking_list_received) + if callback is None: + callback = self._blocking_list_received - def _blocking_list_received(self, stanza: nbxmpp.Iq) -> None: - if not nbxmpp.isResultNode(stanza): - log.info('Error: %s', stanza.getError()) - return + self._con.connection.get_module('Blocking').get_blocking_list( + callback=callback) - self.blocked = [] - blocklist = stanza.getTag('blocklist', namespace=nbxmpp.NS_BLOCKING) - if blocklist is None: - log.error('No blocklist node') + def _blocking_list_received(self, result): + if result.is_error: + log.info('Error: %s', result.error) return - for item in blocklist.getTags('item'): - self.blocked.append(item.getAttr('jid')) - log.info('Received list: %s', self.blocked) - + self.blocked = result.blocking_list app.nec.push_incoming_event( BlockingEvent(None, conn=self._con, changed=self.blocked)) @@ -129,35 +151,6 @@ class Blocking: probe = nbxmpp.Presence(jid, 'probe', frm=self._con.get_own_jid()) self._con.connection.send(probe) - def block(self, contact_list): - if not self.supported: - return - iq = nbxmpp.Iq('set', nbxmpp.NS_BLOCKING) - query = iq.setQuery(name='block') - - for contact in contact_list: - query.addChild(name='item', attrs={'jid': contact.jid}) - log.info('Block: %s', contact.jid) - self._con.connection.SendAndCallForResponse( - iq, self._default_result_handler, {}) - - def unblock(self, contact_list): - if not self.supported: - return - iq = nbxmpp.Iq('set', nbxmpp.NS_BLOCKING) - query = iq.setQuery(name='unblock') - - for contact in contact_list: - query.addChild(name='item', attrs={'jid': contact.jid}) - log.info('Unblock: %s', contact.jid) - self._con.connection.SendAndCallForResponse( - iq, self._default_result_handler, {}) - - @staticmethod - def _default_result_handler(_con, stanza): - if not nbxmpp.isResultNode(stanza): - log.warning('Operation failed: %s', stanza.getError()) - class BlockingEvent(NetworkIncomingEvent): name = 'blocking' ===================================== gajim/common/modules/privacylists.py ===================================== @@ -304,7 +304,8 @@ class PrivacyLists: def block_contacts(self, contact_list, message): if not self.supported: - self._con.get_module('Blocking').block(contact_list) + jid_list = [contact.jid for contact in contact_list] + self._con.get_module('Blocking').block(jid_list) return if self.default_list is None: @@ -350,7 +351,8 @@ class PrivacyLists: def unblock_contacts(self, contact_list): if not self.supported: - self._con.get_module('Blocking').unblock(contact_list) + jid_list = [contact.jid for contact in contact_list] + self._con.get_module('Blocking').unblock(jid_list) return new_blocked_list = [] ===================================== gajim/data/gui/blocking_list.ui ===================================== @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkListStore" id="blocking_store"> + <columns> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkGrid" id="blocking_grid"> + <property name="width_request">400</property> + <property name="height_request">300</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="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"/> + </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> + <child> + <object class="GtkScrolledWindow"> + <property name="height_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="block_view"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">blocking_store</property> + <property name="search_column">0</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="title" translatable="yes">Jabber ID</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"> + <property name="editable">True</property> + <property name="placeholder_text">user(a)example.org</property> + <signal name="edited" handler="_jid_edited" swapped="no"/> + </object> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="index">-1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/blocking.py ===================================== @@ -0,0 +1,150 @@ +# 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/>. + +import logging + +from gi.repository import Gtk +from gi.repository import Gdk + +from gajim.common import app +from gajim.common.i18n import _ + +from gajim.gtk.util import get_builder +from gajim.gtk.dialogs import HigDialog + +log = logging.getLogger('gajim.gtk.blocking_list') + + +class BlockingList(Gtk.ApplicationWindow): + def __init__(self, account): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Blocking List for %s') % account) + + self.connect('key-press-event', self._on_key_press) + + self.account = account + self._con = app.connections[account] + self._prev_blocked_jids = set() + self._await_results = 2 + self._received_errors = False + + self._ui = get_builder('blocking_list.ui') + self.add(self._ui.blocking_grid) + + self._spinner = Gtk.Spinner() + self._ui.overlay.add_overlay(self._spinner) + + self._set_grid_state(False) + self._ui.connect_signals(self) + self.show_all() + + self._activate_spinner() + + self._con.get_module('Blocking').get_blocking_list( + callback=self._on_blocking_list_received) + + def _reset_after_error(self): + self._received_errors = False + self._await_results = 2 + self._disable_spinner() + self._set_grid_state(True) + + def _show_error(self, error): + dialog = HigDialog( + self, Gtk.MessageType.INFO, Gtk.ButtonsType.OK, + _('Error!'), + error) + dialog.popup() + + def _on_blocking_list_received(self, result): + self._disable_spinner() + self._set_grid_state(not result.is_error) + + if result.is_error: + self._show_error(result.error) + + else: + self._prev_blocked_jids = set(result.blocking_list) + self._ui.blocking_store.clear() + for item in result.blocking_list: + self._ui.blocking_store.append((item,)) + + def _on_save_result(self, result): + self._await_results -= 1 + if result.is_error and not self._received_errors: + self._show_error(result.error) + self._received_errors = True + + if not self._await_results: + if self._received_errors: + self._reset_after_error() + else: + self.destroy() + + def _set_grid_state(self, state): + self._ui.blocking_grid.set_sensitive(state) + + def _jid_edited(self, _renderer, path, new_text): + iter_ = self._ui.blocking_store.get_iter(path) + self._ui.blocking_store.set_value(iter_, 0, new_text) + + def _on_add(self, _button): + self._ui.blocking_store.append(['']) + + def _on_remove(self, _button): + mod, paths = self._ui.block_view.get_selection().get_selected_rows() + for path in paths: + iter_ = mod.get_iter(path) + self._ui.blocking_store.remove(iter_) + + def _on_save(self, _button): + self._activate_spinner() + self._set_grid_state(False) + + blocked_jids = set() + for item in self._ui.blocking_store: + blocked_jids.add(item[0].lower()) + + unblock_jids = self._prev_blocked_jids - blocked_jids + if unblock_jids: + self._con.get_module('Blocking').unblock( + unblock_jids, callback=self._on_save_result) + else: + self._await_results -= 1 + + block_jids = blocked_jids - self._prev_blocked_jids + if block_jids: + self._con.get_module('Blocking').block( + block_jids, callback=self._on_save_result) + else: + self._await_results -= 1 + + if not self._await_results: + # No changes + self.destroy() + + def _activate_spinner(self): + self._spinner.show() + self._spinner.start() + + def _disable_spinner(self): + self._spinner.hide() + self._spinner.stop() + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() ===================================== gajim/gui_menu_builder.py ===================================== @@ -788,6 +788,7 @@ def get_account_menu(account): ('-start-single-chat', _('Send Single Message…')), (_('Advanced'), [ ('-archive', _('Archiving Preferences')), + ('-blocking', _('Blocking List')), ('-sync-history', _('Synchronise History')), ('-privacylists', _('Privacy Lists')), ('-server-info', _('Server Info')), ===================================== gajim/roster_window.py ===================================== @@ -388,7 +388,6 @@ class RosterWindow: parent_iters = self._get_contact_iter( big_brother_contact.jid, big_brother_account, big_brother_contact, self.model) - assert parent_iters, 'Big brother is not yet in roster!' # Do not confuse get_contact_iter: Sync groups of family members contact.groups = big_brother_contact.groups[:] @@ -445,7 +444,6 @@ class RosterWindow: if group not in app.groups[account]: app.groups[account][group] = {'expand': is_expanded} - assert added_iters, '%s has not been added to roster!' % contact.jid return added_iters def _remove_entity(self, contact, account, groups=None): @@ -464,7 +462,6 @@ class RosterWindow: """ iters = self._get_contact_iter(contact.jid, account, contact, self.model) - assert iters, '%s shall be removed but is not in roster' % contact.jid parent_iter = self.model.iter_parent(iters[0]) parent_type = self.model[parent_iter][Column.TYPE] @@ -484,10 +481,6 @@ class RosterWindow: return False # Remove us and empty groups from the model for i in iters: - assert self.model[i][Column.JID] == contact.jid and \ - self.model[i][Column.ACCOUNT] == account, \ - "Invalidated iters of %s" % contact.jid - parent_i = self.model.iter_parent(i) parent_type = self.model[parent_i][Column.TYPE] @@ -529,10 +522,6 @@ class RosterWindow: big_brother_contact = app.contacts.get_first_contact_from_jid( big_brother_account, big_brother_jid) - assert not self._get_contact_iter(big_brother_jid, - big_brother_account, big_brother_contact, self.model), \ - 'Big brother %s already in roster\n Family: %s' \ - % (big_brother_jid, family) self._add_entity(big_brother_contact, big_brother_account) brothers = [] @@ -548,9 +537,6 @@ class RosterWindow: # or brother already added continue - assert not self._get_contact_iter(_jid, _account, - _contact, self.model), \ - "%s already in roster.\n Family: %s" % (_jid, nearby_family) self._add_entity(_contact, _account, big_brother_contact=big_brother_contact, big_brother_account=big_brother_account) @@ -582,8 +568,6 @@ class RosterWindow: # Family might not be up to date. # Only try to remove what is actually in the roster continue - assert iters, '%s shall be removed but is not in roster \ - \n Family: %s' % (_jid, family) family_in_roster = True @@ -594,31 +578,14 @@ class RosterWindow: # The contact on top old_big_account = _account old_big_contact = _contact - old_big_jid = _jid continue - ok = self._remove_entity(_contact, _account) - assert ok, '%s was not removed' % _jid - assert not self._get_contact_iter(_jid, _account, _contact, - self.model), '%s is removed but still in roster' % _jid + self._remove_entity(_contact, _account) if not family_in_roster: return False - assert old_big_jid, 'No Big Brother in nearby family %s (Family: %s)' %\ - (nearby_family, family) - iters = self._get_contact_iter(old_big_jid, old_big_account, - old_big_contact, self.model) - assert iters, 'Old Big Brother %s is not in roster anymore' % \ - old_big_jid - assert not self.model.iter_children(iters[0]), \ - 'Old Big Brother %s still has children' % old_big_jid - - ok = self._remove_entity(old_big_contact, old_big_account) - assert ok, "Old Big Brother %s not removed" % old_big_jid - assert not self._get_contact_iter(old_big_jid, old_big_account, - old_big_contact, self.model), \ - 'Old Big Brother %s is removed but still in roster' % old_big_jid + self._remove_entity(old_big_contact, old_big_account) return True @@ -682,9 +649,6 @@ class RosterWindow: jid = app.get_jid_from_account(account) contact = app.contacts.get_first_contact_from_jid(account, jid) - assert not self._get_contact_iter(jid, account, contact, - self.model), 'Self contact %s already in roster' % jid - child_iterA = self._get_account_iter(account, self.model) self._iters[account]['contacts'][jid] = [self.model.append(child_iterA, [None, app.nicks[account], 'self_contact', jid, account, None, @@ -1047,7 +1011,6 @@ class RosterWindow: def _really_draw_account(self, account): child_iter = self._get_account_iter(account, self.model) if not child_iter: - assert False, 'Account iter of %s could not be found.' % account return num_of_accounts = app.get_number_of_connected_accounts() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/46707606687671488314f947cf5eeaac1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/46707606687671488314f947cf5eeaac1… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits