Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] 2 commits: Tooltips: Add gui extension point for contact resources
by Daniel Brötzmann (＠wurstsalat) 24 Oct '21

24 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fd3fb091 by wurstsalat at 2021-10-24T20:12:17+02:00 Tooltips: Add gui extension point for contact resources - - - - - 212115c1 by wurstsalat at 2021-10-24T20:21:47+02:00 GCTooltip: Remove show - - - - - 3 changed files: - gajim/data/gui/tooltip_gc_contact.ui → gajim/data/gui/groupchat_roster_tooltip.ui - gajim/data/gui/roster_tooltip.ui - gajim/gtk/tooltips.py Changes: ===================================== gajim/data/gui/tooltip_gc_contact.ui → gajim/data/gui/groupchat_roster_tooltip.ui ===================================== @@ -1,49 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.22"/> + <requires lib="gtk+" version="3.24"/> +  <object class="GtkGrid" id="tooltip_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> + <property name="can-focus">False</property> + <property name="column-spacing">6</property> <child> <object class="GtkImage" id="avatar"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="icon-name">image-missing</property> + <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> <property name="height">6</property> </packing> </child> <child> <object class="GtkLabel" id="jid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="max_width_chars">36</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">36</property> <attributes> <attribute name="weight" value="bold"/> </attributes> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="nick"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="max_width_chars">25</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">25</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -52,44 +56,32 @@ </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="user_show"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">start</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="fillelement"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="vexpand">True</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="status"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> + <property name="wrap-mode">word-char</property> <property name="ellipsize">end</property> - <property name="max_width_chars">40</property> + <property name="max-width-chars">40</property> <property name="lines">3</property> <property name="xalign">0</property> <attributes> @@ -97,21 +89,42 @@ </attributes> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="affiliation"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/gui/roster_tooltip.ui ===================================== @@ -193,15 +193,12 @@ </packing> </child> <child> -  - <object class="GtkGrid" id="resource_grid"> + <object class="GtkBox" id="resources_box"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> - <child> - <placeholder/> - </child> + <property name="orientation">vertical</property> <child> <placeholder/> </child> ===================================== gajim/gtk/tooltips.py ===================================== @@ -48,29 +48,28 @@ from .util import format_activity from .util import format_tune from .util import format_location -from .util import get_css_show_class log = logging.getLogger('gajim.gui.tooltips') class GCTooltip: def __init__(self): - self.contact = None + self._contact = None - self._ui = get_builder('tooltip_gc_contact.ui') + self._ui = get_builder('groupchat_roster_tooltip.ui') def clear_tooltip(self): - self.contact = None + self._contact = None def get_tooltip(self, contact): - if self.contact == contact: + if self._contact == contact: return True, self._ui.tooltip_grid self._populate_grid(contact) - self.contact = contact + self._contact = contact return False, self._ui.tooltip_grid - def _hide_grid_childs(self): + def _hide_grid_children(self): """ Hide all Elements of the Tooltip Grid """ @@ -81,7 +80,7 @@ def _populate_grid(self, contact): """ Populate the Tooltip Grid with data of from the contact """ - self._hide_grid_childs() + self._hide_grid_children() self._ui.nick.set_text(contact.name) self._ui.nick.show() @@ -93,12 +92,6 @@ def _populate_grid(self, contact): self._ui.status.set_text(status) self._ui.status.show() - # Status - show = helpers.get_uf_show(contact.show.value) - self._ui.user_show.set_text(show) - colorize_status(self._ui.user_show, contact.show.value) - self._ui.user_show.show() - # JID if contact.real_jid is not None: self._ui.jid.set_text(str(contact.real_jid.bare)) @@ -134,7 +127,7 @@ def __init__(self): def clear_tooltip(self): self._row = None - for widget in self._ui.resource_grid.get_children(): + for widget in self._ui.resources_box.get_children(): widget.destroy() for widget in self._ui.tooltip_grid.get_children(): widget.hide() @@ -165,8 +158,7 @@ def _populate_grid(self, contact): self._ui.jid.show() # Resources with show, status, priority - resources = contact.get_resources() - self._build_resource_grid(resources, scale) + self._add_resources(contact) # Subscription if contact.subscription and contact.subscription != 'both': @@ -180,7 +172,7 @@ def _populate_grid(self, contact): # self._append_pep_info(contact) app.plugin_manager.gui_extension_point( - 'roster_tooltip_populate', self, contact, self._ui.tooltip_grid) + 'roster_tooltip_populate', self, contact) # This sets the bottom-most widget to expand, in case the avatar # takes more space than the labels @@ -194,39 +186,42 @@ def _populate_grid(self, contact): break last_widget.set_vexpand(True) - def _build_resource_grid(self, resources, scale): - row_num = 0 - for contact in resources: + def _add_resources(self, contact): + for resource in contact.iter_resources(): + resource_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) + show_surface = get_show_circle( - contact.show, AvatarSize.SHOW_CIRCLE, scale) + resource.show, + AvatarSize.SHOW_CIRCLE, + self._ui.tooltip_grid.get_scale_factor()) show_image = Gtk.Image.new_from_surface(show_surface) show_image.set_halign(Gtk.Align.START) show_image.set_valign(Gtk.Align.CENTER) - self._ui.resource_grid.attach(show_image, 0, row_num, 1, 1) - resource_string = GLib.markup_escape_text(contact.jid.resource) + resource_string = GLib.markup_escape_text(resource.jid.resource) resource_label = Gtk.Label() resource_label.set_halign(Gtk.Align.START) resource_label.set_xalign(0) resource_label.set_ellipsize(Pango.EllipsizeMode.END) resource_label.set_max_width_chars(30) - resource_label.set_text(f'{resource_string} ({contact.priority})') - self._ui.resource_grid.attach(resource_label, 1, row_num, 1, 1) + resource_label.set_text(f'{resource_string} ({resource.priority})') + + base_box = Gtk.Box(spacing=6) + base_box.add(show_image) + base_box.add(resource_label) + resource_box.add(base_box) - if contact.status: - row_num += 1 - status_text = GLib.markup_escape_text(contact.status) + if resource.status: + status_text = GLib.markup_escape_text(resource.status) status_label = Gtk.Label(label=status_text) status_label.set_halign(Gtk.Align.START) status_label.set_xalign(0) status_label.set_ellipsize(Pango.EllipsizeMode.END) status_label.set_max_width_chars(30) - self._ui.resource_grid.attach( - status_label, 1, row_num, 1, 1) + resource_box.add(status_label) - if contact.idle_time: - row_num += 1 - idle_time = time.localtime(contact.idle_time) + if resource.idle_time: + idle_time = time.localtime(resource.idle_time) idle_time = datetime(*(idle_time[:6])) current = datetime.now() if idle_time.date() == current.date(): @@ -237,12 +232,16 @@ def _build_resource_grid(self, resources, scale): idle_label = Gtk.Label(label=idle_text) idle_label.set_halign(Gtk.Align.START) idle_label.set_xalign(0) - self._ui.resource_grid.attach( - idle_label, 1, row_num, 1, 1) + resource_box.add(idle_label) - row_num += 1 + app.plugin_manager.gui_extension_point( + 'roster_tooltip_resource_populate', + resource_box, + resource) - self._ui.resource_grid.show_all() + self._ui.resources_box.add(resource_box) + + self._ui.resources_box.show_all() def _append_pep_info(self, contact): if PEPEventType.MOOD in contact.pep: @@ -367,16 +366,3 @@ def _get_current_status(file_props): return Q_('?transfer status:Transferring') return Q_('?transfer status:Not started') return Q_('?transfer status:Not started') - - -def colorize_status(widget, show): - """ - Colorize the status message inside the tooltip by it's semantics. - """ - css_class = get_css_show_class(show)[14:] - style = widget.get_style_context() - # Remove all css classes with gajim-status- prefix - for css_cls in style.list_classes(): - if css_cls.startswith('gajim-status-'): - style.remove_class(css_cls) - style.add_class(f'gajim-status-{css_class}') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7289a04e41aba8d1464371137bade0a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7289a04e41aba8d1464371137bade0a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Main: Don’t open control for chatstates etc.
by Daniel Brötzmann (＠wurstsalat) 24 Oct '21

24 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 4a8c9e89 by wurstsalat at 2021-10-24T15:59:08+02:00 Main: Don’t open control for chatstates etc. - - - - - ce0bf6a2 by wurstsalat at 2021-10-24T16:05:15+02:00 NotificationManager: Fix tray notifications - - - - - 7289a04e by wurstsalat at 2021-10-24T16:08:17+02:00 Notifications: Fix getting icon - - - - - 3 changed files: - gajim/gtk/main.py - gajim/gtk/notification.py - gajim/gtk/notification_manager.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -560,6 +560,9 @@ def _on_event(self, event): if not self.chat_exists(event.account, event.jid): if event.name == 'message-received': + if not event.properties.body: + # Don’t open control on chatstate etc. + return if event.properties.is_muc_pm: self.add_private_chat(event.account, event.properties.jid, ===================================== gajim/gtk/notification.py ===================================== @@ -133,7 +133,7 @@ def _on_notification(self, event): icon_name = event.icon_name else: icon_name = NOTIFICATION_ICONS.get( - event.notif_detail, 'mail-message-new') + notif_detail, 'mail-message-new') self._issue_notification( event.notif_type, ===================================== gajim/gtk/notification_manager.py ===================================== @@ -143,8 +143,8 @@ def add_subscription_request(self, event): app.nec.push_incoming_event( NetworkEvent('notification', - account=self.account, - jid=self.contact.jid, + account=self._account, + jid=event.jid, notif_type='subscription-request', title=_('Subscription Request'), text=text)) @@ -162,8 +162,8 @@ def add_unsubscribed(self, event): app.nec.push_incoming_event( NetworkEvent('notification', - account=self.account, - jid=self.contact.jid, + account=self._account, + jid=event.jid, notif_type='unsubscribed', title=_('Contact Unsubscribed'), text=text)) @@ -186,8 +186,8 @@ def add_invitation_received(self, event): app.nec.push_incoming_event( NetworkEvent('notification', - account=self.account, - jid=self.contact.jid, + account=self._account, + jid=jid, notif_type='group-chat-invitation', title=_('Group Chat Invitation'), text=text)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/638e5bf31d1bfbb2fee9453524780c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/638e5bf31d1bfbb2fee9453524780c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] Namespaces: Fix bookmarks compat namespace
by Philipp Hörist (＠lovetox) 23 Oct '21

23 Oct '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: 8fffacf1 by lovetox at 2021-10-23T22:52:06+02:00 Namespaces: Fix bookmarks compat namespace - - - - - 1 changed file: - nbxmpp/namespaces.py Changes: ===================================== nbxmpp/namespaces.py ===================================== @@ -35,7 +35,7 @@ class _Namespaces: BOB: str = 'urn:xmpp:bob' BOOKMARKS: str = 'storage:bookmarks' BOOKMARKS_1: str = 'urn:xmpp:bookmarks:1' - BOOKMARKS_COMPAT: str = 'urn:xmpp:bookmarks:0#compat' + BOOKMARKS_COMPAT: str = 'urn:xmpp:bookmarks:1#compat' BOOKMARKS_COMPAT_PEP: str = 'urn:xmpp:bookmarks:1#compat-pep' BOOKMARK_CONVERSION: str = 'urn:xmpp:bookmarks-conversion:0' BROWSE: str = 'jabber:iq:browse' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8fffacf11567f2641e82aebd… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/8fffacf11567f2641e82aebd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 9 commits: Remove unused dict
by Philipp Hörist (＠lovetox) 23 Oct '21

23 Oct '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: bc2870f8 by lovetox at 2021-10-16T17:22:26+02:00 Remove unused dict - - - - - f2a4cdf0 by lovetox at 2021-10-16T17:23:01+02:00 Use generate_id() instead of get_stanza_id() - - - - - cd079530 by lovetox at 2021-10-16T17:23:35+02:00 Add annotations - - - - - b2a46b62 by lovetox at 2021-10-16T17:23:49+02:00 Remove unused method - - - - - b48f0f6c by lovetox at 2021-10-17T11:57:33+02:00 Add annotations - - - - - f5a9acc0 by lovetox at 2021-10-17T12:15:03+02:00 Refactor b64decode() - - - - - 53bfd31b by lovetox at 2021-10-17T12:26:31+02:00 Refactor b64encode() - - - - - bc7cac2b by lovetox at 2021-10-17T14:05:20+02:00 Add annotations - - - - - e3d66d9c by lovetox at 2021-10-23T22:50:23+02:00 Namespaces: Fix bookmarks compat namespace - - - - - 13 changed files: - nbxmpp/auth.py - nbxmpp/client.py - nbxmpp/modules/bits_of_binary.py - nbxmpp/modules/ibb.py - nbxmpp/modules/omemo.py - nbxmpp/modules/openpgp.py - nbxmpp/modules/user_avatar.py - nbxmpp/modules/vcard_temp.py - nbxmpp/namespaces.py - nbxmpp/protocol.py - nbxmpp/simplexml.py - nbxmpp/structs.py - nbxmpp/util.py Changes: ===================================== nbxmpp/auth.py ===================================== @@ -288,7 +288,7 @@ class GSSAPI: self._client.send_nonza(node) def response(self, server_message, *args, **kwargs): - server_message = b64decode(server_message, bytes) + server_message = b64decode(server_message) try: if not self.ctx.complete: output_token = self.ctx.step(server_message) @@ -350,14 +350,14 @@ class SCRAM: self._client.send_nonza(node) def response(self, server_first_message): - server_first_message = b64decode(server_first_message) + server_first_message = b64decode(server_first_message).decode() challenge = self._scram_parse(server_first_message) client_nonce = challenge['r'][:self.nonce_length] if client_nonce != self._client_nonce: raise AuthFail('Invalid client nonce received from server') - salt = b64decode(challenge['s'], bytes) + salt = b64decode(challenge['s']) iteration_count = int(challenge['i']) if iteration_count < 4096: @@ -397,9 +397,9 @@ class SCRAM: self._client.send_nonza(node) def success(self, server_last_message): - server_last_message = b64decode(server_last_message) + server_last_message = b64decode(server_last_message).decode() success = self._scram_parse(server_last_message) - server_signature = b64decode(success['v'], bytes) + server_signature = b64decode(success['v']) if server_signature != self._server_signature: raise AuthFail('Invalid server signature') ===================================== nbxmpp/client.py ===================================== @@ -45,7 +45,7 @@ from nbxmpp.const import ConnectionProtocol from nbxmpp.const import Mode from nbxmpp.dispatcher import StanzaDispatcher from nbxmpp.util import get_stream_header -from nbxmpp.util import get_stanza_id +from nbxmpp.util import generate_id from nbxmpp.util import Observable from nbxmpp.util import validate_stream_header from nbxmpp.util import LogAdapter @@ -576,7 +576,7 @@ class Client(Observable): id_ = stanza.getID() if id_ is None: - id_ = get_stanza_id() + id_ = generate_id() stanza.setID(id_) if callback is not None: ===================================== nbxmpp/modules/bits_of_binary.py ===================================== @@ -15,9 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from typing import Optional + import logging import hashlib +from nbxmpp.simplexml import Node from nbxmpp.namespaces import Namespace from nbxmpp.structs import BobData from nbxmpp.util import b64decode @@ -25,7 +28,7 @@ from nbxmpp.util import b64decode log = logging.getLogger('nbxmpp.m.bob') -def parse_bob_data(stanza): +def parse_bob_data(stanza: Node) -> Optional[BobData]: data_node = stanza.getTag('data', namespace=Namespace.BOB) if data_node is None: return None @@ -57,7 +60,7 @@ def parse_bob_data(stanza): return None try: - bob_data = b64decode(bob_data, return_type=bytes) + bob_data = b64decode(bob_data) except Exception: log.warning('Unable to decode data') log.exception(stanza) ===================================== nbxmpp/modules/ibb.py ===================================== @@ -113,7 +113,7 @@ class IBB(BaseModule): raise NodeProcessed try: - decoded_data = b64decode(data.getData(), return_type=bytes) + decoded_data = b64decode(data.getData()) except Exception: self._log.exception('Failed to decode IBB data') self._client.send_stanza(ErrorStanza(stanza, ERR_BAD_REQUEST)) ===================================== nbxmpp/modules/omemo.py ===================================== @@ -194,7 +194,7 @@ def _parse_omemo_message(stanza): iv_node = header.getTag('iv') try: - iv = b64decode(iv_node.getData(), bytes) + iv = b64decode(iv_node.getData()) except Exception as error: raise MalformedStanzaError('failed to decode iv: %s' % error, stanza) @@ -202,7 +202,7 @@ def _parse_omemo_message(stanza): payload_node = encrypted.getTag('payload') if payload_node is not None: try: - payload = b64decode(payload_node.getData(), bytes) + payload = b64decode(payload_node.getData()) except Exception as error: raise MalformedStanzaError('failed to decode payload: %s' % error, stanza) @@ -227,7 +227,7 @@ def _parse_omemo_message(stanza): raise MalformedStanzaError(error, stanza) try: - keys[int(rid)] = (b64decode(kn.getData(), bytes), prekey) + keys[int(rid)] = (b64decode(kn.getData()), prekey) except Exception as error: raise MalformedStanzaError('failed to decode key: %s' % error, stanza) @@ -273,8 +273,7 @@ def _parse_bundle(item): result = {} signed_prekey_node = bundle.getTag('signedPreKeyPublic') try: - result['spk'] = {'key': b64decode(signed_prekey_node.getData(), - bytes)} + result['spk'] = {'key': b64decode(signed_prekey_node.getData())} except Exception as error: error = 'Failed to decode signedPreKeyPublic: %s' % error raise MalformedStanzaError(error, item) @@ -287,15 +286,14 @@ def _parse_bundle(item): signed_signature_node = bundle.getTag('signedPreKeySignature') try: - result['spk_signature'] = b64decode(signed_signature_node.getData(), - bytes) + result['spk_signature'] = b64decode(signed_signature_node.getData()) except Exception as error: error = 'Failed to decode signedPreKeySignature: %s' % error raise MalformedStanzaError(error, item) identity_key_node = bundle.getTag('identityKey') try: - result['ik'] = b64decode(identity_key_node.getData(), bytes) + result['ik'] = b64decode(identity_key_node.getData()) except Exception as error: error = 'Failed to decode IdentityKey: %s' % error raise MalformedStanzaError(error, item) @@ -312,7 +310,7 @@ def _parse_bundle(item): raise MalformedStanzaError('Invalid prekey: %s' % error, item) try: - key = b64decode(prekey.getData(), bytes) + key = b64decode(prekey.getData()) except Exception as error: raise MalformedStanzaError( 'Failed to decode preKeyPublic: %s' % error, item) ===================================== nbxmpp/modules/openpgp.py ===================================== @@ -74,7 +74,7 @@ class OpenPGP(BaseModule): self._log.info('Encrypted message received') try: - properties.openpgp = b64decode(data, return_type=bytes) + properties.openpgp = b64decode(data) except Exception: self._log.warning('b64decode failed') self._log.warning(stanza) @@ -390,7 +390,7 @@ def _parse_public_key(jid, item): raise ValueError('data node missing') try: - key = b64decode(data.getData(), return_type=bytes) + key = b64decode(data.getData()) except Exception as error: raise ValueError(f'decoding error: {error}') @@ -432,7 +432,7 @@ def _parse_secret_key(item): raise ValueError('secretkey data missing') try: - key = b64decode(data, return_type=bytes) + key = b64decode(data) except Exception as error: raise ValueError(f'decoding error: {error}') ===================================== nbxmpp/modules/user_avatar.py ===================================== @@ -220,7 +220,7 @@ def _get_avatar_data(item, id_): raise MalformedStanzaError('data node empty', item) try: - avatar = b64decode(data, return_type=bytes) + avatar = b64decode(data) except Exception as error: raise MalformedStanzaError(f'decoding error: {error}', item) ===================================== nbxmpp/modules/vcard_temp.py ===================================== @@ -138,6 +138,6 @@ class VCard: if not avatar: return None, None - avatar = b64decode(avatar, return_type=bytes) + avatar = b64decode(avatar) avatar_sha = hashlib.sha1(avatar).hexdigest() return avatar, avatar_sha ===================================== nbxmpp/namespaces.py ===================================== @@ -35,7 +35,7 @@ class _Namespaces: BOB: str = 'urn:xmpp:bob' BOOKMARKS: str = 'storage:bookmarks' BOOKMARKS_1: str = 'urn:xmpp:bookmarks:1' - BOOKMARKS_COMPAT: str = 'urn:xmpp:bookmarks:0#compat' + BOOKMARKS_COMPAT: str = 'urn:xmpp:bookmarks:1#compat' BOOKMARKS_COMPAT_PEP: str = 'urn:xmpp:bookmarks:1#compat-pep' BOOKMARK_CONVERSION: str = 'urn:xmpp:bookmarks-conversion:0' BROWSE: str = 'jabber:iq:browse' ===================================== nbxmpp/protocol.py ===================================== @@ -18,6 +18,13 @@ data structures, including jabber-objects like JID or different stanzas and sub- stanzas) handling routines """ +from __future__ import annotations + +from typing import Any +from typing import Union +from typing import Optional +from typing import cast + import time import hashlib import functools @@ -241,27 +248,6 @@ _errorcodes = { 'cancel': 'invalid-from' } -_status_conditions = { - 'realjid-public': 100, - 'affiliation-changed': 101, - 'unavailable-shown': 102, - 'unavailable-not-shown': 103, - 'configuration-changed': 104, - 'self-presence': 110, - 'logging-enabled': 170, - 'logging-disabled': 171, - 'non-anonymous': 172, - 'semi-anonymous': 173, - 'fully-anonymous': 174, - 'room-created': 201, - 'nick-assigned': 210, - 'banned': 301, - 'new-nick': 303, - 'kicked': 307, - 'removed-affiliation': 321, - 'removed-membership': 322, - 'removed-shutdown': 332, -} _localpart_disallowed_chars = set('"&\'/:<>@') _localpart_escape_chars = ' "&\'/:<>@' @@ -490,7 +476,7 @@ def deprecation_warning(message): @functools.lru_cache(maxsize=None) -def validate_localpart(localpart): +def validate_localpart(localpart: str) -> str: if not localpart or len(localpart.encode()) > 1023: raise LocalpartByteLimit @@ -505,7 +491,7 @@ def validate_localpart(localpart): @functools.lru_cache(maxsize=None) -def validate_resourcepart(resourcepart): +def validate_resourcepart(resourcepart: str) -> str: if not resourcepart or len(resourcepart.encode()) > 1023: raise ResourcepartByteLimit @@ -517,7 +503,7 @@ def validate_resourcepart(resourcepart): @functools.lru_cache(maxsize=None) -def validate_domainpart(domainpart): +def validate_domainpart(domainpart: str) -> str: if not domainpart: raise DomainpartByteLimit @@ -541,12 +527,12 @@ def validate_domainpart(domainpart): @functools.lru_cache(maxsize=None) -def idna_encode(domain): +def idna_encode(domain: str) -> str: return idna.encode(domain, uts46=True).decode() @functools.lru_cache(maxsize=None) -def escape_localpart(localpart): +def escape_localpart(localpart: str) -> str: # https://xmpp.org/extensions/xep-0106.html#bizrules-algorithm # # If there are any instances of character sequences that correspond @@ -568,7 +554,7 @@ def escape_localpart(localpart): @functools.lru_cache(maxsize=None) -def unescape_localpart(localpart): +def unescape_localpart(localpart: str) -> str: if localpart.startswith('\\20') or localpart.endswith('\\20'): # Escaped JIDs are not allowed to start or end with \20 # so this localpart must be already unescaped @@ -587,11 +573,15 @@ def unescape_localpart(localpart): @dataclass(frozen=True) class JID: - localpart: str = None - domain: str = None - resource: str = None + localpart: Optional[str] = None + domain: Optional[str] = None + resource: Optional[str] = None + + def __init__(self, + localpart: Optional[str] = None, + domain: Optional[str] = None, + resource: Optional[str] = None): - def __init__(self, localpart=None, domain=None, resource=None): if localpart is not None: localpart = validate_localpart(localpart) object.__setattr__(self, "localpart", localpart) @@ -605,7 +595,7 @@ class JID: @classmethod @functools.lru_cache(maxsize=None) - def from_string(cls, jid_string): + def from_string(cls, jid_string: str) -> JID: # https://tools.ietf.org/html/rfc7622#section-3.2 # Remove any portion from the first '/' character to the end of the @@ -630,7 +620,7 @@ class JID: @classmethod @functools.lru_cache(maxsize=None) - def from_user_input(cls, user_input, escaped=False): + def from_user_input(cls, user_input: str, escaped: bool = False) -> JID: # Use this if we want JIDs to be escaped according to XEP-0106 # The standard JID parsing cannot be applied because user_input is # not a valid JID. @@ -661,11 +651,11 @@ class JID: domain=domainpart, resource=None) - def __str__(self): + def __str__(self) -> str: if self.localpart: jid = f'{self.localpart}(a){self.domain}' else: - jid = self.domain + jid = cast(str, self.domain) if self.resource is not None: return f'{jid}/{self.resource}' @@ -674,7 +664,7 @@ class JID: def __hash__(self): return hash(str(self)) - def __eq__(self, other): + def __eq__(self, other: Union[str, JID]) -> bool: if isinstance(other, str): deprecation_warning('comparing string with JID is deprected') try: @@ -682,57 +672,54 @@ class JID: except Exception: return False - if not isinstance(other, JID): - raise TypeError('eq with type (%s) not supported' % type(other)) - return (self.localpart == other.localpart and self.domain == other.domain and self.resource == other.resource) - def __ne__(self, other): + def __ne__(self, other: Union[str, JID]) -> bool: return not self.__eq__(other) - def domain_to_ascii(self): + def domain_to_ascii(self) -> str: return idna_encode(self.domain) @property - def bare(self): + def bare(self) -> Optional[str]: if self.localpart is not None: return f'{self.localpart}(a){self.domain}' return self.domain @property - def is_bare(self): + def is_bare(self) -> bool: return self.resource is None - def new_as_bare(self): + def new_as_bare(self) -> JID: if self.resource is None: return self new = asdict(self) new.pop('resource') return JID(**new) - def bare_match(self, other): + def bare_match(self, other: Union[str, JID]) -> bool: if isinstance(other, str): other = JID.from_string(other) return self.bare == other.bare @property - def is_domain(self): + def is_domain(self) -> bool: return self.localpart is None and self.resource is None @property - def is_full(self): + def is_full(self) -> bool: return (self.localpart is not None and self.domain is not None and self.resource is not None) - def new_with(self, **kwargs): + def new_with(self, **kwargs: dict[str, str]) -> JID: new = asdict(self) new.update(kwargs) return JID(**new) - def to_user_string(self, show_punycode=True): + def to_user_string(self, show_punycode: bool = True) -> str: domain = self.domain_to_ascii() if domain.startswith('xn--') and show_punycode: domain_encoded = f' ({domain})' @@ -748,7 +735,7 @@ class JID: return f'{localpart}(a){self.domain}{domain_encoded}' return f'{localpart}(a){self.domain}/{self.resource}{domain_encoded}' - def copy(self): + def copy(self) -> JID: deprecation_warning('copy() is not needed, JID is immutable') return self @@ -757,7 +744,7 @@ class StreamErrorNode(Node): def __init__(self, node): Node.__init__(self, node=node) - self._text = {} + self._text: dict[Optional[str], str] = {} text_elements = self.getTags('text', namespace=Namespace.XMPP_STREAMS) for element in text_elements: @@ -765,14 +752,14 @@ class StreamErrorNode(Node): text = element.getData() self._text[lang] = text - def get_condition(self): + def get_condition(self) -> Optional[str]: for tag in self.getChildren(): if (tag.getName() != 'text' and tag.getNamespace() == Namespace.XMPP_STREAMS): return tag.getName() return None - def get_text(self, pref_lang=None): + def get_text(self, pref_lang: Optional[str] = None) -> str: if pref_lang is not None: text = self._text.get(pref_lang) if text is not None: @@ -905,13 +892,13 @@ class Protocol(Node): return JID.from_string(attr) return attr - def getID(self): + def getID(self) -> Optional[str]: """ Return the value of the 'id' attribute """ return self.getAttr('id') - def setTo(self, val): + def setTo(self, val: Union[str, JID]): """ Set the value of the 'to' attribute """ @@ -919,13 +906,13 @@ class Protocol(Node): val = JID.from_string(val) self.setAttr('to', val) - def getType(self): + def getType(self) -> Optional[str]: """ Return the value of the 'type' attribute """ return self.getAttr('type') - def setFrom(self, val): + def setFrom(self, val: Union[str, JID]): """ Set the value of the 'from' attribute """ @@ -933,13 +920,13 @@ class Protocol(Node): val = JID.from_string(val) self.setAttr('from', val) - def setType(self, val): + def setType(self, val: str): """ Set the value of the 'type' attribute """ self.setAttr('type', val) - def setID(self, val): + def setID(self, val: str): """ Set the value of the 'id' attribute """ @@ -1056,7 +1043,11 @@ class Protocol(Node): props.append(prop) return props - def getTag(self, name, attrs=None, namespace=None, protocol=False): + def getTag(self, + name: str, + attrs: Optional[dict[str, Any]] = None, + namespace: Optional[str] = None, + protocol: bool = False) -> Optional[Node]: """ Return the Node instance for the tag. If protocol is True convert to a new Protocol/Message instance. @@ -1068,14 +1059,14 @@ class Protocol(Node): return Protocol(node=tag) return tag - def __setitem__(self, item, val): + def __setitem__(self, item: str, val: Union[str, JID]): """ Set the item 'item' to the value 'val' """ if item in ['to', 'from']: if not isinstance(val, JID): val = JID.from_string(val) - return self.setAttr(item, val) + self.setAttr(item, val) class Message(Protocol): @@ -1658,13 +1649,15 @@ class Hashes2(Node): class BindRequest(Iq): - def __init__(self, resource): - if resource is not None: - resource = Node('resource', payload=resource) + def __init__(self, resource: Optional[str]): + if resource is None: + res = resource + else: + res = Node('resource', payload=resource) Iq.__init__(self, typ='set') self.addChild(node=Node('bind', {'xmlns': Namespace.BIND}, - payload=resource)) + payload=res)) class TLSRequest(Node): @@ -1679,7 +1672,7 @@ class SessionRequest(Iq): class StreamHeader(Node): - def __init__(self, domain, lang=None): + def __init__(self, domain: str, lang: Optional[str] = None): if lang is None: lang = 'en' Node.__init__(self, @@ -1692,7 +1685,7 @@ class StreamHeader(Node): class WebsocketOpenHeader(Node): - def __init__(self, domain, lang=None): + def __init__(self, domain: str, lang: Optional[str] = None): if lang is None: lang = 'en' Node.__init__(self, @@ -1708,7 +1701,7 @@ class WebsocketCloseHeader(Node): class Features(Node): - def __init__(self, node): + def __init__(self, node: Node): Node.__init__(self, node=node) def has_starttls(self): @@ -1721,7 +1714,7 @@ class Features(Node): def has_sasl(self): return self.getTag('mechanisms', namespace=Namespace.SASL) is not None - def get_mechs(self): + def get_mechs(self) -> set[str]: mechanisms = self.getTag('mechanisms', namespace=Namespace.SASL) if mechanisms is None: return set() ===================================== nbxmpp/simplexml.py ===================================== @@ -276,7 +276,7 @@ class Node: """ if not isinstance(node, Node): node = self.getTag(node, attrs) - assert isinstance(node, Node) + self.kids.remove(node) return node ===================================== nbxmpp/structs.py ===================================== @@ -42,6 +42,7 @@ from nbxmpp.const import StatusCode from nbxmpp.const import PresenceType from nbxmpp.const import LOCATION_DATA from nbxmpp.const import AdHocStatus +from nbxmpp.const import InviteType class StanzaHandler(NamedTuple): @@ -53,17 +54,39 @@ class StanzaHandler(NamedTuple): priority: int = 50 -CommonResult = namedtuple('CommonResult', 'jid') -CommonResult.__new__.__defaults__ = (None,) +class CommonResult(NamedTuple): + jid: Optional[JID] = None -InviteData = namedtuple('InviteData', - 'muc from_ reason password type continued thread') -DeclineData = namedtuple('DeclineData', 'muc from_ reason') +class InviteData(NamedTuple): + muc: JID + from_: JID + reason: Optional[str] + password: Optional[str] + type: InviteType + continued: bool + thread: Optional[str] -CaptchaData = namedtuple('CaptchaData', 'form bob_data') -BobData = namedtuple('BobData', 'algo hash_ max_age data cid type') +class DeclineData(NamedTuple): + muc: JID + from_: JID + reason: Optional[str] + + +class CaptchaData(NamedTuple): + form: Any + bob_data: BobData + + +class BobData(NamedTuple): + algo: str + hash_: str + max_age: str + data: str + cid: str + type: str + VoiceRequest = namedtuple('VoiceRequest', 'form jid nick') ===================================== nbxmpp/util.py ===================================== @@ -15,6 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from typing import Any +from typing import Optional +from typing import Callable +from typing import Literal +from typing import Union + import base64 import hashlib import uuid @@ -35,6 +41,7 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import StanzaMalformed from nbxmpp.protocol import StreamHeader from nbxmpp.protocol import WebsocketOpenHeader +from nbxmpp.simplexml import Node from nbxmpp.structs import Properties from nbxmpp.structs import IqProperties from nbxmpp.structs import MessageProperties @@ -48,25 +55,24 @@ from nbxmpp.third_party.hsluv import hsluv_to_rgb log = logging.getLogger('nbxmpp.util') -def b64decode(data, return_type=str): +def b64decode(data: Union[str, bytes]) -> bytes: if not data: raise ValueError('No data to decode') + if isinstance(data, str): data = data.encode() - result = base64.b64decode(data) - if return_type == bytes: - return result - return result.decode() + return base64.b64decode(data) -def b64encode(data, return_type=str): + +def b64encode(data: Union[str, bytes]) -> str: if not data: raise ValueError('No data to encode') + if isinstance(data, str): data = data.encode() + result = base64.b64encode(data) - if return_type == bytes: - return result return result.decode() @@ -80,7 +86,7 @@ def get_properties_struct(name, own_jid): return Properties() -def from_xs_boolean(value): +def from_xs_boolean(value: str) -> bool: if value in ('1', 'true', 'True'): return True @@ -90,7 +96,7 @@ def from_xs_boolean(value): raise ValueError('Cant convert %s to python boolean' % value) -def to_xs_boolean(value): +def to_xs_boolean(value: bool) -> Literal['true', 'false']: # Convert to xs:boolean ('true', 'false') # from a python boolean (True, False) or None if value is True: @@ -110,7 +116,9 @@ error_classes = { Namespace.HTTPUPLOAD_0: HTTPUploadError } -def error_factory(stanza, condition=None, text=None): +def error_factory(stanza: Node, + condition: Optional[str] = None, + text: Optional[str] = None) -> Any: if condition == 'stanza-malformed': return StanzaMalformedError(stanza, text) app_namespace = stanza.getAppErrorNamespace() @@ -266,11 +274,11 @@ def compute_caps_hash(info, compare=True): return b64hash -def generate_id(): +def generate_id() -> str: return str(uuid.uuid4()) -def get_form(stanza, form_type): +def get_form(stanza: Node, form_type: Any) -> Any: forms = stanza.getTags('x', namespace=Namespace.DATA) if not forms: return None @@ -286,7 +294,7 @@ def get_form(stanza, form_type): return None -def validate_stream_header(stanza, domain, is_websocket): +def validate_stream_header(stanza: Node, domain: str, is_websocket: bool) -> str: attrs = stanza.getAttrs() if attrs.get('from') != domain: raise StanzaMalformed('Invalid from attr in stream header') @@ -308,18 +316,14 @@ def validate_stream_header(stanza, domain, is_websocket): return stream_id -def get_stream_header(domain, lang, is_websocket): +def get_stream_header(domain: str, lang: str, is_websocket: bool) -> str: if is_websocket: - return WebsocketOpenHeader(domain, lang) + return str(WebsocketOpenHeader(domain, lang)) header = StreamHeader(domain, lang) return "<?xml version='1.0'?>%s>" % str(header)[:-3] -def get_stanza_id(): - return str(uuid.uuid4()) - - -def utf8_decode(data): +def utf8_decode(data: bytes) -> tuple[str, bytes]: ''' Decodes utf8 byte string to unicode string Does handle invalid utf8 sequences by splitting @@ -338,7 +342,7 @@ def utf8_decode(data): raise -def get_rand_number(): +def get_rand_number() -> int: return int(binascii.hexlify(os.urandom(6)), 16) @@ -362,7 +366,7 @@ def get_invalid_xml_regex(): return re.compile(r) -def get_tls_error_phrase(tls_error): +def get_tls_error_phrase(tls_error: Gio.TlsCertificateFlags) -> str: phrase = GIO_TLS_ERRORS.get(tls_error) if phrase is None: return GIO_TLS_ERRORS.get(Gio.TlsCertificateFlags.GENERIC_ERROR) @@ -381,7 +385,7 @@ def convert_tls_error_flags(flags): return set(filter(lambda error: error & flags, GIO_TLS_ERRORS.keys())) -def get_websocket_close_string(websocket): +def get_websocket_close_string(websocket: Any) -> str: data = websocket.get_close_data() code = websocket.get_close_code() @@ -390,29 +394,29 @@ def get_websocket_close_string(websocket): return ' Data: %s Code: %s' % (data, code) -def is_websocket_close(stanza): +def is_websocket_close(stanza: Node) -> bool: return (stanza.getName() == 'close' and stanza.getNamespace() == Namespace.FRAMING) -def is_websocket_stream_error(stanza): +def is_websocket_stream_error(stanza: Node) -> bool: return (stanza.getName() == 'error' and stanza.getNamespace() == Namespace.STREAMS) class Observable: - def __init__(self, log_): + def __init__(self, log_: logging.Logger): self._log = log_ self._frozen = False - self._callbacks = defaultdict(list) + self._callbacks: defaultdict[str, list[Callable[..., Any]]] = defaultdict(list) def remove_subscriptions(self): self._callbacks = defaultdict(list) - def subscribe(self, signal_name, func): + def subscribe(self, signal_name: str, func: Callable[..., Any]): self._callbacks[signal_name].append(func) - def notify(self, signal_name, *args, **kwargs): + def notify(self, signal_name: str, *args: Any, **kwargs: dict[str, Any]): if self._frozen: self._frozen = False return View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/2b8b5a2262c14901d5a514c… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/2b8b5a2262c14901d5a514c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatControl: Fix processing PMs
by Daniel Brötzmann (＠wurstsalat) 23 Oct '21

23 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 638e5bf3 by wurstsalat at 2021-10-23T18:35:45+02:00 ChatControl: Fix processing PMs - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -267,8 +267,7 @@ def process_event(self, event): if event.account != self.account: return - jid = self.contact.jid.bare - if event.jid != jid: + if event.jid not in (self.contact.jid, self.contact.jid.bare): return jingle_av_events = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/638e5bf31d1bfbb2fee9453524780c9c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/638e5bf31d1bfbb2fee9453524780c9c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Remove Fcitx workaround
by André (＠andre) 23 Oct '21

23 Oct '21

André pushed to branch master at gajim / gajim Commits: 6a3fda13 by André Apitzsch at 2021-10-23T11:24:35+02:00 Flatpak: Remove Fcitx workaround For Fcitx users: If you still haven't fcitx 4.2.9.7+ installed on your system, you could run `flatpak --user override --talk-name=org.freedesktop.portal.Fcitx org.gajim.Gajim` (or `flatpak --user override --talk-name=org.freedesktop.portal.Fcitx org.gajim.Gajim.Devel`) to restore the functionality. - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -19,7 +19,6 @@ finish-args: - --system-talk-name=org.freedesktop.GeoClue2 - --system-talk-name=org.freedesktop.login1 - --talk-name=org.mpris.MediaPlayer2.* - - --talk-name=org.freedesktop.portal.Fcitx # Automatic status - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.gnome.Mutter.IdleMonitor View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6a3fda13e5bd0984350dfb488b0c1b3e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6a3fda13e5bd0984350dfb488b0c1b3e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: ConversationView: Add message merge rule for encryption
by Daniel Brötzmann (＠wurstsalat) 20 Oct '21

20 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f5c38850 by wurstsalat at 2021-10-21T00:18:24+02:00 ConversationView: Add message merge rule for encryption - - - - - 661213cd by wurstsalat at 2021-10-21T00:21:13+02:00 ConversationView: Add border radius to conversation rows - - - - - 037b2783 by wurstsalat at 2021-10-21T00:24:17+02:00 Remove 'Show next pending event' desktop action - - - - - 3 changed files: - data/org.gajim.Gajim.desktop.in - gajim/data/style/gajim.css - gajim/gtk/conversation/rows/message.py Changes: ===================================== data/org.gajim.Gajim.desktop.in ===================================== @@ -20,9 +20,3 @@ Exec=gajim --start-chat Name=Start a new chat #Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=org.gajim.Gajim - -[Desktop Action ShowNextPendingEvent] -Exec=gajim --show-next-pending-event -Name=Show next pending event -#Translators: Do NOT translate or transliterate this text (this is an icon file name)! -Icon=org.gajim.Gajim ===================================== gajim/data/style/gajim.css ===================================== @@ -46,6 +46,7 @@ .conversation-row:hover button { .conversation-row { padding: 10px 3px 4px 6px; + border-radius: 4px; } .merged { padding-top: 1px;} ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -66,6 +66,8 @@ def __init__(self, self.name = name or '' self.text = text + self.additional_data = additional_data + self._contact = contact self._is_groupchat = False if contact is not None and contact.is_groupchat: @@ -187,11 +189,26 @@ def _get_avatar(self, kind, name): def is_same_sender(self, message): return message.name == self.name + def is_same_encryption(self, message): + message_details = self._get_encryption_details(message.additional_data) + own_details = self._get_encryption_details(self.additional_data) + if message_details is None and own_details is None: + return True + if message_details is not None and own_details is not None: + # *_details contains encryption method's name, fingerprint, trust + m_name, _, m_trust = message_details + o_name, _, o_trust = own_details + if m_name == o_name and m_trust == o_trust: + return True + return False + def is_mergeable(self, message): if message.type != self.type: return False if not self.is_same_sender(message): return False + if not self.is_same_encryption(message): + return False return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME def on_copy_message(self, _widget): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eab5724364784210815d766d799ba79… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eab5724364784210815d766d799ba79… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Don't fail if sound event is None
by Daniel Brötzmann (＠wurstsalat) 19 Oct '21

19 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: eab57243 by wurstsalat at 2021-10-19T18:19:43+02:00 Don't fail if sound event is None - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -455,6 +455,8 @@ def get_contact_dict_for_account(account): def play_sound(sound_event, account, force=False): + if sound_event is None: + return if force or allow_sound_notification(account, sound_event): play_sound_file( app.settings.get_soundevent_settings(sound_event)['path']) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eab5724364784210815d766d799ba794… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/eab5724364784210815d766d799ba794… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Themes: Fix highlight on mention for light/dark theme
by Daniel Brötzmann (＠wurstsalat) 18 Oct '21

18 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3aad342e by wurstsalat at 2021-10-18T19:09:46+02:00 Themes: Fix highlight on mention for light/dark theme - - - - - c6063d27 by wurstsalat at 2021-10-18T19:13:02+02:00 Themes: Adapt search highlight color for light/dark theme - - - - - 6 changed files: - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/gtk/conversation/rows/message.py - gajim/gtk/themes.py Changes: ===================================== gajim/data/style/default-dark.css ===================================== @@ -19,12 +19,12 @@ .gajim-call-message { color: rgb(205, 225, 255); background: rgb(40, 60, 80); } +.gajim-mention-highlight { + background: rgb(100, 50, 10); +} .gajim-url { color: rgb(60, 135, 220); } -.gajim-highlight-message { - color: rgb(210, 70, 30); -} .gajim-state-tab-muc-directed-msg { color: rgb(210, 70, 30); } @@ -58,9 +58,6 @@ .gajim-state-paused { .gajim-msg-correcting text { background: rgb(100, 100, 50); } -.gajim-search-highlight { - color: rgb(30, 80, 80); -} .gajim-notify-message { color: rgb(30, 144, 255); } ===================================== gajim/data/style/default.css ===================================== @@ -19,12 +19,12 @@ .gajim-call-message { color: rgb(40, 70, 100); background: rgb(225, 235, 250); } +.gajim-mention-highlight { + background: rgb(255, 215, 194); +} .gajim-url { color: rgb(30, 75, 135); } -.gajim-highlight-message { - color: rgb(210, 70, 30); -} .gajim-state-tab-muc-directed-msg { color: rgb(210, 70, 30); } @@ -58,9 +58,6 @@ .gajim-state-paused { .gajim-msg-correcting text { background: rgb(240, 230, 170); } -.gajim-search-highlight { - color: rgb(170, 220, 220); -} .gajim-notify-message { color: rgb(30, 144, 255); } ===================================== gajim/data/style/gajim-dark.css ===================================== @@ -17,14 +17,3 @@ infobar.error > revealer > box { color: #FCE5D5; background-color: #D64937; } - -/* ConversationView */ -.conversation-mention-highlight { - background-color: rgb(100, 50, 10); -} -.conversation-mention-highlight grid textview text { - background-color: rgb(100, 50, 10); -} -.conversation-mention-highlight:hover { - background-color: rgb(110, 50, 10); -} ===================================== gajim/data/style/gajim.css ===================================== @@ -56,19 +56,10 @@ .conversation-row grid textview:not(.sourceview) { .conversation-row grid textview:not(.sourceview) text { background: transparent; } -.conversation-mention-highlight { - background-color: rgb(255, 215, 194); -} -.conversation-mention-highlight grid textview text { - background-color: rgb(255, 215, 194); -} -.conversation-mention-highlight:hover { - background-color: rgb(255, 205, 184); -} @keyframes highlight { - from { background: rgb(194, 215, 255) } - to { background: transparent } + from { background: rgb(140, 160, 180); } + to { background: transparent; } } .conversation-search-highlight { animation-duration: 3s; ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -163,8 +163,9 @@ def _check_for_highlight(self, content): self._contact.nickname, self._client.get_own_jid().bare) if needs_highlight: + # TODO: add class to textview text (if message widget is TextView) self.get_style_context().add_class( - 'conversation-mention-highlight') + 'gajim-mention-highlight') def _get_avatar(self, kind, name): if self._contact is None: ===================================== gajim/gtk/themes.py ===================================== @@ -146,9 +146,9 @@ '.gajim-url', StyleAttr.COLOR), - StyleOption(_('Highlight Message Color'), - '.gajim-highlight-message', - StyleAttr.COLOR), + StyleOption(_('Highlight Message Background'), + '.gajim-mention-highlight', + StyleAttr.BACKGROUND), StyleOption(_('Message Correcting'), '.gajim-msg-correcting text', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9460c72a6df40257bc2a5575c9756a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9460c72a6df40257bc2a5575c9756a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Notifications: Simplify message notifications
by Daniel Brötzmann (＠wurstsalat) 17 Oct '21

17 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6f4eb88a by wurstsalat at 2021-10-16T19:12:28+02:00 Notifications: Simplify message notifications - - - - - 9460c72a by wurstsalat at 2021-10-17T14:18:26+02:00 Rework notification system - - - - - 11 changed files: - gajim/app_actions.py - gajim/common/client.py - gajim/common/connection_handlers_events.py - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/gtk/call_widget.py - gajim/gtk/controls/base.py - gajim/gtk/filetransfer.py - gajim/gtk/notification.py - gajim/gtk/notification_manager.py - gajim/gui_interface.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -218,12 +218,12 @@ def on_file_transfers(_action, _param): def on_open_event(_action, param): dict_ = param.unpack() app.interface.handle_event( - dict_['account'], dict_['jid'], dict_['type_']) + dict_['account'], dict_['jid'], dict_['notif_detail']) def on_mark_as_read(_action, param): dict_ = param.unpack() - account, jid, _ = dict_['account'], dict_['jid'], dict_['type_'] + account, jid = dict_['account'], dict_['jid'] app.window.mark_as_read(account, jid) # Other Actions ===================================== gajim/common/client.py ===================================== @@ -266,7 +266,7 @@ def _on_password(password): app.nec.push_incoming_event( NetworkEvent('simple-notification', account=self._account, - type_='connection-failed', + notif_type='connection-failed', title=_('Authentication failed'), text=text or error)) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -144,29 +144,6 @@ def generate(self): return True -class NotificationEvent(nec.NetworkIncomingEvent): - - name = 'notification' - - def init(self): - self.account = None - self.contact = None - - self.notif_type = 'msg' - - self.popup_enabled = False - self.popup_event_type = '' - self.popup_msg_type = '' - self.popup_title = '' - self.popup_text = '' - self.icon_name = None - - self.sound_file = '' # Used by Triggers plugin only - self.sound_event = '' - - self.command = '' # Used by Triggers plugin only - - class NotificationEventOld(nec.NetworkIncomingEvent): name = 'notification' ===================================== gajim/data/style/default-dark.css ===================================== @@ -70,19 +70,13 @@ .gajim-notify-signin { .gajim-notify-signout { color: rgb(134, 22, 22); } -.gajim-notify-status { - color: rgb(170, 170, 170); -} .gajim-notify-invite { color: rgb(224, 145, 42); } -.gajim-notify-ft-request { - color: rgb(240, 230, 140); -} -.gajim-notify-ft-error { +.gajim-notify-error { color: rgb(226, 33, 33); } -.gajim-notify-ft-complete { +.gajim-notify-success { color: rgb(139, 185, 48); } .gajim-notify-other { ===================================== gajim/data/style/default.css ===================================== @@ -64,19 +64,13 @@ .gajim-search-highlight { .gajim-notify-message { color: rgb(30, 144, 255); } -.gajim-notify-status { - color: rgb(170, 170, 170); -} .gajim-notify-invite { color: rgb(224, 145, 42); } -.gajim-notify-ft-request { - color: rgb(240, 230, 140); -} -.gajim-notify-ft-error { +.gajim-notify-error { color: rgb(226, 33, 33); } -.gajim-notify-ft-complete { +.gajim-notify-success { color: rgb(139, 185, 48); } .gajim-notify-other { ===================================== gajim/gtk/call_widget.py ===================================== @@ -23,8 +23,8 @@ from gajim.common import app from gajim.common.const import JingleState -from gajim.common.helpers import allow_showing_notification from gajim.common.i18n import _ +from gajim.common.nec import NetworkEvent from .gstreamer import create_gtk_widget from .util import get_builder @@ -206,19 +206,16 @@ def _on_jingle_request(self, event): # There is no voice call running running yet self.emit('incoming-call', event) - if allow_showing_notification(self._account): - heading = _('Incoming Call') - contact = self._client.get_module('Contacts').get_contact( - event.jid) - text = _('%s is calling') % contact.name - app.notification.popup( - heading, - event.jid, - self._account, - 'jingle-incoming', - icon_name='call-start-symbolic', - title=heading, - text=text) + contact = self._client.get_module('Contacts').get_contact( + event.jid) + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=self.account, + jid=self.contact.jid, + notif_type='jingle-incoming', + title=_('Incoming Call'), + text=_('%s is calling') % contact.name)) def _on_jingle_connected(self, event): session = self._client.get_module('Jingle').get_jingle_session( ===================================== gajim/gtk/controls/base.py ===================================== @@ -42,11 +42,10 @@ from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.nec import EventHelper +from gajim.common.nec import NetworkEvent from gajim.common.helpers import AdditionalDataDict -from gajim.common.helpers import allow_showing_notification from gajim.common.const import KindConstant from gajim.common.structs import OutgoingMessage -from gajim.common.connection_handlers_events import NotificationEvent from gajim.gui.conversation.view import ConversationView from gajim.gui.conversation.scrolled import ScrolledView @@ -1146,57 +1145,49 @@ def _notify(self, name, text, tim): if self._scrolled_view.get_autoscroll(): return - popup_event_type = _('New Message') - popup_title = _('New message from %s') % name - needs_highlight = False + title = _('New message from %s') % name if self.is_chat: - popup_msg_type = 'chat-message' - sound_event = 'first_message_received' + msg_type = 'chat-message' + sound = 'first_message_received' if self.is_groupchat: - popup_msg_type = 'group-chat-message' - popup_title += f' ({self.contact.name})' + msg_type = 'group-chat-message' + title += f' ({self.contact.name})' needs_highlight = helpers.message_needs_highlight( text, self.contact.nickname, self._client.get_own_jid().bare) if needs_highlight: - sound_event = 'muc_message_highlight' + sound = 'muc_message_highlight' else: - sound_event = 'muc_message_received' + sound = 'muc_message_received' if not self.contact.can_notify(): - sound_event = None + sound = None if self.is_privatechat: - popup_msg_type = 'private-chat-message' - popup_title += f' (private in {self.room_name})' - sound_event = 'first_message_received' + msg_type = 'private-chat-message' + title += f' (private in {self.room_name})' + sound = 'first_message_received' # Is it a history message? Don't want sound-floods when we join. if tim is not None and time.mktime(time.localtime()) - tim > 1: - sound_event = None + sound = None - popup_text = '' if app.settings.get('notification_preview_message'): if text.startswith('/me') or text.startswith('/me\n'): - popup_text = f'* {name} {text[3:]}' - else: - popup_text = text + text = f'* {name} {text[3:]}' - popup_enabled = allow_showing_notification(self.account) if self.is_groupchat and not self.contact.can_notify(): - popup_enabled = False - - event = NotificationEvent( - None, - account=self.account, - jid=self.contact.jid, - popup_event_type=popup_event_type, - popup_msg_type=popup_msg_type, - popup_title=popup_title, - popup_text=popup_text, - popup_enabled=popup_enabled, - sound_event=sound_event) - app.nec.push_incoming_event(event) + return + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=self.account, + jid=self.contact.jid, + notif_type='incoming-message', + notif_detail=msg_type, + title=title, + text=text, + sound=sound)) def toggle_emoticons(self): """ ===================================== gajim/gtk/filetransfer.py ===================================== @@ -74,8 +74,8 @@ def __init__(self): self._ui = get_builder('filetransfers.ui') self.window = self._ui.file_transfers_window - show_notification = app.settings.get('notify_on_file_complete') - self._ui.notify_ft_complete.set_active(show_notification) + self._ui.notify_ft_complete.set_active( + app.settings.get('notify_on_file_complete')) self.model = Gtk.ListStore(str, str, str, str, str, int, int, str) self._ui.transfers_list.set_model(self.model) col = Gtk.TreeViewColumn() @@ -178,6 +178,18 @@ def _file_completed(self, event): event.file_props.sid, event.file_props.received_len) + if not app.settings.get('notify_on_file_complete'): + return + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=event.account, + jid=event.jid, + notif_type='file-transfer', + notif_detail='file-completed', + title=_('File Transfer Completed'), + text=_('File: %s') % event.file_props.name)) + def _file_error(self, event): self.set_status(event.file_props, 'stop') @@ -189,17 +201,17 @@ def _file_hash_error(self, event): def _file_send_error(self, event): self.set_status(event.file_props, 'stop') - if helpers.allow_showing_notification(event.account): - if app.window.is_chat_active(event.account, event.jid): - return - app.notification.popup( - _('File Transfer Error'), - event.jid, - event.account, - 'file-send-error', - 'dialog-error', - _('File Transfer Error'), - event.file_props.name) + if app.window.is_chat_active(event.account, event.jid): + return + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=event.account, + jid=event.jid, + notif_type='file-transfer', + notif_detail='file-send-error', + title=_('File Transfer Failed'), + text=_('File: %s') % event.file_props.name)) def _file_request_error(self, event): self.set_status(event.file_props, 'stop') @@ -212,21 +224,22 @@ def _file_request_error(self, event): return if errno in (-4, -5): - msg_type = 'file-error' + notif_detail = 'file-error' else: - msg_type = 'file-request-error' + notif_detail = 'file-request-error' - if helpers.allow_showing_notification(account): - if app.window.is_chat_active(account, event.jid): - return - app.notification.popup( - _('File Transfer Error'), - event.jid, - account, - msg_type, - 'dialog-error', - title=_('File Transfer Error'), - text=event.file_props.name) + if app.window.is_chat_active(account, event.jid): + return + + text = _('File: %s') % event.file_props.name + app.nec.push_incoming_event( + NetworkEvent('notification', + account=account, + jid=event.jid, + notif_type='file-transfer', + notif_detail=notif_detail, + title=_('File Transfer Failed'), + text=text)) def _file_request_received(self, event): account = event.conn.name @@ -243,17 +256,18 @@ def _file_request_received(self, event): self.add_transfer(account, contact, event.file_props) return - if helpers.allow_showing_notification(account): - if app.window.is_chat_active(event.account, event.jid): - return - app.notification.popup( - _('File Transfer Request'), - event.jid, - account, - 'file-request-received', - icon_name='document-send', - title=_('File Transfer Request'), - text=_('%s wants to send you a file') % contact.name) + if app.window.is_chat_active(event.account, event.jid): + return + + text = _('%s wants to send you a file') % contact.name + app.nec.push_incoming_event( + NetworkEvent('notification', + account=account, + jid=event.jid, + notif_type='file-transfer', + notif_detail='file-request-received', + title=_('File Offered'), + text=text)) def _file_transfer_cancelled(self, event): file_props = None ===================================== gajim/gtk/notification.py ===================================== @@ -44,12 +44,21 @@ from .util import add_css_to_widget from .util import get_builder -from .util import get_icon_name from .util import get_monitor_scale_factor from .util import get_total_screen_geometry log = logging.getLogger('gajim.gui.notification') +NOTIFICATION_ICONS = { + 'incoming-message': 'gajim-chat_msg_recv', + 'group-chat-invitation': 'gajim-gc_invitation', + 'jingle-incoming': 'call-start-symbolic', + 'subscription_request': 'gajim-subscription_request', + 'unsubscribed': 'gajim-unsubscribed', + 'file-request-received': 'document-send', + 'file-send-error': 'dialog-error', +} + class Notification(EventHelper): """ @@ -64,9 +73,10 @@ def __init__(self): self._detect_dbus_caps() self.register_events([ - ('notification', ged.GUI2, self._nec_notification), + ('notification', ged.GUI2, self._on_notification), ('simple-notification', ged.GUI2, self._on_notification), - ('our-show', ged.GUI2, self._nec_our_status), + ('our-show', ged.GUI2, self._on_our_show), + ('connection-lost', ged.GUI2, self._on_connection_lost) ]) def _detect_dbus_caps(self): @@ -97,55 +107,79 @@ def on_proxy_ready(_source, res, _data=None): None, on_proxy_ready) - def _nec_notification(self, event): - if event.popup_enabled and allow_showing_notification(event.account): - icon_name = self._get_icon_name(event) - self.popup( - event.popup_event_type, - str(event.jid), - event.account, - event.popup_msg_type, - icon_name=icon_name, - title=event.popup_title, - text=event.popup_text) - - if event.command: + def _on_notification(self, event): + if hasattr(event, 'command'): # Used by Triggers plugin try: exec_command(event.command, use_shell=True) except Exception: pass - if event.sound_file: + if hasattr(event, 'sound_file'): # Allow override here, used by Triggers plugin play_sound_file(event.sound_file) - elif event.sound_event: - play_sound(event.sound_event, event.account) + elif hasattr(event, 'sound'): + play_sound(event.sound, event.account) - def _on_notification(self, event): - self.popup(event.type_, - None, - event.account, - title=event.title, - text=event.text) + if not allow_showing_notification(event.account): + return - def _nec_our_status(self, event): + if hasattr(event, 'notif_detail'): + notif_detail = event.notif_detail + else: + notif_detail = event.notif_type + + if hasattr(event, 'icon_name'): + icon_name = event.icon_name + else: + icon_name = NOTIFICATION_ICONS.get( + event.notif_detail, 'mail-message-new') + + self._issue_notification( + event.notif_type, + event.account, + str(event.jid), + notif_detail=notif_detail, + title=event.title, + 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): if app.account_is_connected(event.account): self._withdraw('connection-failed', event.account) - @staticmethod - def _get_icon_name(event): - if event.notif_type == 'msg': - return 'gajim-chat_msg_recv' - - if event.notif_type == 'pres': - if event.transport_name is not None: - return '%s-%s' % (event.transport_name, event.show) - return get_icon_name(event.show) - return None - - def popup(self, event_type, jid, account, type_='', icon_name=None, - title=None, text=None, timeout=-1, room_jid=None): + 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, + account, + jid, + notif_detail='', + title='', + text='', + icon_name=None, + timeout=-1): """ Notify a user of an event using GNotification and GApplication under Linux, Use PopupNotificationWindow under Windows @@ -160,8 +194,14 @@ def popup(self, event_type, jid, account, type_='', icon_name=None, if sys.platform == 'win32': self._withdraw() self._win32_active_popup = PopupNotification( - event_type, jid, account, type_, - icon_name, title, text, timeout) + notif_type, + account, + jid, + notif_detail, + title, + text, + icon_name, + timeout) self._win32_active_popup.connect('destroy', self._on_popup_destroy) return @@ -176,36 +216,38 @@ def popup(self, event_type, jid, account, type_='', icon_name=None, if text is not None: notification.set_body(text) notif_id = None - if event_type in ( - _('New Message'), - _('Contact Changed Status'), _('File Transfer Request'), - _('File Transfer Error'), _('File Transfer Completed'), - _('File Transfer Stopped'), _('Group Chat Invitation'), - _('Connection Failed'), _('Subscription Request'), - _('Contact Unsubscribed'), _('Incoming Call')): + if notif_type in ( + 'incoming-message', + 'file-transfer', + 'group-chat-invitation', + 'subscription-request', + 'unsubscribed', + 'incoming-call', + 'connection-failed'): if 'actions' in self._daemon_capabilities: # Create Variant Dict dict_ = {'account': GLib.Variant('s', account), 'jid': GLib.Variant('s', jid), - 'type_': GLib.Variant('s', type_)} + 'notif_detail': GLib.Variant('s', notif_detail)} variant_dict = GLib.Variant('a{sv}', dict_) - action = 'app.{}-open-event'.format(account) - # Notification button + + # Add 'Open' action button to notification + action = f'app.{account}-open-event' notification.add_button_with_target( _('Open'), action, variant_dict) notification.set_default_action_and_target( action, variant_dict) - if event_type == _('New Message'): - action = 'app.{}-mark-as-read'.format(account) + + if notif_type == 'incoming-message': + # Add 'Mark as Read' action button to notification + action = f'app.{account}-mark-as-read' notification.add_button_with_target( _('Mark as Read'), action, variant_dict) # Only one notification per JID - if event_type == _('Contact Changed Status'): - notif_id = self._make_id('contact-status-changed', account, jid) - elif event_type == _('Connection Failed'): + if notif_type == 'connection-failed': notif_id = self._make_id('connection-failed', account) - elif event_type == _('New Message'): + elif notif_type == 'incoming-message': if app.desktop_env == 'gnome': icon = self._get_avatar_for_notification(account, jid) notif_id = self._make_id('new-message', account, jid) @@ -238,8 +280,15 @@ def _make_id(*args): class PopupNotification(Gtk.Window): - def __init__(self, event_type, jid, account, msg_type='', - icon_name=None, title=None, text=None, timeout=-1): + def __init__(self, + notif_type, + account, + jid, + notif_detail, + title, + text, + icon_name, + timeout): Gtk.Window.__init__(self) self.set_type_hint(Gdk.WindowTypeHint.NOTIFICATION) self.set_focus_on_map(False) @@ -248,37 +297,28 @@ def __init__(self, event_type, jid, account, msg_type='', self.set_decorated(False) self._timeout_id = None - self.account = account - self.jid = jid - self.msg_type = msg_type + self._account = account + self._jid = jid + self._notif_type = notif_type self._ui = get_builder('popup_notification_window.ui') self.add(self._ui.eventbox) - client = app.get_client(account) - - if event_type in (_('New Message'), - _('New Private Message'), - _('New E-mail')): + if notif_detail == 'incoming-message': bg_color = app.css_config.get_value('.gajim-notify-message', StyleAttr.COLOR) - elif event_type == _('File Transfer Request'): - bg_color = app.css_config.get_value('.gajim-notify-ft-request', + elif notif_detail in ('file-error', + 'file-send-error', + 'file-request-error'): + bg_color = app.css_config.get_value('.gajim-notify-error', StyleAttr.COLOR) - elif event_type == _('File Transfer Error'): - bg_color = app.css_config.get_value('.gajim-notify-ft-error', + elif notif_detail in ('file-completed', 'file-stopped'): + bg_color = app.css_config.get_value('.gajim-notify-success', StyleAttr.COLOR) - elif event_type in (_('File Transfer Completed'), - _('File Transfer Stopped')): - bg_color = app.css_config.get_value('.gajim-notify-ft-complete', - StyleAttr.COLOR) - elif event_type == _('Group Chat Invitation'): + elif notif_detail == 'group-chat-invitation': bg_color = app.css_config.get_value('.gajim-notify-invite', StyleAttr.COLOR) - elif event_type == _('Contact Changed Status'): - bg_color = app.css_config.get_value('.gajim-notify-status', - StyleAttr.COLOR) - else: # Unknown event (shouldn't happen, but deal with it) + else: bg_color = app.css_config.get_value('.gajim-notify-other', StyleAttr.COLOR) @@ -294,8 +334,9 @@ def __init__(self, event_type, jid, account, msg_type='', self._ui.event_type_label.set_markup(title) if text is None: + client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) - text = contact.name # default value of text + text = contact.name escaped_text = GLib.markup_escape_text(text) self._ui.event_description_label.set_markup(escaped_text) @@ -326,7 +367,8 @@ def _on_close_button_clicked(self, _widget): def _on_button_press(self, _widget, event): if event.button == 1: - app.interface.handle_event(self.account, self.jid, self.msg_type) + app.interface.handle_event( + self._account, self._jid, self._notif_type) self.destroy() def _on_destroy(self, *args): ===================================== gajim/gtk/notification_manager.py ===================================== @@ -20,7 +20,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.i18n import _ -from gajim.common.helpers import allow_showing_notification +from gajim.common.nec import NetworkEvent from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_muc_context @@ -137,20 +137,17 @@ def add_subscription_request(self, event): self.add(SubscriptionRequestRow( self._account, event.jid, event.status, event.user_nick)) - if allow_showing_notification(self._account): - event_type = _('Subscription Request') - contact = self._client.get_module('Contacts').get_contact( - event.jid) - text = _('%s asks you to share your status') % contact.name - app.notification.popup( - event_type, - event.jid, - self._account, - 'subscription-request', - 'gajim-subscription_request', - event_type, - text) - + contact = self._client.get_module('Contacts').get_contact( + event.jid) + text = _('%s asks you to share your status') % contact.name + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=self.account, + jid=self.contact.jid, + notif_type='subscription-request', + title=_('Subscription Request'), + text=text)) elif row.type == 'unsubscribed': self.remove(row) @@ -159,19 +156,17 @@ def add_unsubscribed(self, event): if row is None: self.add(UnsubscribedRow(self._account, event.jid)) - if allow_showing_notification(self._account): - event_type = _('Contact Unsubscribed') - contact = self._client.get_module('Contacts').get_contact( - event.jid) - text = _('%s stopped sharing their status') % contact.name - app.notification.popup( - event_type, - event.jid, - self._account, - 'unsubscribed', - 'gajim-unsubscribed', - event_type, - text) + contact = self._client.get_module('Contacts').get_contact( + event.jid) + text = _('%s stopped sharing their status') % contact.name + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=self.account, + jid=self.contact.jid, + notif_type='unsubscribed', + title=_('Contact Unsubscribed'), + text=text)) elif row.type == 'subscribe': self.remove(row) @@ -180,25 +175,22 @@ def add_invitation_received(self, event): if row is None: self.add(InvitationReceivedRow(self._account, event)) - if allow_showing_notification(self._account): - if get_muc_context(event.muc) == 'public': - jid = event.from_ - else: - jid = event.from_.bare - contact = self._client.get_module('Contacts').get_contact(jid) - event_type = _('Group Chat Invitation') - text = _('%(contact)s invited you to %(chat)s') % { - 'contact': contact.name, - 'chat': event.info.muc_name} - app.notification.popup( - event_type, - str(jid), - self._account, - 'gc-invitation', - 'gajim-gc_invitation', - event_type, - text, - room_jid=event.muc) + if get_muc_context(event.muc) == 'public': + jid = event.from_ + else: + jid = event.from_.bare + contact = self._client.get_module('Contacts').get_contact(jid) + text = _('%(contact)s invited you to %(chat)s') % { + 'contact': contact.name, + 'chat': event.info.muc_name} + + app.nec.push_incoming_event( + NetworkEvent('notification', + account=self.account, + jid=self.contact.jid, + notif_type='group-chat-invitation', + title=_('Group Chat Invitation'), + text=text)) def add_invitation_declined(self, event): row = self._get_notification_row(event.muc) ===================================== gajim/gui_interface.py ===================================== @@ -195,7 +195,6 @@ def _create_core_handlers_list(self): self.handlers = { 'information': [self.handle_event_information], 'iq-error-received': [self.handle_event_iq_error], - 'connection-lost': [self.handle_event_connection_lost], 'plain-connection': [self.handle_event_plain_connection], 'http-auth-received': [self.handle_event_http_auth], 'password-required': [self.handle_event_password_required], @@ -229,21 +228,22 @@ def _register_core_handlers(self): prio, event_handler) - def handle_event(self, account, jid, type_): + def handle_event(self, account, jid, notif_detail): jid = JID.from_string(jid) - if type_ in ('connection-lost', 'connection-failed'): + if notif_detail in ('connection-lost', 'connection-failed'): app.window.show_account_page(account) - elif type_ in ('group-chat-message', 'private-chat-message'): + elif notif_detail == 'private-chat-message': + app.window.select_chat(account, jid) + elif notif_detail in ('chat-message', 'group-chat-message'): app.window.select_chat(account, jid.bare) - elif type_ in ('chat-message', ''): - # '' is for log in/out notifications + elif notif_detail == 'jingle-incoming': app.window.select_chat(account, jid.bare) - elif type_ == 'jingle-incoming': + elif notif_detail == 'file-request-received': app.window.select_chat(account, jid.bare) - elif type_ in ('subscription-request', - 'unsubscribed', - 'gc-invitation'): + elif notif_detail in ('subscription-request', + 'unsubscribed', + 'group-chat-invitation'): app.window.show_account_page(account) app.window.present() @@ -278,19 +278,6 @@ def handle_event_iq_error(event): if ctrl and ctrl.is_groupchat: ctrl.add_info_message(f'Error: {event.properties.error}') - @staticmethod - def handle_event_connection_lost(event): - # ('CONNECTION_LOST', account, [title, text]) - account = event.conn.name - app.notification.popup( - _('Connection Failed'), - account, - account, - 'connection-lost', - 'gajim-connection_lost', - event.title, - event.msg) - @staticmethod def handle_event_plain_connection(event): ConfirmationDialog( @@ -580,11 +567,13 @@ def handle_event_file_rcv_completed(self, account, file_props): app.nec.push_incoming_event( NetworkEvent('file-completed', file_props=file_props, + account=account, jid=jid.bare)) else: app.nec.push_incoming_event( NetworkEvent('file-error', file_props=file_props, + account=account, jid=jid.bare)) # End jingle session @@ -601,11 +590,13 @@ def handle_event_file_rcv_completed(self, account, file_props): app.nec.push_incoming_event( NetworkEvent('file-completed', file_props=file_props, + account=account, jid=jid.bare)) else: app.nec.push_incoming_event( NetworkEvent('file-error', file_props=file_props, + account=account, jid=jid.bare)) def __compare_hashes(self, account, file_props): @@ -618,19 +609,21 @@ def __compare_hashes(self, account, file_props): hash_ = hashes.calculateHash(file_props.algo, file_) file_.close() # File is corrupt if the calculated hash differs from the received hash + jid = JID.from_string(file_props.sender) if file_props.hash_ == hash_: app.nec.push_incoming_event( NetworkEvent('file-completed', - file_props=file_props)) + file_props=file_props, + account=account, + jid=jid.bare)) else: # Wrong hash, we need to get the file again! file_props.error = -10 - jid = JID.from_string(file_props.sender) app.nec.push_incoming_event( NetworkEvent('file-hash-error', file_props=file_props, - jid=jid.bare, - account=account)) + account=account, + jid=jid.bare)) # End jingle session client = app.get_client(account) session = client.get_module('Jingle').get_jingle_session( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6c9ba7ff22fb4a47b7b1f7f6b25c23d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6c9ba7ff22fb4a47b7b1f7f6b25c23d… 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