Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] HTTPUpload: Correctly unpack headers
by Philipp Hörist 03 Nov '20

03 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: d5d99c66 by lovetox at 2020-11-03T18:00:05+01:00 HTTPUpload: Correctly unpack headers Fixes #10337 - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -217,7 +217,7 @@ def _upload_file(self, transfer): message.props.request_headers.set_content_type(transfer.mime, None) message.props.request_headers.set_content_length(transfer.size) - for name, value in transfer.headers: + for name, value in transfer.headers.items(): message.props.request_headers.append(name, value) message.connect('wrote-headers', self._on_wrote_headers, transfer) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d5d99c66b8b6ec014621b620caf1b12c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d5d99c66b8b6ec014621b620caf1b12c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 9 commits: Websocket: Don’t add port to custom url
by Daniel Brötzmann 02 Nov '20

02 Nov '20

Daniel Brötzmann pushed to branch chat_markers at gajim / gajim Commits: 40944944 by lovetox at 2020-10-28T21:01:36+01:00 Websocket: Don’t add port to custom url Fixes #10327 - - - - - fcda6a05 by lovetox at 2020-10-29T19:35:49+01:00 Interface: Fix string formatting - - - - - ffeb83ab by lovetox at 2020-10-29T22:05:46+01:00 Util: Catch RuntimeError - - - - - 91c49ebb by André Apitzsch at 2020-10-31T16:59:16+01:00 Flatpak: Update dependencies - - - - - f761c6f9 by lovetox at 2020-11-01T10:32:27+01:00 Windows: Fix opening URIs on 64bit install Fixes #10326 - - - - - e3a787f6 by wurstsalat at 2020-11-01T10:33:51+01:00 HtmlTextview: Fix warning regarding TargetList on destroy - - - - - 81ac4827 by Yann Leboulanger at 2020-11-02T20:26:03+01:00 Add Chat Markers (XEP-0333) - - - - - aa2c24c9 by wurstsalat at 2020-11-02T20:26:03+01:00 Improvements - - - - - d260f1aa by wurstsalat at 2020-11-02T20:26:03+01:00 Improvements 2 - - - - - 22 changed files: - flatpak/org.gajim.Gajim.yaml - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/message.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/structs.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/groupchat_settings.py - gajim/gtk/htmltextview.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - win/_base.sh Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -85,8 +85,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/f7/09/88bbe20b76ca76be052c366fe77aa… - sha256: ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b + url: https://files.pythonhosted.org/packages/cb/ae/380e33d621ae301770358eb11a896… + sha256: f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591 - name: python3-asn1crypto buildsystem: simple @@ -112,8 +112,8 @@ modules: - python3 setup.py install --prefix=/app sources: - type: archive - url: https://files.pythonhosted.org/packages/12/be/c9cc7d7ab71dbcc9e4e517ead0cdd… - sha256: 26409a473cc6278e4c90f782cd5968ebad04d3911ed1c402fc86908c17633e08 + url: https://files.pythonhosted.org/packages/94/5c/42de91c7fbdb817b2d9a4e64b0679… + sha256: d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3 - name: python3-pyopenssl buildsystem: simple @@ -154,11 +154,11 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.1.0-py3-none-any.whl + - pip3 install --prefix=/app zipp-3.4.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/b2/34/bfcb43cc0ba81f527bc4f40ef41ba… - sha256: aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b + url: https://files.pythonhosted.org/packages/41/ad/6a4f1a124b325618a7fb758b885b6… + sha256: 102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 - name: python3-keyring buildsystem: simple @@ -174,11 +174,11 @@ modules: - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install --prefix=/app css_parser-1.0.4-py3-none-any.whl + - pip3 install --prefix=/app css_parser-1.0.6-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/css_parser/css_parser-1.0.4-p… - sha256: 49d6906416569e715b144df97ed81a94b6dc663fbcae6d1dbf4807e7fb8367ae + url: https://files.pythonhosted.org/packages/64/7a/5ea4d019d36e07026ac194817104e… + sha256: 6fc4f8f0a4b62c77f043765e375cc64971c54ff9a0502fec7e8f1fb28bb96082 - name: python3-precis_i18n buildsystem: simple ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ def add_actions(self): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -338,6 +348,12 @@ def update_actions(self): tooltip_text = _('No File Transfer available') self.xml.sendfile_button.set_tooltip_text(tooltip_text) + # Chat markers + state = GLib.Variant.new_boolean( + self.contact.settings.get('send_marker')) + win.lookup_action( + f'send-marker-{self.control_id}').change_state(state) + # Convert to GC if app.settings.get_account_setting(self.account, 'is_zeroconf'): win.lookup_action( @@ -363,6 +379,7 @@ def remove_actions(self): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker-', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +452,10 @@ def _on_send_chatstate(self, action, param): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -643,6 +664,10 @@ def _on_message_sent(self, event): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -1385,6 +1410,14 @@ def read_queue(self): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) ===================================== gajim/chat_control_base.py ===================================== @@ -218,6 +218,9 @@ def __init__(self, parent_win, widget_name, contact, acct, self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -1116,6 +1119,7 @@ def add_message(self, displaymarking=None, msg_log_id=None, message_id=None, + stanza_id=None, correct_id=None, additional_data=None, marker=None, @@ -1159,6 +1163,12 @@ def add_message(self, if restored: return + if message_id: + if self._type.is_groupchat: + self.last_msg_id = stanza_id or message_id + else: + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1203,7 +1213,10 @@ def add_message(self, event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_id, + message_id=message_id, + stanza_id=stanza_id, show_in_roster=show_in_roster, show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) @@ -1355,7 +1368,7 @@ def set_control_active(self, state): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1363,6 +1376,12 @@ def set_control_active(self, state): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1391,20 +1410,27 @@ def _on_edge_reached(self, _scrolledwindow, pos): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1469,6 +1495,8 @@ def redraw_after_event_removed(self, jid): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ def is_error(self): Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,16 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, stanza_id=None, show_in_roster=False, + show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id + self.stanza_id = stanza_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/helpers.py ===================================== @@ -1335,13 +1335,13 @@ def get_custom_host(account): port = app.settings.get_account_setting(account, 'custom_port') type_ = app.settings.get_account_setting(account, 'custom_type') - protocol = ConnectionProtocol.TCP if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET + else: + host = f'{host}:{port}' + protocol = ConnectionProtocol.TCP - return ('%s:%s' % (host, port), - protocol, - ConnectionType(type_)) + return (host, protocol, ConnectionType(type_)) def warn_about_plain_connection(account, connection_types): ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,123 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Chat Markers (XEP-0333) + +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule +from gajim.common.structs import OutgoingMessage + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + disco_info = app.storage.cache.get_last_disco_info(jid) + + context = 'public' + if disco_info is not None and disco_info.muc_is_members_only: + context = 'private' + + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker', context=context): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = OutgoingMessage(account=self._account, + contact=contact, + message=None, + type_=typ, + marker=(marker, id_), + play_sound=False) + self._con.send_message(message) + self._log.info('Send %s: %s', marker, contact.jid) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, str(type_)) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/message.py ===================================== @@ -350,6 +350,13 @@ def build_message_stanza(self, message): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + if message.marker: + marker, id_ = message.marker + stanza.setMarker(marker, id_) + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/setting_values.py ===================================== @@ -255,12 +255,16 @@ class _ACCOUNT_DEFAULT: 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': True, + 'gc_send_marker_private_default': True, + 'gc_send_marker_public_default': False, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -272,6 +276,7 @@ class _ACCOUNT_DEFAULT: 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/common/settings.py ===================================== @@ -678,11 +678,13 @@ def set_group_chat_setting(self, def set_group_chat_settings(self, setting: str, - value: SETTING_TYPE) -> None: + value: SETTING_TYPE, + context: str = None) -> None: for account in self._account_settings: for jid in self._account_settings[account]['group_chat']: - self.set_group_chat_setting(account, jid, setting, value) + self.set_group_chat_setting( + account, jid, setting, value, context) def get_contact_setting(self, account: str, ===================================== gajim/common/structs.py ===================================== @@ -55,6 +55,7 @@ def __init__(self, type_, subject=None, chatstate=None, + marker=None, resource=None, user_nick=None, label=None, @@ -69,7 +70,7 @@ def __init__(self, if type_ not in ('chat', 'groupchat', 'normal', 'headline'): raise ValueError('Unknown message type: %s' % type_) - if not message and chatstate is None: + if not message and chatstate is None and marker is None: raise ValueError('Trying to send message without content') self.account = account @@ -91,6 +92,7 @@ def __init__(self, self.subject = subject self.chatstate = chatstate + self.marker = marker self.resource = resource self.user_nick = user_nick self.label = label ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -311,6 +312,12 @@ def show_receipt(self, id_): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -1194,16 +1201,27 @@ def __init__(self, id_, timestamp, message_icons, start_mark): self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ def __init__(self): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ def __init__(self): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -658,6 +658,17 @@ def on_groupchat_maximize(self): self.update_actions() self.set_lock_image() self.draw_banner_text() + type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): self._start_private_message(nick) @@ -796,17 +807,21 @@ def _on_gc_message_received(self, event): else: if event.properties.muc_nickname == self.nick: self.last_sent_txt = event.msgtxt + stanza_id = None + if event.properties.stanza_id: + stanza_id = event.properties.stanza_id.id self.add_message(event.msgtxt, contact=event.properties.muc_nickname, tim=event.properties.timestamp, displaymarking=event.displaymarking, correct_id=event.correct_id, message_id=event.properties.id, + stanza_id=stanza_id, additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -819,7 +834,9 @@ def on_private_message(self, nick, sent, msg, tim, session, additional_data, session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -837,7 +854,7 @@ def on_private_message(self, nick, sent, msg, tim, session, additional_data, def add_message(self, text, contact='', tim=None, displaymarking=None, correct_id=None, message_id=None, - additional_data=None): + stanza_id=None, additional_data=None): """ Add message to the ConversationsTextview @@ -887,6 +904,7 @@ def add_message(self, text, contact='', tim=None, displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, + stanza_id=stanza_id, additional_data=additional_data) def get_nb_unread(self): @@ -1057,6 +1075,7 @@ def _on_decrypted_message_received(self, event): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) ===================================== gajim/gtk/accounts.py ===================================== @@ -720,6 +720,19 @@ def __init__(self, account): 'button-style': 'destructive-action', 'button-callback': self._reset_gc_send_chatstate}), + Setting(SettingKind.SWITCH, + _('Send Read Markers'), + SettingType.VALUE, + app.settings.get_account_setting( + account, 'send_marker_default'), + callback=self._send_read_marker, + desc=_('Default for chats and private group chats'), + props={'button-text': _('Reset'), + 'button-tooltip': _('Reset all chats to the ' + 'current default value'), + 'button-style': 'destructive-action', + 'button-callback': self._reset_send_read_marker}), + Setting(SettingKind.POPOVER, _('Keep Chat History'), SettingType.ACCOUNT_CONFIG, @@ -739,6 +752,20 @@ def _reset_gc_send_chatstate(button): button.set_sensitive(False) app.settings.set_group_chat_settings('send_chatstate', None) + def _send_read_marker(self, state, _data): + app.settings.set_account_setting( + self._account, 'send_marker_default', state) + app.settings.set_account_setting( + self._account, 'gc_send_marker_private_default', state) + + def _reset_send_read_marker(self, button): + button.set_sensitive(False) + app.settings.set_contact_settings('send_marker', None) + app.settings.set_group_chat_settings( + 'send_marker', None, context='private') + for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): + ctrl.update_actions() + class ConnectionPage(GenericSettingPage): ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,13 @@ def __init__(self, account, jid, context): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + context=context, + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gtk/htmltextview.py ===================================== @@ -716,6 +716,7 @@ def __init__(self, account, standalone=False): self.drag_dest_unset() self.connect('copy-clipboard', self._on_copy_clipboard) + self.connect('destroy', self._on_destroy) self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') self.account = account @@ -726,6 +727,17 @@ def __init__(self, account, standalone=False): self.connect('query-tooltip', self._query_tooltip) self.create_tags() + def _on_destroy(self, *args): + # We restore the TextView’s drag destination to avoid a GTK warning + # when closing the control. ChatControlBase.shutdown() calls destroy() + # on the control’s main box, causing GTK to recursively destroy the + # child widgets. GTK then tries to set a target list on the TextView, + # resulting in a warning because the Widget has no drag destination. + self.drag_dest_set( + Gtk.DestDefaults.ALL, + None, + Gdk.DragAction.DEFAULT) + def create_tags(self): color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) ===================================== gajim/gtk/util.py ===================================== @@ -755,6 +755,10 @@ def load_pixbuf(path, size=None): GdkPixbuf.InterpType.BILINEAR) return pixbuf + except RuntimeError as error: + log.warning('Loading pixbuf failed: %s', error) + return None + def get_thumbnail_size(pixbuf, size): # Calculates the new thumbnail size while preserving the aspect ratio ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,43 @@ def handle_event_presence(self, obj): if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + @staticmethod + def handle_event_read_state_sync(event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + jid = event.jid + + control = app.interface.msg_win_mgr.get_control(jid, event.account) + + # Compare with control.last_msg_id. + events_ = app.events.get_events(event.account, jid, types) + if not events_: + log.warning('No Events') + return + + if event.type.is_groupchat: + id_ = events_[-1].stanza_id or events_[-1].message_id + else: + id_ = events_[-1].message_id + + if id_ != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -317,8 +354,8 @@ def handle_event_subscribed_presence(self, event): bare_jid, event.account, title=_('Authorization accepted'), - text=_('The contact "%s" has authorized you' - ' to see their status.') % event.jid) + text=_('The contact "%(jid)s" has authorized you' + ' to see their status.') % {'jid': event.jid}) def show_unsubscribed_dialog(self, account, contact): def _remove(): @@ -1060,6 +1097,7 @@ def create_core_handlers_list(self): 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def build_menu(preset): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), ===================================== win/_base.sh ===================================== @@ -190,7 +190,7 @@ function cleanup_install { fi done - KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper" + KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper|gspawn-win64-helper" echo "deleting .exe files" find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/523c400df6c3c84e7dad647d2b14d78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/523c400df6c3c84e7dad647d2b14d78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] HtmlTextview: Fix warning regarding TargetList on destroy
by Philipp Hörist 01 Nov '20

