Commits October 2021

commits@gajim.org

1 participants
72 discussions

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

20 Oct '21

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

1 0

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

19 Oct '21

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

1 0

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

18 Oct '21

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

1 0

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

17 Oct '21

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

1 0

[Git][gajim/gajim][mainwindow] Remove obsolete app.last_message_time
by Daniel Brötzmann (＠wurstsalat) 16 Oct '21

16 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6c9ba7ff by wurstsalat at 2021-10-16T16:45:22+02:00 Remove obsolete app.last_message_time - - - - - 5 changed files: - gajim/common/app.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gui_interface.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/common/app.py ===================================== @@ -81,10 +81,6 @@ def __init__(self): transport_type = {} # type: Dict[str, str] -# dict of time of the latest incoming message per jid -# {acct1: {jid1: time1, jid2: time2}, } -last_message_time = {} # type: Dict[str, Dict[str, float]] - contacts = cast(LegacyContactsAPIT, None) # tell if we are connected to the room or not ===================================== gajim/gtk/controls/base.py ===================================== @@ -121,8 +121,6 @@ def __init__(self, widget_name, account, jid): self.control_id = str(uuid.uuid4()) self.session = None - app.last_message_time[self.account][self.contact.jid] = 0 - self.xml = get_builder('%s.ui' % widget_name) self.xml.connect_signals(self) self.widget = self.xml.get_object('%s_hbox' % widget_name) ===================================== gajim/gtk/controls/chat.py ===================================== @@ -87,7 +87,6 @@ def __init__(self, account, jid): self.last_recv_message_id = None self.last_recv_message_marks = None - self.last_message_timestamp = None self.toggle_emoticons() @@ -638,10 +637,13 @@ def shutdown(self): app.check_finalize(self) def allow_shutdown(self, _method, on_yes, on_no): - # TODO: app.last_message_time is not set anywhere - time_ = app.last_message_time[self.account][self.contact.jid] - # 2 seconds - if time.time() - time_ < 2: + row = self.conversation_view.get_last_message_row() + if row is None: + on_yes(self) + return + + if time.time() - row.timestamp < 2: + # Under 2 seconds since last message no_log_for = app.settings.get_account_setting( self.account, 'no_log_for').split() more = '' ===================================== gajim/gui_interface.py ===================================== @@ -165,7 +165,6 @@ def __init__(self): app.to_be_removed[a] = [] app.nicks[a] = app.settings.get_account_setting(a, 'name') app.block_signed_in_notifications[a] = True - app.last_message_time[a] = {} if sys.platform not in ('win32', 'darwin'): logind.enable() @@ -240,7 +239,6 @@ def handle_event(self, account, jid, type_): elif type_ in ('chat-message', ''): # '' is for log in/out notifications app.window.select_chat(account, jid.bare) - app.last_message_time[account][jid] = 0 # long time ago elif type_ == 'jingle-incoming': app.window.select_chat(account, jid.bare) elif type_ in ('subscription-request', @@ -821,7 +819,6 @@ def enable_account(self, account): app.nicks[account] = app.settings.get_account_setting(account, 'name') app.block_signed_in_notifications[account] = True - app.last_message_time[account] = {} app.settings.set_account_setting(account, 'active', True) gui_menu_builder.build_accounts_menu() @@ -866,7 +863,6 @@ def disable_account(self, account): del app.automatic_rooms[account] del app.to_be_removed[account] del app.newly_added[account] - del app.last_message_time[account] def remove_account(self, account): if app.settings.get_account_setting(account, 'active'): ===================================== test/lib/gajim_mocks.py ===================================== @@ -36,7 +36,6 @@ def __init__(self, account, *args): app.to_be_removed[account] = [] app.nicks[account] = app.settings.get_account_setting(account, 'name') app.block_signed_in_notifications[account] = True - app.last_message_time[account] = {} app.connections[account] = self View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6c9ba7ff22fb4a47b7b1f7f6b25c23d2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6c9ba7ff22fb4a47b7b1f7f6b25c23d2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Main Window: Simplify _on_window_delete()
by Daniel Brötzmann (＠wurstsalat) 16 Oct '21

