Commits May 2023

commits@gajim.org

1 participants
125 discussions

[Git][gajim/gajim][master] 6 commits: refactor: Simplify launch.py
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3baa6b33 by Philipp Hörist at 2023-05-27T17:28:13+02:00 refactor: Simplify launch.py - - - - - 4d3f632d by Philipp Hörist at 2023-05-27T17:31:59+02:00 cq: Use capitalized env var name - - - - - c5898f94 by Philipp Hörist at 2023-05-27T17:33:06+02:00 cq: Remove unnecessary list comprehension - - - - - 1de4921a by Philipp Hörist at 2023-05-27T23:03:47+02:00 cq: Ignore false positive ruff error - - - - - ffe5bdd0 by Philipp Hörist at 2023-05-27T23:03:47+02:00 refactor: JingleRTP: Don’t call external process for pipeline debug - - - - - b230d06a by Philipp Hörist at 2023-05-27T23:03:47+02:00 cq: Update ruff version - - - - - 8 changed files: - .pre-commit-config.yaml - gajim/common/configpaths.py - gajim/common/helpers.py - gajim/common/jingle_rtp.py - gajim/common/modules/contacts.py - gajim/gtk/preview_audio_visualizer.py - launch.py - pyproject.toml Changes: ===================================== .pre-commit-config.yaml ===================================== @@ -1,6 +1,6 @@ repos: - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.0.259 + rev: v0.0.270 hooks: - id: ruff exclude: ".githooks/" ===================================== gajim/common/configpaths.py ===================================== @@ -113,7 +113,7 @@ def __init__(self) -> None: else: # Documents and Settings\[User Name]\Application Data\Gajim self.config_root = self.cache_root = self.data_root = \ - Path(os.environ['appdata']) / 'Gajim' + Path(os.environ['APPDATA']) / 'Gajim' else: self.config_root = Path(GLib.get_user_config_dir()) / 'gajim' self.cache_root = Path(GLib.get_user_cache_dir()) / 'gajim' ===================================== gajim/common/helpers.py ===================================== @@ -1109,7 +1109,7 @@ def open_file_uri(uri: str) -> None: if sys.platform != 'win32': Gio.AppInfo.launch_default_for_uri(uri) else: - os.startfile(uri) + os.startfile(uri) # noqa: S606 except Exception as err: log.info("Couldn't open file URI %s: %s", uri, err) ===================================== gajim/common/jingle_rtp.py ===================================== @@ -24,7 +24,6 @@ from typing import Optional import logging -import os import socket from collections import deque from datetime import datetime @@ -40,6 +39,7 @@ pass from gajim.common import app +from gajim.common import configpaths from gajim.common.i18n import _ from gajim.common.jingle_content import contents from gajim.common.jingle_content import JingleContent @@ -571,20 +571,11 @@ def do_setup(self, self.pipeline.set_state(Gst.State.PLAYING) if log.getEffectiveLevel() == logging.DEBUG: - # Use 'export GST_DEBUG_DUMP_DOT_DIR=/tmp/' before starting Gajim timestamp = datetime.now().strftime('%m-%d-%Y-%H-%M-%S') name = f'video-graph-{timestamp}' - debug_dir = os.environ.get('GST_DEBUG_DUMP_DOT_DIR') - name_dot = f'{debug_dir}/{name}.dot' - name_png = f'{debug_dir}/{name}.png' + filename = configpaths.get('DEBUG') / f'{name}.dot' Gst.debug_bin_to_dot_file( - self.pipeline, Gst.DebugGraphDetails.ALL, name) - if debug_dir: - try: - os.system(f'dot -Tpng {name_dot} > {name_png}') - except Exception: - log.debug('Could not save pipeline graph. Make sure ' - 'graphviz is installed.') + self.pipeline, Gst.DebugGraphDetails.ALL, str(filename)) @staticmethod def get_fallback_src() -> Optional[Gst.Bin]: ===================================== gajim/common/modules/contacts.py ===================================== @@ -421,8 +421,8 @@ def iter_resources(self) -> Iterator[ResourceContact]: @property def is_available(self) -> bool: # pylint: disable=R1729 - return any([contact.is_available for contact - in self._resources.values()]) + return any(contact.is_available for contact + in self._resources.values()) @property def show(self): ===================================== gajim/gtk/preview_audio_visualizer.py ===================================== @@ -126,8 +126,8 @@ def _process_samples(self) -> None: samples = self._samples # Normalize both channels using the same scale - max_elem = max(max(samples)) - min_elem = min(min(samples)) + max_elem = max(max(samples)) # noqa: PLW3301 + min_elem = min(min(samples)) # noqa: PLW3301 delta = max_elem - min_elem if delta > 0: self._samples = [ ===================================== launch.py ===================================== @@ -2,16 +2,14 @@ import subprocess -from gajim import gajim +import gajim +from gajim.gajim import main try: - p = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, - stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) - node = p.communicate()[0] - if node: - import gajim as g - g.__version__ += '+' + node.decode('utf-8').strip() + res = subprocess.check_output( + ['git', 'rev-parse', '--short=12', 'HEAD']) # noqa: S603, S607 + gajim.__version__ += f'+{res.decode().strip()}' except Exception: pass -gajim.main() +main() ===================================== pyproject.toml ===================================== @@ -201,6 +201,7 @@ ignore = [ "N806", # Variable should be lower case "N817", # CamelCase imported as acronym "N818", # Exception name should be named with an Error suffix + "PGH003", # Use specific rule codes when ignoring type issues "PLC1901",# Expression can be simplified to x as an empty string is falsey "PLR0911",# Too many return statements "PLR0912",# Too many branches @@ -267,6 +268,10 @@ target-version = "py310" "test/*" = ["E402"] "test/common/test_styling.py" = ["RUF001", "E501"] "test/common/test_regex.py" = ["RUF001"] +"pep517build/*" = ["S603", "S607"] +"mac/*" = ["S603", "S607"] +"win/*" = ["S603", "S607"] +"scripts/*" = ["S603", "S607"] [tool.ruff.mccabe] max-complexity = 15 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17b9e7acc63fc5bb8d43131a9ebc4b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17b9e7acc63fc5bb8d43131a9ebc4b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Appveyor: Grab more commits on clone
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 17b9e7ac by Philipp Hörist at 2023-05-27T16:48:32+02:00 ci: Appveyor: Grab more commits on clone Otherwise we only can start builds for the last commit - - - - - 1 changed file: - .ci/appveyor.yml Changes: ===================================== .ci/appveyor.yml ===================================== @@ -6,7 +6,7 @@ environment: MSYSTEM: MINGW64 ARCH: "64bit" -clone_depth: 1 +clone_depth: 10 # init: # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17b9e7acc63fc5bb8d43131a9ebc4b57… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17b9e7acc63fc5bb8d43131a9ebc4b57… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: other: Update git hook
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: bd6c84ba by Philipp Hörist at 2023-05-27T13:58:45+02:00 other: Update git hook - - - - - 8986cb0c by Philipp Hörist at 2023-05-27T13:59:21+02:00 ci: Debian: Update control file - - - - - 3 changed files: - .githooks/update - CONTRIBUTING.md - debian/control Changes: ===================================== .githooks/update ===================================== @@ -44,6 +44,9 @@ def get_commit_shas(start_ref: str, end_ref: str) -> List[str]: data = subprocess.check_output(['git', 'rev-list', arg]) text = data.decode() text = text.strip() + if not text: + # Can happen if commits are deleted after force push + return [] return text.split('\n') @@ -79,6 +82,7 @@ def main(args: Tuple[str, str, str]) -> None: shas = get_commit_shas(old_ref, new_ref) for sha in shas: + print('Check', sha) subject = get_commit_subject(sha) enforce_message_rules(subject) ===================================== CONTRIBUTING.md ===================================== @@ -51,6 +51,7 @@ # Commit Messages - refactor (code was changed, but the end user will not notice) - chore (reoccuring tasks which need to be done) - release (only used for release commits) +- revert (used when a commit needs to be reverted) - other Further the first letter after the tag must be upper case ===================================== debian/control ===================================== @@ -35,8 +35,8 @@ Depends: python3 (>= 3.10), python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), - python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230503), + python3-nbxmpp-nightly (>=20230527), + python3-omemo-dr (>=20230527), gir1.2-pango-1.0 (>= 1.50.0), gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/754f916833f5deaaeea4acab275fb3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/754f916833f5deaaeea4acab275fb3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Deleted 1 commit: ci: Debian: Update control file
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 374cc03d by Philipp Hörist at 2023-05-27T12:18:23+02:00 ci: Debian: Update control file - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -35,8 +35,8 @@ Depends: python3 (>= 3.10), python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), - python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230503), + python3-nbxmpp-nightly (>=20230527), + python3-omemo-dr (>=20230527), gir1.2-pango-1.0 (>= 1.50.0), gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/374cc03de9ce03c4e3abe1c64d65d104… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/374cc03de9ce03c4e3abe1c64d65d104… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Debian: Update control file
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 374cc03d by Philipp Hörist at 2023-05-27T12:18:23+02:00 ci: Debian: Update control file - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -35,8 +35,8 @@ Depends: python3 (>= 3.10), python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), - python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230503), + python3-nbxmpp-nightly (>=20230527), + python3-omemo-dr (>=20230527), gir1.2-pango-1.0 (>= 1.50.0), gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/374cc03de9ce03c4e3abe1c64d65d104… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/374cc03de9ce03c4e3abe1c64d65d104… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.8.0
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed new tag 1.8.0 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/1.8.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] release: 1.8.0
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 754f9168 by Philipp Hörist at 2023-05-27T12:15:26+02:00 release: 1.8.0 - - - - - 4 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,81 @@ +Gajim 1.8.0 (27 May 2023) + + New + + * XMLConsole: Add logging view + * JID sharing: Include verified OMEMO fingerprints + * Detect dark theme on Windows + * Integrate OMEMO plugin + * Redesign Group Chat actions (#10362) + + Improvements + + * Audio preview: Support more mime types + * ChatBanner: Add share instructions + * ChatList: Clear row content when removing history (#11420) + * XMLConsole: Always use dark theme + * AboutDialog: Show libsoup version + * GroupchatState: Show MAM sync + * ChatList: Improve sorting + * Make contact details/settings available when offline + * ACE: Make descriptions selectable and copyable + * Notifications: Withdraw all when a corresponding chat is read (#11030) + * ChatList: Show indicator if group chat is not connected + * ChatList: Show indicator when joining group chat + * StartChat: Don't filter for account labels (#11494) + * ChatStack: Only respond to supported drag-n-drop types while dragging + * App menu: Add menu entry for privacy policy + * GroupchatRoster: Highlight own nick and sort it to the top (#11431) + * CertificateDialog: Add additional infos and remove org unit field (#11461) + * GroupchatDetails: Hide OMEMO page in public MUCs + * ChatBanner: Add QR code for sharing JIDs (#11429) + * Windows: Package pixbuf loaders for avif and webp + + Change + + * Raise nbxmpp version + * Remove "escape_key_closes" from ACE + * Enable spell checker by default + * OMEMO verification: Generate URIs with pedantically correct query + * Raise gajim when no cmdline options are provided (#11482) + + Performance + + * QR codes: Avoid roundtrip to PNG in storage and back + + Bug Fixes + + * ProfileWindow: Don't fail when no vcard is set + * ContactInfo: Don’t fail when no vcard is set + * Message menu: Fix issue with chats not supplying correct ID + * Exceptions: Fix sending reports via sentry in conjunction with proxy settings + * ChatActionProcessor: De-duplicate emojis + * Fix encryption deadlock with changed MUC configurations (#11421) + * UI: Update avatar on muc-disco-update + * AvatarSelector: Fix that images don't display after repeated loading + * SearchView: Don't change search context when switching chats (#11533) + * SearchView: Remove overlay (#11412) + * ChatActionProcessor: Allow to click items with mouse cursor (#11445) + * MessageWidget: Don't return truncated text for message actions Fixes [#11526](https://dev.gajim.org/gajim/gajim/issues/11526) (#11526) + * Idle: Use default xa implementation for XSS backend (#11522) + * ConversationView: Fix loading messages going forward from specific point (#11201) + * ACE: Handle invalid numeric values gracefully + * XMLConsole: Select first account by default (#11498) + * Fix rendering of copied code blocks and quotes (#11499) + * ContactInfo: Improve behavior for connection changes + * Fix access to GnuPG keys on flatpak (#621) + * Fix showing status icon on flatpak + * Escape JIDs for xmpp URIs everywhere + * Ask for confirmation when leaving a MUC while offline (#11487) + * ContactInfo: Improve behavior for connection changes (#11439) + * Make manually changing the pinned chat sort order work again + * MessageActionsBox: Update send file button tooltip when switching chats (#11473) + * GroupChatRoster: Make scrollbar the right-most widget (#11290) + * GroupChatInviter: Don't filter by account name (#11474) + * Preview: Display webp and avif images on Windows correctly + * CertificateDialog: Display issued-to information correctly + * AccountWizard: Respect global proxy (#11452) + Gajim 1.7.3 (03 Apr 2023) New ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,9 @@ <control>pointing</control> </recommends> <releases> + <release version="1.8.0" date="2023-05-27"> + <url>https://dev.gajim.org/gajim/gajim/-/releases/1.8.0</url> + </release> <release version="1.7.3" date="2023-04-04"> <url>https://dev.gajim.org/gajim/gajim/-/releases/1.7.3</url> </release> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -381,7 +381,7 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.7.3 + tag: 1.8.0 - type: file path: app-overrides.json post-install: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.7.3' +__version__ = '1.8.0' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/754f916833f5deaaeea4acab275fb3d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/754f916833f5deaaeea4acab275fb3d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Debian: Update control file
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 80d2f9f6 by Philipp Hörist at 2023-05-27T12:10:34+02:00 ci: Debian: Update control file - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -12,8 +12,8 @@ Build-Depends: python3-css-parser, python3-gi, python3-gi-cairo, - python3-nbxmpp-nightly (>=20230405), - python3-omemo-dr (>=20230503), + python3-nbxmpp-nightly (>=20230527), + python3-omemo-dr (>=20230527), python3-setuptools, python3-packaging, python3-cryptography (>=3.4.8), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80d2f9f6254ccd30f6fd5343b03300f1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80d2f9f6254ccd30f6fd5343b03300f1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ProfileWindow: Don't fail when no vcard is set
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: a422f065 by André Apitzsch at 2023-05-27T11:11:55+02:00 fix: ProfileWindow: Don't fail when no vcard is set - - - - - 1 changed file: - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/profile.py ===================================== @@ -185,9 +185,12 @@ def _on_access_model_received(self, task: Task) -> None: def _on_vcard_received(self, task: Task): try: - self._current_vcard = cast(VCard, task.finish()) + self._current_vcard = cast(VCard | None, task.finish()) except StanzaError as error: log.info('Error loading VCard: %s', error) + self._current_vcard = None + + if self._current_vcard is None: self._current_vcard = VCard() self._load_avatar() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a422f0651d6a4ba5ba254103045e47c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a422f0651d6a4ba5ba254103045e47c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ContactInfo: Don’t fail when no vcard is set
by Philipp Hörist (＠lovetox) 27 May '23

27 May '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 732d381a by Philipp Hörist at 2023-05-27T09:41:05+02:00 fix: ContactInfo: Don’t fail when no vcard is set - - - - - 1 changed file: - gajim/gtk/contact_info.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -303,9 +303,12 @@ def _query_device(self, contact: ResourceContact) -> None: def _on_vcard_received(self, task: Task) -> None: try: - vcard = cast(VCard, task.finish()) + vcard = cast(VCard | None, task.finish()) except StanzaError as err: log.info('Error loading VCard: %s', err) + vcard = None + + if vcard is None: vcard = VCard() self._vcard_grid.set_vcard(vcard) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/732d381aa489674d5b5c2606e9d7e36e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/732d381aa489674d5b5c2606e9d7e36e… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2023