Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 2 commits: Make idna and precis-18n required dependencys
by Philipp Hörist 19 Oct '18

19 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d4ba654 by Philipp Hörist at 2018-10-19T21:30:56Z Make idna and precis-18n required dependencys - - - - - c2d03dbf by Philipp Hörist at 2018-10-19T21:35:57Z Prepare for nbxmpp API change - - - - - 3 changed files: - README.md - setup.py - win/_base.sh Changes: ===================================== README.md ===================================== @@ -11,7 +11,8 @@ - python3-openssl (>=0.14) - python3-cssutils (>=1.0.2) - python3-keyring - +- python3-idna +- python3-precis-i18n ### Optional Runtime Requirements @@ -25,7 +26,6 @@ - gir1.2-gupnpigd-1.0 for better NAT traversing - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location -- python3-idna and python3-precis-i18n for correctly parsing JIDs ### Compile-time Requirements ===================================== setup.py ===================================== @@ -285,8 +285,10 @@ setup( data_files=data_files, install_requires=[ 'keyring', - 'nbxmpp>=0.6.8', + 'nbxmpp>=0.6.8,<0.7.0', 'pyOpenSSL>=0.12', - 'cssutils>=1.0.2' + 'cssutils>=1.0.2', + 'precis-i18n>=1.0.0', + 'idna>=2.7', ] ) ===================================== win/_base.sh ===================================== @@ -103,6 +103,7 @@ python-axolotl qrcode cssutils precis-i18n +idna " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2c01883fc08147915aa040b8db951e62d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/2c01883fc08147915aa040b8db951e62d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix missing declaration
by Philipp Hörist 19 Oct '18

19 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c01883f by Philipp Hörist at 2018-10-19T20:30:35Z Fix missing declaration Fixes #9322 - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -126,6 +126,7 @@ class AddNewContactWindow(Gtk.ApplicationWindow): type_ = 'jabber' if type_ == 'jabber': self.uid_entry.set_text(jid) + transport = None else: uid, transport = app.get_name_and_server_from_jid(jid) self.uid_entry.set_text(uid.replace('%', '@', 1)) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c01883fc08147915aa040b8db951e62dc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2c01883fc08147915aa040b8db951e62dc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Use parse_datetime for parsing idle time
by Philipp Hörist 19 Oct '18

19 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 53ec34a9 by Philipp Hörist at 2018-10-19T18:37:18Z Use parse_datetime for parsing idle time Fixes #9393 - - - - - abf19093 by Philipp Hörist at 2018-10-19T18:38:44Z Remove support for XEP-0091 - - - - - e44cedf0 by Philipp Hörist at 2018-10-19T18:43:04Z Use parse_delay also for presences - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/common/modules/misc.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -17,7 +17,6 @@ # pylint: disable=no-init # pylint: disable=attribute-defined-outside-init -from calendar import timegm import logging from time import time as time_time @@ -30,6 +29,8 @@ from gajim.common import app from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.modules import dataforms +from gajim.common.modules.misc import parse_idle +from gajim.common.modules.misc import parse_delay from gajim.common.const import KindConstant, SSLError from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 @@ -87,18 +88,6 @@ class HelperEvent: minimized = app.interface.minimized_controls[self.conn.name] self.gc_control = minimized.get(self.jid) - def _generate_timestamp(self, tag): - # Make sure we use only int/float Epoch time - if tag is None: - self.timestamp = time_time() - return - try: - tim = helpers.datetime_tuple(tag) - self.timestamp = timegm(tim) - except Exception: - log.error('wrong timestamp, ignoring it: %s', tag) - self.timestamp = time_time() - def get_oob_data(self, stanza): oob_node = stanza.getTag('x', namespace=nbxmpp.NS_X_OOB) if oob_node is not None: @@ -249,17 +238,14 @@ PresenceHelperEvent): self.user_nick = self.stanza.getTagData('nick') or '' self.contact_nickname = None self.transport_auto_auth = False + # XEP-0203 - delay_tag = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) - if delay_tag: - self._generate_timestamp(self.stanza.timestamp) + self.timestamp = parse_delay(self.stanza) + if self.timestamp is None: + self.timestamp = time_time() + # XEP-0319 - self.idle_time = None - idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) - if idle_tag: - time_str = idle_tag.getAttr('since') - tim = helpers.datetime_tuple(time_str) - self.idle_time = timegm(tim) + self.idle_time = parse_idle(self.stanza) xtags = self.stanza.getTags('x') for x in xtags: @@ -268,9 +254,6 @@ PresenceHelperEvent): self.is_gc = True elif namespace == nbxmpp.NS_SIGNED: sig_tag = x - elif namespace == nbxmpp.NS_DELAY and not self.timestamp: - # XEP-0091 - self._generate_timestamp(self.stanza.timestamp) self.status = self.stanza.getStatus() or '' self._generate_show() ===================================== gajim/common/modules/misc.py ===================================== @@ -139,3 +139,24 @@ def parse_xhtml(stanza): if app.config.get('ignore_incoming_xhtml'): return None return stanza.getXHTML() + + +# XEP-0319: Last User Interaction in Presence + +def parse_idle(stanza): + idle_tag = stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) + if idle_tag is None: + return + + since = idle_tag.getAttr('since') + if since is None: + log.warning('No since attr in idle node') + log.warning(stanza) + return + + timestamp = parse_datetime(since, convert='utc', epoch=True) + if timestamp is None: + log.warning('Invalid timestamp received: %s', since) + log.warning(stanza) + + return timestamp View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dbd3165c00bcb6100d6605e46b69f0ef4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/dbd3165c00bcb6100d6605e46b69f0ef4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] DiscoveryWindow: Add default identity
by Philipp Hörist 19 Oct '18

