Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/gajim][master] Exceptions: Rework and basic Sentry integration
by Philipp Hörist (＠lovetox) 23 Mar '22

23 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 38a3b673 by Daniel Brötzmann at 2022-03-23T20:21:54+00:00 Exceptions: Rework and basic Sentry integration - - - - - 8 changed files: - README.md - gajim/common/app.py - gajim/common/helpers.py - gajim/data/gui/exception_dialog.ui - gajim/gtk/builder.pyi - gajim/gtk/exception.py - gajim/gtk/util.py - win/_base.sh Changes: ===================================== README.md ===================================== @@ -21,6 +21,7 @@ ### Runtime Requirements ### Optional Runtime Requirements - python3-pil (pillow) for support of webp avatars +- python3-sentry-sdk for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working ===================================== gajim/common/app.py ===================================== @@ -126,6 +126,7 @@ def __init__(self): 'IDLE': False, 'APPINDICATOR': False, 'AYATANA_APPINDICATOR': False, + 'SENTRY_SDK': False, } _tasks: dict[int, list[Any]] = defaultdict(list) @@ -277,6 +278,13 @@ def detect_dependencies() -> None: except (ImportError, ValueError): pass + # SENTRY SDK + try: + import sentry_sdk # pylint: disable=unused-import + _dependencies['SENTRY_SDK'] = True + except ImportError: + pass + # Print results for dep, val in _dependencies.items(): log('gajim').info('%-13s %s', dep, val) ===================================== gajim/common/helpers.py ===================================== @@ -78,6 +78,8 @@ from gi.repository import Gio from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Soup import precis_i18n.codec # pylint: disable=unused-import @@ -757,6 +759,18 @@ def get_proxy(proxy_name: str) -> Optional[ProxyData]: password=password) +def is_proxy_in_use() -> bool: + return get_global_proxy() is not None or is_account_proxy_in_use() + + +def is_account_proxy_in_use() -> bool: + for client in app.get_clients(): + account_proxy = get_account_proxy(client.account, fallback=False) + if account_proxy is not None: + return True + return False + + def version_condition(current_version: str, required_version: str) -> bool: if V(current_version) < V(required_version): return False @@ -1444,6 +1458,42 @@ def get_start_of_day(date_time: datetime) -> datetime: microsecond=0) +def get_os_name() -> str: + if sys.platform in ('win32', 'darwin'): + return platform.system() + if os.name == 'posix': + try: + import distro + return distro.name(pretty=True) + except ImportError: + return platform.system() + return '' + + +def get_os_version() -> str: + if sys.platform in ('win32', 'darwin'): + return platform.release() + if os.name == 'posix': + try: + import distro + return distro.version(pretty=True) + except ImportError: + return platform.release() + return '' + + +def get_gobject_version() -> str: + gobject_ver = '.'.join(map(str, GObject.pygobject_version)) + return gobject_ver + + +def get_glib_version() -> str: + glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, + GLib.MINOR_VERSION, + GLib.MICRO_VERSION])) + return glib_ver + + def make_path_from_jid(base_path: Path, jid: JID) -> Path: assert jid.domain is not None domain = jid.domain[:50] @@ -1455,3 +1505,21 @@ def make_path_from_jid(base_path: Path, jid: JID) -> Path: if jid.resource is not None: return path / jid.resource[:30] return path + + +def make_http_request(uri: str, callback: Any) -> None: + proxy = get_global_proxy() + if proxy is None: + if is_account_proxy_in_use(): + raise ValueError('No global proxy found, ' + 'but account proxies are in use') + resolver = None + + else: + resolver = proxy.get_resolver() + + session = Soup.Session() + session.props.proxy_resolver = resolver + session.props.user_agent = f'Gajim {app.version}' + message = Soup.Message.new('GET', uri) + session.queue_message(message, callback) ===================================== gajim/data/gui/exception_dialog.ui ===================================== @@ -1,29 +1,91 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkApplicationWindow" id="exception_dialog"> - <property name="can_focus">False</property> - <property name="window_position">center</property> - <property name="type_hint">dialog</property> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="exception_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkInfoBar" id="infobar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> + <property name="can-focus">False</property> + <property name="layout-style">end</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="content_area"> + <object class="GtkBox"> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">dialog-information-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Install <tt>sentry-sdk</tt> to make reporting issues easier.</property> + <property name="use-markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="spacing">24</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="icon_name">dialog-error</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="icon-name">face-embarrassed</property> <property name="icon_size">6</property> </object> <packing> @@ -33,22 +95,87 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Sorry, that should not have happened</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">50</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Gajim encountered an error. +Please help us fixing this issue by sending this report.</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">60</property> + <property name="lines">3</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="height-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="margin-top">6</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTextView" id="exception_view"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="editable">False</property> + <property name="left-margin">4</property> + <property name="right-margin">4</property> + <property name="top-margin">4</property> + <property name="bottom-margin">4</property> + <property name="accepts-tab">False</property> + <property name="monospace">True</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="user_feedback_box"> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="margin-top">6</property> + <property name="spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Sorry, that should not have happened</property> + <property name="label" translatable="yes">What happened</property> <property name="wrap">True</property> - <property name="max_width_chars">30</property> - <property name="xalign">0</property> <style> - <class name="large-header"/> + <class name="dim-label"/> </style> </object> <packing> @@ -58,16 +185,13 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkEntry" id="user_feedback_entry"> + <property name="width-request">400</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">True</property> <property name="halign">start</property> - <property name="label" translatable="yes">Gajim encountered an error. A report is shown below. -By reporting this bug you might help people to fix this.</property> - <property name="wrap">True</property> - <property name="max_width_chars">60</property> - <property name="lines">3</property> - <property name="xalign">0</property> + <property name="activates-default">True</property> + <property name="placeholder-text" translatable="yes">Add some details…</property> </object> <packing> <property name="expand">False</property> @@ -79,7 +203,7 @@ By reporting this bug you might help people to fix this.</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">4</property> </packing> </child> </object> @@ -90,79 +214,72 @@ By reporting this bug you might help people to fix this.</property> </packing> </child> <child> - <object class="GtkButtonBox"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkButton" id="close_btn"> - <property name="label">_Close</property> + <object class="GtkButton" id="close_button"> + <property name="label" translatable="yes">_Close</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_close_clicked" swapped="no"/> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_close_clicked" swapped="no"/> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="report_btn"> - <property name="label" translatable="yes">_Report Bug</property> + <object class="GtkButton" id="report_button"> + <property name="label" translatable="yes">Send _Report</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_report_clicked" swapped="no"/> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_report_clicked" swapped="no"/> <style> <class name="suggested-action"/> </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="pack-type">end</property> + <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="height_request">200</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> <child> - <object class="GtkTextView" id="exception_view"> + <object class="GtkSpinner" id="report_spinner"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="editable">False</property> - <property name="left_margin">4</property> - <property name="right_margin">4</property> - <property name="accepts_tab">False</property> + <property name="can-focus">False</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="pack-type">end</property> + <property name="position">4</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </interface> ===================================== gajim/gtk/builder.pyi ===================================== @@ -313,10 +313,14 @@ class EmojiChooserBuilder(Builder): class ExceptionDialogBuilder(Builder): - exception_dialog: Gtk.ApplicationWindow - close_btn: Gtk.Button - report_btn: Gtk.Button + exception_box: Gtk.Box + infobar: Gtk.InfoBar exception_view: Gtk.TextView + user_feedback_box: Gtk.Box + user_feedback_entry: Gtk.Entry + close_button: Gtk.Button + report_button: Gtk.Button + report_spinner: Gtk.Spinner class FileTransferBuilder(Builder): ===================================== gajim/gtk/exception.py ===================================== @@ -17,29 +17,46 @@ # 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 Type +from types import TracebackType + import sys -import os +import json import traceback import threading import webbrowser -import platform from io import StringIO from urllib.parse import urlencode +from gi.repository import Gdk from gi.repository import Gtk -from gi.repository import GObject -from gi.repository import GLib +from gi.repository import Soup import nbxmpp import gajim -from gajim.common import configpaths +from gajim.common import app +from gajim.common.helpers import get_glib_version +from gajim.common.helpers import get_gobject_version +from gajim.common.helpers import get_os_name +from gajim.common.helpers import get_os_version +from gajim.common.helpers import is_proxy_in_use +from gajim.common.helpers import make_http_request +from gajim.common.i18n import _ + from .builder import get_builder +from .util import get_gtk_version +try: + import sentry_sdk +except ImportError: + pass _exception_in_progress = threading.Lock() -ISSUE_TEXT = '''## Versions +ISSUE_URL = 'https://dev.gajim.org/gajim/gajim/issues/new' + +ISSUE_TEXT = '''## Versions: - OS: {} - GTK Version: {} - PyGObject Version: {} @@ -55,7 +72,10 @@ ...''' -def _hook(type_, value, tb): +def _hook(type_: Type[BaseException], + value: BaseException, + tb: TracebackType + ) -> None: if not _exception_in_progress.acquire(False): # Exceptions have piled up, so we use the default exception # handler for such exceptions @@ -66,65 +86,159 @@ def _hook(type_, value, tb): _exception_in_progress.release() -class ExceptionDialog(): - def __init__(self, type_, value, tb): - path = configpaths.get('GUI') / 'exception_dialog.ui' - self._ui = get_builder(path.resolve()) - self._ui.connect_signals(self) +class ExceptionDialog(Gtk.ApplicationWindow): + def __init__(self, + type_: Type[BaseException], + value: BaseException, + tb: TracebackType + ) -> None: + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_resizable(True) + self.set_default_size(700, -1) + self.set_title(_('Gajim - Error')) - self._ui.report_btn.grab_focus() + self._traceback_data = (type_, value, tb) + self._sentry_available = app.is_installed('SENTRY_SDK') + + self._ui = get_builder('exception_dialog.ui') + self.add(self._ui.exception_box) + + if not self._sentry_available: + self._ui.user_feedback_box.set_no_show_all(True) + self._ui.infobar.set_revealed(True) + + self._ui.report_button.grab_focus() + self._ui.report_button.grab_default() - buffer_ = self._ui.exception_view.get_buffer() trace = StringIO() traceback.print_exception(type_, value, tb, None, trace) - self.text = self.get_issue_text(trace.getvalue()) - buffer_.set_text(self.text) - print(self.text, file=sys.stderr) - self._ui.exception_view.set_editable(False) - self._ui.exception_dialog.show() + self._issue_text = self._get_issue_text(trace.getvalue()) + buffer_ = self._ui.exception_view.get_buffer() + buffer_.set_text(self._issue_text) - def on_report_clicked(self, *args): - issue_url = 'https://dev.gajim.org/gajim/gajim/issues/new' - params = {'issue[description]': self.text} - url = '{}?{}'.format(issue_url, urlencode(params)) + self._ui.connect_signals(self) + self.show_all() + + if self._sentry_available: + self._ui.user_feedback_entry.grab_focus() + + def _on_report_clicked(self, _button: Gtk.Button) -> None: + if self._sentry_available and not is_proxy_in_use(): + # sentry-sdk supports a http-proxy arg but for now only use + # sentry when no proxy is set, because we never tested if this + # works. It's not worth it to potentially leak users identity just + # because of error reporting. + self._report_with_sentry() + else: + self._report_with_browser() + + def _report_with_browser(self): + params = {'issue[description]': self._issue_text} + url = f'{ISSUE_URL}?{urlencode(params)}' webbrowser.open(url, new=2) + self.destroy() - def on_close_clicked(self, *args): - self._ui.exception_dialog.destroy() + def _on_close_clicked(self, _button: Gtk.Button) -> None: + self.destroy() @staticmethod - def get_issue_text(traceback_text): - gtk_ver = '%i.%i.%i' % ( - Gtk.get_major_version(), - Gtk.get_minor_version(), - Gtk.get_micro_version()) - gobject_ver = '.'.join(map(str, GObject.pygobject_version)) - glib_ver = '.'.join(map(str, [GLib.MAJOR_VERSION, - GLib.MINOR_VERSION, - GLib.MICRO_VERSION])) - - return ISSUE_TEXT.format(get_os_info(), - gtk_ver, - gobject_ver, - glib_ver, - nbxmpp.__version__, - gajim.__version__, - traceback_text) - - -def init(): - if os.name == 'nt' or not sys.stderr.isatty(): - sys.excepthook = _hook + def _get_issue_text(traceback_text: str) -> str: + return ISSUE_TEXT.format( + f'{get_os_name()} {get_os_version()}', + get_gtk_version(), + get_gobject_version(), + get_glib_version(), + nbxmpp.__version__, + gajim.__version__, + traceback_text) + + def _report_with_sentry(self) -> None: + if sentry_sdk.last_event_id() is None: + # Sentry has not been initialized yet: + # update sentry endpoint, init sentry, then capture exception + self._request_sentry_endpoint() + return + + self._capture_exception() + self.destroy() + + def _request_sentry_endpoint(self) -> None: + self._ui.report_button.set_sensitive(False) + self._ui.close_button.set_sensitive(False) + self._ui.report_spinner.show() + self._ui.report_spinner.start() + + make_http_request('https://gajim.org/updates.json', + self._on_endpoint_received) + + def _parse_endpoint(self, message: Soup.Message) -> str: + status = message.props.status_code + response_body = message.props.response_body + + if status != Soup.Status.OK: + error = message.props.reason_phrase + raise ValueError('Failed to retrieve sentry endpoint: %s %s' % ( + status, error)) + + if response_body is None or not response_body.data: + raise ValueError('Failed to retrieve sentry endpoint, ' + 'no response body') + try: + data = json.loads(response_body.data) + except Exception as error: + raise ValueError('Json parsing error: %s' % error) -def get_os_info(): - if os.name == 'nt' or sys.platform == 'darwin': - return platform.system() + " " + platform.release() - if os.name == 'posix': + endpoint = data.get('sentry_endpoint') + if endpoint is None: + raise ValueError('Sentry endpoint missing in response') + + return endpoint + + def _on_endpoint_received(self, + _session: Soup.Session, + message: Soup.Message + ) -> None: try: - import distro - return distro.name(pretty=True) - except ImportError: - return platform.system() - return '' + endpoint = self._parse_endpoint(message) + except ValueError as error: + print(error) + self._report_with_browser() + + else: + self._init_sentry(endpoint) + self._capture_exception() + self.destroy() + + def _init_sentry(self, endpoint: str) -> None: + # pylint: disable=abstract-class-instantiated + sentry_sdk.init( + dsn=endpoint, + traces_sample_rate=0.0, + max_breadcrumbs=0, + release=gajim.__version__) + sentry_sdk.set_context('os', { + 'name': get_os_name(), + 'version': get_os_version()}) + sentry_sdk.set_context('app', { + 'app_version': gajim.__version__}) + sentry_sdk.set_context('software', { + 'python-nbxmpp': nbxmpp.__version__, + 'GTK': get_gtk_version(), + 'GObject': get_gobject_version(), + 'GLib': get_glib_version()}) + + def _capture_exception(self) -> None: + sentry_sdk.set_context('user feedback', { + 'Feedback': self._ui.user_feedback_entry.get_text()}) + sentry_sdk.capture_exception(self._traceback_data) + + +def init() -> None: + if sys.platform == 'win32' or not sys.stderr.isatty(): + sys.excepthook = _hook ===================================== gajim/gtk/util.py ===================================== @@ -779,6 +779,14 @@ def open_window(name: str, **kwargs: Any) -> Any: return window +def get_gtk_version() -> str: + gtk_ver = '%i.%i.%i' % ( + Gtk.get_major_version(), + Gtk.get_minor_version(), + Gtk.get_micro_version()) + return gtk_ver + + class EventHelper(CommonEventHelper): def __init__(self): CommonEventHelper.__init__(self) ===================================== win/_base.sh ===================================== @@ -112,6 +112,7 @@ python-gnupg python-axolotl qrcode css_parser +sentry-sdk " build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/38a3b673eb1baa08ea98b148bcd0222b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/38a3b673eb1baa08ea98b148bcd0222b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Desktop: Add "SingleMainWindow" key
by Philipp Hörist (＠lovetox) 23 Mar '22

