Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] Add Last Activity module (XEP-0012)
by Philipp Hörist 13 Feb '21

13 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 14e676a6 by lovetox at 2021-02-13T21:24:13+01:00 Add Last Activity module (XEP-0012) - - - - - 3 changed files: - nbxmpp/dispatcher.py - + nbxmpp/modules/last_activity.py - nbxmpp/structs.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -82,6 +82,7 @@ from nbxmpp.modules.vcard4 import VCard4 from nbxmpp.modules.ping import Ping from nbxmpp.modules.delimiter import Delimiter from nbxmpp.modules.roster import Roster +from nbxmpp.modules.last_activity import LastActivity from nbxmpp.modules.misc import unwrap_carbon from nbxmpp.modules.misc import unwrap_mam from nbxmpp.util import get_properties_struct @@ -193,6 +194,7 @@ class StanzaDispatcher(Observable): self._modules['Ping'] = Ping(self._client) self._modules['Delimiter'] = Delimiter(self._client) self._modules['Roster'] = Roster(self._client) + self._modules['LastActivity'] = LastActivity(self._client) for instance in self._modules.values(): for handler in instance.handlers: ===================================== nbxmpp/modules/last_activity.py ===================================== @@ -0,0 +1,87 @@ +# Copyright (C) 2021 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of nbxmpp. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 3 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; If not, see <http://www.gnu.org/licenses/>. + +from nbxmpp.protocol import Iq +from nbxmpp.protocol import NodeProcessed +from nbxmpp.namespaces import Namespace +from nbxmpp.task import iq_request_task +from nbxmpp.structs import LastActivityData +from nbxmpp.structs import StanzaHandler +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import StanzaError +from nbxmpp.modules.base import BaseModule + + +class LastActivity(BaseModule): + def __init__(self, client): + BaseModule.__init__(self, client) + + self._client = client + self.handlers = [ + StanzaHandler(name='iq', + callback=self._answer_request, + priority=30, + typ='get', + ns=Namespace.LAST), + ] + + self._idle_func = None + + def disable(self): + self._idle_func = None + + def set_idle_func(self, func): + self._idle_func = func + + @iq_request_task + def request_last_activity(self, jid): + _task = yield + + response = yield _make_request(jid) + if response.isError(): + raise StanzaError(response) + + yield _parse_response(response) + + def _answer_request(self, _client, stanza, _properties): + self._log.info('Request received from %s', stanza.getFrom()) + if self._idle_func is None: + return + + seconds = self._idle_func() + iq = stanza.buildReply('result') + query = iq.getQuery() + query.setAttr('seconds', seconds) + self._log.info('Send last activity: %s', seconds) + self._client.send_stanza(iq) + raise NodeProcessed + + +def _make_request(jid): + return Iq('get', queryNS=Namespace.LAST, to=jid) + + +def _parse_response(response): + query = response.getQuery() + seconds = query.getAttr('seconds') + + try: + seconds = int(seconds) + except Exception: + raise MalformedStanzaError('seconds attribute invalid', response) + + return LastActivityData(seconds=seconds, status=query.getData()) ===================================== nbxmpp/structs.py ===================================== @@ -129,6 +129,8 @@ MAMPreferencesData = namedtuple('MAMPreferencesData', 'default always never') RosterData = namedtuple('RosterData', 'items version') RosterItem = namedtuple('RosterItem', 'data jid') +LastActivityData = namedtuple('LastActivityData', 'seconds status') + class DiscoInfo(namedtuple('DiscoInfo', 'stanza identities features dataforms timestamp')): View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/14e676a6e059ffb58bc8465d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/14e676a6e059ffb58bc8465d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use nbxmpp last activity module
by Philipp Hörist 13 Feb '21

13 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 94b6b0c2 by lovetox at 2021-02-13T21:53:40+01:00 Use nbxmpp last activity module - - - - - 3 changed files: - gajim/common/client.py - gajim/common/modules/last_activity.py - gajim/gtk/server_info.py Changes: ===================================== gajim/common/client.py ===================================== @@ -435,6 +435,7 @@ def _finish_connect(self): self.get_module('Bookmarks').request_bookmarks() self.get_module('SoftwareVersion').set_enabled(True) + self.get_module('LastActivity').set_enabled(True) self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() ===================================== gajim/common/modules/last_activity.py ===================================== @@ -14,45 +14,33 @@ # XEP-0012: Last Activity -import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler - from gajim.common import app from gajim.common import idle from gajim.common.modules.base import BaseModule class LastActivity(BaseModule): + + _nbxmpp_extends = 'LastActivity' + _nbxmpp_methods = [ + 'request_last_activity', + 'set_idle_func', + 'disable', + ] + def __init__(self, con): BaseModule.__init__(self, con) - self.handlers = [ - StanzaHandler(name='iq', - typ='get', - callback=self._answer_request, - ns=Namespace.LAST), - ] - - def _answer_request(self, _con, stanza, properties): - self._log.info('Request from %s', properties.jid) - - allow_send = app.settings.get_account_setting(self._account, - 'send_idle_time') - if app.is_installed('IDLE') and allow_send: - iq = stanza.buildReply('result') - query = iq.setQuery() - seconds = idle.Monitor.get_idle_sec() - query.attrs['seconds'] = seconds - self._log.info('Respond with seconds: %s', seconds) - else: - iq = stanza.buildReply('error') - err = nbxmpp.ErrorNode(nbxmpp.ERR_SERVICE_UNAVAILABLE) - iq.addChild(node=err) - - self._con.connection.send(iq) + def set_enabled(self, enabled): + if enabled and app.is_installed('IDLE'): + if not app.settings.get_account_setting(self._account, + 'send_idle_time'): + return - raise nbxmpp.NodeProcessed + self._nbxmpp('LastActivity').set_idle_func( + idle.Monitor.get_idle_sec) + else: + self._nbxmpp('LastActivity').disable() def get_instance(*args, **kwargs): ===================================== gajim/gtk/server_info.py ===================================== @@ -16,8 +16,8 @@ from collections import namedtuple from datetime import timedelta -import nbxmpp from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError from nbxmpp.namespaces import Namespace from gi.repository import Gtk from gi.repository import Gdk @@ -67,7 +67,9 @@ def __init__(self, account): con = app.connections[account] con.get_module('SoftwareVersion').request_software_version( self.hostname, callback=self._software_version_received) - self.request_last_activity() + + con.get_module('LastActivity').request_last_activity( + self.hostname, callback=self._on_last_activity) server_info = con.get_module('Discovery').server_info self._add_contact_addresses(server_info.dataforms) @@ -129,13 +131,6 @@ def _on_cert_button_clicked(self, _button): transient_for=self, cert=self.cert) - def request_last_activity(self): - if not app.account_is_connected(self.account): - return - con = app.connections[self.account] - iq = nbxmpp.Iq(to=self.hostname, typ='get', queryNS=Namespace.LAST) - con.connection.SendAndCallForResponse(iq, self._on_last_activity) - def _add_contact_addresses(self, dataforms): fields = { 'admin-addresses': _('Admin'), @@ -209,28 +204,20 @@ def _on_activate_link(self, label, *args): open_uri(label.get_text(), account=self.account) return Gdk.EVENT_STOP - def _on_last_activity(self, _nbxmpp_client, stanza): - if self._destroyed: - # Window got closed in the meantime - return - if not nbxmpp.isResultNode(stanza): - log.warning('Received malformed result: %s', stanza) - return - if stanza.getQueryNS() != Namespace.LAST: - log.warning('Wrong namespace on result: %s', stanza) - return + def _on_last_activity(self, task): try: - seconds = int(stanza.getQuery().getAttr('seconds')) - except (ValueError, TypeError, AttributeError): - log.exception('Received malformed last activity result') - else: - delta = timedelta(seconds=seconds) - hours = 0 - if seconds >= 3600: - hours = delta.seconds // 3600 - uptime = _('%(days)s days, %(hours)s hours') % { - 'days': delta.days, 'hours': hours} - self._ui.server_uptime.set_text(uptime) + result = task.finish() + except (StanzaError, MalformedStanzaError) as error: + log.warning(error) + return + + delta = timedelta(seconds=result.seconds) + hours = 0 + if result.seconds >= 3600: + hours = delta.seconds // 3600 + uptime = _('%(days)s days, %(hours)s hours') % { + 'days': delta.days, 'hours': hours} + self._ui.server_uptime.set_text(uptime) def _software_version_received(self, task): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/94b6b0c2523ac3562b78031f6f0f0d42… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/94b6b0c2523ac3562b78031f6f0f0d42… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change dataform to href markup URLs in instructions
by Philipp Hörist 13 Feb '21

13 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9e0c64b1 by mimi89999 at 2021-02-13T21:45:51+01:00 Change dataform to href markup URLs in instructions - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -220,7 +220,8 @@ def add(self, form_grid, row_number): class Instructions: def __init__(self, instructions): - self._label = Gtk.Label(label=instructions) + self._label = Gtk.Label() + self._label.set_markup(make_href_markup(instructions)) self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) self._label.set_justify(Gtk.Justification.CENTER) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9e0c64b175ff94a3ae6e56dcd9f113ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9e0c64b175ff94a3ae6e56dcd9f113ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move regular expressions to separate file
by Philipp Hörist 13 Feb '21