01 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: e3a787f6 by wurstsalat at 2020-11-01T10:33:51+01:00 HtmlTextview: Fix warning regarding TargetList on destroy - - - - - 1 changed file: - gajim/gtk/htmltextview.py Changes: ===================================== gajim/gtk/htmltextview.py ===================================== @@ -716,6 +716,7 @@ def __init__(self, account, standalone=False): self.drag_dest_unset() self.connect('copy-clipboard', self._on_copy_clipboard) + self.connect('destroy', self._on_destroy) self.get_buffer().eol_tag = self.get_buffer().create_tag('eol') self.account = account @@ -726,6 +727,17 @@ def __init__(self, account, standalone=False): self.connect('query-tooltip', self._query_tooltip) self.create_tags() + def _on_destroy(self, *args): + # We restore the TextView’s drag destination to avoid a GTK warning + # when closing the control. ChatControlBase.shutdown() calls destroy() + # on the control’s main box, causing GTK to recursively destroy the + # child widgets. GTK then tries to set a target list on the TextView, + # resulting in a warning because the Widget has no drag destination. + self.drag_dest_set( + Gtk.DestDefaults.ALL, + None, + Gdk.DragAction.DEFAULT) + def create_tags(self): color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3a787f6b9d81e702f9eb2982fdd57b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e3a787f6b9d81e702f9eb2982fdd57b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix opening URIs on 64bit install
by Philipp Hörist 01 Nov '20