19 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: dbd3165c by Philipp Hörist at 2018-10-19T15:52:00Z DiscoveryWindow: Add default identity Fixes #9386 - - - - - 1 changed file: - gajim/disco.py Changes: ===================================== gajim/disco.py ===================================== @@ -405,6 +405,10 @@ class ServicesCache: Callback for when we receive an agent's info array is (agent, node, identities, features, data) """ + if not identities: + # Ejabberd doesn't send identities when using admin nodes + identities = [{'category': 'server', 'type': 'im', 'name': node}] + self._on_agent_info(str(from_), node, identities, features, data) def _disco_info_error(self, from_, error): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbd3165c00bcb6100d6605e46b69f0ef45… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dbd3165c00bcb6100d6605e46b69f0ef45… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make bookmark parsing more resilient
by Philipp Hörist 19 Oct '18

19 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8487bdb8 by Philipp Hörist at 2018-10-19T13:59:04Z Make bookmark parsing more resilient Fixes #9385 - - - - - 2 changed files: - gajim/common/modules/bookmarks.py - gajim/common/modules/util.py Changes: ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -166,6 +166,7 @@ class Bookmarks: autojoin_val = conf.getAttr('autojoin') if not autojoin_val: # not there (it's optional) autojoin_val = False + minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) if not minimize_val: # not there, try old Gajim behaviour minimize_val = conf.getAttr('minimize') @@ -189,19 +190,27 @@ class Bookmarks: conf.getAttr('jid')) continue + bookmark = { + 'name': conf.getAttr('name'), + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status + } + + try: + bookmark['autojoin'] = from_xs_boolean(autojoin_val) + bookmark['minimize'] = from_xs_boolean(minimize_val) + except ValueError as error: + log.warning(error) + continue + if check_merge: if jid in self.bookmarks: continue merged = True log.debug('Found Bookmark: %s', jid) - self.bookmarks[jid] = { - 'name': conf.getAttr('name'), - 'autojoin': from_xs_boolean(autojoin_val), - 'minimize': from_xs_boolean(minimize_val), - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} + self.bookmarks[jid] = bookmark return merged ===================================== gajim/common/modules/util.py ===================================== @@ -47,20 +47,16 @@ def is_muc_pm(message: nbxmpp.Node, def from_xs_boolean(value: Union[str, bool]) -> bool: - # Convert a xs:boolean ('true', 'false', '1', '0', '') - # to a python boolean (True, False) if isinstance(value, bool): return value - if value in ('1', 'true'): + if value in ('1', 'true', 'True'): return True - # '0', 'false' or empty - if value in ('0', 'false', ''): + if value in ('0', 'false', 'False', ''): return False - raise ValueError( - 'Cant convert %s to python boolean' % value) + raise ValueError('Cant convert %s to python boolean' % value) def to_xs_boolean(value: Union[bool, None]) -> str: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8487bdb83e8e0ef4d310d73b30be254a8b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8487bdb83e8e0ef4d310d73b30be254a8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 3 commits: Default to showing offline contacts
by Philipp Hörist 14 Oct '18