13 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1ac4fd7a by André Apitzsch at 2021-02-13T18:09:40+01:00 Move regular expressions to separate file - - - - - b243c3c0 by André Apitzsch at 2021-02-13T18:09:41+01:00 Move regex tests - - - - - 7 changed files: - gajim/common/helpers.py - + gajim/common/regex.py - gajim/conversation_textview.py - gajim/gtk/message_input.py - gajim/gui_interface.py - + test/no_gui/test_regex.py - test/unit/test_gui_interface.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -80,6 +80,8 @@ from gajim.common.const import URIAction from gajim.common.const import GIO_TLS_ERRORS from gajim.common.const import SHOW_LIST +from gajim.common.regex import INVALID_XML_CHARS_REGEX +from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX from gajim.common.structs import URI @@ -632,7 +634,7 @@ def get_auth_sha(sid, initiator, target): def remove_invalid_xml_chars(string_): if string_: - string_ = re.sub(app.interface.invalid_XML_chars_re, '', string_) + string_ = re.sub(INVALID_XML_CHARS_REGEX, '', string_) return string_ def get_random_string(count=16): @@ -1067,7 +1069,7 @@ def parse_uri(uri): uri = uri[4:] return URI(type=URIType.TEL, data=uri) - if app.interface.sth_at_sth_dot_sth_re.match(uri): + if STH_AT_STH_DOT_STH_REGEX.match(uri): return URI(type=URIType.AT, data=uri) if uri.startswith('geo:'): ===================================== gajim/common/regex.py ===================================== @@ -0,0 +1,88 @@ +import re + +def _get_link_pattern(): + # regexp meta characters are: . ^ $ * + ? { } [ ] \ | ( ) + # one escapes the metachars with \ + # \S matches anything but ' ' '\t' '\n' '\r' '\f' and '\v' + # \s matches any whitespace character + # \w any alphanumeric character + # \W any non-alphanumeric character + # \b means word boundary. This is a zero-width assertion that + # matches only at the beginning or end of a word. + # ^ matches at the beginning of lines + # + # * means 0 or more times + # + means 1 or more times + # ? means 0 or 1 time + # | means or + # [^*] anything but '*' (inside [] you don't have to escape metachars) + # [^\s*] anything but whitespaces and '*' + # (?<!\S) is a one char lookbehind assertion and asks for any leading + # whitespace + # and matches beginning of lines so we have correct formatting detection + # even if the text is just '*foo*' + # (?!\S) is the same thing but it's a lookahead assertion + # \S*[^\s\W] --> in the matching string don't match ? or ) etc.. if at + # the end + # so http://be) will match http://be and http://be)be) will match + # http://be)be + + legacy_prefixes = r"((?<=$)(www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$"\ + r"&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+(?=\)))"\ + r"|((www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]"\ + r"|%[A-Fa-f0-9]{2})+"\ + r"\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" + # NOTE: it's ok to catch www.gr such stuff exist! + + # FIXME: recognize xmpp: and treat it specially + links = r"((?<=$)[A-Za-z][A-Za-z0-9\+\.\-]*:"\ + r"([\w\.\-_~:/\?#\[\]@!\$&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+"\ + r"(?=\)))|(\w[\w\+\.\-]*:([^<>\s]|%[A-Fa-f0-9]{2})+)" + + # 2nd one: at_least_one_char(a)at_least_one_char.at_least_one_char + mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+(a)\S+\.\S*[^\s\W]' + + link_pattern = links + '|' + mail + '|' + legacy_prefixes + return link_pattern + +def _get_basic_pattern(): + basic_pattern = _get_link_pattern() + # detects eg. *b* *bold* *bold bold* test *bold* *bold*! (*bold*) + # doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold* + formatting = r'|(?<!\w)' r'\*[^\s*]' r'([^*]*[^\s*])?' r'\*(?!\w)|'\ + r'(?<!\S)' r'~[^\s~]' r'([^~]*[^\s~])?' r'~(?!\S)|'\ + r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' + return basic_pattern + formatting + +def _get_emot_and_basic_pattern(use_ascii_formatting=True): + from gajim.gui.emoji_data import emoji_data + # because emoticons match later (in the string) they need to be after + # basic matches that may occur earlier + emoticons = emoji_data.get_regex() + + if use_ascii_formatting: + pattern = _get_basic_pattern() + else: + pattern = _get_link_pattern() + + return '%s|%s' % (pattern, emoticons) + +LINK_REGEX = re.compile(_get_link_pattern(), re.I | re.U) + +# link pattern + ASCII formatting +BASIC_REGEX = re.compile(_get_basic_pattern(), re.IGNORECASE) + +# emoticons + link pattern +EMOT_AND_LINK_REGEX = re.compile(_get_emot_and_basic_pattern(False), + re.IGNORECASE) + +# emoticons + link pattern + ASCII formatting +EMOT_AND_BASIC_REGEX = re.compile(_get_emot_and_basic_pattern(True), + re.IGNORECASE) + +INVALID_XML_CHARS_REGEX = re.compile( + '[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|[\ud800-\udfff]|[\ufffe-\uffff]') + +# at least one character in 3 parts (before @, after @, after .) +STH_AT_STH_DOT_STH_REGEX = re.compile( + r'^[a-zA-Z0-9_.+-]+(a)[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$') ===================================== gajim/conversation_textview.py ===================================== @@ -44,6 +44,11 @@ from gajim.common.const import Trust from gajim.common.const import URI_SCHEMES from gajim.common.helpers import to_user_string +from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX +from gajim.common.regex import BASIC_REGEX +from gajim.common.regex import LINK_REGEX +from gajim.common.regex import EMOT_AND_BASIC_REGEX +from gajim.common.regex import EMOT_AND_LINK_REGEX from gajim.gui import util from gajim.gui.util import get_cursor @@ -584,9 +589,17 @@ def detect_and_print_special_text(self, otext, other_tags, graphics=True, # basic: links + mail + formatting is always checked (we like that) if app.settings.get('emoticons_theme') and graphics: # search for emoticons & urls - iterator = app.interface.emot_and_basic_re.finditer(otext) - else: # search for just urls + mail + formatting - iterator = app.interface.basic_pattern_re.finditer(otext) + if app.settings.get('ascii_formatting'): + regex = EMOT_AND_BASIC_REGEX + else: + regex = EMOT_AND_LINK_REGEX + else: + if app.settings.get('ascii_formatting'): + # search for just urls + mail + formatting + regex = BASIC_REGEX + else: # search for just urls + mail + regex = LINK_REGEX + iterator = regex.finditer(otext) if iter_: end_iter = iter_ else: @@ -693,7 +706,7 @@ def print_special_text(self, special_text, other_tags, graphics=True, tags.append('mail') elif special_text.startswith('xmpp:') and not is_xhtml_link: tags.append('xmpp') - elif app.interface.sth_at_sth_dot_sth_re.match(special_text) and\ + elif STH_AT_STH_DOT_STH_REGEX.match(special_text) and \ not is_xhtml_link: # it's a JID or mail tags.append('sth_at_sth') ===================================== gajim/gtk/message_input.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.const import StyleAttr +from gajim.common.regex import LINK_REGEX from .util import scroll_to_end @@ -207,7 +208,7 @@ def make_clickable_urls(self, text): index = 0 new_text = '' - iterator = app.interface.link_pattern_re.finditer(text) + iterator = LINK_REGEX.finditer(text) for match in iterator: start, end = match.span() url = text[start:end] ===================================== gajim/gui_interface.py ===================================== @@ -33,7 +33,6 @@ import os import sys -import re import time import json import logging @@ -101,7 +100,6 @@ from gajim.gui.dialogs import InputDialog from gajim.gui.dialogs import PassphraseDialog from gajim.gui.filechoosers import FileChooserDialog -from gajim.gui.emoji_data import emoji_data from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.filetransfer_progress import FileTransferProgress from gajim.gui.roster_item_exchange import RosterItemExchangeWindow @@ -1296,112 +1294,6 @@ def handle_event(self, account, fjid, type_): if isinstance(ctrl, ChatControlBase): ctrl.scroll_to_end() -################################################################################ -### Methods dealing with emoticons -################################################################################ - - @property - def basic_pattern_re(self): - if not self._basic_pattern_re: - self._basic_pattern_re = re.compile(self.basic_pattern, - re.IGNORECASE) - return self._basic_pattern_re - - @property - def emot_and_basic_re(self): - if not self._emot_and_basic_re: - self._emot_and_basic_re = re.compile( - self.emot_and_basic, re.IGNORECASE) - return self._emot_and_basic_re - - @property - def sth_at_sth_dot_sth_re(self): - if not self._sth_at_sth_dot_sth_re: - self._sth_at_sth_dot_sth_re = re.compile(self.sth_at_sth_dot_sth) - return self._sth_at_sth_dot_sth_re - - @property - def invalid_XML_chars_re(self): - if not self._invalid_XML_chars_re: - self._invalid_XML_chars_re = re.compile(self.invalid_XML_chars) - return self._invalid_XML_chars_re - - def make_regexps(self): - # regexp meta characters are: . ^ $ * + ? { } [ ] \ | ( ) - # one escapes the metachars with \ - # \S matches anything but ' ' '\t' '\n' '\r' '\f' and '\v' - # \s matches any whitespace character - # \w any alphanumeric character - # \W any non-alphanumeric character - # \b means word boundary. This is a zero-width assertion that - # matches only at the beginning or end of a word. - # ^ matches at the beginning of lines - # - # * means 0 or more times - # + means 1 or more times - # ? means 0 or 1 time - # | means or - # [^*] anything but '*' (inside [] you don't have to escape metachars) - # [^\s*] anything but whitespaces and '*' - # (?<!\S) is a one char lookbehind assertion and asks for any leading - # whitespace - # and matches beginning of lines so we have correct formatting detection - # even if the text is just '*foo*' - # (?!\S) is the same thing but it's a lookahead assertion - # \S*[^\s\W] --> in the matching string don't match ? or ) etc.. if at - # the end - # so http://be) will match http://be and http://be)be) will match - # http://be)be - - self._basic_pattern_re = None - self._emot_and_basic_re = None - self._sth_at_sth_dot_sth_re = None - self._invalid_XML_chars_re = None - - legacy_prefixes = r"((?<=$)(www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$"\ - r"&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+(?=\)))"\ - r"|((www|ftp)\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]"\ - r"|%[A-Fa-f0-9]{2})+"\ - r"\.([A-Za-z0-9\.\-_~:/\?#\[\]@!\$&'\*\+,;=]|%[A-Fa-f0-9]{2})+)" - # NOTE: it's ok to catch www.gr such stuff exist! - - # FIXME: recognize xmpp: and treat it specially - links = r"((?<=$)[A-Za-z][A-Za-z0-9\+\.\-]*:"\ - r"([\w\.\-_~:/\?#\[\]@!\$&'\($\*\+,;=]|%[A-Fa-f0-9]{2})+"\ - r"(?=\)))|(\w[\w\+\.\-]*:([^<>\s]|%[A-Fa-f0-9]{2})+)" - - # 2nd one: at_least_one_char(a)at_least_one_char.at_least_one_char - mail = r'\bmailto:\S*[^\s\W]|' r'\b\S+(a)\S+\.\S*[^\s\W]' - - # detects eg. *b* *bold* *bold bold* test *bold* *bold*! (*bold*) - # doesn't detect (it's a feature :P) * bold* *bold * * bold * test*bold* - formatting = r'|(?<!\w)' r'\*[^\s*]' r'([^*]*[^\s*])?' r'\*(?!\w)|'\ - r'(?<!\S)' r'~[^\s~]' r'([^~]*[^\s~])?' r'~(?!\S)|'\ - r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' - - basic_pattern = links + '|' + mail + '|' + legacy_prefixes - - link_pattern = basic_pattern - self.link_pattern_re = re.compile(link_pattern, re.I | re.U) - - if app.settings.get('ascii_formatting'): - basic_pattern += formatting - self.basic_pattern = basic_pattern - - # because emoticons match later (in the string) they need to be after - # basic matches that may occur earlier - emoticons = emoji_data.get_regex() - - self.emot_and_basic = '%s|%s' % (basic_pattern, emoticons) - - # at least one character in 3 parts (before @, after @, after .) - self.sth_at_sth_dot_sth = r'^[a-zA-Z0-9_.+-]+(a)[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$' - - # Invalid XML chars - self.invalid_XML_chars = '[\x00-\x08]|[\x0b-\x0c]|[\x0e-\x1f]|'\ - '[\ud800-\udfff]|[\ufffe-\uffff]' - - ################################################################################ ### Methods for opening new messages controls ################################################################################ @@ -2114,15 +2006,6 @@ def __init__(self): self.handlers = {} self.roster = None - self._invalid_XML_chars_re = None - self._basic_pattern_re = None - self._emot_and_basic_re = None - self._sth_at_sth_dot_sth_re = None - self.link_pattern_re = None - self.invalid_XML_chars = None - self.basic_pattern = None - self.emot_and_basic = None - self.sth_at_sth_dot_sth = None self.avatar_storage = AvatarStorage() @@ -2199,8 +2082,6 @@ def __init__(self): from gajim.gui.emoji_chooser import emoji_chooser emoji_chooser.load() - self.make_regexps() - self.last_ftwindow_update = 0 self._network_monitor = Gio.NetworkMonitor.get_default() ===================================== test/no_gui/test_regex.py ===================================== @@ -0,0 +1,36 @@ +import unittest + +from gajim import gui +gui.init('gtk') +import gajim.common.regex as regex + +class Test(unittest.TestCase): + def test_links_regexp_entire(self): + def assert_matches_all(str_): + m = regex.BASIC_REGEX.match(str_) + + # the match should equal the string + str_span = (0, len(str_)) + self.assertEqual(m.span(), str_span) + + # these entire strings should be parsed as links + assert_matches_all('http://google.com/') + assert_matches_all('http://google.com') + assert_matches_all('http://www.google.ca/search?q=xmpp') + + assert_matches_all('http://tools.ietf.org/html/draft-saintandre-rfc3920bis-05#section-12.3') + + assert_matches_all('http://en.wikipedia.org/wiki/Protocol_(computing)') + assert_matches_all( + 'http://en.wikipedia.org/wiki/Protocol_%28computing%29') + + assert_matches_all('mailto:test@example.org') + + assert_matches_all('xmpp:example-node@example.com') + assert_matches_all('xmpp:example-node@example.com/some-resource') + assert_matches_all('xmpp:example-node@example.com?message') + assert_matches_all('xmpp://guest@example.com/support@example.com?message') + + +if __name__ == "__main__": + unittest.main() ===================================== test/unit/test_gui_interface.py ===================================== @@ -24,33 +24,6 @@ def close_app(): GLib.idle_add(close_app) app.app.run() - def test_links_regexp_entire(self): - sut = Interface() - def assert_matches_all(str_): - m = sut.basic_pattern_re.match(str_) - - # the match should equal the string - str_span = (0, len(str_)) - self.assertEqual(m.span(), str_span) - - # these entire strings should be parsed as links - assert_matches_all('http://google.com/') - assert_matches_all('http://google.com') - assert_matches_all('http://www.google.ca/search?q=xmpp') - - assert_matches_all('http://tools.ietf.org/html/draft-saintandre-rfc3920bis-05#section-12.3') - - assert_matches_all('http://en.wikipedia.org/wiki/Protocol_(computing)') - assert_matches_all( - 'http://en.wikipedia.org/wiki/Protocol_%28computing%29') - - assert_matches_all('mailto:test@example.org') - - assert_matches_all('xmpp:example-node@example.com') - assert_matches_all('xmpp:example-node@example.com/some-resource') - assert_matches_all('xmpp:example-node@example.com?message') - assert_matches_all('xmpp://guest@example.com/support@example.com?message') - if __name__ == "__main__": unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c46ee9a29e80cb87f9f049d7eafa4a1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c46ee9a29e80cb87f9f049d7eafa4a1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set chat window hscrollbar_policy to never
by Philipp Hörist 13 Feb '21

