Commits June 2023

commits@gajim.org

1 participants
27 discussions

[Git][gajim/gajim] Pushed new branch git-rev-parse
by Daniel Brötzmann (＠wurstsalat) 10 Jun '23

10 Jun '23

Daniel Brötzmann pushed new branch git-rev-parse at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/git-rev-parse You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CertificateBox: Catch exception if cert does not offer extension
by Daniel Brötzmann (＠wurstsalat) 10 Jun '23

10 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: fcc5504f by wurstsalat at 2023-06-10T10:18:16+02:00 fix: CertificateBox: Catch exception if cert does not offer extension Fixes #11560 - - - - - 1 changed file: - gajim/gtk/certificate_dialog.py Changes: ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -14,6 +14,8 @@ from typing import cast +import logging + from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.asymmetric.dsa import DSAPublicKey from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePublicKey @@ -21,6 +23,7 @@ from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey from cryptography.x509 import DNSName +from cryptography.x509 import ExtensionNotFound from cryptography.x509.oid import ExtensionOID from gi.repository import Gdk from gi.repository import Gio @@ -33,6 +36,8 @@ from gajim.gtk.builder import get_builder +log = logging.getLogger('gajim.gtk.certificate_dialog') + class CertificateDialog(Gtk.ApplicationWindow): def __init__(self, @@ -83,13 +88,18 @@ def __init__(self, account: str, certificate: Gio.TlsCertificate) -> None: self._it_organization = str(attribute.value) # Get the subjectAltName extension from the certificate - subject_ext = cert.extensions.get_extension_for_oid( - ExtensionOID.SUBJECT_ALTERNATIVE_NAME) - # Get the DNSName entries from the SAN extension - alt_names = cast( - list[str], - subject_ext.value.get_values_for_type(DNSName)) # pyright: ignore - self._it_subject_alt_names = '\n'.join(alt_names) + try: + subject_ext = cert.extensions.get_extension_for_oid( + ExtensionOID.SUBJECT_ALTERNATIVE_NAME) + # Get the DNSName entries from the SAN extension + alt_names = cast( + list[str], + subject_ext.value.get_values_for_type( # pyright: ignore + DNSName)) + self._it_subject_alt_names = '\n'.join(alt_names) + except ExtensionNotFound as err: + log.info('Certificate does not have extension: %s', err) + self._it_subject_alt_names = '' serial_str = f'{cert.serial_number:02X}' serial_str_foratted = ':'.join( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fcc5504f23f742c6222c830bad1ec084… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fcc5504f23f742c6222c830bad1ec084… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Add Windows MSIX package build
by Philipp Hörist (＠lovetox) 09 Jun '23

09 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 92451f3f by Michel Le Bihan at 2023-06-09T08:32:26+00:00 ci: Add Windows MSIX package build - - - - - 4 changed files: - .ci/appveyor.yml - win/_base.sh - + win/misc/appxmanifest.xml - + win/misc/priconfig.xml Changes: ===================================== .ci/appveyor.yml ===================================== @@ -23,6 +23,7 @@ build_script: - ps: | $filename = "Gajim-$($env:GAJIM_VERSION)-$($env:ARCH)" $filename_portable = "Gajim-Portable-$($env:GAJIM_VERSION)-$($env:ARCH)" + $filename_msixbundle = "Gajim-$($env:GAJIM_VERSION)" if ($env:GAJIM_VERSION -eq "Nightly") { $time_string=(get-date -UFormat "%Y-%m-%d").ToString() @@ -43,6 +44,7 @@ build_script: Push-AppveyorArtifact "$($buildroot)/Gajim.exe" -FileName "$($filename).exe" Push-AppveyorArtifact "$($buildroot)/Gajim-Portable.exe" -FileName "$($filename_portable).exe" + Push-AppveyorArtifact "$($buildroot)/Gajim.msixbundle" -FileName "$($filename_msixbundle).msixbundle" if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } # on_finish: ===================================== win/_base.sh ===================================== @@ -49,6 +49,7 @@ function install_pre_deps { wget \ intltool \ mingw-w64-x86_64-nsis \ + "${MINGW_PACKAGE_PREFIX}"-librsvg \ "${MINGW_PACKAGE_PREFIX}"-toolchain \ "${MINGW_PACKAGE_PREFIX}"-python } @@ -314,7 +315,46 @@ function cleanup_install { } +function makeappx { + "$(find /c/Program\ Files\ $x86$/Windows\ Kits/10/bin/*/x64/ -name makeappx.exe -print | sort | tail -n 1)" "$@" +} + +function makepri { + "$(find /c/Program\ Files\ $x86$/Windows\ Kits/10/bin/*/x64/ -name makepri.exe -print | sort | tail -n 1)" "$@" +} + function build_installer { MSYSTEM='MINGW64' /usr/bin/bash -lc "cd ${BUILD_ROOT} && makensis -NOCD -DVERSION=\"$QL_VERSION_DESC\" -DARCH=\"${MSYSTEM_CARCH}\" -DPREFIX=\"${MSYSTEM_PREFIX:1}\" ${MISC}/gajim.nsi" MSYSTEM='MINGW64' /usr/bin/bash -lc "cd ${BUILD_ROOT} && makensis -NOCD -DVERSION=\"$QL_VERSION_DESC\" -DARCH=\"${MSYSTEM_CARCH}\" -DPREFIX=\"${MSYSTEM_PREFIX:1}\" ${MISC}/gajim-portable.nsi" + ( + cd ${BUILD_ROOT} + rm -rf assets bundle filemapping.txt assets.resfiles appxmanifest.xml resources.pri + echo "[Files]" > filemapping.txt + find ${MSYSTEM_PREFIX:1} -type f | while read line; do + echo "\"$line\" \"${line/${MSYSTEM_PREFIX:1}\///}\"" >> filemapping.txt + done + mkdir -p assets bundle + # https://learn.microsoft.com/en-us/windows/apps/design/style/iconography/app… + for size in {44,50,150}; do + for scale in {100,125,150,200,400}; do + scaled_size=$(( (${size}*${scale}+100/2)/100 )) + rsvg-convert -w ${scaled_size} -h ${scaled_size} -o assets/gajim${size}x${size}.scale-${scale}.png ${DIR}/../gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg + echo "\"assets/gajim${size}x${size}.scale-${scale}.png\" \"assets/gajim${size}x${size}.scale-${scale}.png\"" >> filemapping.txt + done + done + for size in {16,24,32,48,256}; do + rsvg-convert -w ${size} -h ${size} -o assets/gajim44x44.targetsize-${size}.png ${DIR}/../gajim/data/icons/hicolor/scalable/apps/org.gajim.Gajim.svg + cp assets/gajim44x44.targetsize-${size}.png assets/gajim44x44.targetsize-${size}_altform-unplated.png + cp assets/gajim44x44.targetsize-${size}.png assets/gajim44x44.targetsize-${size}_altform-lightunplated.png + echo "\"assets/gajim44x44.targetsize-${size}.png\" \"assets/gajim44x44.targetsize-${size}.png\"" >> filemapping.txt + echo "\"assets/gajim44x44.targetsize-${size}_altform-unplated.png\" \"assets/gajim44x44.targetsize-${size}_altform-unplated.png\"" >> filemapping.txt + echo "\"assets/gajim44x44.targetsize-${size}_altform-lightunplated.png\" \"assets/gajim44x44.targetsize-${size}_altform-lightunplated.png\"" >> filemapping.txt + done + sed "s/QL_VERSION/${QL_VERSION}.0/" ${MISC}/appxmanifest.xml > AppxManifest.xml + makepri new -pr . -cf ${MISC}/priconfig.xml -mn AppxManifest.xml -of resources.pri -o + echo "\"resources.pri\" \"resources.pri\"" >> filemapping.txt + echo "\"AppxManifest.xml\" \"AppxManifest.xml\"" >> filemapping.txt + makeappx pack -f filemapping.txt -p bundle/Gajim_x64.msix -o + makeappx bundle -d bundle/ -p Gajim.msixbundle -o + ) } ===================================== win/misc/appxmanifest.xml ===================================== @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<Package + xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" + xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" + xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" + xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedc…"> + <Identity + Name="2126Gajim.Gajim" + Version="QL_VERSION" + Publisher="CN=7BA5D718-F03F-4E0C-BC3A-3CBC8E87B36A" + ProcessorArchitecture="x64" /> + <Properties> + <DisplayName>Gajim</DisplayName> + <PublisherDisplayName>Gajim</PublisherDisplayName> + <Description>A fully-featured XMPP client</Description> + <Logo>gajim50x50.png</Logo> + </Properties> + <Resources> + <Resource Language="en-us" /> + </Resources> + <Dependencies> + <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0" /> + </Dependencies> + <Capabilities> + <rescap:Capability Name="runFullTrust"/> + </Capabilities> + <Applications> + <Application Id="Gajim" Executable="bin\Gajim.exe" EntryPoint="Windows.FullTrustApplication"> + <uap:VisualElements + BackgroundColor="transparent" + DisplayName="Gajim" + Square44x44Logo="gajim44x44.png" + Square150x150Logo="gajim150x150.png" + Description="Gajim"> + </uap:VisualElements> + <Extensions> + <desktop:Extension Category="windows.startupTask" Executable="bin\Gajim.exe" EntryPoint="Windows.FullTrustApplication"> + <desktop:StartupTask TaskId="Gajim" Enabled="true" DisplayName="Gajim"/> + </desktop:Extension> + </Extensions> + </Application> + </Applications> +</Package> ===================================== win/misc/priconfig.xml ===================================== @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<resources targetOsVersion="10.0.0" majorVersion="1"> + <index root="\" startIndexAt="\assets"> + <default> + <qualifier name="Language" value="en-US"/> + <qualifier name="Contrast" value="standard"/> + <qualifier name="Scale" value="100"/> + <qualifier name="HomeRegion" value="001"/> + <qualifier name="TargetSize" value="256"/> + <qualifier name="LayoutDirection" value="LTR"/> + <qualifier name="Theme" value="dark"/> + <qualifier name="AlternateForm" value=""/> + <qualifier name="DXFeatureLevel" value="DX9"/> + <qualifier name="Configuration" value=""/> + <qualifier name="DeviceFamily" value="Universal"/> + <qualifier name="Custom" value=""/> + </default> + <indexer-config type="folder" foldernameAsQualifier="true" filenameAsQualifier="true" qualifierDelimiter="."/> + </index> +  +  +  +  +</resources> \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92451f3fc754d27e6b70d8b4bbbe8c16… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/92451f3fc754d27e6b70d8b4bbbe8c16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: CreateGroupchat: Make Dialog more error resistent
by Philipp Hörist (＠lovetox) 08 Jun '23

