Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Helpers: Typing
by Daniel Brötzmann (＠wurstsalat) 07 Jan '22

07 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a31b97a1 by wurstsalat at 2022-01-07T19:31:45+01:00 Helpers: Typing - - - - - bfa8592d by wurstsalat at 2022-01-07T19:32:00+01:00 CertificateDialog: Typing - - - - - 0b5f4816 by wurstsalat at 2022-01-07T19:38:41+01:00 Preview: Always generate for own messages Fixes #10744 - - - - - 4 changed files: - gajim/common/helpers.py - gajim/common/preview.py - gajim/gtk/certificate_dialog.py - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -74,7 +74,7 @@ from nbxmpp.structs import ProxyData from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid -from OpenSSL.crypto import load_certificate +from OpenSSL.crypto import X509, load_certificate from OpenSSL.crypto import FILETYPE_PEM from gi.repository import Gio from gi.repository import GLib @@ -116,20 +116,20 @@ class InvalidFormat(Exception): pass -def parse_jid(jidstring): +def parse_jid(jidstring: str) -> str: try: return str(validate_jid(jidstring)) except Exception as error: raise InvalidFormat(error) -def idn_to_ascii(host): +def idn_to_ascii(host: str) -> str: """ Convert IDN (Internationalized Domain Names) to ACE (ASCII-compatible encoding) """ from encodings import idna labels = idna.dots.split(host) - converted_labels = [] + converted_labels: list[str] = [] for label in labels: if label: converted_labels.append(idna.ToASCII(label).decode('utf-8')) @@ -137,19 +137,19 @@ def idn_to_ascii(host): converted_labels.append('') return ".".join(converted_labels) -def ascii_to_idn(host): +def ascii_to_idn(host: str) -> str: """ Convert ACE (ASCII-compatible encoding) to IDN (Internationalized Domain Names) """ from encodings import idna labels = idna.dots.split(host) - converted_labels = [] + converted_labels: list[str] = [] for label in labels: converted_labels.append(idna.ToUnicode(label)) return ".".join(converted_labels) -def puny_encode_url(url): +def puny_encode_url(url: str) -> Optional[str]: _url = url if '//' not in _url: _url = '//' + _url @@ -158,10 +158,10 @@ def puny_encode_url(url): p_loc = idn_to_ascii(o.hostname) except Exception: log.debug('urlparse failed: %s', url) - return False + return None return url.replace(o.hostname, p_loc) -def parse_resource(resource): +def parse_resource(resource: str) -> Optional[str]: """ Perform stringprep on resource and return it """ @@ -260,48 +260,43 @@ def get_uf_role(role: Union[Role, str], plural: bool = False) -> str: role = role.value if role == 'none': - role_name = Q_('?Group Chat Contact Role:None') - elif role == 'moderator': + return Q_('?Group Chat Contact Role:None') + if role == 'moderator': if plural: - role_name = _('Moderators') - else: - role_name = _('Moderator') - elif role == 'participant': + return _('Moderators') + return _('Moderator') + if role == 'participant': if plural: - role_name = _('Participants') - else: - role_name = _('Participant') - elif role == 'visitor': + return _('Participants') + return _('Participant') + if role == 'visitor': if plural: - role_name = _('Visitors') - else: - role_name = _('Visitor') - return role_name + return _('Visitors') + return _('Visitor') + return '' def get_uf_affiliation(affiliation: Union[Affiliation, str], - plural: bool = False) -> str: + plural: bool = False + ) -> str: '''Get a nice and translated affilition for muc''' if not isinstance(affiliation, str): affiliation = affiliation.value if affiliation == 'none': - affiliation_name = Q_('?Group Chat Contact Affiliation:None') - elif affiliation == 'owner': + return Q_('?Group Chat Contact Affiliation:None') + if affiliation == 'owner': if plural: - affiliation_name = _('Owners') - else: - affiliation_name = _('Owner') - elif affiliation == 'admin': + return _('Owners') + return _('Owner') + if affiliation == 'admin': if plural: - affiliation_name = _('Administrators') - else: - affiliation_name = _('Administrator') - elif affiliation == 'member': + return _('Administrators') + return _('Administrator') + if affiliation == 'member': if plural: - affiliation_name = _('Members') - else: - affiliation_name = _('Member') - return affiliation_name + return _('Members') + return _('Member') + return '' def get_uf_relative_time(timestamp: int) -> str: date_time = datetime.fromtimestamp(timestamp) @@ -389,23 +384,23 @@ def exec_command(command: str, process = subprocess.Popen(args) app.thread_interface(process.wait) -def build_command(executable, parameter): +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 - parameter = parameter.replace('"', '\\"') # but first escape " + parameter = parameter.replace('"', '\\"') # but first escape " 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 = path.strip('\r\n\x00') # remove \r\n and NULL + path = urllib.parse.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 - path = path[8:] # 8 is len('file:///') - elif path.startswith('file://'): # nautilus, rox - path = path[7:] # 7 is len('file://') - elif path.startswith('file:'): # xffm - path = path[5:] # 5 is len('file:') + if re.match('^file:///[a-zA-Z]:/', path): # windows + path = path[8:] # 8 is len('file:///') + elif path.startswith('file://'): # nautilus, rox + path = path[7:] # 7 is len('file://') + elif path.startswith('file:'): # xffm + path = path[5:] # 5 is len('file:') return path def sanitize_filename(filename: str) -> str: @@ -437,7 +432,7 @@ def reduce_chars_newlines(text: str, max_chars: int = 0, If any of the params is not present (None or 0) the action on it is not performed """ - def _cut_if_long(string_): + def _cut_if_long(string_: str) -> str: if len(string_) > max_chars: string_ = string_[:max_chars - 3] + '…' return string_ @@ -458,12 +453,12 @@ def _cut_if_long(string_): return reduced_text -def get_contact_dict_for_account(account: str) -> Dict[str, types.BareContact]: +def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: """ Creates a dict of jid -> contact with all contacts of account Can be used for completion lists """ - contacts_dict = {} + contacts_dict: dict[str, types.BareContact] = {} client = app.get_client(account) for contact in client.get_module('Roster').iter_contacts(): contacts_dict[str(contact.jid)] = contact @@ -572,6 +567,7 @@ def get_global_show() -> str: def get_global_status_message() -> str: maxi = 0 + status_message = '' for account, con in app.connections.items(): if not app.settings.get_account_setting(account, 'sync_with_global_status'): @@ -614,14 +610,14 @@ def get_jid_from_iq(iq_obj): jid = get_full_jid_from_iq(iq_obj) return app.get_jid_without_resource(jid) -def get_auth_sha(sid, initiator, target): +def get_auth_sha(sid: str, initiator: str, target: str) -> str: """ Return sha of sid + initiator + target used for proxy auth """ return hashlib.sha1( (f'{sid}{initiator}{target}').encode('utf-8')).hexdigest() -def remove_invalid_xml_chars(string_): +def remove_invalid_xml_chars(string_: str) -> str: if string_: string_ = re.sub(INVALID_XML_CHARS_REGEX, '', string_) return string_ @@ -771,7 +767,7 @@ def get_proxy(proxy_name: str) -> Optional[ProxyData]: username=username, password=password) -def version_condition(current_version, required_version): +def version_condition(current_version: str, required_version: str) -> bool: if V(current_version) < V(required_version): return False return True @@ -1327,9 +1323,8 @@ def _on_load_finished(file: Gio.File, file.load_contents_async(None, _on_load_finished) -def convert_gio_to_openssl_cert(cert): - cert = load_certificate(FILETYPE_PEM, cert.props.certificate_pem.encode()) - return cert +def convert_gio_to_openssl_cert(cert: Gio.TlsCertificate) -> X509: + return load_certificate(FILETYPE_PEM, cert.props.certificate_pem.encode()) def get_custom_host(account: str) -> Optional[Tuple[str, @@ -1403,7 +1398,7 @@ def ask_for_status_message(status: str, signin: bool = False) -> bool: return app.settings.get('always_ask_for_status_message') -def get_group_chat_nick(account: str, room_jid: str) -> str: +def get_group_chat_nick(account: str, room_jid: Union[JID, str]) -> str: nick = app.nicks[account] client = app.get_client(account) @@ -1416,7 +1411,7 @@ def get_group_chat_nick(account: str, room_jid: str) -> str: return nick -def get_muc_context(jid: str) -> str: +def get_muc_context(jid: Union[JID, str]) -> Optional[str]: disco_info = app.storage.cache.get_last_disco_info(jid) if disco_info is None: return None ===================================== gajim/common/preview.py ===================================== @@ -258,6 +258,7 @@ def is_previewable(self, def create_preview(self, uri: str, widget: Any, + is_self: bool, context: Optional[str] = None ) -> None: if uri.startswith('geo:'): @@ -268,7 +269,7 @@ def create_preview(self, preview = self._process_web_uri(uri, widget, context) if not preview.orig_exists(): - if context is not None: + if context is not None and not is_self: allow_in_public = app.settings.get('preview_anonymous_muc') if context == 'public' and not allow_in_public: preview.update_widget() ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -47,16 +47,16 @@ def __init__(self, self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - cert = convert_gio_to_openssl_cert(cert) + certificate = convert_gio_to_openssl_cert(cert) # Get data for labels and copy button - issuer = cert.get_issuer() - subject = cert.get_subject() + issuer = certificate.get_issuer() + subject = certificate.get_subject() self._headline = _('Certificate for \n%s') % self.account self._it_common_name = subject.commonName or '' self._it_organization = subject.organizationName or '' self._it_org_unit = subject.organizationalUnitName or '' - it_serial_no = str(cert.get_serial_number()) + it_serial_no = str(certificate.get_serial_number()) it_serial_no_half = int(len(it_serial_no) / 2) self._it_serial_number = '%s\n%s' % ( it_serial_no[:it_serial_no_half], @@ -64,15 +64,15 @@ def __init__(self, self._ib_common_name = issuer.commonName or '' self._ib_organization = issuer.organizationName or '' self._ib_org_unit = issuer.organizationalUnitName or '' - issued = datetime.strptime(cert.get_notBefore().decode('ascii'), + issued = datetime.strptime(certificate.get_notBefore().decode('ascii'), '%Y%m%d%H%M%SZ') self._issued = issued.strftime('%c %Z') - expires = datetime.strptime(cert.get_notAfter().decode('ascii'), + expires = datetime.strptime(certificate.get_notAfter().decode('ascii'), '%Y%m%d%H%M%SZ') self._expires = expires.strftime('%c %Z') - sha1 = cert.digest('sha1').decode('utf-8') + sha1 = certificate.digest('sha1').decode('utf-8') self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = cert.digest('sha256').decode('utf-8') + sha256 = certificate.digest('sha256').decode('utf-8') self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) @@ -94,11 +94,11 @@ def __init__(self, self._ui.connect_signals(self) self.show_all() - def _on_key_press(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_copy_cert_info_button_clicked(self, _widget): + def _on_copy_cert_info_button_clicked(self, _widget: Gtk.Button) -> None: clipboard_text = \ self._headline + '\n\n' + \ _('Issued to\n') + \ ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -100,6 +100,12 @@ def __init__(self, # Keep original text for message correction self._original_text: str = text + if self._is_groupchat: + our_nick = get_group_chat_nick(self._account, self._contact.jid) + is_self = name == our_nick + else: + is_self = kind == 'outgoing' + is_previewable = False if additional_data is not None: is_previewable = app.interface.preview_manager.is_previewable( @@ -110,7 +116,7 @@ def __init__(self, context = get_muc_context(self._contact.jid) self._message_widget = PreviewWidget(account) app.interface.preview_manager.create_preview( - text, self._message_widget, context) + text, self._message_widget, is_self, context) else: self._message_widget = MessageWidget(account) self._message_widget.add_with_styling(text, nickname=name) @@ -120,12 +126,6 @@ def __init__(self, if name != our_nick: self._check_for_highlight(text) - if self._is_groupchat: - our_nick = get_group_chat_nick(self._account, self._contact.jid) - is_self = name == our_nick - else: - is_self = kind == 'outgoing' - if self._contact.jid == self._client.get_own_jid().bare: name = _('Me') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/53ed60a197ef9b467340794c08ba1de… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/53ed60a197ef9b467340794c08ba1de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused imports
by Daniel Brötzmann (＠wurstsalat) 06 Jan '22