13 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: c46ee9a2 by mimi89999 at 2021-02-13T13:09:54+01:00 Set chat window hscrollbar_policy to never - - - - - 2 changed files: - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui Changes: ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -621,6 +621,7 @@ <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> <property name="height_request">60</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -261,6 +261,7 @@ <property name="height_request">60</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c46ee9a29e80cb87f9f049d7eafa4a1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c46ee9a29e80cb87f9f049d7eafa4a1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Change dataform to href markup URLs in fixed field
by Philipp Hörist 13 Feb '21

13 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: a4fba1f4 by mimi89999 at 2021-02-13T10:08:20+01:00 Change dataform to href markup URLs in fixed field Closes #10445 - - - - - 1 changed file: - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/dataform.py ===================================== @@ -27,6 +27,7 @@ from .util import MultiLineLabel from .util import MaxWidthComboBoxText +from .util import make_href_markup # Options @@ -329,7 +330,7 @@ class FixedField(Field): def __init__(self, field, form_grid, options): Field.__init__(self, field, form_grid, options) - self._label.set_text(field.value) + self._label.set_markup(make_href_markup(field.value)) # If the value is more than 40 chars it proabably isn’t # meant as a section header View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4fba1f47c8abdd4bbd759741ef98f22… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a4fba1f47c8abdd4bbd759741ef98f22… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update servers.json
by Philipp Hörist 12 Feb '21