01 Nov '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: f761c6f9 by lovetox at 2020-11-01T10:32:27+01:00 Windows: Fix opening URIs on 64bit install Fixes #10326 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -190,7 +190,7 @@ function cleanup_install { fi done - KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper" + KEEP="gajim|gajim-debug|python3|gajim-history-manager|gdbus|gspawn-win32-helper|gspawn-win64-helper" echo "deleting .exe files" find "${MINGW_ROOT}" -regextype "posix-extended" -name "*.exe" -and ! \ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f761c6f9bed34ba1243c5b585acd3826… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f761c6f9bed34ba1243c5b585acd3826… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André 31 Oct '20

31 Oct '20

André pushed to branch master at gajim / gajim Commits: 91c49ebb by André Apitzsch at 2020-10-31T16:59:16+01:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -85,8 +85,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/f7/09/88bbe20b76ca76be052c366fe77aa… - sha256: ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b + url: https://files.pythonhosted.org/packages/cb/ae/380e33d621ae301770358eb11a896… + sha256: f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591 - name: python3-asn1crypto buildsystem: simple @@ -112,8 +112,8 @@ modules: - python3 setup.py install --prefix=/app sources: - type: archive - url: https://files.pythonhosted.org/packages/12/be/c9cc7d7ab71dbcc9e4e517ead0cdd… - sha256: 26409a473cc6278e4c90f782cd5968ebad04d3911ed1c402fc86908c17633e08 + url: https://files.pythonhosted.org/packages/94/5c/42de91c7fbdb817b2d9a4e64b0679… + sha256: d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3 - name: python3-pyopenssl buildsystem: simple @@ -154,11 +154,11 @@ modules: - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.1.0-py3-none-any.whl + - pip3 install --prefix=/app zipp-3.4.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/b2/34/bfcb43cc0ba81f527bc4f40ef41ba… - sha256: aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b + url: https://files.pythonhosted.org/packages/41/ad/6a4f1a124b325618a7fb758b885b6… + sha256: 102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 - name: python3-keyring buildsystem: simple @@ -174,11 +174,11 @@ modules: - name: python3-css-parser buildsystem: simple build-commands: - - pip3 install --prefix=/app css_parser-1.0.4-py3-none-any.whl + - pip3 install --prefix=/app css_parser-1.0.6-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/c/css_parser/css_parser-1.0.4-p… - sha256: 49d6906416569e715b144df97ed81a94b6dc663fbcae6d1dbf4807e7fb8367ae + url: https://files.pythonhosted.org/packages/64/7a/5ea4d019d36e07026ac194817104e… + sha256: 6fc4f8f0a4b62c77f043765e375cc64971c54ff9a0502fec7e8f1fb28bb96082 - name: python3-precis_i18n buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91c49ebb7aaca715aa596e266fd45890… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/91c49ebb7aaca715aa596e266fd45890… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Util: Catch RuntimeError
by Philipp Hörist 29 Oct '20

29 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: ffeb83ab by lovetox at 2020-10-29T22:05:46+01:00 Util: Catch RuntimeError - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -755,6 +755,10 @@ def load_pixbuf(path, size=None): GdkPixbuf.InterpType.BILINEAR) return pixbuf + except RuntimeError as error: + log.warning('Loading pixbuf failed: %s', error) + return None + def get_thumbnail_size(pixbuf, size): # Calculates the new thumbnail size while preserving the aspect ratio View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ffeb83ab176eb4613f185f2f69a292b1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ffeb83ab176eb4613f185f2f69a292b1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Interface: Fix string formatting
by Philipp Hörist 29 Oct '20

