Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] Add property for server delays
by Philipp Hörist 11 Mar '19

11 Mar '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5f35b297 by Philipp Hörist at 2019-03-11T19:47:52Z Add property for server delays - - - - - 2 changed files: - nbxmpp/modules/delay.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/modules/delay.py ===================================== @@ -57,7 +57,11 @@ class Delay: else: jids = [self._client.get_bound_jid().getDomain()] - properties.timestamp = parse_delay(stanza, from_=jids) + server_delay = parse_delay(stanza, from_=jids) + if server_delay is not None: + properties.has_server_delay = True + properties.timestamp = server_delay + properties.user_timestamp = parse_delay(stanza, not_from=jids) @staticmethod ===================================== nbxmpp/structs.py ===================================== @@ -162,6 +162,7 @@ class MessageProperties: self.thread = None self.user_timestamp = None self.timestamp = time.time() + self.has_server_delay = False self.error = None self.eme = None self.http_auth = None @@ -184,6 +185,10 @@ class MessageProperties: self.omemo = None self.encrypted = None + @property + def has_user_delay(self): + return self.user_timestamp is not None + @property def is_encrypted(self): return self.encrypted is not None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/5f35b297806347abcc4bd69e67… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/5f35b297806347abcc4bd69e67… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Use count of parameters instead of name
by Philipp Hörist 10 Mar '19

10 Mar '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e5773ba9 by Philipp Hörist at 2019-03-10T15:53:11Z Use count of parameters instead of name - - - - - 1 changed file: - nbxmpp/dispatcher.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -617,7 +617,7 @@ class XMPPDispatcher(PlugIn): # Backwards compatibility until all handlers support # properties signature = inspect.signature(handler['func']) - if 'properties' in signature.parameters: + if len(signature.parameters) > 2: handler['func'](session, stanza, properties) else: handler['func'](session, stanza) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e5773ba9221401ee40a1893e6c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/e5773ba9221401ee40a1893e6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Modules: Use LogAdapter
by Philipp Hörist 10 Mar '19

10 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0eb75eb7 by Philipp Hörist at 2019-03-10T09:06:45Z Modules: Use LogAdapter - Make all modules inherit from BaseModule - Use LogAdapter in BaseModule - - - - - b80bbaf2 by Philipp Hörist at 2019-03-10T09:07:12Z Improve log message format - - - - - 30 changed files: - gajim/common/logging_helpers.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/annotations.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/caps.py - gajim/common/modules/carbons.py - gajim/common/modules/chatstates.py - gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - gajim/common/modules/entity_time.py - gajim/common/modules/gateway.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/iq.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/metacontacts.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/privacylists.py - gajim/common/modules/pubsub.py - gajim/common/modules/receipts.py - gajim/common/modules/register.py - gajim/common/modules/roster.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6e672c991187f383d950f0cf692af6748… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6e672c991187f383d950f0cf692af6748… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add LogAdapter
by Philipp Hörist 08 Mar '19

08 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6e672c99 by Philipp Hörist at 2019-03-08T19:31:05Z Add LogAdapter This adds the account to all log messages issues in module code - - - - - 2 changed files: - gajim/common/modules/base.py - gajim/common/modules/util.py Changes: ===================================== gajim/common/modules/base.py ===================================== @@ -24,6 +24,7 @@ import nbxmpp from nbxmpp.structs import StanzaHandler from gajim.common import app +from gajim.common.modules.util import LogAdapter log = logging.getLogger('gajim.c.m.base') @@ -33,9 +34,11 @@ class BaseModule: _nbxmpp_extends = '' _nbxmpp_methods = [] # type: List[str] - def __init__(self, con): + def __init__(self, con, logger=None): self._con = con self._account = con.name + if logger is not None: + self._log = LogAdapter(logger, {'account': self._account}) self._nbxmpp_callbacks = {} # type: Dict[str, Any] self._stored_publish = None # type: Callable self.handlers = [] # type: List[str] ===================================== gajim/common/modules/util.py ===================================== @@ -16,6 +16,7 @@ from typing import Union +from logging import LoggerAdapter from functools import wraps from functools import partial @@ -81,3 +82,8 @@ def get_eme_message(eme_data): return EME_MESSAGES[eme_data.namespace] except KeyError: return EME_MESSAGES['fallback'] % eme_data.name + + +class LogAdapter(LoggerAdapter): + def process(self, msg, kwargs): + return '[%s] %s' % (self.extra['account'], msg), kwargs View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e672c991187f383d950f0cf692af67486… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6e672c991187f383d950f0cf692af67486… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dont allow setting invalid show values
by Philipp Hörist 06 Mar '19

06 Mar '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 6d9d8f72 by Philipp Hörist at 2019-03-06T22:19:59Z Dont allow setting invalid show values - - - - - 1 changed file: - nbxmpp/protocol.py Changes: ===================================== nbxmpp/protocol.py ===================================== @@ -1261,6 +1261,8 @@ class Presence(Protocol): """ Set the show value of the message """ + if val not in ['away', 'chat', 'dnd', 'xa']: + raise ValueError('Invalid show value: %s' % val) self.setTagData('show', val) def setStatus(self, val): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/6d9d8f722a7d247b7aa16ec80f… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/6d9d8f722a7d247b7aa16ec80f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Write correct show values to database
by Philipp Hörist 06 Mar '19

06 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: b704e27a by Philipp Hörist at 2019-03-06T22:03:45Z Write correct show values to database Since the refactor we wrote accidentally string instead of int - - - - - 3 changed files: - gajim/common/helpers.py - gajim/common/modules/presence.py - gajim/history_manager.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -56,6 +56,7 @@ from gajim.common import configpaths from gajim.common.i18n import Q_ from gajim.common.i18n import _ from gajim.common.i18n import ngettext +from gajim.common.const import ShowConstant log = logging.getLogger('gajim.c.helpers') @@ -246,6 +247,9 @@ def get_uf_show(show, use_mnemonic=False): If use_mnemonic is True, it adds _ so GUI should call with True for accessibility issues """ + if isinstance(show, ShowConstant): + show = show.name.lower() + if show == 'dnd': if use_mnemonic: uf_show = _('_Busy') ===================================== gajim/common/modules/presence.py ===================================== @@ -25,6 +25,7 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant +from gajim.common.const import ShowConstant from gajim.common.helpers import prepare_and_validate_gpg_keyID log = logging.getLogger('gajim.c.m.presence') @@ -236,11 +237,9 @@ class Presence: if not app.config.should_log(self._account, properties.jid.getBare()): return - # TODO: Refactor + show = ShowConstant[properties.show.name] if properties.type.is_unavailable: - show = 'offline' - else: - show = properties.show.value + show = ShowConstant.OFFLINE app.logger.insert_into_logs(self._account, properties.jid.getBare(), ===================================== gajim/history_manager.py ===================================== @@ -50,6 +50,7 @@ from gajim.common.i18n import _ from gajim.common.const import StyleAttr from gajim.common.const import JIDConstant from gajim.common.const import KindConstant +from gajim.common.const import ShowConstant def is_standalone(): # Determine if we are in standalone mode @@ -398,7 +399,8 @@ class HistoryManager: message = '' else: message = ' : ' + message - message = helpers.get_uf_show(show) + message + + message = helpers.get_uf_show(ShowConstant(show)) + message message_ = '<span' if color: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b704e27abcb831f0ad2cc9d5d743352f4e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b704e27abcb831f0ad2cc9d5d743352f4e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HistoryManager: Display show value correctly
by Philipp Hörist 06 Mar '19

06 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5e97d805 by Philipp Hörist at 2019-03-06T21:14:57Z HistoryManager: Display show value correctly - - - - - 1 changed file: - gajim/history_manager.py Changes: ===================================== gajim/history_manager.py ===================================== @@ -398,8 +398,7 @@ class HistoryManager: message = '' else: message = ' : ' + message - message = helpers.get_uf_show(app.SHOW_LIST[show]) + \ - message + message = helpers.get_uf_show(show) + message message_ = '<span' if color: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5e97d805d970ef6ce596b2730d39b8e407… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5e97d805d970ef6ce596b2730d39b8e407… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix presence subscription
by Philipp Hörist 06 Mar '19

06 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 872ee3d6 by Philipp Hörist at 2019-03-06T21:11:35Z Fix presence subscription Fixes #9612 - - - - - 1 changed file: - gajim/common/modules/presence.py Changes: ===================================== gajim/common/modules/presence.py ===================================== @@ -174,7 +174,9 @@ class Presence: else: # Convert the inital roster contact to a contact with resource contact.resource = resource - event.old_show = status_strings.index(contact.show) + event.old_show = 0 + if contact.show in status_strings: + event.old_show = status_strings.index(contact.show) event.need_add_in_roster = True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/872ee3d6753912629f000e8cf7114c9105… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/872ee3d6753912629f000e8cf7114c9105… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix imports
by Philipp Hörist 04 Mar '19

04 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18272496 by Philipp Hörist at 2019-03-04T12:49:03Z Fix imports transports_nb was renamed in nbxmpp - - - - - 3 changed files: - gajim/common/connection.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -1023,7 +1023,7 @@ class Connection(CommonConnection, ConnectionHandlers): if self._proxy and self._proxy['type'] == 'bosh': # with BOSH, we can't do TLS negotiation with <starttls>, we do only "plain" # connection and TLS with handshake right after TCP connecting ("ssl") - scheme = nbxmpp.transports_nb.urisplit(self._proxy['bosh_uri'])[0] + scheme = nbxmpp.transports.urisplit(self._proxy['bosh_uri'])[0] if scheme == 'https': connection_types = ['ssl'] else: ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -31,9 +31,9 @@ from nbxmpp import simplexml from nbxmpp.structs import StanzaHandler from nbxmpp.plugin import PlugIn from nbxmpp.idlequeue import IdleObject -from nbxmpp.transports_nb import DATA_RECEIVED -from nbxmpp.transports_nb import DATA_SENT -from nbxmpp.transports_nb import DATA_ERROR +from nbxmpp.transports import DATA_RECEIVED +from nbxmpp.transports import DATA_SENT +from nbxmpp.transports import DATA_ERROR from gajim.common import app from gajim.common.zeroconf import zeroconf ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -465,7 +465,7 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): def _event_dispatcher(self, realm, event, data): CommonConnection._event_dispatcher(self, realm, event, data) if realm == '': - if event == nbxmpp.transports_nb.DATA_ERROR: + if event == nbxmpp.transports.DATA_ERROR: thread_id = data[1] frm = data[0] session = self.get_or_create_session(frm, thread_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1827249653a9d07fc355453c8133ced12c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1827249653a9d07fc355453c8133ced12c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Avahi: don't fail if avahi gir is not installed
by Philipp Hörist 04 Mar '19

04 Mar '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 74c5f3d0 by André Apitzsch at 2019-03-04T07:20:01Z Avahi: don't fail if avahi gir is not installed Fixes #9610 - - - - - 1 changed file: - gajim/common/zeroconf/zeroconf.py Changes: ===================================== gajim/common/zeroconf/zeroconf.py ===================================== @@ -41,7 +41,7 @@ def test_avahi(): import gi gi.require_version('Avahi', '0.6') from gi.repository import Avahi # pylint: disable=unused-variable - except ImportError: + except (ImportError, ValueError): return False return True View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74c5f3d0e940d0ec7babbf3703037641cc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/74c5f3d0e940d0ec7babbf3703037641cc… 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