14 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 889fa149 by Philipp Hörist at 2018-10-14T19:47:42Z Default to showing offline contacts Many messengers dont show the status anymore, its not evident to new users that most of their roster is hidden per default and they have to show it to access the contacts - - - - - 895a7a87 by Philipp Hörist at 2018-10-14T19:47:42Z Add a dedicated folder for plugin data - - - - - 479bfa56 by Philipp Hörist at 2018-10-14T19:47:42Z Set password correctly on MUC join - - - - - 3 changed files: - gajim/common/config.py - gajim/common/configpaths.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/config.py ===================================== @@ -79,7 +79,7 @@ class Config: 'autopopupaway': [opt_bool, False], 'autopopup_chat_opened': [opt_bool, False, _('Show desktop notification even when a chat window is opened for this contact and does not have focus')], 'sounddnd': [opt_bool, False, _('Play sound when user is busy')], - 'showoffline': [opt_bool, False], + 'showoffline': [opt_bool, True], 'show_only_chat_and_online': [opt_bool, False, _('Show only online and free for chat contacts in roster.')], 'show_transports_group': [opt_bool, True], 'autoaway': [opt_bool, True], ===================================== gajim/common/configpaths.py ===================================== @@ -197,6 +197,7 @@ class ConfigPaths: ('SECRETS_FILE', 'secrets', PathLocation.DATA, PathType.FILE), ('MY_PEER_CERTS', 'certs', PathLocation.DATA, PathType.FOLDER), ('DEBUG', 'debug', PathLocation.DATA, PathType.FOLDER), + ('PLUGINS_DATA', 'plugins_data', PathLocation.DATA, PathType.FOLDER), # Config paths ('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE), ===================================== gajim/common/modules/muc.py ===================================== @@ -59,26 +59,26 @@ class MUC: presence = self._con.get_module('Presence').get_presence( *args, **kwargs) + muc_x = presence.setTag(nbxmpp.NS_MUC + ' x') if room_jid is not None: - self._add_history_query(presence, room_jid, rejoin) + self._add_history_query(muc_x, room_jid, rejoin) if password is not None: - presence.setTagData('password', password) + muc_x.setTagData('password', password) log.debug('Send MUC join presence:\n%s', presence) self._con.connection.send(presence) - def _add_history_query(self, presence, room_jid, rejoin): + def _add_history_query(self, muc_x, room_jid, rejoin): last_date = app.logger.get_room_last_message_time( self._account, room_jid) if not last_date: last_date = 0 - history = presence.setTag(nbxmpp.NS_MUC + ' x') if muc_caps_cache.has_mam(room_jid): # The room is MAM capable dont get MUC History - history.setTag('history', {'maxchars': '0'}) + muc_x.setTag('history', {'maxchars': '0'}) else: # Request MUC History (not MAM) tags = {} @@ -100,7 +100,7 @@ class MUC: if nb >= 0: tags['maxstanzas'] = nb if tags: - history.setTag('history', tags) + muc_x.setTag('history', tags) def set_subject(self, room_jid, subject): if not app.account_is_connected(self._account): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c0ae4af7cfbd77d365a9db61544a29af0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c0ae4af7cfbd77d365a9db61544a29af0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set password correctly on MUC join
by Philipp Hörist 14 Oct '18

14 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: ba2618d0 by Philipp Hörist at 2018-10-14T19:42:51Z Set password correctly on MUC join - - - - - 1 changed file: - gajim/common/modules/muc.py Changes: ===================================== gajim/common/modules/muc.py ===================================== @@ -59,26 +59,26 @@ class MUC: presence = self._con.get_module('Presence').get_presence( *args, **kwargs) + muc_x = presence.setTag(nbxmpp.NS_MUC + ' x') if room_jid is not None: - self._add_history_query(presence, room_jid, rejoin) + self._add_history_query(muc_x, room_jid, rejoin) if password is not None: - presence.setTagData('password', password) + muc_x.setTagData('password', password) log.debug('Send MUC join presence:\n%s', presence) self._con.connection.send(presence) - def _add_history_query(self, presence, room_jid, rejoin): + def _add_history_query(self, muc_x, room_jid, rejoin): last_date = app.logger.get_room_last_message_time( self._account, room_jid) if not last_date: last_date = 0 - history = presence.setTag(nbxmpp.NS_MUC + ' x') if muc_caps_cache.has_mam(room_jid): # The room is MAM capable dont get MUC History - history.setTag('history', {'maxchars': '0'}) + muc_x.setTag('history', {'maxchars': '0'}) else: # Request MUC History (not MAM) tags = {} @@ -100,7 +100,7 @@ class MUC: if nb >= 0: tags['maxstanzas'] = nb if tags: - history.setTag('history', tags) + muc_x.setTag('history', tags) def set_subject(self, room_jid, subject): if not app.account_is_connected(self._account): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba2618d035b02b5dadfb61536b9a9f7d7c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ba2618d035b02b5dadfb61536b9a9f7d7c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add a dedicated folder for plugin data
by Philipp Hörist 14 Oct '18

14 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c34ce28f by Philipp Hörist at 2018-10-14T15:09:39Z Add a dedicated folder for plugin data - - - - - 1 changed file: - gajim/common/configpaths.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -197,6 +197,7 @@ class ConfigPaths: ('SECRETS_FILE', 'secrets', PathLocation.DATA, PathType.FILE), ('MY_PEER_CERTS', 'certs', PathLocation.DATA, PathType.FOLDER), ('DEBUG', 'debug', PathLocation.DATA, PathType.FOLDER), + ('PLUGINS_DATA', 'plugins_data', PathLocation.DATA, PathType.FOLDER), # Config paths ('CONFIG_FILE', 'config', PathLocation.CONFIG, PathType.FILE), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c34ce28f56ac8d68b8f4c515526e998dc7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c34ce28f56ac8d68b8f4c515526e998dc7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Default to showing offline contacts
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c58ea133 by Philipp Hörist at 2018-10-13T14:21:44Z Default to showing offline contacts Many messengers dont show the status anymore, its not evident to new users that most of their roster is hidden per default and they have to show it to access the contacts - - - - - 1 changed file: - gajim/common/config.py Changes: ===================================== gajim/common/config.py ===================================== @@ -79,7 +79,7 @@ class Config: 'autopopupaway': [opt_bool, False], 'autopopup_chat_opened': [opt_bool, False, _('Show desktop notification even when a chat window is opened for this contact and does not have focus')], 'sounddnd': [opt_bool, False, _('Play sound when user is busy')], - 'showoffline': [opt_bool, False], + 'showoffline': [opt_bool, True], 'show_only_chat_and_online': [opt_bool, False, _('Show only online and free for chat contacts in roster.')], 'show_transports_group': [opt_bool, True], 'autoaway': [opt_bool, True], View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58ea1337943e0564aa433244652e6b39f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c58ea1337943e0564aa433244652e6b39f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] Windows: Add precis-i18n to the build
by Philipp Hörist 13 Oct '18

13 Oct '18

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: c0ae4af7 by Philipp Hörist at 2018-10-13T13:42:19Z Windows: Add precis-i18n to the build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -102,6 +102,7 @@ python-gnupg python-axolotl qrcode cssutils +precis-i18n " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0ae4af7cfbd77d365a9db61544a29af02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c0ae4af7cfbd77d365a9db61544a29af02… 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