16 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e47d9712 by wurstsalat at 2021-10-16T16:23:43+02:00 Main Window: Simplify _on_window_delete() - - - - - 1 changed file: - gajim/gtk/main.py Changes: ===================================== gajim/gtk/main.py ===================================== @@ -282,23 +282,25 @@ def _on_window_motion_notify(self, _widget, _event): def _on_window_delete(self, _widget, _event): # Main window X button was clicked - if (not app.settings.get('quit_on_main_window_x_button') and - ((app.interface.systray_enabled and - app.settings.get('trayicon') != 'on_event') or - app.settings.get('allow_hide_roster'))): - save_main_window_position() - if (os.name == 'nt' or - app.settings.get('hide_on_main_window_x_button')): - self.hide() - else: - self.iconify() - elif app.settings.get('quit_on_main_window_x_button'): + if app.settings.get('quit_on_main_window_x_button'): self.quit() else: + if (app.settings.get('allow_hide_roster') or + (app.interface.systray_enabled and + app.settings.get('trayicon') != 'on_event')): + save_main_window_position() + if (os.name == 'nt' or + app.settings.get('hide_on_main_window_x_button')): + self.hide() + else: + self.iconify() + return True + def _on_ok(is_checked): if is_checked: app.settings.set('quit_on_main_window_x_button', True) self.quit() + ConfirmationCheckDialog( _('Quit Gajim'), _('You are about to quit Gajim'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e47d97129bbece2ac204a89b7e1ba140… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e47d97129bbece2ac204a89b7e1ba140… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] AccountWizard: Handle all errors during disconnect
by Philipp Hörist (＠lovetox) 16 Oct '21

16 Oct '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: e133c4f0 by lovetox at 2021-10-16T15:48:02+02:00 AccountWizard: Handle all errors during disconnect Fixes #10658 - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -363,7 +363,10 @@ def _on_disconnected(self, client, _signal_name): # by the server. This ignores all stream errors if we already # know that we succeeded. if self.get_current_page() != 'success': - self._show_error_page(_('Error'), _('Error'), error) + self._show_error_page(_('Error'), _('Error'), text or error) + + else: + self._show_error_page(_('Error'), _('Error'), text or error) self.get_page('form').remove_form() self._client.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e133c4f0fb91213069268a9d8af379ed… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e133c4f0fb91213069268a9d8af379ed… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Dispatcher: Pass str as error instead of exception
by Philipp Hörist (＠lovetox) 16 Oct '21

16 Oct '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 2b8b5a22 by lovetox at 2021-10-16T15:41:14+02:00 Dispatcher: Pass str as error instead of exception - - - - - 1 changed file: - nbxmpp/dispatcher.py Changes: ===================================== nbxmpp/dispatcher.py ===================================== @@ -241,7 +241,7 @@ class StanzaDispatcher(Observable): self._parser.Parse(data) except (ExpatError, ValueError) as error: self._log.error('XML parsing error: %s', error) - self.notify('parsing-error', error) + self.notify('parsing-error', str(error)) return # end stream:stream tag received View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/2b8b5a2262c14901d5a514c0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/2b8b5a2262c14901d5a514c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Events: Remove usage of chat message events
by Daniel Brötzmann (＠wurstsalat) 16 Oct '21

16 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 83bb932d by wurstsalat at 2021-10-16T15:12:31+02:00 Events: Remove usage of chat message events - - - - - fc2d8132 by wurstsalat at 2021-10-16T15:15:51+02:00 Remove obsolete common/events.py - - - - - 9 changed files: - gajim/common/app.py - − gajim/common/events.py - gajim/gtk/accounts.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/main.py - gajim/gtk/notification.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/common/app.py ===================================== @@ -48,7 +48,6 @@ from gajim.common import ged as ged_module from gajim.common.i18n import LANG from gajim.common.const import Display -from gajim.common.events import Events from gajim.common.types import NetworkEventsControllerT # pylint: disable=unused-import from gajim.common.types import InterfaceT # pylint: disable=unused-import from gajim.common.types import ConnectionT # pylint: disable=unused-import @@ -106,8 +105,6 @@ def __init__(self): # list of contacts that has just signed out to_be_removed = {} # type: Dict[str, List[str]] -events = Events() - notification = None # list of our nick names in each account ===================================== gajim/common/events.py deleted ===================================== @@ -1,280 +0,0 @@ -# Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> -# Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> -# Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# Jonathan Schleifer <js-gajim AT webkeks.org> -# -# 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/>. - -import time - - -class Event: - def __init__(self, time_=None): - """ - type_ in chat-message, group-chat-message, private-chat-message, - - parameters is (per type_): - *-chat-message: [message, subject, control, msg_log_id] - """ - if time_: - self.time_ = time_ - else: - self.time_ = time.time() - # Set when adding the event - self.jid = None - self.account = None - - -class ChatMsgEvent(Event): - - type_ = 'chat-message' - - def __init__(self, - message, - subject, - control, - msg_log_id, - time_=None, - message_id=None, - stanza_id=None): - Event.__init__(self, time_) - 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 GroupChatMsgEvent(ChatMsgEvent): - - type_ = 'group-chat-message' - - -class PrivateChatMsgEvent(ChatMsgEvent): - - type_ = 'private-chat-message' - - -class Events: - def __init__(self): - self._events = {} # list of events {acct: {jid1: [E1, E2]}, } - self._event_added_listeners = [] - self._event_removed_listeners = [] - - def event_added_subscribe(self, listener): - """ - Add a listener when an event is added to the queue - """ - if listener not in self._event_added_listeners: - self._event_added_listeners.append(listener) - - def event_added_unsubscribe(self, listener): - """ - Remove a listener when an event is added to the queue - """ - if listener in self._event_added_listeners: - self._event_added_listeners.remove(listener) - - def event_removed_subscribe(self, listener): - """ - Add a listener when an event is removed from the queue - """ - if listener not in self._event_removed_listeners: - self._event_removed_listeners.append(listener) - - def event_removed_unsubscribe(self, listener): - """ - Remove a listener when an event is removed from the queue - """ - if listener in self._event_removed_listeners: - self._event_removed_listeners.remove(listener) - - def fire_event_added(self, event): - for listener in self._event_added_listeners: - listener(event) - - def fire_event_removed(self, event_list): - for listener in self._event_removed_listeners: - listener(event_list) - - def add_account(self, account): - self._events[account] = {} - - def get_accounts(self): - return self._events.keys() - - def remove_account(self, account): - del self._events[account] - - def add_event(self, account, jid, event): - if account not in self._events: - self._events[account] = {jid: [event]} - elif jid not in self._events[account]: - self._events[account][jid] = [event] - else: - self._events[account][jid].append(event) - - event.jid = jid - event.account = account - - self.fire_event_added(event) - - def remove_account_events(self, account): - if account not in self._events: - return - - account_events = self.get_events(account) - for jid, _events in account_events.items(): - self.remove_events(account, jid) - - def remove_events(self, account, jid, event=None, types=None): - """ - If event is not specified, remove all events from this jid, optionally - only from given type return True if no such event found - """ - if types is None: - types = [] - if account not in self._events: - return True - if jid not in self._events[account]: - return True - - if event: # remove only one event - if event in self._events[account][jid]: - if len(self._events[account][jid]) == 1: - del self._events[account][jid] - else: - self._events[account][jid].remove(event) - self.fire_event_removed([event]) - return False - return True - if types: - new_list = [] # list of events to keep - removed_list = [] # list of removed events - for ev in self._events[account][jid]: - if ev.type_ not in types: - new_list.append(ev) - else: - removed_list.append(ev) - if len(new_list) == len(self._events[account][jid]): - return True - - if new_list: - self._events[account][jid] = new_list - else: - del self._events[account][jid] - self.fire_event_removed(removed_list) - return False - - # No event nor type given, remove them all - removed_list = self._events[account][jid] - del self._events[account][jid] - self.fire_event_removed(removed_list) - - def change_jid(self, account, old_jid, new_jid): - if account not in self._events: - return - if old_jid not in self._events[account]: - return - if new_jid in self._events[account]: - self._events[account][new_jid] += self._events[account][old_jid] - else: - self._events[account][new_jid] = self._events[account][old_jid] - del self._events[account][old_jid] - - def get_events(self, account, jid=None, types=None): - """ - Return all events from the given account of the form: - {jid1: [], jid2: []}. - If jid is given, returns all events from the given jid in a list: - [] - optionally only from given type - """ - if types is None: - types = [] - if account not in self._events: - return [] - - if not jid: - events_list = {} - for jid_ in self._events[account]: - events = [] - for ev in self._events[account][jid_]: - if not types or ev.type_ in types: - events.append(ev) - if events: - events_list[jid_] = events - return events_list - - if jid not in self._events[account]: - return [] - - events_list = [] - for ev in self._events[account][jid]: - if not types or ev.type_ in types: - events_list.append(ev) - return events_list - - def get_all_events(self, types=None): - accounts = self._events.keys() - events = [] - for account in accounts: - for jid in self._events[account]: - for event in self._events[account][jid]: - if types is None or event.type_ in types: - events.append(event) - return events - - def get_first_event(self, account=None, jid=None, type_=None): - """ - Return the first event of type type_ if given - """ - if not account: - return self._get_first_event_with_attribute(self._events) - - events_list = self.get_events(account, jid, type_) - # be sure it's bigger than latest event - first_event_time = time.time() + 1 - first_event = None - for event in events_list: - if event.time_ < first_event_time: - first_event_time = event.time_ - first_event = event - return first_event - - @staticmethod - def _get_first_event_with_attribute(events): - """ - Get the first event. - events is in the form {account1: {jid1: [ev1, ev2], },. } - """ - # be sure it's bigger than latest event - first_event_time = time.time() + 1 - first_account = None - first_jid = None - first_event = None - for account in events: - for jid in events[account]: - for event in events[account][jid]: - if event.time_ < first_event_time: - first_event_time = event.time_ - first_account = account - first_jid = jid - first_event = event - return first_account, first_jid, first_event ===================================== gajim/gtk/accounts.py ===================================== @@ -147,10 +147,6 @@ def _get_relogin_settings(account): @staticmethod def on_remove_account(account): - if app.events.get_events(account): - app.interface.raise_dialog('unread-events-on-remove-account') - return - if app.settings.get_account_setting(account, 'is_zeroconf'): # Should never happen as button is insensitive return ===================================== gajim/gtk/controls/base.py ===================================== @@ -40,9 +40,6 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n -from gajim.common.events import ChatMsgEvent -from gajim.common.events import GroupChatMsgEvent -from gajim.common.events import PrivateChatMsgEvent from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict @@ -1140,9 +1137,6 @@ def add_message(self, # Issue notification self._notify(name, text, tim) - # Add message event - self._add_message_event(text, msg_log_id, message_id, stanza_id) - # Send chat marker if we’re actively following the chat chat_active = app.window.is_chat_active( self.account, self.contact.jid) @@ -1206,29 +1200,6 @@ def _notify(self, name, text, tim): sound_event=sound_event) app.nec.push_incoming_event(event) - def _add_message_event(self, text, msg_log_id, message_id, stanza_id): - if app.window.is_chat_active(self.account, self.contact.jid): - if self._scrolled_view.get_autoscroll(): - return - - if self.is_groupchat: - event_type = GroupChatMsgEvent - event = 'gc_message_received' - else: - if self.is_chat: - event_type = ChatMsgEvent - else: - event_type = PrivateChatMsgEvent - event = 'message_received' - - event = event_type(text, - '', - self, - msg_log_id, - message_id=message_id, - stanza_id=stanza_id) - app.events.add_event(self.account, str(self.contact.jid), event) - def toggle_emoticons(self): """ Hide show emoticons_button ===================================== gajim/gtk/controls/chat.py ===================================== @@ -638,6 +638,7 @@ def shutdown(self): app.check_finalize(self) def allow_shutdown(self, _method, on_yes, on_no): + # TODO: app.last_message_time is not set anywhere time_ = app.last_message_time[self.account][self.contact.jid] # 2 seconds if time.time() - time_ < 2: ===================================== gajim/gtk/main.py ===================================== @@ -631,28 +631,21 @@ def on_continue(message): if message is None: # user pressed Cancel to change status message dialog return - # check if we have unread messages - # TODO: - # unread = app.events.get_nb_events() - - # for event in app.events.get_all_events(['group-chat-message']): - # contact = app.contacts.get_groupchat_contact(event.jid) - # if contact is None or not contact.can_notify(): - # unread -= 1 - - # if unread: - # ConfirmationDialog( - # _('Unread Messages'), - # _('You still have unread messages'), - # _('Messages will only be available for reading them later ' - # 'if storing chat history is enabled and if the contact ' - # 'is in your contact list.'), - # [DialogButton.make('Cancel'), - # DialogButton.make('Remove', - # text=_('_Quit'), - # callback=on_continue2, - # args=[message])]).show() - # return + + # Check for unread messages + if self.get_total_unread_count(): + ConfirmationDialog( + _('Unread Messages'), + _('You still have unread messages'), + _('Messages will only be available for reading them later ' + 'if storing chat history is enabled and if the contact ' + 'is in your contact list.'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('_Quit'), + callback=on_continue2, + args=[message])]).show() + return on_continue2(message) if get_msg and ask_for_status_message('offline'): ===================================== gajim/gtk/notification.py ===================================== @@ -69,8 +69,6 @@ def __init__(self): ('our-show', ged.GUI2, self._nec_our_status), ]) - app.events.event_removed_subscribe(self._on_event_removed) - def _detect_dbus_caps(self): if sys.platform in ('win32', 'darwin'): return @@ -131,14 +129,6 @@ def _on_notification(self, event): title=event.title, text=event.text) - def _on_event_removed(self, event_list): - for event in event_list: - if event.type_ in ('chat-message', - 'group-chat-message', - 'private-chat-message', - 'jingle-incoming'): - self._withdraw('new-message', event.account, event.jid) - def _nec_our_status(self, event): if app.account_is_connected(event.account): self._withdraw('connection-failed', event.account) ===================================== gajim/gui_interface.py ===================================== @@ -235,15 +235,12 @@ def handle_event(self, account, jid, type_): if type_ in ('connection-lost', 'connection-failed'): app.window.show_account_page(account) - app.events.remove_events(account, jid, types=type_) elif type_ in ('group-chat-message', 'private-chat-message'): app.window.select_chat(account, jid.bare) - app.events.remove_events(account, jid, types=type_) elif type_ in ('chat-message', ''): # '' is for log in/out notifications app.window.select_chat(account, jid.bare) app.last_message_time[account][jid] = 0 # long time ago - app.events.remove_events(account, jid, types=type_) elif type_ == 'jingle-incoming': app.window.select_chat(account, jid.bare) elif type_ in ('subscription-request', @@ -856,8 +853,6 @@ def disable_account(self, account): 'account-disabled', account=account)) - app.events.remove_account_events(account) - if account == app.ZEROCONF_ACC_NAME: app.connections[account].disable_account() app.connections[account].cleanup() ===================================== gajim/remote_control.py ===================================== @@ -784,20 +784,7 @@ def _contacts_as_dbus_structure(self, bare_contact): return contact_dict def get_unread_msgs_number(self): - # TODO: - return 0 - - unread = app.events.get_nb_events() - for event in app.events.get_all_events(['group-chat-message']): - client = app.get_client(event.account) - contact = client.get_module('Contacts').get_contact( - event.jid, groupchat=True) - - if not contact.can_notify(): - unread -= 1 - continue - - return str(unread) + return str(app.window.get_total_unread_count()) def start_chat(self, jid=''): app.app.activate_action('start-chat', GLib.Variant('s', jid)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef621f9987bc025cd0ae1bb9b95a51f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ef621f9987bc025cd0ae1bb9b95a51f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Chat Markers: Fix read state sync
by Daniel Brötzmann (＠wurstsalat) 16 Oct '21