23 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 32cf1968 by André Apitzsch at 2022-03-23T20:48:00+01:00 Desktop: Add "SingleMainWindow" key Signal to the desktop that gajim does not support having an additional main window opended. https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.ht… - - - - - 1 changed file: - data/org.gajim.Gajim.desktop.in Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== @@ -9,6 +9,7 @@ Exec=gajim %u #Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim StartupNotify=false +SingleMainWindow=true X-GNOME-UsesNotifications=true Terminal=false Type=Application View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32cf1968a49af76954e7295c86a3649c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/32cf1968a49af76954e7295c86a3649c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Accounts: Change text of privacy setting
by Philipp Hörist (＠lovetox) 23 Mar '22

23 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6330f453 by lovetox at 2022-03-23T19:11:24+01:00 Accounts: Change text of privacy setting It’s not possible to disable client information anymore - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -732,11 +732,11 @@ def __init__(self, account: str) -> None: desc=_('Disclose the local system time of the ' 'device Gajim runs on')), - Setting(SettingKind.SWITCH, _('Client / Operating System'), + Setting(SettingKind.SWITCH, _('Operating System'), SettingType.ACCOUNT_CONFIG, 'send_os_info', callback=self._send_os_info, - desc=_('Disclose information about the client ' - 'and operating system you currently use')), + desc=_('Disclose information about the ' + 'operating system you currently use')), Setting(SettingKind.SWITCH, _('Media Playback'), SettingType.ACCOUNT_CONFIG, 'publish_tune', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6330f45337d39cbeacee1e17cf1ae252… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6330f45337d39cbeacee1e17cf1ae252… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] SoftwareVersion: Only disable OS information
by Philipp Hörist (＠lovetox) 23 Mar '22