29 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: fcda6a05 by lovetox at 2020-10-29T19:35:49+01:00 Interface: Fix string formatting - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -317,8 +317,8 @@ def handle_event_subscribed_presence(self, event): bare_jid, event.account, title=_('Authorization accepted'), - text=_('The contact "%s" has authorized you' - ' to see their status.') % event.jid) + text=_('The contact "%(jid)s" has authorized you' + ' to see their status.') % {'jid': event.jid}) def show_unsubscribed_dialog(self, account, contact): def _remove(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fcda6a05d2476bb5895ac757d8221e77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fcda6a05d2476bb5895ac757d8221e77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Websocket: Don’t add port to custom url
by Philipp Hörist 28 Oct '20

28 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 40944944 by lovetox at 2020-10-28T21:01:36+01:00 Websocket: Don’t add port to custom url Fixes #10327 - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1335,13 +1335,13 @@ def get_custom_host(account): port = app.settings.get_account_setting(account, 'custom_port') type_ = app.settings.get_account_setting(account, 'custom_type') - protocol = ConnectionProtocol.TCP if host.startswith('ws://') or host.startswith('wss://'): protocol = ConnectionProtocol.WEBSOCKET + else: + host = f'{host}:{port}' + protocol = ConnectionProtocol.TCP - return ('%s:%s' % (host, port), - protocol, - ConnectionType(type_)) + return (host, protocol, ConnectionType(type_)) def warn_about_plain_connection(account, connection_types): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/40944944feb73c86dc9703dda87a21e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/40944944feb73c86dc9703dda87a21e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][chat_markers] 7 commits: Delimiter: Adapt to nbxmpp changes
by Philipp Hörist 27 Oct '20

27 Oct '20

Philipp Hörist pushed to branch chat_markers at gajim / gajim Commits: c208f411 by lovetox at 2020-10-26T21:17:59+01:00 Delimiter: Adapt to nbxmpp changes - - - - - 9add1bc0 by wurstsalat at 2020-10-26T22:40:20+01:00 DOAP: Add XEP-0083: Nested Roster Groups - - - - - a7f98f7c by lovetox at 2020-10-26T23:05:58+01:00 Ping: Refactor module - - - - - 78482964 by lovetox at 2020-10-26T23:08:34+01:00 Ping: Fix mypy error - - - - - 11d77d80 by Yann Leboulanger at 2020-10-27T20:40:02+01:00 Add Chat Markers (XEP-0333) - - - - - 2c2ab8b4 by wurstsalat at 2020-10-27T20:40:03+01:00 Improvements - - - - - 523c400d by wurstsalat at 2020-10-27T20:40:03+01:00 Improvements 2 - - - - - 20 changed files: - data/gajim.doap - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/__init__.py - + gajim/common/modules/chat_markers.py - gajim/common/modules/delimiter.py - gajim/common/modules/message.py - gajim/common/modules/ping.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/groupchat_settings.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== data/gajim.doap ===================================== @@ -187,6 +187,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0083.html" /> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0084.html" /> ===================================== gajim/chat_control.py ===================================== @@ -123,7 +123,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): # Menu for the HeaderBar self.control_menu = gui_menu_builder.get_singlechat_menu( - self.control_id, self.account, self.contact.jid) + self.control_id, self.account, self.contact.jid, self._type) # Settings menu self.xml.settings_menu.set_menu_model(self.control_menu) @@ -228,6 +228,7 @@ def __init__(self, parent_win, contact, acct, session, resource=None): ('mam-decrypted-message-received', ged.GUI1, self._on_mam_decrypted_message_received), ('decrypted-message-received', ged.GUI1, self._on_decrypted_message_received), ('receipt-received', ged.GUI1, self._receipt_received), + ('displayed-received', ged.GUI1, self._displayed_received), ('message-error', ged.GUI1, self._on_message_error), ('zeroconf-error', ged.GUI1, self._on_zeroconf_error), ]) @@ -271,6 +272,15 @@ def add_actions(self): act.connect('change-state', self._on_send_chatstate) self.parent_win.window.add_action(act) + marker = self.contact.settings.get('send_marker') + + act = Gio.SimpleAction.new_stateful( + f'send-marker-{self.control_id}', + None, + GLib.Variant.new_boolean(marker)) + act.connect('change-state', self._on_send_marker) + self.parent_win.window.add_action(act) + def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) @@ -338,6 +348,12 @@ def update_actions(self): tooltip_text = _('No File Transfer available') self.xml.sendfile_button.set_tooltip_text(tooltip_text) + # Chat markers + state = GLib.Variant.new_boolean( + self.contact.settings.get('send_marker')) + win.lookup_action( + f'send-marker-{self.control_id}').change_state(state) + # Convert to GC if app.settings.get_account_setting(self.account, 'is_zeroconf'): win.lookup_action( @@ -363,6 +379,7 @@ def remove_actions(self): 'information-', 'start-call-', 'send-chatstate-', + 'send-marker-', ] for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') @@ -435,6 +452,10 @@ def _on_send_chatstate(self, action, param): action.set_state(param) self.contact.settings.set('send_chatstate', param.get_string()) + def _on_send_marker(self, action, param): + action.set_state(param) + self.contact.settings.set('send_marker', param.get_boolean()) + def subscribe_events(self): """ Register listeners to the events class @@ -643,6 +664,10 @@ def _on_message_sent(self, event): def _receipt_received(self, event): self.conv_textview.show_receipt(event.receipt_id) + @event_filter(['account', 'jid']) + def _displayed_received(self, event): + self.conv_textview.show_displayed(event.marker_id) + @event_filter(['account', 'jid']) def _on_zeroconf_error(self, event): self.add_status_message(event.message) @@ -651,6 +676,7 @@ def _on_zeroconf_error(self, event): def _on_update_roster_avatar(self, obj): self._update_avatar() + @event_filter(['account']) def _nec_ping(self, event): if self.contact != event.contact: return @@ -660,7 +686,7 @@ def _nec_ping(self, event): self.add_info_message( _('Pong! (%s seconds)') % event.seconds) elif event.name == 'ping-error': - self.add_info_message(_('Error.')) + self.add_info_message(event.error) def change_resource(self, resource): old_full_jid = self.get_full_jid() @@ -1384,6 +1410,14 @@ def read_queue(self): self.set_session(event.session) if message_ids: app.storage.archive.set_read_messages(message_ids) + + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None app.events.remove_events(self.account, jid_with_resource, types=[str(self._type)]) ===================================== gajim/chat_control_base.py ===================================== @@ -218,6 +218,9 @@ def __init__(self, parent_win, widget_name, contact, acct, self.received_history_pos = 0 self.orig_msg = None + # For XEP-0333 + self.last_msg_id = None + self.correcting = False self.last_sent_msg = None @@ -1116,6 +1119,7 @@ def add_message(self, displaymarking=None, msg_log_id=None, message_id=None, + stanza_id=None, correct_id=None, additional_data=None, marker=None, @@ -1159,6 +1163,12 @@ def add_message(self, if restored: return + if message_id: + if self._type.is_groupchat: + self.last_msg_id = stanza_id or message_id + else: + self.last_msg_id = message_id + if kind == 'incoming': if (not self._type.is_groupchat or self.contact.can_notify() or @@ -1203,7 +1213,10 @@ def add_message(self, event = event_type(text, subject, - self, msg_log_id, + self, + msg_log_id, + message_id=message_id, + stanza_id=stanza_id, show_in_roster=show_in_roster, show_in_systray=show_in_systray) app.events.add_event(self.account, full_jid, event) @@ -1355,7 +1368,7 @@ def set_control_active(self, state): jid = self.contact.jid if self.conv_textview.autoscroll: # we are at the end - type_ = ['printed_%s' % self._type] + type_ = [f'printed_{self._type}'] if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, @@ -1363,6 +1376,12 @@ def set_control_active(self, state): types=type_): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> marker + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None # send chatstate inactive to the one we're leaving # and active to the one we visit if self.msg_textview.has_text(): @@ -1391,20 +1410,27 @@ def _on_edge_reached(self, _scrolledwindow, pos): types_list = [] if self._type.is_groupchat: types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: # Not a GC - types_list = ['printed_%s' % self._type, str(self._type)] + else: + types_list = [f'printed_{self._type}', str(self._type)] if not app.events.get_events(self.account, jid, types_list): return if not self.parent_win: return - if self.parent_win.get_active_control() == self and \ - self.parent_win.window.is_active(): + if (self.parent_win.get_active_control() == self and + self.parent_win.window.is_active()): # we are at the end if not app.events.remove_events( self.account, jid, types=types_list): # There were events to remove self.redraw_after_event_removed(jid) + # XEP-0333 Send <displayed> tag + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: @@ -1469,6 +1495,8 @@ def redraw_after_event_removed(self, jid): We just removed a 'printed_*' event, redraw contact in roster or gc_roster and titles in roster and msg_win """ + if not self.parent_win: # minimized groupchat + return self.parent_win.redraw_tab(self) self.parent_win.show_title() # TODO : get the contact and check get_show_in_roster() ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -419,4 +419,6 @@ def ping(self, nick): raise CommandError( _('Command is not supported for zeroconf accounts')) gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) + if gc_c is None: + raise CommandError(_("Unknown nickname")) app.connections[self.account].get_module('Ping').send_ping(gc_c) ===================================== gajim/common/const.py ===================================== @@ -970,6 +970,7 @@ def is_error(self): Namespace.SECLABEL, Namespace.CONFERENCE, Namespace.CORRECT, + Namespace.CHATMARKERS, Namespace.EME, Namespace.XHTML_IM, Namespace.HASHES_2, ===================================== gajim/common/events.py ===================================== @@ -91,13 +91,16 @@ class PmEvent(ChatEvent): class PrintedChatEvent(Event): type_ = 'printed_chat' def __init__(self, message, subject, control, msg_log_id, time_=None, - show_in_roster=False, show_in_systray=True): + message_id=None, stanza_id=None, show_in_roster=False, + show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + show_in_systray=show_in_systray) self.message = message self.subject = subject self.control = control self.msg_log_id = msg_log_id + self.message_id = message_id + self.stanza_id = stanza_id class PrintedGcMsgEvent(PrintedChatEvent): type_ = 'printed_gc_msg' ===================================== gajim/common/modules/__init__.py ===================================== @@ -40,6 +40,7 @@ 'bookmarks', 'caps', 'carbons', + 'chat_markers', 'chatstates', 'delimiter', 'discovery', ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -0,0 +1,119 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Chat Markers (XEP-0333) + +import nbxmpp +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import StanzaHandler + +from gajim.common import app +from gajim.common.nec import NetworkEvent +from gajim.common.modules.base import BaseModule + + +class ChatMarkers(BaseModule): + + _nbxmpp_extends = 'ChatMarkers' + + def __init__(self, con): + BaseModule.__init__(self, con) + + self.handlers = [ + StanzaHandler(name='message', + callback=self._process_chat_marker, + ns=Namespace.CHATMARKERS, + priority=47), + ] + + def _process_chat_marker(self, _con, _stanza, properties): + if not properties.is_marker or not properties.marker.is_displayed: + return + + if properties.type.is_error: + return + + if properties.type.is_groupchat: + manager = self._con.get_module('MUC').get_manager() + muc_data = manager.get(properties.muc_jid) + if muc_data is None: + return + + if properties.muc_nickname != muc_data.nick: + return + + self._raise_event('read-state-sync', properties) + return + + if properties.is_carbon_message and properties.carbon.is_sent: + self._raise_event('read-state-sync', properties) + return + + if properties.is_mam_message: + if properties.from_.bareMatch(self._con.get_own_jid()): + return + + self._raise_event('displayed-received', properties) + + def _raise_event(self, name, properties): + self._log.info('%s: %s %s', + name, + properties.jid, + properties.marker.id) + + jid = properties.jid + if not properties.is_muc_pm and not properties.type.is_groupchat: + jid = properties.jid.bare + + app.nec.push_outgoing_event( + NetworkEvent(name, + account=self._account, + jid=jid, + properties=properties, + type=properties.type, + is_muc_pm=properties.is_muc_pm, + marker_id=properties.marker.id)) + + def _send_marker(self, contact, marker, id_, type_): + jid = contact.jid + if contact.is_pm_contact: + jid = app.get_jid_without_resource(contact.jid) + + if type_ in ('gc', 'pm'): + disco_info = app.storage.cache.get_last_disco_info(jid) + + context = 'public' + if disco_info is not None and disco_info.muc_is_members_only: + context = 'private' + + if not app.settings.get_group_chat_setting( + self._account, jid, 'send_marker', context=context): + return + else: + if not app.settings.get_contact_setting( + self._account, jid, 'send_marker'): + return + + typ = 'groupchat' if type_ == 'gc' else 'chat' + message = nbxmpp.Message(to=contact.jid, typ=typ) + message.setMarker(marker, id_) + self._log.info('Send %s: %s', marker, contact.jid) + self._nbxmpp().send(message) + + def send_displayed_marker(self, contact, id_, type_): + self._send_marker(contact, 'displayed', id_, str(type_)) + + +def get_instance(*args, **kwargs): + return ChatMarkers(*args, **kwargs), 'ChatMarkers' ===================================== gajim/common/modules/delimiter.py ===================================== @@ -14,53 +14,41 @@ # XEP-0083: Nested Roster Groups -import nbxmpp -from nbxmpp.namespaces import Namespace + +from nbxmpp.errors import is_error +from nbxmpp.modules.util import raise_if_error from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import as_task class Delimiter(BaseModule): + + _nbxmpp_extends = 'Delimiter' + _nbxmpp_methods = [ + 'request_delimiter', + 'set_delimiter' + ] + def __init__(self, con): BaseModule.__init__(self, con) self.available = False self.delimiter = '::' + @as_task def get_roster_delimiter(self): - self._log.info('Request') - node = nbxmpp.Node('storage', attrs={'xmlns': 'roster:delimiter'}) - iq = nbxmpp.Iq('get', Namespace.PRIVATE, payload=node) - - self._con.connection.SendAndCallForResponse( - iq, self._delimiter_received) + _task = yield - def _delimiter_received(self, _nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.info('Request error: %s', stanza.getError()) - else: - delimiter = stanza.getQuery().getTagData('roster') - self.available = True - self._log.info('Delimiter received: %s', delimiter) - if delimiter: - self.delimiter = delimiter - else: - self.set_roster_delimiter() + delimiter = yield self.request_delimiter() + if is_error(delimiter) or delimiter is None: + result = yield self.set_delimiter(self.delimiter) + raise_if_error(result) + delimiter = self.delimiter + self.delimiter = delimiter + self.available = True self._con.connect_machine() - def set_roster_delimiter(self): - self._log.info('Set delimiter') - iq = nbxmpp.Iq('set', Namespace.PRIVATE) - roster = iq.getQuery().addChild('roster', namespace='roster:delimiter') - roster.setData('::') - - self._con.connection.SendAndCallForResponse( - iq, self._set_delimiter_response) - - def _set_delimiter_response(self, _nbxmpp_client, stanza): - if not nbxmpp.isResultNode(stanza): - self._log.info('Store error: %s', stanza.getError()) - def get_instance(*args, **kwargs): return Delimiter(*args, **kwargs), 'Delimiter' ===================================== gajim/common/modules/message.py ===================================== @@ -308,6 +308,8 @@ def build_message_stanza(self, message): stanza.setID(message.message_id) stanza.setOriginID(message.message_id) + stanza.setMarkable() + if message.label: stanza.addChild(node=message.label.to_node()) @@ -350,6 +352,10 @@ def build_message_stanza(self, message): stanza.setTag('no-store', namespace=Namespace.MSG_HINTS) + # XEP-0333 + if message.message: + stanza.setMarkable() + # Add other nodes if message.nodes is not None: for node in message.nodes: ===================================== gajim/common/modules/ping.py ===================================== @@ -16,94 +16,66 @@ from typing import Any from typing import Tuple +from typing import Generator import time -import nbxmpp -from nbxmpp.namespaces import Namespace -from nbxmpp.structs import StanzaHandler +from nbxmpp.errors import is_error from gajim.common import app -from gajim.common.nec import NetworkIncomingEvent +from gajim.common.nec import NetworkEvent from gajim.common.types import ConnectionT from gajim.common.types import ContactsT from gajim.common.modules.base import BaseModule +from gajim.common.modules.util import as_task class Ping(BaseModule): + + _nbxmpp_extends = 'Ping' + _nbxmpp_methods = [ + 'ping', + ] + def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) - self.handlers = [ - StanzaHandler(name='iq', - callback=self._answer_request, - typ='get', - ns=Namespace.PING), - ] + self.handlers = [] - @staticmethod - def _get_ping_iq(to: str) -> nbxmpp.Iq: - iq = nbxmpp.Iq('get', to=to) - iq.addChild(name='ping', namespace=Namespace.PING) - return iq + @as_task + def send_ping(self, contact: ContactsT) -> Generator: + _task = yield - def send_ping(self, contact: ContactsT) -> None: if not app.account_is_available(self._account): return - to = contact.get_full_jid() - iq = self._get_ping_iq(to) + jid = contact.get_full_jid() - self._log.info('Send ping to %s', to) + self._log.info('Send ping to %s', jid) - self._con.connection.SendAndCallForResponse( - iq, self._pong_received, {'ping_time': time.time(), - 'contact': contact}) + app.nec.push_incoming_event(NetworkEvent('ping-sent', + account=self._account, + contact=contact)) - app.nec.push_incoming_event( - PingSentEvent(None, conn=self._con, contact=contact)) + ping_time = time.time() - def _pong_received(self, - _nbxmpp_client: Any, - stanza: nbxmpp.Iq, - ping_time: int, - contact: ContactsT) -> None: - if not nbxmpp.isResultNode(stanza): - self._log.info('Error: %s', stanza.getError()) - app.nec.push_incoming_event( - PingErrorEvent(None, conn=self._con, contact=contact)) + response = yield self.ping(jid, timeout=10) + if is_error(response): + app.nec.push_incoming_event(NetworkEvent( + 'ping-error', + account=self._account, + contact=contact, + error=str(response))) return + diff = round(time.time() - ping_time, 2) self._log.info('Received pong from %s after %s seconds', - stanza.getFrom(), diff) - app.nec.push_incoming_event( - PingReplyEvent(None, conn=self._con, - contact=contact, - seconds=diff)) - - def _answer_request(self, - _con: ConnectionT, - stanza: nbxmpp.Iq, - _properties: Any) -> None: - iq = stanza.buildReply('result') - ping = iq.getTag('ping') - if ping is not None: - iq.delChild(ping) - self._con.connection.send(iq) - self._log.info('Send pong to %s', stanza.getFrom()) - raise nbxmpp.NodeProcessed - - -class PingSentEvent(NetworkIncomingEvent): - name = 'ping-sent' - - -class PingReplyEvent(NetworkIncomingEvent): - name = 'ping-reply' - + response.jid, diff) -class PingErrorEvent(NetworkIncomingEvent): - name = 'ping-error' + app.nec.push_incoming_event(NetworkEvent('ping-reply', + account=self._account, + contact=contact, + seconds=diff)) def get_instance(*args: Any, **kwargs: Any) -> Tuple[Ping, str]: ===================================== gajim/common/setting_values.py ===================================== @@ -255,12 +255,16 @@ class _ACCOUNT_DEFAULT: 'filetransfer_preference': 'httpupload', 'send_chatstate_default': 'composing_only', 'gc_send_chatstate_default': 'composing_only', + 'send_marker_default': True, + 'gc_send_marker_private_default': True, + 'gc_send_marker_public_default': False, 'chat_history_max_age': -1, }, 'contact': { 'speller_language': '', 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', }, @@ -272,6 +276,7 @@ class _ACCOUNT_DEFAULT: 'minimize_on_autojoin': True, 'minimize_on_close': True, 'send_chatstate': HAS_ACCOUNT_DEFAULT, + 'send_marker': HAS_ACCOUNT_DEFAULT, 'encryption': '', 'sync_threshold': HAS_APP_DEFAULT, }, ===================================== gajim/common/settings.py ===================================== @@ -678,11 +678,13 @@ def set_group_chat_setting(self, def set_group_chat_settings(self, setting: str, - value: SETTING_TYPE) -> None: + value: SETTING_TYPE, + context: str = None) -> None: for account in self._account_settings: for jid in self._account_settings[account]['group_chat']: - self.set_group_chat_setting(account, jid, setting, value) + self.set_group_chat_setting( + account, jid, setting, value, context) def get_contact_setting(self, account: str, ===================================== gajim/conversation_textview.py ===================================== @@ -38,6 +38,7 @@ from gajim.common import helpers from gajim.common import i18n from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import StyleAttr from gajim.common.const import Trust @@ -311,6 +312,12 @@ def show_receipt(self, id_): return line.set_receipt() + def show_displayed(self, id_): + line = self._get_message_line(id_) + if line is None: + return + line.set_displayed() + def show_error(self, id_, error): line = self._get_message_line(id_) if line is None: @@ -1194,16 +1201,27 @@ def __init__(self, id_, timestamp, message_icons, start_mark): self.timestamp = timestamp self.start_mark = start_mark self._has_receipt = False + self._has_displayed = False self._message_icons = message_icons @property def has_receipt(self): return self._has_receipt + @property + def has_displayed(self): + return self._has_displayed + def set_receipt(self): self._has_receipt = True + if self._has_displayed: + return self._message_icons.set_receipt_icon_visible(True) + def set_displayed(self): + self._has_displayed = True + self._message_icons.set_displayed_icon_visible(True) + def set_correction(self, tooltip): self._message_icons.set_correction_icon_visible(True) self._message_icons.set_correction_tooltip(tooltip) @@ -1222,12 +1240,12 @@ def __init__(self): 'document-edit-symbolic', Gtk.IconSize.MENU) self._correction_image.set_no_show_all(True) - self._receipt_image = Gtk.Image.new_from_icon_name( + self._marker_image = Gtk.Image.new_from_icon_name( 'emblem-ok-symbolic', Gtk.IconSize.MENU) - self._receipt_image.get_style_context().add_class( + self._marker_image.get_style_context().add_class( 'receipt-received-color') - self._receipt_image.set_tooltip_text(_('Received')) - self._receipt_image.set_no_show_all(True) + self._marker_image.set_tooltip_text(_('Received')) + self._marker_image.set_no_show_all(True) self._error_image = Gtk.Image.new_from_icon_name( 'dialog-warning-symbolic', Gtk.IconSize.MENU) @@ -1235,14 +1253,22 @@ def __init__(self): self._error_image.set_no_show_all(True) self.add(self._correction_image) - self.add(self._receipt_image) + self.add(self._marker_image) self.add(self._error_image) self.show_all() def set_receipt_icon_visible(self, visible): if not app.settings.get('positive_184_ack'): return - self._receipt_image.set_visible(visible) + self._marker_image.set_visible(visible) + + def set_displayed_icon_visible(self, visible): + self._marker_image.set_visible(visible) + self._marker_image.get_style_context().remove_class( + 'receipt-received-color') + self._marker_image.get_style_context().add_class( + 'displayed-received-color') + self._marker_image.set_tooltip_text(Q_('?Message state:Read')) def set_correction_icon_visible(self, visible): self._correction_image.set_visible(visible) ===================================== gajim/data/style/gajim.css ===================================== @@ -295,6 +295,7 @@ button.flat.link { padding: 0; border: 0; } /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } +.displayed-received-color { color: rgb(0, 141, 242); } /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} ===================================== gajim/groupchat_control.py ===================================== @@ -658,6 +658,17 @@ def on_groupchat_maximize(self): self.update_actions() self.set_lock_image() self.draw_banner_text() + type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + if not app.events.remove_events(self.account, + self.get_full_jid(), + types=type_): + # XEP-0333 Send <displayed> marker + con = app.connections[self.account] + con.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_roster_row_activated(self, _roster, nick): self._start_private_message(nick) @@ -796,17 +807,21 @@ def _on_gc_message_received(self, event): else: if event.properties.muc_nickname == self.nick: self.last_sent_txt = event.msgtxt + stanza_id = None + if event.properties.stanza_id: + stanza_id = event.properties.stanza_id.id self.add_message(event.msgtxt, contact=event.properties.muc_nickname, tim=event.properties.timestamp, displaymarking=event.displaymarking, correct_id=event.correct_id, message_id=event.properties.id, + stanza_id=stanza_id, additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) def on_private_message(self, nick, sent, msg, tim, session, additional_data, - msg_log_id=None, displaymarking=None): + message_id, msg_log_id=None, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick @@ -819,7 +834,9 @@ def on_private_message(self, nick, sent, msg, tim, session, additional_data, session=session, displaymarking=displaymarking, sent_forwarded=sent, - additional_data=additional_data) + additional_data=additional_data, + message_id=message_id) + app.events.add_event(self.account, fjid, event) if allow_popup_window(self.account): @@ -837,7 +854,7 @@ def on_private_message(self, nick, sent, msg, tim, session, additional_data, def add_message(self, text, contact='', tim=None, displaymarking=None, correct_id=None, message_id=None, - additional_data=None): + stanza_id=None, additional_data=None): """ Add message to the ConversationsTextview @@ -887,6 +904,7 @@ def add_message(self, text, contact='', tim=None, displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, + stanza_id=stanza_id, additional_data=additional_data) def get_nb_unread(self): @@ -1057,6 +1075,7 @@ def _on_decrypted_message_received(self, event): event.properties.timestamp, self.session, event.additional_data, + event.properties.id, msg_log_id=event.msg_log_id, displaymarking=event.displaymarking) @@ -1070,7 +1089,11 @@ def _nec_our_status(self, event): if self.parent_win: self.parent_win.redraw_tab(self) + @event_filter(['account']) def _nec_ping(self, event): + if not event.contact.is_groupchat: + return + if self.contact.jid != event.contact.room_jid: return @@ -1082,7 +1105,7 @@ def _nec_ping(self, event): _('Pong! (%(nick)s %(delay)s s.)') % {'nick': nick, 'delay': event.seconds}) elif event.name == 'ping-error': - self.add_info_message(_('Error.')) + self.add_info_message(event.error) @property def is_connected(self) -> bool: ===================================== gajim/gtk/accounts.py ===================================== @@ -720,6 +720,19 @@ def __init__(self, account): 'button-style': 'destructive-action', 'button-callback': self._reset_gc_send_chatstate}), + Setting(SettingKind.SWITCH, + _('Send Read Markers'), + SettingType.VALUE, + app.settings.get_account_setting( + account, 'send_marker_default'), + callback=self._send_read_marker, + desc=_('Default for chats and private group chats'), + props={'button-text': _('Reset'), + 'button-tooltip': _('Reset all chats to the ' + 'current default value'), + 'button-style': 'destructive-action', + 'button-callback': self._reset_send_read_marker}), + Setting(SettingKind.POPOVER, _('Keep Chat History'), SettingType.ACCOUNT_CONFIG, @@ -739,6 +752,20 @@ def _reset_gc_send_chatstate(button): button.set_sensitive(False) app.settings.set_group_chat_settings('send_chatstate', None) + def _send_read_marker(self, state, _data): + app.settings.set_account_setting( + self._account, 'send_marker_default', state) + app.settings.set_account_setting( + self._account, 'gc_send_marker_private_default', state) + + def _reset_send_read_marker(self, button): + button.set_sensitive(False) + app.settings.set_contact_settings('send_marker', None) + app.settings.set_group_chat_settings( + 'send_marker', None, context='private') + for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): + ctrl.update_actions() + class ConnectionPage(GenericSettingPage): ===================================== gajim/gtk/groupchat_settings.py ===================================== @@ -71,6 +71,13 @@ def __init__(self, account, jid, context): 'send_chatstate', props={'entries': chat_state}), + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.GROUP_CHAT, + 'send_marker', + context=context, + desc=_('Let others know if you read up to this point')), + Setting(SettingKind.POPOVER, _('Sync Threshold'), SettingType.GROUP_CHAT, ===================================== gajim/gui_interface.py ===================================== @@ -242,6 +242,43 @@ def handle_event_presence(self, obj): if ctrl and ctrl.session and len(obj.contact_list) > 1: ctrl.remove_session(ctrl.session) + @staticmethod + def handle_event_read_state_sync(event): + if event.type.is_groupchat: + control = app.get_groupchat_control( + event.account, event.jid.bare) + if control is None: + log.warning('Groupchat control not found') + return + + jid = event.jid.bare + types = ['printed_gc_msg', 'printed_marked_gc_msg'] + + else: + types = ['chat', 'pm', 'printed_chat', 'printed_pm'] + jid = event.jid + + control = app.interface.msg_win_mgr.get_control(jid, event.account) + + # Compare with control.last_msg_id. + events_ = app.events.get_events(event.account, jid, types) + if not events_: + log.warning('No Events') + return + + if event.type.is_groupchat: + id_ = events_[-1].stanza_id or events_[-1].message_id + else: + id_ = events_[-1].message_id + + if id_ != event.marker_id: + return + + if not app.events.remove_events(event.account, jid, types=types): + # There were events to remove + if control is not None: + control.redraw_after_event_removed(event.jid) + @staticmethod def handle_event_msgsent(obj): if not obj.play_sound: @@ -1060,6 +1097,7 @@ def create_core_handlers_list(self): 'unsubscribed-presence-received': [ self.handle_event_unsubscribed_presence], 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'read-state-sync': [self.handle_event_read_state_sync], } def register_core_handlers(self): ===================================== gajim/gui_menu_builder.py ===================================== @@ -511,12 +511,13 @@ def get_transport_menu(contact, account): return menu -def get_singlechat_menu(control_id, account, jid): +def get_singlechat_menu(control_id, account, jid, type_): singlechat_menu = [ (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')), ]), + ('win.send-marker-', _('Send Read Markers')), (_('Send Chatstate'), ['chatstate']), ('win.invite-contacts-', _('Invite Contacts…')), ('win.add-to-roster-', _('Add to Contact List…')), @@ -545,6 +546,9 @@ def build_menu(preset): for item in preset: if isinstance(item[1], str): action_name, label = item + if action_name == 'win.send-marker-' and type_ == 'pm': + continue + if action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/78d119a3a22191a7dd7d08a9fffcd47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/78d119a3a22191a7dd7d08a9fffcd47… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Ping: Fix mypy error
by Philipp Hörist 26 Oct '20

26 Oct '20

Philipp Hörist pushed to branch master at gajim / gajim Commits: 78482964 by lovetox at 2020-10-26T23:08:34+01:00 Ping: Fix mypy error - - - - - 1 changed file: - gajim/common/modules/ping.py Changes: ===================================== gajim/common/modules/ping.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Tuple +from typing import Generator import time @@ -42,7 +43,7 @@ def __init__(self, con: ConnectionT) -> None: self.handlers = [] @as_task - def send_ping(self, contact: ContactsT) -> None: + def send_ping(self, contact: ContactsT) -> Generator: _task = yield if not app.account_is_available(self._account): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/784829645c4262306cdaf09b0bae9e47… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/784829645c4262306cdaf09b0bae9e47… 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