06 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 53ed60a1 by wurstsalat at 2022-01-06T19:03:08+01:00 Remove unused imports - - - - - 2 changed files: - gajim/dialog_messages.py - gajim/gui_interface.py Changes: ===================================== gajim/dialog_messages.py ===================================== @@ -22,7 +22,6 @@ from gajim.common.app import app from gajim.common.i18n import _ from gajim.gui.dialogs import ErrorDialog -from gajim.gui.dialogs import InformationDialog Message = namedtuple('Message', ['title', 'text', 'dialog']) ===================================== gajim/gui_interface.py ===================================== @@ -80,7 +80,6 @@ from gajim.common.preview import PreviewManager from gajim.common.const import Display from gajim.common.file_props import FileProp -from gajim.common.events import InformationEvent from gajim.common import ged from gajim.common import exceptions View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53ed60a197ef9b467340794c08ba1de3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/53ed60a197ef9b467340794c08ba1de3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dialog messages: Remove obsolete messages
by Daniel Brötzmann (＠wurstsalat) 06 Jan '22

06 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 886ea230 by wurstsalat at 2022-01-06T18:57:06+01:00 Dialog messages: Remove obsolete messages - - - - - 3 changed files: - gajim/dialog_messages.py - gajim/gtk/controls/base.py - gajim/gui_interface.py Changes: ===================================== gajim/dialog_messages.py ===================================== @@ -27,61 +27,6 @@ Message = namedtuple('Message', ['title', 'text', 'dialog']) messages = { - 'invalid-jid-with-error': Message( - _('Invalid XMPP Address'), - '%s', - ErrorDialog), - - 'invalid-jid': Message( - _('Invalid XMPP Address'), - _('It is not possible to send a message ' - 'to %s. This XMPP Address is not valid.'), - ErrorDialog), - - 'unread-events-on-remove-account': Message( - _('Unread Events'), - _('Read or acknowledge all pending events before ' - 'removing this account.'), - ErrorDialog), - - 'invalid-form': Message( - _('Invalid Form'), - _('The form is not filled correctly.'), - ErrorDialog), - - 'not-connected-while-sending': Message( - _('No Connection Available'), - _('Your message can not be sent until you are connected.'), - ErrorDialog), - - 'jid-in-list': Message( - _('XMPP Address Already in List'), - _('The XMPP Address you entered is already in the list. ' - 'Please choose another one.'), - ErrorDialog), - - 'invalid-answer': Message( - _('Invalid Answer'), - _('Transport %(name)s answered wrongly to ' - 'register request: %(error)s'), - ErrorDialog), - - 'invalid-custom-hostname': Message( - _('Wrong Custom Hostname'), - _('Custom hostname "%s" is wrong. It will be ignored.'), - ErrorDialog), - - 'agent-register-success': Message( - _('Registration Succeeded'), - _('Registration with agent %s succeeded.'), - InformationDialog), - - 'agent-register-error': Message( - _('Registration Failed'), - _('Registration with agent %(agent)s failed with error %(error)s: ' - '%(error_msg)s'), - ErrorDialog), - 'gstreamer-error': Message( _('GStreamer Error'), _('Error: %(error)s\nDebug: %(debug)s'), @@ -96,12 +41,6 @@ _('Avahi Error'), _('%s\nLink-local messaging might not work properly.'), ErrorDialog), - - 'open-file-error2': Message( - _('Could not Open File'), - '%s', - ErrorDialog), - } ===================================== gajim/gtk/controls/base.py ===================================== @@ -65,6 +65,7 @@ from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.dialogs import DialogButton +from gajim.gui.dialogs import ErrorDialog from gajim.gui.dialogs import PastePreviewDialog from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import get_hardware_key_codes @@ -962,7 +963,9 @@ def _on_message_textview_key_press_event(self, textview, event): if not app.account_is_available(self.account): # we are not connected - app.interface.raise_dialog('not-connected-while-sending') + ErrorDialog( + _('No Connection Available'), + _('Your message can not be sent until you are connected.')) return True self._on_send_message() ===================================== gajim/gui_interface.py ===================================== @@ -612,9 +612,7 @@ def _send_httpupload(self, chat_control, path): chat_control.contact, chat_control.is_groupchat) except exceptions.FileError as error: - app.ged.raise_event( - InformationEvent(dialog_name='open-file-error2', - args=error)) + ErrorDialog(_('Could not Open File'), error) return transfer.connect('cancel', self._on_cancel_upload) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/886ea23022d547501ebd84e758d1aa9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/886ea23022d547501ebd84e758d1aa9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Fix unassigned var
by Philipp Hörist (＠lovetox) 05 Jan '22