12 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: dbda5c5c by mimi89999 at 2021-02-12T23:14:58+01:00 Update servers.json Remove servers that redirect to a website or have registration disabled Closes #10437 - - - - - 1 changed file: - gajim/data/other/servers.json Changes: ===================================== gajim/data/other/servers.json ===================================== @@ -5,11 +5,8 @@ "creep.im", "deshalbfrei.org", "draugr.de", - "im.apinc.org", - "jabber-hosting.de", "jabber.ccc.de", "jabber.cz", - "jabber.hot-chilli.net", "jabber.meta.net.nz", "jabber.no", "jabber.sk", @@ -22,13 +19,10 @@ "lightwitch.org", "linuxlovers.at", "njs.netlab.cz", - "richim.org", - "suchat.org", "tigase.im", "ubuntu-jabber.de", "ubuntu-jabber.net", "verdammung.org", - "xabber.de", - "xmpp-hosting.de" + "xabber.de" ] } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dbda5c5c0fbaba68af053ab64760046a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dbda5c5c0fbaba68af053ab64760046a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ServiceRegistration: Use nbxmpp register methods
by Philipp Hörist 12 Feb '21

12 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9d0ffffc by lovetox at 2021-02-12T23:10:33+01:00 ServiceRegistration: Use nbxmpp register methods Fixes #10443 - - - - - 7439dc9a by lovetox at 2021-02-12T23:10:33+01:00 Register: Remove unused methods - - - - - 2 changed files: - gajim/common/modules/register.py - gajim/gtk/service_registration.py Changes: ===================================== gajim/common/modules/register.py ===================================== @@ -14,14 +14,10 @@ # XEP-0077: In-Band Registration -import weakref -import nbxmpp from nbxmpp.namespaces import Namespace -from gajim.common import app from gajim.common.modules.base import BaseModule -from gajim.common.modules.bits_of_binary import parse_bob_data class Register(BaseModule): @@ -31,101 +27,18 @@ class Register(BaseModule): 'unregister', 'change_password', 'change_password_with_form', + 'request_register_form', + 'submit_register_form', ] def __init__(self, con): BaseModule.__init__(self, con) - self.agent_registrations = {} - self.supported = False def pass_disco(self, info): self.supported = Namespace.REGISTER in info.features - def register_agent(self, agent, form, is_form, success_cb, error_cb): - if not app.account_is_available(self._account): - return - - weak_success_cb = weakref.WeakMethod(success_cb) - weak_error_cb = weakref.WeakMethod(error_cb) - - iq = nbxmpp.Iq('set', Namespace.REGISTER, to=agent) - if is_form: - query = iq.setQuery() - form.setAttr('type', 'submit') - query.addChild(node=form) - else: - for field in form.keys(): - iq.setTag('query').setTagData(field, form[field]) - - self._con.connection.SendAndCallForResponse( - iq, self._register_agent_response, {'agent': agent, - 'success_cb': weak_success_cb, - 'error_cb': weak_error_cb}) - - def _register_agent_response(self, _nbxmpp_client, stanza, agent, - success_cb, error_cb): - if not nbxmpp.isResultNode(stanza): - error = stanza.getErrorMsg() - self._log.info('Error: %s', error) - if error_cb() is not None: - form = is_form = None - if stanza.getErrorType() == 'modify': - form, is_form = self._get_register_form(stanza) - error_cb()(error, form, is_form) - return - - self._con.get_module('Presence').subscribe(agent, auto_auth=True) - - if success_cb() is not None: - success_cb()() - - def get_register_form(self, jid, success_cb, error_cb): - if not app.account_is_available(self._account): - return - - weak_success_cb = weakref.WeakMethod(success_cb) - weak_error_cb = weakref.WeakMethod(error_cb) - - iq = nbxmpp.Iq('get', Namespace.REGISTER, to=jid) - self._con.connection.SendAndCallForResponse( - iq, self._register_info_response, {'success_cb': weak_success_cb, - 'error_cb': weak_error_cb}) - - def _register_info_response(self, _nbxmpp_client, stanza, - success_cb, error_cb): - if not nbxmpp.isResultNode(stanza): - error = stanza.getErrorMsg() - self._log.info('Error: %s', error) - if error_cb() is not None: - error_cb()(error) - else: - self._log.info('Register form received') - - if success_cb() is not None: - form, is_form = self._get_register_form(stanza) - success_cb()(form, is_form) - - @staticmethod - def _get_register_form(stanza): - parse_bob_data(stanza.getQuery()) - form = stanza.getQuery().getTag('x', namespace=Namespace.DATA) - is_form = form is not None - if not is_form: - form = {} - oob = stanza.getQuery().getTag('x', namespace=Namespace.X_OOB) - if oob is not None: - form['redirect-url'] = oob.getTagData('url') - for field in stanza.getQueryPayload(): - if not isinstance(field, nbxmpp.Node): - continue - if field.getName() == 'x': - continue - form[field.getName()] = field.getData() - - return form, is_form - def get_instance(*args, **kwargs): return Register(*args, **kwargs), 'Register' ===================================== gajim/gtk/service_registration.py ===================================== @@ -17,13 +17,14 @@ from gi.repository import Gtk -from nbxmpp.modules import dataforms +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import RegisterStanzaError from gajim.common import app from gajim.common.i18n import _ from .dataform import DataFormWidget -from .dataform import FakeDataFormWidget log = logging.getLogger('gajim.gui.registration') @@ -44,7 +45,6 @@ def __init__(self, account, agent): self._agent = agent self._account = account self._data_form_widget = None - self._is_form = None self.set_application(app.app) self.set_resizable(True) @@ -77,63 +77,55 @@ def _remove_sidebar(self): sidebar = main_box.get_children()[0] main_box.remove(sidebar) - def _build_dataform(self, form, is_form): - if not is_form: - return FakeDataFormWidget(form) - - dataform = dataforms.extend_form(node=form) - - form_widget = DataFormWidget(dataform) - form_widget.connect('is-valid', self._on_is_valid) - form_widget.validate() - return form_widget - def _on_page_change(self, _assistant, _page): if self.get_current_page() == Page.REQUEST: - self._con.get_module('Register').get_register_form( - self._agent, self._on_get_success, self._on_error) + self._con.get_module('Register').request_register_form( + self._agent, callback=self._on_register_form) elif self.get_current_page() == Page.SENDING: self._register() self.commit() - def _on_get_success(self, form, is_form): - log.info('Show Form page') - self._is_form = is_form - self._data_form_widget = self._build_dataform(form, is_form) + def _on_register_form(self, task): + try: + result = task.finish() + except (StanzaError, MalformedStanzaError) as error: + self.get_nth_page(Page.ERROR).set_text(error.get_text()) + self.set_current_page(Page.ERROR) + return + + form = result.form + if result.form is None: + form = result.fields_form + + self._data_form_widget = DataFormWidget(form) + self._data_form_widget.connect('is-valid', self._on_is_valid) + self._data_form_widget.validate() self.get_nth_page(Page.FORM).set_form(self._data_form_widget) self.set_current_page(Page.FORM) def _on_is_valid(self, _widget, is_valid): self.set_page_complete(self.get_nth_page(Page.FORM), is_valid) - def _on_error(self, error_text, form=None, is_form=False): - if form is not None: - log.info('Show Form page') - self._is_form = is_form - self._data_form_widget = self._build_dataform(form, is_form) - self.get_nth_page(Page.FORM).set_form(self._data_form_widget, - error_text=error_text) - self.set_current_page(Page.FORM) - else: - log.info('Show Error page') - self.get_nth_page(Page.ERROR).set_text(error_text) - self.set_current_page(Page.ERROR) - def _on_cancel(self, _widget): self.destroy() def _register(self): - log.info('Show Sending page') form = self._data_form_widget.get_submit_form() - self._con.get_module('Register').register_agent( - self._agent, + self._con.get_module('Register').submit_register_form( form, - self._is_form, - self._on_register_success, - self._on_error) + self._agent, + callback=self._on_register_result) + + def _on_register_result(self, task): + try: + task.finish() + except (StanzaError, + MalformedStanzaError, + RegisterStanzaError) as error: + self.get_nth_page(Page.ERROR).set_text(error.get_text()) + self.set_current_page(Page.ERROR) + return - def _on_register_success(self): - log.info('Show Success page') self.set_current_page(Page.SUCCESS) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3fcdc8a5d0c4019f8b95ecc38dac94a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3fcdc8a5d0c4019f8b95ecc38dac94a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove conversion of ASCII emojis
by Philipp Hörist 12 Feb '21