23 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5307fb2b by André Apitzsch at 2022-03-23T17:22:48+00:00 SoftwareVersion: Only disable OS information Only disable the OS info but not sending the client version, because it is leaked via disco info anyway. - - - - - 1 changed file: - gajim/common/modules/software_version.py Changes: ===================================== gajim/common/modules/software_version.py ===================================== @@ -32,15 +32,13 @@ def __init__(self, con): BaseModule.__init__(self, con) def set_enabled(self, enabled): - if not enabled: - self._nbxmpp('SoftwareVersion').disable() - return - - if not app.settings.get_account_setting(self._account, 'send_os_info'): - return - + if enabled and app.settings.get_account_setting(self._account, + 'send_os_info'): + os_info = get_os_info() + else: + os_info = None self._nbxmpp('SoftwareVersion').set_software_version( - 'Gajim', app.version, get_os_info()) + 'Gajim', app.version, os_info) self._nbxmpp('SoftwareVersion').set_allow_reply_func(self._allow_reply) def _allow_reply(self, jid): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5307fb2b2040d2a3da2360d09616e1cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5307fb2b2040d2a3da2360d09616e1cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Refactor passing variants for actions
by Philipp Hörist (＠lovetox) 23 Mar '22

23 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 753d8275 by lovetox at 2022-03-23T18:16:21+01:00 Refactor passing variants for actions - - - - - 7 changed files: - gajim/gtk/application.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/notification.py - gajim/gtk/structs.py - gajim/gtk/workspace_side_bar.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -715,12 +715,12 @@ def _on_open_event_action(_action: Gio.SimpleAction, app.window.present_with_time(Gtk.get_current_event_time()) - @staticmethod - def _on_mark_as_read_action(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: - dict_ = param.unpack() - account, jid = dict_['account'], dict_['jid'] - app.window.mark_as_read(account, JID.from_string(jid)) + @structs.actionmethod + def _on_mark_as_read_action(self, + _action: Gio.SimpleAction, + params: structs.AccountJidParam) -> None: + + app.window.mark_as_read(params.account, params.jid) @staticmethod def _on_ipython_action(_action: Gio.SimpleAction, @@ -787,7 +787,7 @@ def _remove() -> None: @staticmethod @structs.actionfunction def _on_forget_groupchat_action(_action: Gio.SimpleAction, - params: structs.ForgetGroupchatActionParams + params: structs.AccountJidParam ) -> None: window = cast(StartChatDialog, get_app_window('StartChatDialog')) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -87,9 +87,9 @@ def __init__(self, def _add_actions(self) -> None: actions = [ - ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), + ('toggle-chat-pinned', 'a{sv}', self._toggle_chat_pinned), ('move-chat-to-workspace', 'a{sv}', self._move_chat_to_workspace), - ('mark-as-read', 'as', self._mark_as_read), + ('mark-as-read', 'a{sv}', self._mark_as_read), ] for action in actions: @@ -202,21 +202,20 @@ def store_open_chats(self, workspace_id: str) -> None: app.settings.set_workspace_setting( workspace_id, 'open_chats', open_chats) + @structs.actionmethod def _toggle_chat_pinned(self, _action: Gio.SimpleAction, - param: GLib.Variant + params: structs.ChatListEntryParam ) -> None: - workspace_id, account, jid = param.unpack() - jid = JID.from_string(jid) - chat_list = self._chat_lists[workspace_id] - chat_list.toggle_chat_pinned(account, jid) - self.store_open_chats(workspace_id) + chat_list = self._chat_lists[params.workspace_id] + chat_list.toggle_chat_pinned(params.account, params.jid) + self.store_open_chats(params.workspace_id) @structs.actionmethod def _move_chat_to_workspace(self, _action: Gio.SimpleAction, - params: structs.MoveChatToWorkspaceAP + params: structs.ChatListEntryParam ) -> None: current_chatlist = cast(ChatList, self.get_visible_child()) @@ -230,12 +229,13 @@ def _move_chat_to_workspace(self, self.store_open_chats(current_chatlist.workspace_id) self.store_open_chats(params.workspace_id) + @structs.actionmethod def _mark_as_read(self, _action: Gio.SimpleAction, - param: GLib.Variant + params: structs.AccountJidParam ) -> None: - _workspace_id, account, jid = param.unpack() - self.mark_as_read(account, JID.from_string(jid)) + + self.mark_as_read(params.account, params.jid) def remove_chat(self, workspace_id: str, account: str, jid: JID) -> None: chat_list = self._chat_lists[workspace_id] ===================================== gajim/gtk/main.py ===================================== @@ -56,8 +56,9 @@ from .util import open_window from .util import set_urgency_hint from .const import UNLOAD_CHAT_TIME +from .structs import AccountJidParam from .structs import AddChatActionParams -from .structs import AddToRosterParams +from .structs import actionmethod log = logging.getLogger('gajim.gui.main') @@ -596,11 +597,11 @@ def select_chat_number(self, number: int) -> None: if chat_list is not None: chat_list.select_chat_number(number) - @staticmethod - def _add_to_roster(_action: Gio.SimpleAction, - param: GLib.Variant) -> None: + @actionmethod + def _add_to_roster(self, + _action: Gio.SimpleAction, + params: AccountJidParam) -> None: - params = AddToRosterParams.from_variant(param) open_window('AddContact', account=params.account, jid=params.jid) def show_app_page(self) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -44,9 +44,8 @@ from gajim.common.modules.contacts import can_add_to_roster from gajim.gui.structs import AddChatActionParams -from gajim.gui.structs import AddToRosterParams -from gajim.gui.structs import ForgetGroupchatActionParams -from gajim.gui.structs import MoveChatToWorkspaceAP +from gajim.gui.structs import AccountJidParam +from gajim.gui.structs import ChatListEntryParam from gajim.gui.structs import RemoveHistoryActionParams from gajim.gui.util import GajimMenu from gajim.gui.const import ControlType @@ -402,7 +401,7 @@ def get_subscription_menu(account: str, jid: JID) -> GajimMenu: def get_start_chat_row_menu(account: str, jid: JID) -> GajimMenu: - params = ForgetGroupchatActionParams(account=account, jid=jid) + params = AccountJidParam(account=account, jid=jid) menuitems: MenuItemListT = [ (_('Forget this Group Chat'), 'app.forget-groupchat', params), ] @@ -421,8 +420,12 @@ def get_chat_list_row_menu(workspace_id: str, menu = GajimMenu() + params = ChatListEntryParam(workspace_id=workspace_id, + account=account, + jid=jid) + toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') - menu.add_item(toggle_label, 'win.toggle-chat-pinned', None) + menu.add_item(toggle_label, 'win.toggle-chat-pinned', params) workspaces = app.settings.get_workspaces() if len(workspaces) > 1: @@ -431,11 +434,12 @@ def get_chat_list_row_menu(workspace_id: str, submenu.add_item(name, 'win.move-chat-to-workspace', params) if can_add_to_roster(contact): - params = AddToRosterParams(account=account, jid=jid) + params = AccountJidParam(account=account, jid=jid) menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) if app.window.get_chat_unread_count(account, jid, include_silent=True): - menu.add_item(_('Mark as read'), 'win.mark-as-read', None) + params = AccountJidParam(account=account, jid=jid) + menu.add_item(_('Mark as read'), 'win.mark-as-read', params) return menu @@ -443,15 +447,15 @@ def get_chat_list_row_menu(workspace_id: str, def get_workspace_params(current_workspace_id: str, account: str, jid: JID - ) -> Iterator[tuple[str, MoveChatToWorkspaceAP]]: + ) -> Iterator[tuple[str, ChatListEntryParam]]: for workspace_id in app.settings.get_workspaces(): if workspace_id == current_workspace_id: continue name = app.settings.get_workspace_setting(workspace_id, 'name') - params = MoveChatToWorkspaceAP(workspace_id=workspace_id, - account=account, - jid=jid) + params = ChatListEntryParam(workspace_id=workspace_id, + account=account, + jid=jid) yield name, params ===================================== gajim/gtk/notification.py ===================================== @@ -56,6 +56,7 @@ from .util import add_css_to_widget from .util import get_monitor_scale_factor from .util import get_total_screen_geometry +from .structs import AccountJidParam from .structs import OpenEventActionParams log = logging.getLogger('gajim.gui.notification') @@ -352,6 +353,8 @@ def _add_actions(self, if event.type == 'incoming-message': action = f'app.{event.account}-mark-as-read' + params = AccountJidParam(account=event.account, + jid=JID.from_string(jid)) notification.add_button_with_target( _('Mark as Read'), action, params.to_variant()) ===================================== gajim/gtk/structs.py ===================================== @@ -45,12 +45,6 @@ class RemoveHistoryActionParams(VariantMixin): jid: Optional[JID] = None -@dataclass -class ForgetGroupchatActionParams(VariantMixin): - account: str - jid: JID - - @dataclass class AddChatActionParams(VariantMixin): account: str @@ -60,14 +54,14 @@ class AddChatActionParams(VariantMixin): @dataclass -class MoveChatToWorkspaceAP(VariantMixin): +class ChatListEntryParam(VariantMixin): workspace_id: str account: str jid: JID @dataclass -class AddToRosterParams(VariantMixin): +class AccountJidParam(VariantMixin): account: str jid: JID ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -34,7 +34,7 @@ from .chat_list_stack import ChatListStack from .chat_page import ChatPage -from .structs import MoveChatToWorkspaceAP +from .structs import ChatListEntryParam from .util import open_window log = logging.getLogger('gajim.gui.workspace_sidebar') @@ -153,9 +153,9 @@ def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: if workspace_row.workspace_id == 'add': return - params = MoveChatToWorkspaceAP(workspace_id=workspace_row.workspace_id, - account=account, - jid=JID.from_string(jid)) + params = ChatListEntryParam(workspace_id=workspace_row.workspace_id, + account=account, + jid=JID.from_string(jid)) app.window.activate_action('move-chat-to-workspace', params.to_variant()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/753d82753ea694f47b1afec89df3b104… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/753d82753ea694f47b1afec89df3b104… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CacheStorage: Rebuild malformed database automatically
by Philipp Hörist (＠lovetox) 22 Mar '22

22 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1da4efd by wurstsalat at 2022-03-22T22:55:16+00:00 CacheStorage: Rebuild malformed database automatically - - - - - 1 changed file: - gajim/common/storage/cache.py Changes: ===================================== gajim/common/storage/cache.py ===================================== @@ -122,7 +122,13 @@ def _namedtuple_factory(cursor: sqlite3.Cursor, return Row(*row) def _migrate(self) -> None: - user_version = self.user_version + try: + user_version = self.user_version + except sqlite3.DatabaseError as error: + log.error('Database error: %s', error) + self._reinit_storage() + return + if user_version > CURRENT_USER_VERSION: # Gajim was downgraded, reinit the storage self._reinit_storage() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e1da4efdebb3a7e2d31b948edd192c64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e1da4efdebb3a7e2d31b948edd192c64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André (＠andre) 22 Mar '22

22 Mar '22

André pushed to branch master at gajim / gajim Commits: 72a7fbfb by André Apitzsch at 2022-03-22T18:57:13+01:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '41' +runtime-version: '42' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -97,11 +97,11 @@ modules: - name: python3-asn1crypto buildsystem: simple build-commands: - - pip3 install asn1crypto-1.4.0-py2.py3-none-any.whl + - pip3 install asn1crypto-1.5.1-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/a/asn1crypto/asn1crypto-1.4… - sha256: 4bcdf33c861c7d40bdcd74d8e4dd7661aac320fcdf40b9a3f95b4ee12fde2fa8 + url: https://files.pythonhosted.org/packages/py2.py3/a/asn1crypto/asn1crypto-1.5… + sha256: db4e40728b728508912cbb3d44f19ce188f218e9eba635821bb4b68564f8fd67 - name: python3-idna buildsystem: simple @@ -117,22 +117,22 @@ modules: only-arches: - aarch64 build-commands: - - pip3 install cryptography-36.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + - pip3 install cryptography-36.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… - sha256: 5d59a9d55027a8b88fd9fd2826c4392bd487d74bf628bb9d39beecc62a644c12 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 8241cac0aae90b82d6b5c443b853723bcc66963970c67e56e71a2609dc4b5eaf - name: python3-cryptography buildsystem: simple only-arches: - x86_64 build-commands: - - pip3 install cryptography-36.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + - pip3 install cryptography-36.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl sources: - type: file - url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… - sha256: 0a817b961b46894c5ca8a66b599c745b9a3d9f822725221f0e0fe49dc043a3a3 + url: https://files.pythonhosted.org/packages/cp36/c/cryptography/cryptography-36… + sha256: 7b2d54e787a884ffc6e187262823b6feb06c338084bbe80d45166a1cb1c6c5bf - name: python3-pyopenssl buildsystem: simple @@ -183,13 +183,13 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.0-py3-none-any.whl + - pip3 install importlib_metadata-4.11.3-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 6affcdb3aec542dd98df8211e730bba6c5f2bec8288d47bacacde898f548c9ad + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 - name: python3-keyring buildsystem: simple @@ -236,8 +236,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.2.tar.gz - sha256: 748efbcf7cfb31183cd75e5314493e79fe3521b3ec00d090a77e23f7c75fa59d + url: https://files.pythonhosted.org/packages/source/g/gssapi/gssapi-1.7.3.tar.gz + sha256: c69b9f633a0c03c1b84ba14c73b0ec132f6323056e675702c1a5f75f316e06fb # GSound dependency - name: libcanberra View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72a7fbfb1ec66ed0b3d46f385777da3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72a7fbfb1ec66ed0b3d46f385777da3c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: Format helpers.py
by Philipp Hörist (＠lovetox) 20 Mar '22

20 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0f72e168 by lovetox at 2022-03-20T21:10:55+01:00 Format helpers.py - - - - - e10a4814 by lovetox at 2022-03-20T21:14:37+01:00 Remove unused methods - - - - - 33722790 by lovetox at 2022-03-20T21:17:22+01:00 Simplify import - - - - - d2b56ae9 by lovetox at 2022-03-20T21:18:23+01:00 Remove unused method - - - - - 1cf2bf41 by lovetox at 2022-03-20T21:24:38+01:00 Helpers: Add type annotations - - - - - d9762a40 by lovetox at 2022-03-20T21:26:08+01:00 Remove unused import - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -54,7 +54,6 @@ import string import webbrowser from string import Template -import urllib from datetime import datetime from datetime import timedelta from urllib.parse import unquote @@ -129,6 +128,7 @@ def parse_jid(jidstring: str) -> str: except Exception as error: raise InvalidFormat(error) + def idn_to_ascii(host: str) -> str: """ Convert IDN (Internationalized Domain Names) to ACE (ASCII-compatible @@ -144,6 +144,7 @@ def idn_to_ascii(host: str) -> str: converted_labels.append('') return ".".join(converted_labels) + def ascii_to_idn(host: str) -> str: """ Convert ACE (ASCII-compatible encoding) to IDN (Internationalized Domain @@ -156,17 +157,6 @@ def ascii_to_idn(host: str) -> str: converted_labels.append(idna.ToUnicode(label)) return ".".join(converted_labels) -def puny_encode_url(url: str) -> Optional[str]: - _url = url - if '//' not in _url: - _url = '//' + _url - try: - o = urllib.parse.urlparse(_url) - p_loc = idn_to_ascii(o.hostname) - except Exception: - log.debug('urlparse failed: %s', url) - return None - return url.replace(o.hostname, p_loc) def parse_resource(resource: str) -> Optional[str]: """ @@ -180,16 +170,13 @@ def parse_resource(resource: str) -> Optional[str]: except UnicodeError: raise InvalidFormat('Invalid character in resource.') -def windowsify(word: str) -> str: - if os.name == 'nt': - return word.capitalize() - return word def get_uf_show(show: str, use_mnemonic: bool = False) -> str: if use_mnemonic: return SHOW_STRING_MNEMONIC[show] return SHOW_STRING[show] + def get_uf_sub(sub: str) -> str: if sub == 'none': uf_sub = Q_('?Subscription we already have:None') @@ -204,6 +191,7 @@ def get_uf_sub(sub: str) -> str: return uf_sub + def get_uf_ask(ask: Union[str, None]) -> str: if ask is None: uf_ask = Q_('?Ask (for Subscription):None') @@ -214,6 +202,7 @@ def get_uf_ask(ask: Union[str, None]) -> str: return uf_ask + def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: ''' plural determines if you get Moderators or Moderator''' if not isinstance(role, str): @@ -235,6 +224,7 @@ def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: return _('Visitor') return '' + def get_uf_affiliation(affiliation: Union[Affiliation, str], plural: bool = False ) -> str: @@ -258,6 +248,7 @@ def get_uf_affiliation(affiliation: Union[Affiliation, str], return _('Member') return '' + def get_uf_relative_time(timestamp: float) -> str: date_time = datetime.fromtimestamp(timestamp) now = datetime.now() @@ -282,9 +273,6 @@ def get_uf_relative_time(timestamp: float) -> str: minutes) return _('Just now') -def get_sorted_keys(adict): - keys = sorted(adict.keys()) - return keys def to_one_line(msg: str) -> str: msg = msg.replace('\\', '\\\\') @@ -296,6 +284,7 @@ def to_one_line(msg: str) -> str: # 'test\\ntest\\\\ntest' return msg + def from_one_line(msg: str) -> str: # (?<!\\) is a lookbehind assertion which asks anything but '\' # to match the regexp that follows it @@ -311,6 +300,7 @@ def from_one_line(msg: str) -> str: # 'test\ntest\\ntest' return msg + def get_uf_chatstate(chatstate: str) -> str: """ Remove chatstate jargon and returns user friendly messages @@ -322,12 +312,13 @@ def get_uf_chatstate(chatstate: str) -> str: if chatstate == 'composing': return _('is composing a message…') if chatstate == 'paused': - #paused means he or she was composing but has stopped for a while + # paused means he or she was composing but has stopped for a while return _('paused composing a message') if chatstate == 'gone': return _('has closed the chat window or tab') return '' + def exec_command(command: str, use_shell: bool = False, posix: bool = True @@ -344,6 +335,7 @@ def exec_command(command: str, process = subprocess.Popen(args) app.thread_interface(process.wait) + def build_command(executable: str, parameter: str) -> str: # we add to the parameter (can hold path with spaces) # "" so we have good parsing from shell @@ -351,8 +343,9 @@ def build_command(executable: str, parameter: str) -> str: command = f'{executable} "{parameter}"' return command + def get_file_path_from_dnd_dropped_uri(uri: str) -> str: - path = urllib.parse.unquote(uri) # escape special chars + path = unquote(uri) # escape special chars path = path.strip('\r\n\x00') # remove \r\n and NULL # get the path to file if re.match('^file:///[a-zA-Z]:/', path): # windows @@ -363,6 +356,7 @@ def get_file_path_from_dnd_dropped_uri(uri: str) -> str: path = path[5:] # 5 is len('file:') return path + def sanitize_filename(filename: str) -> str: """ Make sure the filename we will write does contain only acceptable and latin @@ -383,6 +377,7 @@ def sanitize_filename(filename: str) -> str: return filename + def reduce_chars_newlines(text: str, max_chars: int = 0, max_lines: int = 0) -> str: """ @@ -464,7 +459,10 @@ def check_soundfile_path(file_: str, return dir_ return None -def strip_soundfile_path(file_, dirs=None, abs_=True): + +def strip_soundfile_path(file_: Union[Path, str], + dirs: Optional[list[Path]] = None, + abs_: bool = True): """ Remove knowns paths from a sound file @@ -494,6 +492,7 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): return name return file_ + def play_sound_file(str_path_to_soundfile: str, loop: bool = False) -> None: path_to_soundfile = check_soundfile_path(str_path_to_soundfile) if path_to_soundfile is None: @@ -502,6 +501,7 @@ def play_sound_file(str_path_to_soundfile: str, loop: bool = False) -> None: from gajim.common import sound sound.play(path_to_soundfile, loop) + def get_client_status(account: str) -> str: client = app.get_client(account) if client.state.is_disconnected: @@ -514,6 +514,7 @@ def get_client_status(account: str) -> str: return client.status + def get_global_show() -> str: maxi = 0 for account in app.connections: @@ -526,6 +527,7 @@ def get_global_show() -> str: maxi = index return SHOW_LIST[maxi] + def get_global_status_message() -> str: maxi = 0 status_message = '' @@ -539,6 +541,7 @@ def get_global_status_message() -> str: status_message = con.status_message return status_message + def statuses_unified() -> bool: """ Test if all statuses are the same @@ -566,6 +569,7 @@ def get_full_jid_from_iq(iq_obj: Iq) -> Optional[str]: return None return parse_jid(str(iq_obj.getFrom())) + def get_jid_from_iq(iq_obj: Iq) -> Optional[str]: """ Return the jid (without resource) from an iq @@ -575,6 +579,7 @@ def get_jid_from_iq(iq_obj: Iq) -> Optional[str]: return None return app.get_jid_without_resource(jid) + def get_auth_sha(sid: str, initiator: str, target: str) -> str: """ Return sha of sid + initiator + target used for proxy auth @@ -582,11 +587,13 @@ def get_auth_sha(sid: str, initiator: str, target: str) -> str: return hashlib.sha1( (f'{sid}{initiator}{target}').encode('utf-8')).hexdigest() + def remove_invalid_xml_chars(string_: str) -> str: if string_: string_ = re.sub(INVALID_XML_CHARS_REGEX, '', string_) return string_ + def get_random_string(count: int = 16) -> str: """ Create random string of count length @@ -661,7 +668,7 @@ def allow_sound_notification(account: str, sound_event: str) -> bool: return False -def get_optional_features(account: str) -> list[Namespace]: +def get_optional_features(account: str) -> list[str]: features: list[str] = [] if app.settings.get_account_setting(account, 'request_user_data'): @@ -684,10 +691,12 @@ def get_optional_features(account: str) -> list[Namespace]: app.plugin_manager.extension_point('update_caps', account, features) return features + def jid_is_blocked(account: str, jid: str) -> bool: con = app.connections[account] return jid in con.get_module('Blocking').blocked + def get_subscription_request_msg(account: Optional[str] = None) -> str: message = _('I would like to add you to my contact list.') if account is None: @@ -701,8 +710,11 @@ def get_subscription_request_msg(account: Optional[str] = None) -> str: message = _('Hello, I am $name. %s') % message return Template(message).safe_substitute({'name': app.nicks[account]}) -def get_retraction_text(account: str, moderator_jid: str, + +def get_retraction_text(account: str, + moderator_jid: str, reason: Optional[str]) -> str: + client = app.get_client(account) contact = client.get_module('Contacts').get_contact( moderator_jid, groupchat=True) @@ -711,12 +723,14 @@ def get_retraction_text(account: str, moderator_jid: str, text += ' ' + _('Reason: %s') % reason return text + def get_global_proxy() -> Optional[ProxyData]: proxy_name = app.settings.get('global_proxy') if not proxy_name: return None return get_proxy(proxy_name) + def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: proxy_name = app.settings.get_account_setting(account, 'proxy') if proxy_name: @@ -726,6 +740,7 @@ def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: return get_global_proxy() return None + def get_proxy(proxy_name: str) -> Optional[ProxyData]: try: settings = app.settings.get_proxy_settings(proxy_name) @@ -741,11 +756,13 @@ def get_proxy(proxy_name: str) -> Optional[ProxyData]: username=username, password=password) + def version_condition(current_version: str, required_version: str) -> bool: if V(current_version) < V(required_version): return False return True + def get_available_emoticon_themes() -> list[str]: files: list[Path] = [] for folder in configpaths.get('EMOTICONS').iterdir(): @@ -761,6 +778,7 @@ def get_available_emoticon_themes() -> list[str]: emoticons_themes += [file.stem for file in files if file.suffix == '.png'] return sorted(emoticons_themes) + def call_counter(func): def helper(self, restart=False): if restart: @@ -769,6 +787,7 @@ def helper(self, restart=False): return func(self) return helper + def load_json(path: Path, key: Optional[str] = None, default: Optional[Any] = None) -> Any: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24900985f9342d6fc81844685e17469… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/24900985f9342d6fc81844685e17469… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Add get_global_proxy()
by Philipp Hörist (＠lovetox) 20 Mar '22

20 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6acb06af by lovetox at 2022-03-20T13:53:17+01:00 Add get_global_proxy() - - - - - 73113fc5 by lovetox at 2022-03-20T13:56:19+01:00 Rename get_user_proxy() - - - - - 24900985 by lovetox at 2022-03-20T14:31:11+01:00 Add fallback param for get_account_proxy() - - - - - 4 changed files: - gajim/common/client.py - gajim/common/helpers.py - gajim/common/modules/httpupload.py - gajim/common/preview.py Changes: ===================================== gajim/common/client.py ===================================== @@ -46,7 +46,7 @@ from gajim.common.const import ClientState from gajim.common.const import SimpleClientState from gajim.common.helpers import get_custom_host -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource from gajim.common.helpers import get_idle_status_message @@ -527,7 +527,7 @@ def _prepare_for_connect(self) -> None: 'use_plain_connection'): self._client.set_connection_types([ConnectionType.PLAIN]) - proxy = get_user_proxy(self._account) + proxy = get_account_proxy(self._account) if proxy is not None: self._client.set_proxy(proxy) ===================================== gajim/common/helpers.py ===================================== @@ -711,14 +711,21 @@ def get_retraction_text(account: str, moderator_jid: str, text += ' ' + _('Reason: %s') % reason return text -def get_user_proxy(account: str) -> Optional[ProxyData]: - proxy_name = app.settings.get_account_setting(account, 'proxy') +def get_global_proxy() -> Optional[ProxyData]: + proxy_name = app.settings.get('global_proxy') if not proxy_name: - proxy_name = app.settings.get('global_proxy') - if not proxy_name: - return None + return None return get_proxy(proxy_name) +def get_account_proxy(account: str, fallback=True) -> Optional[ProxyData]: + proxy_name = app.settings.get_account_setting(account, 'proxy') + if proxy_name: + return get_proxy(proxy_name) + + if fallback: + return get_global_proxy() + return None + def get_proxy(proxy_name: str) -> Optional[ProxyData]: try: settings = app.settings.get_proxy_settings(proxy_name) ===================================== gajim/common/modules/httpupload.py ===================================== @@ -31,7 +31,7 @@ from gajim.common import app from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.const import FTState from gajim.common.filetransfer import FileTransfer from gajim.common.modules.base import BaseModule @@ -57,7 +57,7 @@ def __init__(self, con): self._session.props.user_agent = 'Gajim %s' % app.version def _set_proxy_if_available(self): - proxy = get_user_proxy(self._account) + proxy = get_account_proxy(self._account) if proxy is None: self._proxy_resolver = None self._session.props.proxy_resolver = None ===================================== gajim/common/preview.py ===================================== @@ -34,7 +34,7 @@ from gajim.common.helpers import load_file_async from gajim.common.helpers import write_file_async from gajim.common.helpers import get_tls_error_phrase -from gajim.common.helpers import get_user_proxy +from gajim.common.helpers import get_account_proxy from gajim.common.preview_helpers import aes_decrypt from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import parse_fragment @@ -187,7 +187,7 @@ def _create_session(account: str) -> Tuple[ session.props.https_aliases = ['aesgcm'] session.props.ssl_strict = False - proxy = get_user_proxy(account) + proxy = get_account_proxy(account) if proxy is None: resolver = None else: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6e30706fdb2707a21716a2b5ad58748… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6e30706fdb2707a21716a2b5ad58748… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch set-secret-detection-config-1
by Philipp Hörist (＠lovetox) 19 Mar '22

19 Mar '22

Philipp Hörist deleted branch set-secret-detection-config-1 at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022