16 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ef621f99 by wurstsalat at 2021-10-16T14:21:09+02:00 Chat Markers: Fix read state sync - - - - - 3 changed files: - gajim/gtk/controls/base.py - gajim/gtk/main.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -534,15 +534,16 @@ def remove_actions(self): for action in actions: app.window.remove_action(f'{action}{self.control_id}') - def mark_as_read(self): + def mark_as_read(self, send_marker=True): self._jump_to_end_button.reset_unread_count() - # XEP-0333 Send <displayed> marker - self._client.get_module('ChatMarkers').send_displayed_marker( - self.contact, - self.last_msg_id, - self._type) - self.last_msg_id = None + if send_marker: + # XEP-0333 Send <displayed> marker + self._client.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def change_encryption(self, action, param): encryption = param.get_string() ===================================== gajim/gtk/main.py ===================================== @@ -460,13 +460,13 @@ def get_chat_unread_count(self, account, jid): count = chat_list_stack.get_chat_unread_count(account, jid) return count or 0 - def mark_as_read(self, account, jid): + def mark_as_read(self, account, jid, send_marker=True): # TODO set window urgency hint, etc. control = self.get_control(account, jid) if control is not None: # Send displayed marker and # reset jump to bottom button unread counter - control.mark_as_read() + control.mark_as_read(send_marker=send_marker) # Reset chat list unread counter (emits unread-count-changed) chat_list_stack = self._chat_page.get_chat_list_stack() chat_list_stack.mark_as_read(account, jid) ===================================== gajim/gui_interface.py ===================================== @@ -517,31 +517,18 @@ def handle_event_msgnotsent(event): def handle_event_read_state_sync(event): if event.type.is_groupchat: jid = event.jid.bare - types = ['group-chat-message'] - else: jid = event.jid - types = ['chat-message', 'private-chat-message'] control = app.window.get_control(event.account, jid) if control is None: log.warning('No ChatControl found') return - 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: + if event.marker_id != control.last_msg_id: return - app.events.remove_events(event.account, jid, types=types) + app.window.mark_as_read(event.account, jid, send_marker=False) @staticmethod def handle_event_metacontacts(obj): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef621f9987bc025cd0ae1bb9b95a51f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ef621f9987bc025cd0ae1bb9b95a51f6… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2021