12 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3fcdc8a5 by André Apitzsch at 2021-02-12T21:54:30+01:00 Remove conversion of ASCII emojis Display emojis as intended by the sender, i.e. don't replace it. Closes #10416. - - - - - 6 changed files: - gajim/common/config.py - gajim/common/setting_values.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/preferences.py - gajim/gui_interface.py Changes: ===================================== gajim/common/config.py ===================================== @@ -93,7 +93,6 @@ class Config: 'speller_language': [opt_str, '', _('Language used for spell checking.')], 'print_time': [opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'emoticons_theme': [opt_str, 'noto-emoticons', '', True], - 'ascii_emoticons': [opt_bool, True, _('When enabled, ASCII emojis will be converted to graphical emojis.'), True], 'ascii_formatting': [opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], 'show_ascii_formatting_chars': [opt_bool, True, _('If enabled, do not ' ===================================== gajim/common/setting_values.py ===================================== @@ -41,7 +41,6 @@ class _ACCOUNT_DEFAULT: 'speller_language': '', 'print_time': 'always', 'emoticons_theme': 'noto-emoticons', - 'ascii_emoticons': True, 'ascii_formatting': True, 'show_ascii_formatting_chars': True, 'sounds_on': True, ===================================== gajim/gtk/emoji_data.py ===================================== @@ -144,45 +144,11 @@ def _replace_emojis(self): start(), end(), pixbuf.copy(), codepoint) -class EmojiAsciiData(dict): - def get_regex(self): - # When an emoticon is bordered by an alphanumeric character it - # is NOT expanded. e.g., foo:) NO, foo :) YES, (brb) NO, - # (:)) YES, etc. We still allow multiple emoticons - # side-by-side like :P:P:P - - # TODO: Refactor this - keys = sorted(self.keys(), key=len, reverse=True) - pre_pattern = '' - post_pattern = '' - emoticon_length = 0 - emoticons_pattern = '' - for emoticon in keys: - # escape regexp metachars - emoticon_escaped = re.escape(emoticon) - emoticons_pattern += emoticon_escaped + '|' - if emoticon_length != len(emoticon): - # Build up expressions to match emoticons next to others - pre_pattern = pre_pattern[:-1] + ')|(?<=' - post_pattern = post_pattern[:-1] + ')|(?=' - emoticon_length = len(emoticon) - pre_pattern += emoticon_escaped + '|' - post_pattern += emoticon_escaped + '|' - # We match from our list of emoticons, but they must either have - # whitespace, or another emoticon next to it to match successfully - # [\w.] alphanumeric and dot (for not matching 8) in (2.8)) - emoticons_pattern = r'(?:(?<![\w.]' + \ - pre_pattern[:-1] + '))' + '(?:' + \ - emoticons_pattern[:-1] + ')' + r'(?:(?![\w]' + \ - post_pattern[:-1] + '))' - return emoticons_pattern - - emoji_pixbufs = EmojiPixbufs() # pylint: disable=line-too-long -emoji_ascii_data = EmojiAsciiData([ +emoji_ascii_data = dict([ ("':-D", '\U0001F605'), (':)', '\U0001F642'), (':-O', '\U0001F62e'), ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -29,11 +29,8 @@ class EmojiData(OrderedDict): class EmojiPixbufs(dict): ... -class EmojiAsciiData(dict): - ... - emoji_pixbufs = EmojiPixbufs() -emoji_ascii_data = EmojiAsciiData() +emoji_ascii_data: dict[str, str] emoji_data = EmojiData() ===================================== gajim/gtk/preferences.py ===================================== @@ -103,6 +103,8 @@ def __init__(self): self._ui.connect_signals(self) self.show_all() + if sys.platform not in ('win32', 'darwin'): + self._ui.emoji.hide() def get_ui(self): return self._ui @@ -727,30 +729,24 @@ def _on_dark_theme(value, *args): class Emoji(PreferenceBox): def __init__(self, *args): + if sys.platform not in ('win32', 'darwin'): + PreferenceBox.__init__(self, []) + return emoji_themes_items = [] for theme in helpers.get_available_emoticon_themes(): emoji_themes_items.append(theme) settings = [ - Setting(SettingKind.SWITCH, - _('Convert ASCII Emojis'), + Setting(SettingKind.POPOVER, + _('Emoji Theme'), SettingType.CONFIG, - 'ascii_emoticons', - desc=_('Typing short codes like :-) will display emojis'), - callback=self._on_ascii_emoticons), + 'emoticons_theme', + desc=_('Choose from various emoji styles'), + props={'entries': emoji_themes_items}, + callback=self._on_emoticons_theme) ] - if sys.platform in ('win32', 'darwin'): - settings.append( - Setting(SettingKind.POPOVER, - _('Emoji Theme'), - SettingType.CONFIG, - 'emoticons_theme', - desc=_('Choose from various emoji styles'), - props={'entries': emoji_themes_items}, - callback=self._on_emoticons_theme)) - PreferenceBox.__init__(self, settings) def _on_emoticons_theme(self, *args): @@ -763,10 +759,6 @@ def _toggle_emoticons(): for ctrl in controls: ctrl.toggle_emoticons() - @staticmethod - def _on_ascii_emoticons(*args): - app.interface.make_regexps() - class StatusIcon(PreferenceBox): def __init__(self, *args): ===================================== gajim/gui_interface.py ===================================== @@ -102,7 +102,6 @@ from gajim.gui.dialogs import PassphraseDialog from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.emoji_data import emoji_data -from gajim.gui.emoji_data import emoji_ascii_data from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.filetransfer_progress import FileTransferProgress from gajim.gui.roster_item_exchange import RosterItemExchangeWindow @@ -1392,8 +1391,6 @@ def make_regexps(self): # because emoticons match later (in the string) they need to be after # basic matches that may occur earlier emoticons = emoji_data.get_regex() - if app.settings.get('ascii_emoticons'): - emoticons += '|%s' % emoji_ascii_data.get_regex() self.emot_and_basic = '%s|%s' % (basic_pattern, emoticons) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3fcdc8a5d0c4019f8b95ecc38dac94aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3fcdc8a5d0c4019f8b95ecc38dac94aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Add setting for GSSAPI authentication
by Philipp Hörist 12 Feb '21

12 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: d0e602bd by lovetox at 2021-02-12T21:27:43+01:00 Add setting for GSSAPI authentication - - - - - 739ead2b by lovetox at 2021-02-12T21:27:43+01:00 Client: Determine some Settings right before connecting - - - - - 3 changed files: - gajim/common/client.py - gajim/common/setting_values.py - gajim/gtk/accounts.py Changes: ===================================== gajim/common/client.py ===================================== @@ -157,33 +157,16 @@ def _create_client(self): self._client.set_username(self._user) self._client.set_resource(get_resource(self._account)) - custom_host = get_custom_host(self._account) - if custom_host is not None: - self._client.set_custom_host(*custom_host) - pass_saved = app.settings.get_account_setting(self._account, 'savepass') if pass_saved: # Request password from keyring only if the user chose to save # his password self.password = passwords.get_password(self._account) - anonymous = app.settings.get_account_setting(self._account, - 'anonymous_auth') - if anonymous: - self._client.set_mechs(['ANONYMOUS']) - self._client.set_password(self.password) self._client.set_accepted_certificates( app.cert_store.get_certificates()) - if app.settings.get_account_setting(self._account, - 'use_plain_connection'): - self._client.set_connection_types([ConnectionType.PLAIN]) - - proxy = get_user_proxy(self._account) - if proxy is not None: - self._client.set_proxy(proxy) - self._client.subscribe('resume-failed', self._on_resume_failed) self._client.subscribe('resume-successful', self._on_resume_successful) self._client.subscribe('disconnected', self._on_disconnected) @@ -272,7 +255,7 @@ def _on_disconnected(self, _client, _signal_name): def _on_password(password): self.password = password self._client.set_password(password) - self.connect() + self._prepare_for_connect() app.nec.push_incoming_event(NetworkEvent( 'password-required', conn=self, on_password=_on_password)) @@ -367,7 +350,7 @@ def change_status(self, show, message): if show == 'offline': return - self.connect() + self._prepare_for_connect() return if self._state.is_connecting: @@ -382,7 +365,7 @@ def change_status(self, show, message): self._destroy_client = True self._abort_reconnect() else: - self.connect() + self._prepare_for_connect() return # We are connected @@ -517,6 +500,31 @@ def send_messages(self, jids, message): message.stanza = stanza self._send_message(message) + def _prepare_for_connect(self): + custom_host = get_custom_host(self._account) + if custom_host is not None: + self._client.set_custom_host(*custom_host) + + gssapi = app.settings.get_account_setting(self._account, + 'enable_gssapi') + if gssapi: + self._client.set_mechs(['GSSAPI']) + + anonymous = app.settings.get_account_setting(self._account, + 'anonymous_auth') + if anonymous: + self._client.set_mechs(['ANONYMOUS']) + + if app.settings.get_account_setting(self._account, + 'use_plain_connection'): + self._client.set_connection_types([ConnectionType.PLAIN]) + + proxy = get_user_proxy(self._account) + if proxy is not None: + self._client.set_proxy(proxy) + + self.connect() + def connect(self, ignored_tls_errors=None): if self._state not in (ClientState.DISCONNECTED, ClientState.RECONNECT_SCHEDULED): @@ -545,7 +553,7 @@ def _schedule_reconnect(self): self._set_state(ClientState.RECONNECT_SCHEDULED) log.info("Reconnect to %s in 3s", self._account) self._reconnect_timer_source = GLib.timeout_add_seconds( - 3, self.connect) + 3, self._prepare_for_connect) def _abort_reconnect(self): self._set_state(ClientState.DISCONNECTED) ===================================== gajim/common/setting_values.py ===================================== @@ -258,6 +258,7 @@ class _ACCOUNT_DEFAULT: 'gc_send_marker_private_default': True, 'gc_send_marker_public_default': False, 'chat_history_max_age': -1, + 'enable_gssapi': False, }, 'contact': { ===================================== gajim/gtk/accounts.py ===================================== @@ -994,6 +994,9 @@ def __init__(self, account, parent): Setting(SettingKind.CHANGEPASSWORD, _('Change Password'), SettingType.DIALOG, callback=self.on_password_change, props={'dialog': None}), + + Setting(SettingKind.SWITCH, _('Use GSSAPI'), + SettingType.ACCOUNT_CONFIG, 'enable_gssapi'), ] SettingsDialog.__init__(self, parent, _('Login Settings'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c6fd3959f81de8f412e49ba49076ba1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c6fd3959f81de8f412e49ba49076ba1… 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