05 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ea4d6d80 by lovetox at 2022-01-05T23:54:19+01:00 Notifications: Fix unassigned var - - - - - b3449635 by lovetox at 2022-01-05T23:54:19+01:00 AccountSideBar: Add type annotations - - - - - 2 changed files: - gajim/gtk/account_side_bar.py - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/account_side_bar.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import List from typing import Optional @@ -19,6 +21,7 @@ from gajim.common.const import AvatarSize from gajim.common import app +from gajim.common import types from gajim.common.i18n import _ @@ -45,7 +48,7 @@ def remove_account(self, account: str) -> None: return @staticmethod - def _on_row_activated(_listbox, row): + def _on_row_activated(_listbox: AccountSideBar, row: Account) -> None: app.window.show_account_page(row.account) def activate_account_page(self, account: str) -> None: @@ -112,10 +115,14 @@ def __init__(self, account: str) -> None: self.connect('destroy', self._on_destroy) self._update_image() - def _on_presence_update(self, _contact, _signal_name): + def _on_presence_update(self, + _contact: types.BareContact, + _signal_name: str) -> None: self._update_image() - def _on_avatar_update(self, _contact, _signal_name): + def _on_avatar_update(self, + _contact: types.BareContact, + _signal_name: str) -> None: self._update_image() def _update_image(self) -> None: @@ -124,6 +131,6 @@ def _update_image(self) -> None: style='circle') self.set_from_surface(surface) - def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Image) -> None: self._contact.disconnect_all_from_obj(self) app.check_finalize(self) ===================================== gajim/gtk/notification.py ===================================== @@ -27,6 +27,7 @@ from __future__ import annotations from typing import Optional +from typing import Union import sys import logging @@ -36,6 +37,7 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Gtk +from nbxmpp.protocol import JID from gajim.common import app from gajim.common import ged @@ -112,9 +114,6 @@ def on_proxy_ready(_source: Gio.DBusProxy, on_proxy_ready) def _on_notification(self, event: events.Notification) -> None: - if event.jid is not None: - jid = str(event.jid) - if event.sound is not None: play_sound(event.sound, event.account) @@ -131,7 +130,7 @@ def _on_notification(self, event: events.Notification) -> None: self._issue_notification( event.notif_type, event.account, - jid, + event.jid, notif_detail=notif_detail, title=event.title, text=event.text, @@ -144,7 +143,7 @@ def _on_our_show(self, event: events.ShowChanged) -> None: def _issue_notification(self, notif_type: str, account: str, - jid: Optional[str], + jid: Optional[Union[str, JID]], notif_detail: str = '', title: str = '', text: str = '', @@ -155,6 +154,8 @@ def _issue_notification(self, Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows """ + if jid is not None: + jid = str(jid) if icon_name is None: icon_name = 'mail-message-new' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1f94d3810d71dec826e6574845e4f8a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1f94d3810d71dec826e6574845e4f8a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update DOAP
by Daniel Brötzmann (＠wurstsalat) 05 Jan '22

05 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1f94d381 by wurstsalat at 2022-01-05T22:11:10+01:00 Update DOAP - - - - - 1 changed file: - data/gajim.doap Changes: ===================================== data/gajim.doap ===================================== @@ -107,7 +107,7 @@ <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0049.html"/> <xmpp:status>complete</xmpp:status> <xmpp:version>1.2</xmpp:version> - <xmpp:note>For bookmark storage and meta contacts.</xmpp:note> + <xmpp:note>For bookmarks storage</xmpp:note> </xmpp:SupportedXep> </implements> <implements> @@ -244,7 +244,7 @@ <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> <xmpp:status>removed</xmpp:status> <xmpp:version>1.2</xmpp:version> - <xmpp:note>Removed in 1.4.0</xmpp:note> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -252,7 +252,7 @@ <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0108.html"/> <xmpp:status>removed</xmpp:status> <xmpp:version>1.3</xmpp:version> - <xmpp:note>Removed in 1.4.0</xmpp:note> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> @@ -416,8 +416,9 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0209.html"/> - <xmpp:status>complete</xmpp:status> + <xmpp:status>removed</xmpp:status> <xmpp:version>0.1</xmpp:version> + <xmpp:since>1.4.0</xmpp:since> </xmpp:SupportedXep> </implements> <implements> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f94d3810d71dec826e6574845e4f8a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1f94d3810d71dec826e6574845e4f8a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use upstream project for gi stubs
by Philipp Hörist (＠lovetox) 05 Jan '22

05 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0d062e0c by lovetox at 2022-01-05T20:17:04+01:00 Use upstream project for gi stubs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,7 +9,7 @@ pyright: stage: test script: - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git@$NBXMPP_BRANCH - - pip3 install -I git+https://dev.gajim.org/gajim/gi-stubs.git + - pip3 install -I git+https://github.com/pygobject/pygobject-stubs.git - npm install pyright - python3 -V - python3 scripts/ci/link-gtk.py View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d062e0ca0e8e86d89704e8f4ec9ad81… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0d062e0ca0e8e86d89704e8f4ec9ad81… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ged: Improve type annotations
by Philipp Hörist (＠lovetox) 04 Jan '22

04 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 18cd0156 by lovetox at 2022-01-04T22:18:26+01:00 ged: Improve type annotations - - - - - 93216c47 by lovetox at 2022-01-04T22:20:10+01:00 Harmonize notification events - Remove plugin specific code - Port SimpleNotification to Notification - Simplify Code - - - - - 4d430d23 by lovetox at 2022-01-04T23:44:10+01:00 Notification: Add type annotations - - - - - 4 changed files: - gajim/common/client.py - gajim/common/events.py - gajim/common/ged.py - gajim/gtk/notification.py Changes: ===================================== gajim/common/client.py ===================================== @@ -41,7 +41,7 @@ from gajim.common.events import PlainConnection from gajim.common.events import ShowChanged from gajim.common.events import SignedIn -from gajim.common.events import SimpleNotification +from gajim.common.events import Notification from gajim.common.events import StanzaReceived from gajim.common.events import StanzaSent from gajim.common.const import ClientState @@ -292,10 +292,10 @@ def _on_password(password: str) -> None: on_password=_on_password)) app.ged.raise_event( - SimpleNotification(account=self._account, - notif_type='connection-failed', - title=_('Authentication failed'), - text=text or error)) + Notification(account=self._account, + notif_type='connection-failed', + title=_('Authentication failed'), + text=text or error)) if self._reconnect: self._after_disconnect() ===================================== gajim/common/events.py ===================================== @@ -14,6 +14,7 @@ import typing from typing import Any +from typing import Union from typing import Optional from typing import Callable @@ -88,24 +89,15 @@ class PasswordRequired(ApplicationEvent): class Notification(ApplicationEvent): name: str = field(init=False, default='notification') account: str - jid: str notif_type: str title: str text: str + jid: Optional[Union[JID, str]] = None notif_detail: Optional[str] = None sound: Optional[str] = None icon_name: Optional[str] = None -@dataclass -class SimpleNotification(ApplicationEvent): - name: str = field(init=False, default='simple-notification') - account: str - notif_type: str - title: str - text: str - - @dataclass class StanzaSent(ApplicationEvent): name: str = field(init=False, default='stanza-sent') ===================================== gajim/common/ged.py ===================================== @@ -41,8 +41,8 @@ POSTGUI = 110 -HandlerFuncT = Callable[[ApplicationEvent], Any] -EventHelperHandlersT = list[tuple[str, int, Callable[[ApplicationEvent], Any]]] +HandlerFuncT = Callable[[Any], Any] +EventHandlerT = tuple[str, int, HandlerFuncT] class GlobalEventsDispatcher: @@ -112,18 +112,17 @@ def raise_event(self, event_obj: ApplicationEvent) -> Any: class EventHelper: def __init__(self): - self.__event_handlers: EventHelperHandlersT = [] + self.__event_handlers: list[EventHandlerT] = [] def register_event(self, event_name: str, priority: int, - handler: Callable[[ApplicationEvent], Any]) -> None: + handler: HandlerFuncT) -> None: self.__event_handlers.append((event_name, priority, handler)) app.ged.register_event_handler(event_name, priority, handler) - def register_events(self, events: EventHelperHandlersT) -> None: - + def register_events(self, events: list[EventHandlerT]) -> None: for handler in events: self.__event_handlers.append(handler) app.ged.register_event_handler(*handler) @@ -131,7 +130,7 @@ def register_events(self, events: EventHelperHandlersT) -> None: def unregister_event(self, event_name: str, priority: int, - handler: Callable[[ApplicationEvent], Any]) -> None: + handler: HandlerFuncT) -> None: self.__event_handlers.remove((event_name, priority, handler)) app.ged.register_event_handler(event_name, priority, handler) ===================================== gajim/gtk/notification.py ===================================== @@ -24,9 +24,9 @@ # 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 Dict +from __future__ import annotations + from typing import Optional -from typing import Tuple import sys import logging @@ -36,16 +36,14 @@ from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import Gtk -from gi.repository import GObject from gajim.common import app from gajim.common import ged +from gajim.common import events from gajim.common.const import StyleAttr from gajim.common.i18n import _ from gajim.common.helpers import allow_showing_notification -from gajim.common.helpers import exec_command from gajim.common.helpers import play_sound -from gajim.common.helpers import play_sound_file from gajim.common.ged import EventHelper from .util import add_css_to_widget @@ -55,7 +53,8 @@ log = logging.getLogger('gajim.gui.notification') -NOTIFICATION_ICONS: Dict[str, str] = { + +NOTIFICATION_ICONS: dict[str, str] = { 'incoming-message': 'gajim-chat_msg_recv', 'group-chat-invitation': 'gajim-gc_invitation', 'incoming-call': 'call-start-symbolic', @@ -80,9 +79,7 @@ def __init__(self) -> None: self.register_events([ ('notification', ged.GUI2, self._on_notification), - ('simple-notification', ged.GUI2, self._on_notification), - ('our-show', ged.GUI2, self._on_our_show), - ('connection-lost', ged.GUI2, self._on_connection_lost) + ('our-show', ged.GUI2, self._on_our_show) ]) def _detect_dbus_caps(self) -> None: @@ -93,10 +90,8 @@ def _detect_dbus_caps(self) -> None: self._dbus_available = True return - def on_proxy_ready(_source: GObject.Object, - res: Gio.AsyncResult, - _data: Optional[object] = None - ) -> None: + def on_proxy_ready(_source: Gio.DBusProxy, + res: Gio.AsyncResult) -> None: try: proxy = Gio.DBusProxy.new_finish(res) self._daemon_capabilities = proxy.GetCapabilities() @@ -116,42 +111,22 @@ def on_proxy_ready(_source: GObject.Object, None, on_proxy_ready) - def _on_notification(self, event): - if hasattr(event, 'jid'): + def _on_notification(self, event: events.Notification) -> None: + if event.jid is not None: jid = str(event.jid) - else: - jid = None - if hasattr(event, 'command'): - # Used by Triggers plugin - try: - exec_command(event.command, use_shell=True) - except Exception: - pass - - if hasattr(event, 'sound_file'): - # Allow override here, used by Triggers plugin - play_sound_file(event.sound_file) - elif hasattr(event, 'sound'): + + if event.sound is not None: play_sound(event.sound, event.account) - if hasattr(event, 'show_notification'): - # Allow override here, used by Triggers plugin - if not event.show_notification: - return - else: - if not allow_showing_notification(event.account): - return + if not allow_showing_notification(event.account): + return - if hasattr(event, 'notif_detail'): - notif_detail = event.notif_detail - else: - notif_detail = event.notif_type + notif_detail = event.notif_detail or event.notif_type - if hasattr(event, 'icon_name'): + if event.icon_name is not None: icon_name = event.icon_name else: - icon_name = NOTIFICATION_ICONS.get( - notif_detail, 'mail-unread') + icon_name = NOTIFICATION_ICONS.get(notif_detail, 'mail-unread') self._issue_notification( event.notif_type, @@ -162,33 +137,10 @@ def _on_notification(self, event): text=event.text, icon_name=icon_name) - def _on_simple_notification(self, event): - if not allow_showing_notification(event.account): - return - - self._issue_notification( - event.notif_type, - event.account, - None, - title=event.title, - text=event.text) - - def _on_our_show(self, event): + def _on_our_show(self, event: events.ShowChanged) -> None: if app.account_is_connected(event.account): self._withdraw('connection-failed', event.account) - def _on_connection_lost(self, event): - if not allow_showing_notification(event.conn.name): - return - - self._issue_notification( - 'connection-lost', - event.conn.name, - None, - title=event.title, - text=event.msg, - icon_name='gajim-connection_lost') - def _issue_notification(self, notif_type: str, account: str, @@ -375,7 +327,7 @@ def __init__(self, self._timeout_id = GLib.timeout_add_seconds(timeout, self.destroy) @staticmethod - def _get_window_pos() -> Tuple[int, int]: + def _get_window_pos() -> tuple[int, int]: pos_x = app.settings.get('notification_position_x') screen_w, screen_h = get_total_screen_geometry() if pos_x < 0: @@ -397,6 +349,6 @@ def _on_button_press(self, self._account, self._jid, self._notif_type) self.destroy() - def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Window) -> None: if self._timeout_id is not None: GLib.source_remove(self._timeout_id) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/15f338e4aa9bf116812fd19a887b18b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/15f338e4aa9bf116812fd19a887b18b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Events: Fix MessageReceived event
by Philipp Hörist (＠lovetox) 03 Jan '22

03 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: a52b9237 by lovetox at 2022-01-03T22:48:58+01:00 Events: Fix MessageReceived event - - - - - 15f338e4 by lovetox at 2022-01-03T22:49:50+01:00 Use log level=ERROR for nbxmpp We need ERROR because log.exception() uses that level and we always want to see exception on the console - - - - - 2 changed files: - gajim/common/events.py - gajim/common/logging_helpers.py Changes: ===================================== gajim/common/events.py ===================================== @@ -383,8 +383,6 @@ class MessageReceived(ApplicationEvent): additional_data: 'AdditionalDataDict' unique_id: str stanza_id: str - archive_jid: str - kind: 'KindConstant' fjid: str resource: str session: Any @@ -394,7 +392,7 @@ class MessageReceived(ApplicationEvent): @dataclass -class GcMessageReceived(ApplicationEvent): +class GcMessageReceived(MessageReceived): name: str = field(init=False, default='gc-message-received') room_jid: str ===================================== gajim/common/logging_helpers.py ===================================== @@ -174,7 +174,7 @@ def init() -> None: root_log.propagate = False root_log = logging.getLogger('nbxmpp') - root_log.setLevel(logging.CRITICAL) + root_log.setLevel(logging.ERROR) root_log.addHandler(consoleloghandler) root_log.propagate = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/092ac61925ce81ab81123c268d9b618… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/092ac61925ce81ab81123c268d9b618… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MUC: Remove unused code
by Philipp Hörist (＠lovetox) 03 Jan '22

03 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 741b3437 by lovetox at 2022-01-03T22:33:50+01:00 MUC: Remove unused code - - - - - 092ac619 by lovetox at 2022-01-03T22:34:11+01:00 Remove trailing whitespace - - - - - 2 changed files: - gajim/common/events.py - gajim/common/modules/muc.py Changes: ===================================== gajim/common/events.py ===================================== @@ -297,7 +297,7 @@ class AgentRemoved(ApplicationEvent): conn: 'Client' agent: str jid_list: list[str] - + @dataclass class GatewayPromptReceived(ApplicationEvent): ===================================== gajim/common/modules/muc.py ===================================== @@ -610,16 +610,6 @@ def _remove_join_timeout(self, room_jid): GLib.source_remove(id_) del self._join_timeouts[room_jid] - def _raise_muc_event(self, event_name, properties): - raise ValueError - # Not used Currently - # app.ged.raise_event( - # NetworkEvent(event_name, - # account=self._account, - # jid=properties.jid.bare, - # properties=properties)) - self._log_muc_event(event_name, properties) - def _log_muc_event(self, event_name, properties): # TODO CURRENTLY NOT USED if event_name not in ['muc-user-joined', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5e194357d2734d130c8fe0f0c66b548… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5e194357d2734d130c8fe0f0c66b548… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Mark gajim package as typed
by Philipp Hörist (＠lovetox) 03 Jan '22

03 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: fddc116f by lovetox at 2022-01-03T22:10:20+01:00 Mark gajim package as typed - - - - - 4d5e5839 by lovetox at 2022-01-03T22:10:20+01:00 Add CoreApplication This further separates the GUI code - - - - - aeeb2e11 by lovetox at 2022-01-03T22:10:20+01:00 nec: Remove unused code We don’t need to differentiate between incoming and outgoing events, all we need is a simple events dispatcher. - - - - - 84a38668 by lovetox at 2022-01-03T22:10:20+01:00 ged: Remove OUT_* constants - - - - - 5e194357 by lovetox at 2022-01-03T22:10:20+01:00 Refactor Events - - - - - 30 changed files: - gajim/common/app.py - + gajim/common/application.py - gajim/common/client.py - − gajim/common/connection_handlers_events.py - gajim/common/dbus/music_track.py - + gajim/common/events.py - gajim/common/ged.py - gajim/common/jingle_ft.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/base.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/bytestream.py - gajim/common/modules/chat_markers.py - gajim/common/modules/discovery.py - gajim/common/modules/gateway.py - gajim/common/modules/http_auth.py - gajim/common/modules/iq.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/receipts.py - gajim/common/modules/roster.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/security_labels.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a93cb7ad3388dff7cd4762aab930164… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a93cb7ad3388dff7cd4762aab930164… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits