Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Use bare_match()
by Philipp Hörist 28 Feb '21

28 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 508a0604 by lovetox at 2021-02-28T11:01:55+01:00 Use bare_match() bareMatch() is deprecated - - - - - 1 changed file: - gajim/common/modules/chat_markers.py Changes: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -61,7 +61,7 @@ def _process_chat_marker(self, _con, _stanza, properties): return if properties.is_mam_message: - if properties.from_.bareMatch(self._con.get_own_jid()): + if properties.from_.bare_match(self._con.get_own_jid()): return self._raise_event('displayed-received', properties) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/508a0604d815604363adef761ee5a01a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/508a0604d815604363adef761ee5a01a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Move finalize check to app module
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f5deffef by lovetox at 2021-02-27T17:57:44+01:00 Move finalize check to app module - - - - - 4 changed files: - gajim/common/app.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/util.py Changes: ===================================== gajim/common/app.py ===================================== @@ -30,15 +30,18 @@ from typing import Optional # pylint: disable=unused-import from typing import cast +import gc import os import sys import logging import uuid +import weakref from collections import namedtuple from collections import defaultdict import nbxmpp from gi.repository import Gdk +from gi.repository import GLib import gajim from gajim.common import config as c_config @@ -683,3 +686,32 @@ def cancel_tasks(obj): task_list = _tasks[id_] for task in task_list: task.cancel() + + +def check_finalize(obj): + if 'GAJIM_LEAK' not in os.environ: + return + name = obj.__class__.__name__ + logger = logging.getLogger('gajim.leak') + finalizer = weakref.finalize(obj, logger.info, f'{name} has been finalized') + + def is_finalizer_ref(ref): + try: + return isinstance(ref[2][0], str) + except Exception: + return False + + def check_finalized(): + tup = finalizer.peek() + if tup is None: + return + + gc.collect() + logger.warning('%s not finalized', name) + logger.warning('References:') + for ref in gc.get_referrers(tup[0]): + if is_finalizer_ref(ref): + continue + logger.warning(ref) + + GLib.timeout_add_seconds(2, check_finalized) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -20,7 +20,6 @@ from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject -from nbxmpp.const import Role from nbxmpp.const import Affiliation from gajim.common import app @@ -28,7 +27,6 @@ from gajim.common.helpers import get_uf_role from gajim.common.helpers import get_uf_affiliation from gajim.common.helpers import jid_is_blocked -from gajim.common.helpers import event_filter from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr @@ -485,3 +483,4 @@ def _on_destroy(self, _roster): self._store = None self._tooltip.destroy() self._tooltip = None + app.check_finalize(self) ===================================== gajim/gtk/main.py ===================================== @@ -404,7 +404,6 @@ def add_chat_for_workspace(self, type_, pinned=False, select=False): - if self.chat_exists(account, jid): if select: self._chat_list_stack.select_chat(account, jid) ===================================== gajim/gtk/util.py ===================================== @@ -20,9 +20,7 @@ from typing import Tuple from typing import Optional -import gc import sys -import weakref import logging import math import textwrap @@ -855,31 +853,6 @@ def _destroy(*args): widget.connect('destroy', _destroy) -def check_finalize(obj, name): - finalizer = weakref.finalize(obj, log.info, f'{name} has been finalized') - - def is_finalizer_ref(ref): - try: - return isinstance(ref[2][0], str) - except Exception: - return False - - def check_finalized(): - tup = finalizer.peek() - if tup is None: - return - - gc.collect() - log.warning('%s not finalized', name) - log.warning('References:') - for ref in gc.get_referrers(tup[0]): - if is_finalizer_ref(ref): - continue - log.warning(ref) - - GLib.timeout_add_seconds(2, check_finalized) - - def _connect_destroy(sender, func, detailed_signal, handler, *args, **kwargs): """Connect a bound method to a foreign object signal and disconnect if the object the method is bound to emits destroy (Gtk.Widget subclass). View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5deffef340f9a6f7ad2344864278412… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5deffef340f9a6f7ad2344864278412… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Destroy roster correctly
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 366d4ddc by lovetox at 2021-02-27T16:49:55+01:00 Destroy roster correctly - - - - - 4 changed files: - gajim/common/helpers.py - gajim/groupchat_control.py - gajim/gtk/groupchat_roster.py - gajim/gtk/util.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1286,11 +1286,11 @@ def disconnect_signals(self): def disconnect(self, object_): for signal_name, qualifiers in self._callbacks.items(): - for handlers in qualifiers.values(): + for qualifier, handlers in qualifiers.items(): for handler in list(handlers): func = handler() if func is None or func.__self__ == object_: - self._callbacks[signal_name][qualifiers].remove(handler) + self._callbacks[signal_name][qualifier].remove(handler) def connect(self, signal_name, func, qualifiers=None): if inspect.ismethod(func): ===================================== gajim/groupchat_control.py ===================================== @@ -144,9 +144,6 @@ def __init__(self, parent_win, jid, muc_data, acct): self.roster.connect('row-activated', self._on_roster_row_activated) if parent_win is not None: - # On AutoJoin with minimize Groupchats are created without parent - # Tooltip Window and Actions have to be created with parent - self.roster.enable_tooltips() self.add_actions() GLib.idle_add(self.update_actions) self.scale_factor = parent_win.window.get_scale_factor() ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -74,7 +74,6 @@ def __init__(self, account, room_jid, control): self._control = control self._control_id = control.control_id self._show_roles = True - self._handler_ids = {} self._tooltip = GCTooltip() self._group_chat_contact = control.contact self._group_chat_contact.connect('user-avatar-update', @@ -102,6 +101,8 @@ def __init__(self, account, room_jid, control): self._roster = self._ui.roster_treeview self._roster.set_search_equal_func(self._search_func) + self._roster.set_has_tooltip(True) + self._roster.connect('query-tooltip', self._query_tooltip) self._ui.contact_column.set_fixed_width( app.settings.get('groupchat_roster_width')) @@ -125,14 +126,6 @@ def set_model(self): def set_show_roles(self, enabled): self._show_roles = enabled - def enable_tooltips(self): - if self._roster.get_tooltip_window(): - return - - self._roster.set_has_tooltip(True) - id_ = self._roster.connect('query-tooltip', self._query_tooltip) - self._handler_ids[id_] = self._roster - def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): try: row = self._roster.get_path_at_pos(x_pos, y_pos)[0] @@ -479,10 +472,7 @@ def clear(self): self._store.clear() def _on_destroy(self, _roster): - for id_ in list(self._handler_ids.keys()): - if self._handler_ids[id_].handler_is_connected(id_): - self._handler_ids[id_].disconnect(id_) - del self._handler_ids[id_] + self._group_chat_contact.disconnect(self) self._contact_refs = {} self._group_refs = {} @@ -490,6 +480,8 @@ def _on_destroy(self, _roster): self._roster.set_model(None) self._roster = None self._store.clear() + # Store keeps a ref on the object if we dont unset the sort func + self._store.set_sort_func(Column.TEXT, print) self._store = None self._tooltip.destroy() self._tooltip = None ===================================== gajim/gtk/util.py ===================================== @@ -20,6 +20,7 @@ from typing import Tuple from typing import Optional +import gc import sys import weakref import logging @@ -855,7 +856,28 @@ def _destroy(*args): def check_finalize(obj, name): - weakref.finalize(obj, print, f'{name} has been finalized') + finalizer = weakref.finalize(obj, log.info, f'{name} has been finalized') + + def is_finalizer_ref(ref): + try: + return isinstance(ref[2][0], str) + except Exception: + return False + + def check_finalized(): + tup = finalizer.peek() + if tup is None: + return + + gc.collect() + log.warning('%s not finalized', name) + log.warning('References:') + for ref in gc.get_referrers(tup[0]): + if is_finalizer_ref(ref): + continue + log.warning(ref) + + GLib.timeout_add_seconds(2, check_finalized) def _connect_destroy(sender, func, detailed_signal, handler, *args, **kwargs): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/366d4ddcfed7efad3854455e13e37a4e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/366d4ddcfed7efad3854455e13e37a4e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Chatlist: Remove tooltip
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d28518df by lovetox at 2021-02-27T13:35:07+01:00 Chatlist: Remove tooltip - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -36,10 +36,8 @@ def __init__(self, workspace_id): self._set_placeholder() self.connect('destroy', self._on_destroy) - self.connect('query-tooltip', self._query_tooltip) self._timer_id = GLib.timeout_add_seconds(60, self._update_timer) - self._tab_tooltip = RosterTooltip() self.show_all() @@ -66,32 +64,6 @@ def _update_timer(self): self.update_time() return True - def _query_tooltip(self, widget, _x_pos, y_pos, _keyboard_mode, tooltip): - row = self.get_row_at_y(y_pos) - if row is None or row.type == 'pm': - self._tab_tooltip.clear_tooltip() - return False - - connected_contacts = [] - contacts = app.contacts.get_contacts(row.account, row.jid) - if row.type == 'contact': - for contact in contacts: - if contact.show not in ('offline', 'error'): - connected_contacts.append(contact) - if not connected_contacts: - # no connected contacts, show the offline one - connected_contacts = contacts - elif row.type == 'groupchat': - connected_contacts = contacts - else: - # TODO - connected_contacts = [row.jid] - - value, widget = self._tab_tooltip.get_tooltip( - row, connected_contacts, row.account, None) - tooltip.set_custom(widget) - return value - def _filter_func(self, row): if not self._current_filter_text: return True View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d28518df9758c425c86fb9fcc7ecdf84… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d28518df9758c425c86fb9fcc7ecdf84… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 32 commits: ChatControl: Remove shortcut from tooltip
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 9925650f by Daniel Brötzmann at 2021-02-27T12:52:27+01:00 ChatControl: Remove shortcut from tooltip - - - - - fdf0a533 by Daniel Brötzmann at 2021-02-27T12:53:26+01:00 Preferences: Check for pipeline before removing elements Fixes #10430 - - - - - f864fa8a by mimi89999 at 2021-02-27T12:53:26+01:00 Set account window stack as non-vhomogeneous Closes #10438 - - - - - afcec676 by lovetox at 2021-02-27T12:53:26+01:00 Add setting for GSSAPI authentication - - - - - e33dac26 by lovetox at 2021-02-27T12:53:26+01:00 Client: Determine some Settings right before connecting - - - - - 0852a8ce by André Apitzsch at 2021-02-27T12:53:26+01:00 Remove conversion of ASCII emojis Display emojis as intended by the sender, i.e. don't replace it. Closes #10416. - - - - - 2749ffae by lovetox at 2021-02-27T12:53:26+01:00 ServiceRegistration: Use nbxmpp register methods Fixes #10443 - - - - - 565d0f00 by lovetox at 2021-02-27T12:53:26+01:00 Register: Remove unused methods - - - - - ee9d2f67 by mimi89999 at 2021-02-27T12:53:26+01:00 Update servers.json Remove servers that redirect to a website or have registration disabled Closes #10437 - - - - - b57abec5 by mimi89999 at 2021-02-27T12:53:26+01:00 Change dataform to href markup URLs in fixed field Closes #10445 - - - - - 84e9b081 by mimi89999 at 2021-02-27T12:53:26+01:00 Set chat window hscrollbar_policy to never - - - - - 93fabbc1 by André Apitzsch at 2021-02-27T12:53:26+01:00 Move regular expressions to separate file - - - - - 734650e3 by André Apitzsch at 2021-02-27T12:53:26+01:00 Move regex tests - - - - - e6d83017 by mimi89999 at 2021-02-27T12:53:26+01:00 Change dataform to href markup URLs in instructions - - - - - 073cc613 by lovetox at 2021-02-27T12:54:10+01:00 Windows: Set debug env var This allows us to discover if Gajim was started with Gajim-Debug.exe - - - - - c3578713 by lovetox at 2021-02-27T12:54:10+01:00 Logging: Move logging setup methods to logging_helpers Also check for GAJIM_DEBUG - - - - - eb71b81e by wurstsalat at 2021-02-27T12:54:10+01:00 VcardWindow: Fix resource string if resource is missing Fixes: #10273 - - - - - 4a4f9129 by wurstsalat at 2021-02-27T12:54:10+01:00 GroupChatInvitation: Show account badge Fixes: #10424 - - - - - 87427ae9 by wurstsalat at 2021-02-27T12:54:10+01:00 Stop early when handling connection-failed in handle_event Fixes: #10436 - - - - - af3c9004 by lovetox at 2021-02-27T12:54:10+01:00 Profile: Check for PubSub instead of vcard-temp - - - - - 1ff4eed0 by lovetox at 2021-02-27T12:54:10+01:00 Remove unused code - - - - - 2ca80f99 by lovetox at 2021-02-27T12:54:10+01:00 Profile: Don’t check for server features We just assume pubsub will be always there - - - - - 023e45fe by lovetox at 2021-02-27T12:54:10+01:00 Remove unused imports - - - - - 999f6e9b by Daniel Brötzmann at 2021-02-27T12:54:10+01:00 AvatarSelector: Improve error handling Enable loading images <100px and add multiple fail-safes - - - - - f5ebd9da by wurstsalat at 2021-02-27T12:54:10+01:00 AvatarSelector: Fix pipeline - - - - - 488663da by wurstsalat at 2021-02-27T12:54:10+01:00 ChatControlBase: Add workaround for hscrollbar As soon as a line break occurs in Gtk.TextView with word-char wrapping enabled, a hyphen character is automatically inserted before the line break. This triggers the hscrollbar to show, see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384 - - - - - ec29073b by wurstsalat at 2021-02-27T12:54:10+01:00 ChatControlBase: Fix pipeline - - - - - 039e3eb1 by wurstsalat at 2021-02-27T12:54:10+01:00 DOAP: Update - - - - - 99ffe9b1 by lovetox at 2021-02-27T12:54:10+01:00 Profile: Show error if avatar upload fails - - - - - 62ec5f97 by mimi89999 at 2021-02-27T12:54:10+01:00 Change servers.json format - - - - - 8df76a0a by lovetox at 2021-02-27T12:54:10+01:00 Windows: Fix launcher - - - - - 59c8a4de by lovetox at 2021-02-27T12:54:27+01:00 UserAvatar: Handle empty data nodes - - - - - 30 changed files: - data/gajim.doap - gajim/application.py - gajim/chat_control_base.py - gajim/common/client.py - gajim/common/config.py - gajim/common/helpers.py - gajim/common/logging_helpers.py - gajim/common/modules/register.py - gajim/common/modules/user_avatar.py - gajim/common/modules/vcard_temp.py - + gajim/common/regex.py - gajim/common/setting_values.py - gajim/conversation_textview.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/other/servers.json - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/avatar_selector.py - gajim/gtk/dataform.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/groupchat_invitation.py - gajim/gtk/message_input.py - gajim/gtk/preferences.py - gajim/gtk/profile.py - gajim/gtk/service_registration.py - gajim/gtk/video_preview.py - gajim/gui_interface.py - gajim/vcard.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b3da8835e231c4512bf46de7a41203a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b3da8835e231c4512bf46de7a41203a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] UserAvatar: Handle empty data nodes
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 97080f7a by lovetox at 2021-02-27T12:16:09+01:00 UserAvatar: Handle empty data nodes - - - - - 1 changed file: - gajim/common/modules/user_avatar.py Changes: ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -71,6 +71,11 @@ def _request_avatar_data(self, jid, avatar_info): avatar = yield self._nbxmpp('UserAvatar').request_avatar_data( avatar_info.id, jid=jid) + if avatar is None: + self._log.warning('%s advertised %s but data node is empty', + jid, avatar_info.id) + return + if is_error(avatar): self._log.warning(avatar) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97080f7a346d4b9ad0e6c4112e8995d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/97080f7a346d4b9ad0e6c4112e8995d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix subscription check
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3aeb6ed3 by lovetox at 2021-02-27T11:53:19+01:00 Fix subscription check - - - - - 2 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -216,7 +216,7 @@ def _get_roster_attr(self, attr): item = self._module('Roster').get_item(self._jid) if item is None: return None - return getattr(item, attr) + return item.get(attr) @property def is_in_roster(self): ===================================== gajim/common/modules/receipts.py ===================================== @@ -98,8 +98,8 @@ def _should_answer(self, properties): if properties.is_muc_pm: return True - contact = self._get_contact(properties.jid) - if contact.sub not in ('to', 'none'): + contact = self._get_contact(properties.jid.bare) + if contact.subscription not in ('to', 'none'): return True return False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3aeb6ed321395460482934bc32095ebb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3aeb6ed321395460482934bc32095ebb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix receipt processing
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7a8aefd2 by lovetox at 2021-02-27T11:46:46+01:00 Fix receipt processing - - - - - 1 changed file: - gajim/common/modules/receipts.py Changes: ===================================== gajim/common/modules/receipts.py ===================================== @@ -65,7 +65,7 @@ def _process_message_receipt(self, _con, stanza, properties): if not properties.is_encrypted: return - if not self._should_answer(properties.jid): + if not self._should_answer(properties): return self._log.info('Send receipt: %s', properties.jid) self._con.connection.send(build_receipt(stanza)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a8aefd26d3952a24a65ebf1a5096f65… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7a8aefd26d3952a24a65ebf1a5096f65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Adapt to nbxmpp chatstate changes
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 213ee3cd by lovetox at 2021-02-27T11:44:52+01:00 Adapt to nbxmpp chatstate changes - - - - - 1 changed file: - gajim/common/modules/chatstates.py Changes: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -158,7 +158,7 @@ def _process_chatstate(self, _con, _stanza, properties): if contact is None: return - contact.chatstate = properties.chatstate + contact.chatstate = properties.chatstate.value self._log.info('Recv: %-10s - %s', properties.chatstate, properties.jid) app.nec.push_outgoing_event( NetworkEvent('chatstate-received', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/213ee3cd701be5b75bdc5f21885d91fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/213ee3cd701be5b75bdc5f21885d91fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add Chatstate enum
by Philipp Hörist 27 Feb '21

27 Feb '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: e77e74e4 by lovetox at 2021-02-27T11:43:03+01:00 Add Chatstate enum - - - - - 2 changed files: - nbxmpp/const.py - nbxmpp/modules/chatstates.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -162,6 +162,52 @@ PresenceShow._WEIGHTS = { } +@total_ordering +class Chatstate(Enum): + COMPOSING = 'composing' + PAUSED = 'paused' + ACTIVE = 'active' + INACTIVE = 'inactive' + GONE = 'gone' + + @property + def is_composing(self): + return self == Chatstate.COMPOSING + + @property + def is_paused(self): + return self == Chatstate.PAUSED + + @property + def is_active(self): + return self == Chatstate.ACTIVE + + @property + def is_inactive(self): + return self == Chatstate.INACTIVE + + @property + def is_gone(self): + return self == Chatstate.GONE + + def __lt__(self, other): + try: + w1 = self._WEIGHTS[self] + w2 = self._WEIGHTS[other] + except KeyError: + return NotImplemented + return w1 < w2 + + +Chatstate._WEIGHTS = { + Chatstate.COMPOSING: 0, + Chatstate.PAUSED: 1, + Chatstate.ACTIVE: 2, + Chatstate.INACTIVE: 3, + Chatstate.GONE: 4, +} + + class StatusCode(Enum): NON_ANONYMOUS = '100' AFFILIATION_CHANGE = '101' @@ -606,14 +652,6 @@ TUNE_DATA = [ 'uri'] -CHATSTATES = [ - 'active', - 'inactive', - 'gone', - 'composing', - 'paused' -] - REGISTER_FIELDS = [ 'username', 'nick', ===================================== nbxmpp/modules/chatstates.py ===================================== @@ -17,7 +17,7 @@ from nbxmpp.namespaces import Namespace from nbxmpp.structs import StanzaHandler -from nbxmpp.const import CHATSTATES +from nbxmpp.const import Chatstate from nbxmpp.modules.base import BaseModule @@ -34,7 +34,13 @@ class Chatstates(BaseModule): ] def _process_message_chatstate(self, _client, stanza, properties): - chatstate = parse_chatstate(stanza) + try: + chatstate = parse_chatstate(stanza) + except ValueError as error: + self._log.warning('Invalid chatstate: %s', error) + self._log.warning(stanza) + return + if chatstate is None: return @@ -44,11 +50,6 @@ class Chatstates(BaseModule): if stanza.getTag('delay', namespace=Namespace.DELAY2) is not None: return - if chatstate not in CHATSTATES: - self._log.warning('Invalid chatstate: %s', chatstate) - self._log.warning(stanza) - return - properties.chatstate = chatstate @@ -56,5 +57,5 @@ def parse_chatstate(stanza): children = stanza.getChildren() for child in children: if child.getNamespace() == Namespace.CHATSTATES: - return child.getName() + return Chatstate(child.getName()) return None View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e77e74e4c52dceff2d35197d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/e77e74e4c52dceff2d35197d… 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