08 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 939133a9 by Philipp Hörist at 2023-06-09T00:47:53+02:00 refactor: CreateGroupchat: Make Dialog more error resistent - Add info label to separate errors and info messages - Make advanced switch insensitive but active if no MUC service is offered - Reset all fields correctly when switching accounts - - - - - 3 changed files: - gajim/data/gui/groupchat_creation.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -38,7 +38,7 @@ </packing> </child> <child> -  +  <object class="GtkGrid" id="grid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -85,7 +85,6 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="hexpand">True</property> - <signal name="changed" handler="_on_name_entry_changed" swapped="no"/> </object> <packing> <property name="left-attach">1</property> @@ -159,7 +158,7 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkLabel" id="advanced_switch_label"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> @@ -172,147 +171,153 @@ </packing> </child> <child> - <object class="GtkBox" id="advanced_box"> + <object class="GtkLabel" id="error_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="wrap">True</property> + <property name="max-width-chars">38</property> + <style> + <class name="error-color"/> + <class name="padding-12"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">8</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="info_label"> <property name="can-focus">False</property> <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">12</property> + <property name="wrap">True</property> + <property name="max-width-chars">38</property> + <style> + <class name="padding-12"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">7</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="address_entry_label"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">end</property> + <property name="margin-top">12</property> + <property name="label" translatable="yes">_Address</property> + <property name="use-underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">6</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="address_entry"> + <property name="width-request">250</property> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="margin-top">12</property> + <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">6</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="public_radio"> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="margin-top">12</property> + <property name="draw-indicator">True</property> + <property name="group">private_radio</property> <child> - <object class="GtkRadioButton" id="private_radio"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="margin-top">12</property> - <property name="active">True</property> - <property name="draw-indicator">True</property> - <property name="group">public_radio</property> + <property name="can-focus">False</property> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin-start">6</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Private</property> - <property name="use-markup">True</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </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="halign">start</property> - <property name="label" translatable="yes">You have to invite people so they can join</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="label" translatable="yes">Public</property> + <property name="use-markup">True</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> </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="GtkRadioButton" id="public_radio"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">False</property> - <property name="draw-indicator">True</property> - <property name="group">private_radio</property> <child> - <object class="GtkBox"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="margin-start">6</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Public</property> - <property name="use-markup">True</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </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="halign">start</property> - <property name="label" translatable="yes">Anyone can join</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label" translatable="yes">Anyone can join</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </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">1</property> - </packing> </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="private_radio"> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="margin-top">12</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="spacing">12</property> + <property name="halign">start</property> + <property name="margin-start">6</property> + <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Address</property> - <property name="use-underline">True</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Private</property> + <property name="use-markup">True</property> + <property name="wrap">True</property> + <property name="xalign">0</property> <style> - <class name="dim-label"/> + <class name="bold"/> </style> </object> <packing> @@ -322,11 +327,16 @@ </packing> </child> <child> - <object class="GtkEntry" id="address_entry"> - <property name="width-request">250</property> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can-focus">True</property> - <signal name="changed" handler="_on_address_entry_changed" swapped="no"/> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">You have to invite people so they can join</property> + <property name="wrap">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> <property name="expand">False</property> @@ -335,36 +345,19 @@ </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="error_label"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="wrap">True</property> - <property name="max-width-chars">38</property> - <style> - <class name="warning-color"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> </child> </object> <packing> - <property name="left-attach">0</property> + <property name="left-attach">1</property> <property name="top-attach">4</property> - <property name="width">2</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -402,11 +402,13 @@ class GroupchatCreationBuilder(Builder): account_combo: Gtk.ComboBox account_label: Gtk.Label advanced_switch: Gtk.Switch - advanced_box: Gtk.Box - private_radio: Gtk.RadioButton - public_radio: Gtk.RadioButton - address_entry: Gtk.Entry + advanced_switch_label: Gtk.Label error_label: Gtk.Label + info_label: Gtk.Label + address_entry_label: Gtk.Label + address_entry: Gtk.Entry + public_radio: Gtk.RadioButton + private_radio: Gtk.RadioButton spinner: Gtk.Spinner create_button: Gtk.Button ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -80,8 +80,7 @@ def __init__(self, account: str | None) -> None: return self._update_accounts(account) - - self.set_focus(self._ui.address_entry) + self._ui.create_button.grab_focus() def _on_account_state(self, _event: AccountConnected | AccountDisconnected @@ -134,12 +133,16 @@ def _fill_placeholders(self) -> None: self._ui.address_entry.set_placeholder_text( f'{placeholder[2]}@{server}') + def _has_muc_service(self, account: str) -> bool: + client = app.get_client(account) + return client.get_module('MUC').service_jid is not None + def _get_muc_service_jid(self) -> str: assert self._account is not None client = app.get_client(self._account) service_jid = client.get_module('MUC').service_jid if service_jid is None: - return '' + return 'muc.example.org' return str(service_jid) def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: @@ -154,23 +157,25 @@ def _on_account_combo_changed(self, combo: Gtk.ComboBox) -> None: if not iter_: return self._account = model[iter_][0] + self._fill_placeholders() + self._unset_error() + self._unset_info() + self._ui.address_entry.get_buffer().set_text('', 0) - self._validate_jid(self._ui.address_entry.get_text()) + has_muc_service = self._has_muc_service(self._account) - if not self._get_muc_service_jid(): - self._set_warning( - _('Your server does not provide a group chat service. ' - 'Please try with a different server.')) - self._ui.advanced_switch.set_active(True) - else: - self._ui.error_label.hide() + self._ui.advanced_switch.set_active(not has_muc_service) + self._ui.advanced_switch.set_sensitive(has_muc_service) + + if not has_muc_service: + self._set_info( + _('Your server does not offer a group chat service. ' + 'Please specify the address of a different server.')) - def _validate_jid(self, text: str) -> None: + def _is_jid_valid(self, text: str) -> bool: if not text: - self._ui.error_label.hide() - self._ui.create_button.set_sensitive(False) - return + return True try: jid = validate_jid(text) @@ -178,10 +183,9 @@ def _validate_jid(self, text: str) -> None: raise ValueError except ValueError: - self._set_warning(_('Invalid Address')) - else: - self._ui.error_label.hide() - self._ui.create_button.set_sensitive(True) + return False + + return True def _set_processing_state(self, enabled: bool) -> None: if enabled: @@ -191,32 +195,36 @@ def _set_processing_state(self, enabled: bool) -> None: self._ui.spinner.stop() self._ui.grid.set_sensitive(not enabled) - def _set_warning(self, text: str) -> None: + def _unset_info(self) -> None: + self._ui.info_label.hide() + + def _set_info(self, text: str) -> None: + self._ui.info_label.set_text(text) + self._ui.info_label.show() + + def _unset_error(self) -> None: + self._ui.error_label.hide() + self._ui.create_button.set_sensitive(True) + + def _set_error(self, text: str) -> None: self._ui.error_label.set_text(text) self._ui.error_label.show() - self._ui.advanced_switch.set_active(True) self._ui.create_button.set_sensitive(False) - def _set_warning_from_error(self, error: StanzaError) -> None: + def _set_error_from_error(self, error: StanzaError) -> None: condition = error.condition or '' if condition == 'gone': condition = 'already-exists' text = MUC_DISCO_ERRORS.get(condition, to_user_string(error)) - self._set_warning(text) - - def _set_warning_from_error_code(self, error_code: str) -> None: - self._set_warning(MUC_DISCO_ERRORS[error_code]) + self._set_error(text) - def _on_name_entry_changed(self, entry: Gtk.Entry) -> None: - name = entry.get_text() - name = name.replace(' ', '-') - server = self._get_muc_service_jid() - self._ui.address_entry.set_text(f'{name.lower()}@{server}') + def _set_error_from_error_code(self, error_code: str) -> None: + self._set_error(MUC_DISCO_ERRORS[error_code]) def _on_address_entry_changed(self, entry: Gtk.Entry) -> None: text = entry.get_text() self._update_entry_completion(entry, text) - self._validate_jid(text) + self._unset_error() def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: text = entry.get_text() @@ -231,11 +239,12 @@ def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: model.append([f'{text}@{server}']) def _on_toggle_advanced(self, switch: Gtk.Switch, *args: Any) -> None: - if switch.get_active(): - self._ui.advanced_box.set_no_show_all(False) - self._ui.advanced_box.show_all() - else: - self._ui.advanced_box.hide() + self._unset_error() + active = switch.get_active() + self._ui.address_entry.set_visible(active) + self._ui.address_entry_label.set_visible(active) + self._ui.public_radio.set_visible(active) + self._ui.private_radio.set_visible(active) def _on_create_clicked(self, _button: Gtk.Button) -> None: assert self._account is not None @@ -250,6 +259,10 @@ def _on_create_clicked(self, _button: Gtk.Button) -> None: server = self._get_muc_service_jid() room_jid = f'{get_random_muc_localpart()}@{server}' + if not self._is_jid_valid(room_jid): + self._set_error(_('Invalid Address')) + return + self._set_processing_state(True) client = app.get_client(self._account) client.get_module('Discovery').disco_info( @@ -264,10 +277,10 @@ def _disco_info_received(self, task: Task) -> None: assert error.jid is not None self._create_muc(error.jid) return - self._set_warning_from_error(error) + self._set_error_from_error(error) else: - self._set_warning_from_error_code( + self._set_error_from_error_code( 'already-exists' if result.is_muc else 'not-muc-service') self._set_processing_state(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/939133a959699da5da78413e6b4a9902… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/939133a959699da5da78413e6b4a9902… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch close-gajim-on-escape
by Daniel Brötzmann (＠wurstsalat) 08 Jun '23

08 Jun '23

Daniel Brötzmann pushed new branch close-gajim-on-escape at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/close-gajim-on-escape You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][message-replies] 27 commits: cq: Typings: Use union operator
by Daniel Brötzmann (＠wurstsalat) 08 Jun '23

08 Jun '23

Daniel Brötzmann pushed to branch message-replies at gajim / gajim Commits: caeaf169 by wurstsalat at 2023-06-07T19:23:07+02:00 cq: Typings: Use union operator - - - - - 19c006b2 by wurstsalat at 2023-06-07T20:16:13+02:00 cq: PlainWidget: Fix URIType import - - - - - 04648b02 by wurstsalat at 2023-06-07T20:19:08+02:00 cq: Discovery: Remove unnecessary string conversion - - - - - d9f3255f by wurstsalat at 2023-06-07T21:09:01+02:00 cq: Accounts, ChatListStack: Fix imports - - - - - c2044cea by wurstsalat at 2023-06-07T21:09:27+02:00 cq: Plugin helpers: Remove unnecessary ignore comment - - - - - 10388f01 by wurstsalat at 2023-06-07T21:38:07+02:00 cq: Typings: Use union operator for css_parser - - - - - 6fb6eea6 by wurstsalat at 2023-06-07T22:14:41+02:00 cq: AdditionalDataDict: Improve type annotation - - - - - ba7f11ea by wurstsalat at 2023-06-07T22:14:47+02:00 cq: Preview: Improve type annotations - - - - - 18d1505d by wurstsalat at 2023-06-07T22:14:47+02:00 cq: Improve typing stubs for qrcode - - - - - 39d250ac by wurstsalat at 2023-06-07T22:19:55+02:00 cfix: Revert: Plugin helpers: Remove unnecessary ignore comment" This reverts commit c2044cea4d9fce61d90ed832e021bfc4339e16d7. - - - - - 4634bc9b by Philipp Hörist at 2023-06-08T00:27:22+02:00 new: Storage: Return occupant-id and real jid for conversations queries - - - - - f5e1c952 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Storage: Remove not needed column from query - - - - - a61265a2 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Message: Simplify code - - - - - e38b7a25 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Control: Don’t treat messages from the bare room jid differently - - - - - 0df81b02 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Control: Make method private - - - - - b1648d62 by Philipp Hörist at 2023-06-08T00:27:22+02:00 fix: SecurityLabels: Display labels for messages received with MAM - - - - - 323aa283 by Philipp Hörist at 2023-06-08T00:27:22+02:00 new: MAM: Add msg_log_id to MamMessageReceived - - - - - d91a3ace by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Control: Harmonize data needed to add MUC messages - - - - - 55123b06 by Philipp Hörist at 2023-06-08T10:06:55+02:00 refactor: Control: Simplify adding group chat messages - - - - - 404ecb7c by Philipp Hörist at 2023-06-08T13:53:27+02:00 refactor: Control: Simplify processing MAM event - - - - - afa5d744 by Philipp Hörist at 2023-06-08T14:34:15+02:00 refactor: Control: Remove public add_message() method - - - - - c4836921 by Philipp Hörist at 2023-06-08T16:11:26+02:00 refactor: Control: Sort methods - - - - - 31282dc3 by Philipp Hörist at 2023-06-08T16:19:23+02:00 refactor: Control: Make more methods private - - - - - 47ab5462 by Philipp Hörist at 2023-06-08T16:39:35+02:00 refactor: Control: Only allow keyword arguments when adding message - - - - - dfe0cd60 by wurstsalat at 2023-06-08T19:22:13+02:00 fix: Preview: Show error if file saving directory is not available Fixes #11558 - - - - - 0f5af752 by wurstsalat at 2023-06-08T20:34:00+02:00 fix: CreateGroupchatWindow: Improve handling of MUC service availability Fixes #11557 - - - - - 86ee593e by wurstsalat at 2023-06-08T21:03:09+02:00 feat: Add support for XEP-0461: Message Replies - - - - - 30 changed files: - data/gajim.doap - gajim/common/client.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/preview.py - gajim/common/storage/archive.py - gajim/common/storage/base.py - gajim/common/structs.py - gajim/common/util/text.py - gajim/data/gui/groupchat_creation.ui - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_list_row.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/control.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/discovery.py - gajim/gtk/groupchat_creation.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py - gajim/gtk/message_input.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/49d17d9aff28910b01e56372090363a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/49d17d9aff28910b01e56372090363a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CreateGroupchatWindow: Improve handling of MUC service availability
by Daniel Brötzmann (＠wurstsalat) 08 Jun '23

08 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0f5af752 by wurstsalat at 2023-06-08T20:34:00+02:00 fix: CreateGroupchatWindow: Improve handling of MUC service availability Fixes #11557 - - - - - 3 changed files: - gajim/data/gui/groupchat_creation.ui - gajim/gtk/builder.pyi - gajim/gtk/groupchat_creation.py Changes: ===================================== gajim/data/gui/groupchat_creation.ui ===================================== @@ -341,6 +341,23 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="error_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="wrap">True</property> + <property name="max-width-chars">38</property> + <style> + <class name="warning-color"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> </object> <packing> <property name="left-attach">0</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -406,6 +406,7 @@ class GroupchatCreationBuilder(Builder): private_radio: Gtk.RadioButton public_radio: Gtk.RadioButton address_entry: Gtk.Entry + error_label: Gtk.Label spinner: Gtk.Spinner create_button: Gtk.Button ===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -137,7 +137,10 @@ def _fill_placeholders(self) -> None: def _get_muc_service_jid(self) -> str: assert self._account is not None client = app.get_client(self._account) - return str(client.get_module('MUC').service_jid or 'muc.example.com') + service_jid = client.get_module('MUC').service_jid + if service_jid is None: + return '' + return str(service_jid) def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: @@ -153,9 +156,19 @@ def _on_account_combo_changed(self, combo: Gtk.ComboBox) -> None: self._account = model[iter_][0] self._fill_placeholders() + self._validate_jid(self._ui.address_entry.get_text()) + + if not self._get_muc_service_jid(): + self._set_warning( + _('Your server does not provide a group chat service. ' + 'Please try with a different server.')) + self._ui.advanced_switch.set_active(True) + else: + self._ui.error_label.hide() + def _validate_jid(self, text: str) -> None: if not text: - self._set_warning_icon(False) + self._ui.error_label.hide() self._ui.create_button.set_sensitive(False) return @@ -167,7 +180,7 @@ def _validate_jid(self, text: str) -> None: except ValueError: self._set_warning(_('Invalid Address')) else: - self._set_warning_icon(False) + self._ui.error_label.hide() self._ui.create_button.set_sensitive(True) def _set_processing_state(self, enabled: bool) -> None: @@ -178,18 +191,10 @@ def _set_processing_state(self, enabled: bool) -> None: self._ui.spinner.stop() self._ui.grid.set_sensitive(not enabled) - def _set_warning_icon(self, enabled: bool) -> None: - icon = 'dialog-warning-symbolic' if enabled else None - self._ui.address_entry.set_icon_from_icon_name( - Gtk.EntryIconPosition.SECONDARY, icon) - - def _set_warning_tooltip(self, text: str) -> None: - self._ui.address_entry.set_icon_tooltip_text( - Gtk.EntryIconPosition.SECONDARY, text) - def _set_warning(self, text: str) -> None: - self._set_warning_icon(True) - self._set_warning_tooltip(text) + self._ui.error_label.set_text(text) + self._ui.error_label.show() + self._ui.advanced_switch.set_active(True) self._ui.create_button.set_sensitive(False) def _set_warning_from_error(self, error: StanzaError) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f5af752c7eeb5ab47566f651586aef2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0f5af752c7eeb5ab47566f651586aef2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Preview: Show error if file saving directory is not available
by Daniel Brötzmann (＠wurstsalat) 08 Jun '23

08 Jun '23

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dfe0cd60 by wurstsalat at 2023-06-08T19:22:13+02:00 fix: Preview: Show error if file saving directory is not available Fixes #11558 - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -531,6 +531,13 @@ def _on_preview_action(self, elif action_name == 'preview-save-as': def _on_ok(paths: list[str]) -> None: + if not paths: + ErrorDialog( + _('Could not save file'), + _('Could not save file to selected directory.'), + transient_for=self) + return + target = paths[0] assert preview is not None assert preview.orig_path is not None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dfe0cd605211097f4ae07f2667e66113… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dfe0cd605211097f4ae07f2667e66113… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: refactor: Control: Simplify adding group chat messages
by Philipp Hörist (＠lovetox) 08 Jun '23

08 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 55123b06 by Philipp Hörist at 2023-06-08T10:06:55+02:00 refactor: Control: Simplify adding group chat messages - - - - - 404ecb7c by Philipp Hörist at 2023-06-08T13:53:27+02:00 refactor: Control: Simplify processing MAM event - - - - - afa5d744 by Philipp Hörist at 2023-06-08T14:34:15+02:00 refactor: Control: Remove public add_message() method - - - - - c4836921 by Philipp Hörist at 2023-06-08T16:11:26+02:00 refactor: Control: Sort methods - - - - - 31282dc3 by Philipp Hörist at 2023-06-08T16:19:23+02:00 refactor: Control: Make more methods private - - - - - 47ab5462 by Philipp Hörist at 2023-06-08T16:39:35+02:00 refactor: Control: Only allow keyword arguments when adding message - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -121,6 +121,18 @@ def client(self) -> types.Client: assert self._client is not None return self._client + @property + def is_chat(self) -> bool: + return isinstance(self.contact, BareContact) + + @property + def is_privatechat(self) -> bool: + return isinstance(self.contact, GroupchatParticipant) + + @property + def is_groupchat(self) -> bool: + return isinstance(self.contact, GroupchatContact) + def is_loaded(self, account: str, jid: JID) -> bool: if self._contact is None: return False @@ -132,6 +144,20 @@ def has_active_chat(self) -> bool: def get_group_chat_roster(self) -> GroupchatRoster: return self._roster + def add_command_output(self, text: str, is_error: bool) -> None: + self._scrolled_view.add_command_output(text, is_error) + + def add_info_message(self, + text: str, + timestamp: float | None = None + ) -> None: + + self._scrolled_view.add_info_message(text, timestamp) + + def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: + app.window.activate_action('send-file', + GLib.Variant('as', selection.get_uris())) + def clear(self) -> None: log.info('Clear') @@ -145,6 +171,35 @@ def clear(self) -> None: self._roster.clear() self.unregister_events() + def remove_message(self, log_line_id: int) -> None: + self._scrolled_view.remove_message(log_line_id) + + def reset_view(self) -> None: + self._scrolled_view.reset() + + def get_autoscroll(self) -> bool: + return self._scrolled_view.get_autoscroll() + + def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: + row = self._scrolled_view.get_row_by_log_line_id(log_line_id) + if row is None: + # Clear view and reload conversation around timestamp + self._scrolled_view.reset() + self._scrolled_view.block_signals(True) + before, at_after = app.storage.archive.get_conversation_around( + self.contact.account, self.contact.jid, timestamp) + self._add_messages(before) + self._add_messages(at_after) + self._scrolled_view.set_history_complete(False, False) + + GLib.idle_add(self._scrolled_view.block_signals, False) + GLib.idle_add( + self._scrolled_view.scroll_to_message_and_highlight, + log_line_id) + + def mark_as_read(self) -> None: + self._jump_to_end_button.reset_unread_count() + def switch_contact( self, contact: BareContact | GroupchatContact | GroupchatParticipant @@ -197,7 +252,7 @@ def switch_contact( contact) if transfers is not None: for transfer in transfers: - self.add_file_transfer(transfer) + self._add_file_transfer(transfer) if isinstance(contact, GroupchatContact): if (not app.settings.get('show_subject_on_join') or @@ -279,16 +334,20 @@ def _on_message_sent(self, event: events.MessageSent) -> None: if event.correct_id: self._scrolled_view.correct_message( - event.correct_id, event.message, self.get_our_nick()) + event.correct_id, event.message, self._get_our_nick()) return - self.add_message(event.message, - 'outgoing', - tim=event.timestamp, - displaymarking=displaymarking, - message_id=message_id, - msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + name = self._get_our_nick() + + self._add_message(text=event.message, + kind='outgoing', + name=name, + timestamp=event.timestamp, + displaymarking=displaymarking, + msg_log_id=event.msg_log_id, + message_id=message_id, + stanza_id=None, + additional_data=event.additional_data) def _on_message_received(self, event: events.MessageReceived) -> None: if not self._is_event_processable(event): @@ -301,17 +360,20 @@ def _on_message_received(self, event: events.MessageReceived) -> None: return kind = 'incoming' + name = self.contact.name if event.properties.is_sent_carbon: kind = 'outgoing' - - self.add_message(event.msgtxt, - kind, - tim=event.properties.timestamp, - displaymarking=event.displaymarking, - msg_log_id=event.msg_log_id, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) + name = self._get_our_nick() + + self._add_message(text=event.msgtxt, + kind=kind, + name=name, + timestamp=event.properties.timestamp, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) def _on_mam_message_received(self, event: events.MamMessageReceived) -> None: @@ -325,14 +387,12 @@ def _on_mam_message_received(self, return if event.archive_jid != self.contact.jid: return - self._add_muc_message(event.msgtxt, - tim=event.properties.mam.timestamp, - contact=event.properties.muc_nickname, - displaymarking=event.displaymarking, - message_id=event.properties.id, - stanza_id=event.stanza_id, - msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + + nickname = event.properties.muc_nickname + if nickname == self.contact.nickname: + kind = 'outgoing' + else: + kind = 'incoming' else: @@ -344,28 +404,42 @@ def _on_mam_message_received(self, return kind = 'incoming' + nickname = self.contact.name if event.kind == KindConstant.CHAT_MSG_SENT: kind = 'outgoing' - - self.add_message(event.msgtxt, - kind, - tim=event.properties.mam.timestamp, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) + nickname = self._get_our_nick() + + self._add_message(text=event.msgtxt, + kind=kind, + name=nickname, + timestamp=event.properties.mam.timestamp, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: if not self._is_event_processable(event): return - self._add_muc_message(event.msgtxt, - tim=event.properties.timestamp, - contact=event.properties.muc_nickname, - displaymarking=event.displaymarking, - message_id=event.properties.id, - stanza_id=event.stanza_id, - msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + assert isinstance(self.contact, GroupchatContact) + + nickname = event.properties.muc_nickname + if nickname == self.contact.nickname: + kind = 'outgoing' + else: + kind = 'incoming' + + self._add_message(text=event.msgtxt, + kind=kind, + name=nickname, + timestamp=event.properties.timestamp, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) def _on_message_updated(self, event: events.MessageUpdated) -> None: if not self._is_event_processable(event): @@ -423,7 +497,7 @@ def _on_jingle_request_received(self, active_jid = app.call_manager.get_active_call_jid() # Don't add a second row if contact upgrades to video if active_jid is None: - self.add_call_message(event=event) + self._add_call_message(event=event) def _on_file_request_event( self, @@ -433,10 +507,10 @@ def _on_file_request_event( if not self._is_event_processable(event): return - self.add_jingle_file_transfer(event=event) + self._add_jingle_file_transfer(event=event) def _on_http_upload_started(self, event: events.HTTPUploadStarted) -> None: - self.add_file_transfer(event.transfer) + self._add_file_transfer(event.transfer) def _on_http_upload_error(self, event: events.HTTPUploadError) -> None: self.add_info_message(event.error_msg) @@ -448,21 +522,6 @@ def _on_encryption_info(self, event: events.EncryptionInfo) -> None: if self._allow_add_message(): self._scrolled_view.add_encryption_info(event) - @property - def is_chat(self) -> bool: - return isinstance(self.contact, BareContact) - - @property - def is_privatechat(self) -> bool: - return isinstance(self.contact, GroupchatParticipant) - - @property - def is_groupchat(self) -> bool: - return isinstance(self.contact, GroupchatContact) - - def mark_as_read(self) -> None: - self._jump_to_end_button.reset_unread_count() - def _on_autoscroll_changed(self, _widget: ConversationView, autoscroll: bool @@ -495,11 +554,7 @@ def _on_cancel_selection(self, _widget: MessageSelection) -> None: def _on_jump_to_end(self, _button: Gtk.Button) -> None: self.reset_view() - def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: - app.window.activate_action('send-file', - GLib.Variant('as', selection.get_uris())) - - def get_our_nick(self) -> str: + def _get_our_nick(self) -> str: if isinstance(self.contact, GroupchatParticipant): muc_data = self.client.get_module('MUC').get_muc_data( self.contact.jid.bare) @@ -511,40 +566,31 @@ def get_our_nick(self) -> str: def _allow_add_message(self) -> bool: return self._scrolled_view.get_lower_complete() - def add_command_output(self, text: str, is_error: bool) -> None: - self._scrolled_view.add_command_output(text, is_error) - - def add_info_message(self, - text: str, - timestamp: float | None = None - ) -> None: - - self._scrolled_view.add_info_message(text, timestamp) - - def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: + def _add_file_transfer(self, transfer: HTTPFileTransfer) -> None: self._scrolled_view.add_file_transfer(transfer) - def add_jingle_file_transfer( + def _add_jingle_file_transfer( self, event: events.FileRequestReceivedEvent | events.FileRequestSent | None ) -> None: if self._allow_add_message(): self._scrolled_view.add_jingle_file_transfer(event) - def add_call_message(self, event: events.JingleRequestReceived) -> None: + def _add_call_message(self, event: events.JingleRequestReceived) -> None: if self._allow_add_message(): self._scrolled_view.add_call_message(event=event) def _add_message(self, + *, text: str, kind: str, name: str, - tim: float, - displaymarking: Displaymarking | None = None, - msg_log_id: int | None = None, - message_id: str | None = None, - stanza_id: str | None = None, - additional_data: AdditionalDataDict | None = None + timestamp: float, + displaymarking: Displaymarking | None, + msg_log_id: int | None, + message_id: str | None, + stanza_id: str | None, + additional_data: AdditionalDataDict | None ) -> None: if additional_data is None: @@ -555,7 +601,7 @@ def _add_message(self, text, kind, name, - tim, + timestamp, display_marking=displaymarking, message_id=message_id, stanza_id=stanza_id, @@ -570,31 +616,67 @@ def _add_message(self, else: self._jump_to_end_button.add_unread_count() - def remove_message(self, log_line_id: int) -> None: - self._scrolled_view.remove_message(log_line_id) + def _add_messages(self, messages: list[ConversationRow]): + for msg in messages: + if msg.kind in (KindConstant.FILE_TRANSFER_INCOMING, + KindConstant.FILE_TRANSFER_OUTGOING): + assert msg.additional_data is not None + if msg.additional_data.get_value('gajim', 'type') == 'jingle': + self._scrolled_view.add_jingle_file_transfer( + db_message=msg) + continue - def reset_view(self) -> None: - self._scrolled_view.reset() + if msg.kind in (KindConstant.CALL_INCOMING, + KindConstant.CALL_OUTGOING): + self._scrolled_view.add_call_message(db_message=msg) + continue - def get_autoscroll(self) -> bool: - return self._scrolled_view.get_autoscroll() + if not msg.message: + continue - def scroll_to_message(self, log_line_id: int, timestamp: float) -> None: - row = self._scrolled_view.get_row_by_log_line_id(log_line_id) - if row is None: - # Clear view and reload conversation around timestamp - self._scrolled_view.reset() - self._scrolled_view.block_signals(True) - before, at_after = app.storage.archive.get_conversation_around( - self.contact.account, self.contact.jid, timestamp) - self.add_messages(before) - self.add_messages(at_after) - self._scrolled_view.set_history_complete(False, False) + message_text = msg.message - GLib.idle_add(self._scrolled_view.block_signals, False) - GLib.idle_add( - self._scrolled_view.scroll_to_message_and_highlight, - log_line_id) + contact_name = msg.contact_name + kind = 'incoming' + if msg.kind in ( + KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): + kind = 'incoming' + contact_name = self.contact.name + elif msg.kind == KindConstant.GC_MSG: + kind = 'incoming' + if contact_name is None: + # Fall back to MUC name if contact name is None + # (may be the case for service messages from the MUC) + contact_name = self.contact.name + elif msg.kind in ( + KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): + kind = 'outgoing' + contact_name = self._get_our_nick() + else: + log.warning('kind attribute could not be processed' + 'while adding message') + + assert contact_name is not None + + if msg.additional_data is not None: + retracted_by = msg.additional_data.get_value('retracted', 'by') + if retracted_by is not None: + reason = msg.additional_data.get_value( + 'retracted', 'reason') + message_text = get_retraction_text( + self.contact.account, retracted_by, reason) + + self._scrolled_view.add_message( + message_text, + kind, + contact_name, + msg.time, + additional_data=msg.additional_data, + message_id=msg.message_id, + stanza_id=msg.stanza_id, + log_line_id=msg.log_line_id, + marker=msg.marker, + error=msg.error) def _request_messages(self, before: bool) -> list[ConversationRow]: if before: @@ -645,7 +727,7 @@ def _request_history(self, assert self._contact is not None for row in rows: if not isinstance(row, events.ApplicationEvent): - self.add_messages([row]) + self._add_messages([row]) elif isinstance(row, events.MUCUserJoined): self._process_muc_user_joined(row) @@ -703,94 +785,6 @@ def sort_func(obj: HistoryRowT) -> float: rows.sort(key=sort_func, reverse=before) return rows - def add_messages(self, messages: list[ConversationRow]): - for msg in messages: - if msg.kind in (KindConstant.FILE_TRANSFER_INCOMING, - KindConstant.FILE_TRANSFER_OUTGOING): - assert msg.additional_data is not None - if msg.additional_data.get_value('gajim', 'type') == 'jingle': - self._scrolled_view.add_jingle_file_transfer( - db_message=msg) - continue - - if msg.kind in (KindConstant.CALL_INCOMING, - KindConstant.CALL_OUTGOING): - self._scrolled_view.add_call_message(db_message=msg) - continue - - if not msg.message: - continue - - message_text = msg.message - - contact_name = msg.contact_name - kind = 'incoming' - if msg.kind in ( - KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): - kind = 'incoming' - contact_name = self.contact.name - elif msg.kind == KindConstant.GC_MSG: - kind = 'incoming' - if contact_name is None: - # Fall back to MUC name if contact name is None - # (may be the case for service messages from the MUC) - contact_name = self.contact.name - elif msg.kind in ( - KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): - kind = 'outgoing' - contact_name = self.get_our_nick() - else: - log.warning('kind attribute could not be processed' - 'while adding message') - - assert contact_name is not None - - if msg.additional_data is not None: - retracted_by = msg.additional_data.get_value('retracted', 'by') - if retracted_by is not None: - reason = msg.additional_data.get_value( - 'retracted', 'reason') - message_text = get_retraction_text( - self.contact.account, retracted_by, reason) - - self._scrolled_view.add_message( - message_text, - kind, - contact_name, - msg.time, - additional_data=msg.additional_data, - message_id=msg.message_id, - stanza_id=msg.stanza_id, - log_line_id=msg.log_line_id, - marker=msg.marker, - error=msg.error) - - def add_message(self, - text: str, - kind: str, - tim: float, - displaymarking: Displaymarking | None = None, - msg_log_id: int | None = None, - stanza_id: str | None = None, - message_id: str | None = None, - additional_data: AdditionalDataDict | None = None - ) -> None: - - if kind == 'incoming': - name = self.contact.name - else: - name = self.get_our_nick() - - self._add_message(text, - kind, - name, - tim, - displaymarking=displaymarking, - msg_log_id=msg_log_id, - message_id=message_id, - stanza_id=stanza_id, - additional_data=additional_data) - def _on_user_nickname_changed(self, _contact: types.GroupchatContact, _signal_name: str, @@ -1192,35 +1186,6 @@ def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: self.add_info_message(message, event.timestamp) - def _add_muc_message(self, - text: str, - tim: float, - contact: str, - displaymarking: Displaymarking | None, - message_id: str | None, - stanza_id: str | None, - msg_log_id: int | None, - additional_data: AdditionalDataDict | None, - ) -> None: - - assert isinstance(self._contact, GroupchatContact) - - if contact == self._contact.nickname: - kind = 'outgoing' - else: - kind = 'incoming' - # muc-specific chatstate - - self._add_message(text, - kind, - contact, - tim, - displaymarking=displaymarking, - message_id=message_id, - stanza_id=stanza_id, - msg_log_id=msg_log_id, - additional_data=additional_data) - def _on_room_subject(self, contact: GroupchatContact, _signal_name: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d91a3aceb8811481f169e807cf68018… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d91a3aceb8811481f169e807cf68018… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: new: Storage: Return occupant-id and real jid for conversations queries
by Philipp Hörist (＠lovetox) 07 Jun '23

07 Jun '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4634bc9b by Philipp Hörist at 2023-06-08T00:27:22+02:00 new: Storage: Return occupant-id and real jid for conversations queries - - - - - f5e1c952 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Storage: Remove not needed column from query - - - - - a61265a2 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Message: Simplify code - - - - - e38b7a25 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Control: Don’t treat messages from the bare room jid differently - - - - - 0df81b02 by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Control: Make method private - - - - - b1648d62 by Philipp Hörist at 2023-06-08T00:27:22+02:00 fix: SecurityLabels: Display labels for messages received with MAM - - - - - 323aa283 by Philipp Hörist at 2023-06-08T00:27:22+02:00 new: MAM: Add msg_log_id to MamMessageReceived - - - - - d91a3ace by Philipp Hörist at 2023-06-08T00:27:22+02:00 refactor: Control: Harmonize data needed to add MUC messages - - - - - 5 changed files: - gajim/common/events.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/storage/archive.py - gajim/gtk/control.py Changes: ===================================== gajim/common/events.py ===================================== @@ -400,6 +400,8 @@ class MamMessageReceived(ApplicationEvent): kind: KindConstant occupant_id: str | None real_jid: JID | None + msg_log_id: int | None + displaymarking: Displaymarking | None @dataclass ===================================== gajim/common/modules/mam.py ===================================== @@ -302,6 +302,10 @@ def _mam_message_received(self, occupant_id = self._get_occupant_id(properties) real_jid = self._get_real_jid(properties) + displaymarking = None + if properties.has_security_label: + displaymarking = properties.security_label.displaymarking + event_attr: dict[str, Any] = { 'account': self._account, 'jid': jid, @@ -314,6 +318,7 @@ def _mam_message_received(self, 'kind': kind, 'occupant_id': occupant_id, 'real_jid': real_jid, + 'displaymarking': displaymarking } if check_if_message_correction(properties, @@ -325,7 +330,7 @@ def _mam_message_received(self, self._log): return - app.storage.archive.insert_into_logs( + event_attr['msg_log_id'] = app.storage.archive.insert_into_logs( self._account, jid, properties.mam.timestamp, ===================================== gajim/common/modules/message.py ===================================== @@ -211,7 +211,6 @@ def _message_received(self, event = GcMessageReceived(**event_attr) - # TODO: Some plugins modify msgtxt in the GUI event msg_log_id = self._log_muc_message(event) event.msg_log_id = msg_log_id app.ged.raise_event(event) @@ -261,24 +260,26 @@ def _message_error_received(self, error=properties.error)) def _log_muc_message(self, event: GcMessageReceived) -> int | None: + if not event.properties.muc_nickname: + return None + + if not event.msgtxt: + return None + self._check_for_mam_compliance(event.room_jid, event.stanza_id) - if event.msgtxt and event.properties.muc_nickname: - msg_log_id = app.storage.archive.insert_into_logs( - self._account, - event.jid, - event.properties.timestamp, - KindConstant.GC_MSG, - message=event.msgtxt, - contact_name=event.properties.muc_nickname, - additional_data=event.additional_data, - stanza_id=event.stanza_id, - message_id=event.properties.id, - occupant_id=event.occupant_id, - real_Jid=event.real_jid) - return msg_log_id - - return None + return app.storage.archive.insert_into_logs( + self._account, + event.jid, + event.properties.timestamp, + KindConstant.GC_MSG, + message=event.msgtxt, + contact_name=event.properties.muc_nickname, + additional_data=event.additional_data, + stanza_id=event.stanza_id, + message_id=event.properties.id, + occupant_id=event.occupant_id, + real_Jid=event.real_jid) def _check_for_mam_compliance(self, room_jid: str, stanza_id: str) -> None: disco_info = app.storage.cache.get_last_disco_info(room_jid) ===================================== gajim/common/storage/archive.py ===================================== @@ -99,17 +99,17 @@ class JidsTableRow(NamedTuple): class ConversationRow(NamedTuple): + log_line_id: int contact_name: str | None + occupant_id: str | None + real_jid: JID | None time: float kind: int - show: int message: str - subject: str + error: CommonError additional_data: AdditionalDataDict | None - log_line_id: int - message_id: str stanza_id: str - error: CommonError + message_id: str marker: str @@ -382,10 +382,19 @@ def get_conversation_before_after(self, time_order = 'AND time > ? ORDER BY time ASC, log_line_id ASC' sql = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, stanza_id, - error as "error [common_error]", - marker as "marker [marker]" + SELECT + log_line_id, + contact_name, + occupant_id, + real_jid as "real_jid [jid]", + time, + kind, + message, + error as "error [common_error]", + additional_data, + stanza_id, + message_id, + marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -459,10 +468,19 @@ def get_conversation_around(self, n_lines = 50 sql_before = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, stanza_id, - error as "error [common_error]", - marker as "marker [marker]" + SELECT + log_line_id, + contact_name, + occupant_id, + real_jid as "real_jid [jid]", + time, + kind, + message, + error as "error [common_error]", + additional_data, + stanza_id, + message_id, + marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -473,10 +491,19 @@ def get_conversation_around(self, account_id=account_id, kinds=', '.join(kinds)) sql_at_after = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, stanza_id, - error as "error [common_error]", - marker as "marker [marker]" + SELECT + log_line_id, + contact_name, + occupant_id, + real_jid as "real_jid [jid]", + time, + kind, + message, + error as "error [common_error]", + additional_data, + stanza_id, + message_id, + marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) @@ -518,10 +545,19 @@ def get_conversation_between(self, kinds = map(str, [KindConstant.ERROR]) sql = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id, message_id, stanza_id, - error as "error [common_error]", - marker as "marker [marker]" + SELECT + log_line_id, + contact_name, + occupant_id, + real_jid as "real_jid [jid]", + time, + kind, + message, + error as "error [common_error]", + additional_data, + stanza_id, + message_id, + marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) ===================================== gajim/gtk/control.py ===================================== @@ -325,12 +325,14 @@ def _on_mam_message_received(self, return if event.archive_jid != self.contact.jid: return - self.add_muc_message(event.msgtxt, - tim=event.properties.mam.timestamp, - contact=event.properties.muc_nickname, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) + self._add_muc_message(event.msgtxt, + tim=event.properties.mam.timestamp, + contact=event.properties.muc_nickname, + displaymarking=event.displaymarking, + message_id=event.properties.id, + stanza_id=event.stanza_id, + msg_log_id=event.msg_log_id, + additional_data=event.additional_data) else: @@ -356,21 +358,14 @@ def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: if not self._is_event_processable(event): return - if event.properties.muc_nickname is None: - # message from server - self.add_muc_message(event.msgtxt, - tim=event.properties.timestamp, - displaymarking=event.displaymarking, - additional_data=event.additional_data) - else: - self.add_muc_message(event.msgtxt, - tim=event.properties.timestamp, - contact=event.properties.muc_nickname, - displaymarking=event.displaymarking, - message_id=event.properties.id, - stanza_id=event.stanza_id, - msg_log_id=event.msg_log_id, - additional_data=event.additional_data) + self._add_muc_message(event.msgtxt, + tim=event.properties.timestamp, + contact=event.properties.muc_nickname, + displaymarking=event.displaymarking, + message_id=event.properties.id, + stanza_id=event.stanza_id, + msg_log_id=event.msg_log_id, + additional_data=event.additional_data) def _on_message_updated(self, event: events.MessageUpdated) -> None: if not self._is_event_processable(event): @@ -1197,16 +1192,16 @@ def _process_muc_user_left(self, event: events.MUCUserLeft) -> None: self.add_info_message(message, event.timestamp) - def add_muc_message(self, - text: str, - tim: float, - contact: str = '', - displaymarking: Displaymarking | None = None, - message_id: str | None = None, - stanza_id: str | None = None, - msg_log_id: int | None = None, - additional_data: AdditionalDataDict | None = None, - ) -> None: + def _add_muc_message(self, + text: str, + tim: float, + contact: str, + displaymarking: Displaymarking | None, + message_id: str | None, + stanza_id: str | None, + msg_log_id: int | None, + additional_data: AdditionalDataDict | None, + ) -> None: assert isinstance(self._contact, GroupchatContact) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/39d250ac590beb6aaebc5274038ede1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/39d250ac590beb6aaebc5274038ede1… 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 June 2023