Commits August 2021

commits@gajim.org

1 participants
21 discussions

[Git][gajim/gajim][mainwindow] ConversationView: Add Call row
by Daniel Brötzmann (＠wurstsalat) 27 Aug '21

27 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 4dce9b32 by wurstsalat at 2021-08-27T21:10:08+02:00 ConversationView: Add Call row - - - - - 9 changed files: - gajim/common/const.py - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - + gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/view.py - gajim/gui_interface.py Changes: ===================================== gajim/common/const.py ===================================== @@ -32,6 +32,7 @@ class AvatarSize(IntEnum): WORKSPACE_EDIT = 100 CHAT = 48 NOTIFICATION = 48 + CALL = 100 GROUP_INFO = 100 TOOLTIP = 100 ACCOUNT_PAGE = 150 ===================================== gajim/data/style/default-dark.css ===================================== @@ -15,6 +15,10 @@ .gajim-subject-message { color: rgb(205, 225, 255); background: rgb(40, 60, 80); } +.gajim-call-message { + color: rgb(205, 225, 255); + background: rgb(40, 60, 80); +} .gajim-url { color: rgb(60, 135, 220); } ===================================== gajim/data/style/default.css ===================================== @@ -15,6 +15,10 @@ .gajim-subject-message { color: rgb(40, 70, 100); background: rgb(225, 235, 250); } +.gajim-call-message { + color: rgb(40, 70, 100); + background: rgb(225, 235, 250); +} .gajim-url { color: rgb(30, 75, 135); } ===================================== gajim/data/style/gajim.css ===================================== @@ -82,7 +82,8 @@ .conversation-system-row { .conversation-date-row { padding: 12px; } -.conversation-subject-box { +.conversation-subject-box, +.conversation-call-box { border-radius: 6px; padding: 12px; } ===================================== gajim/gtk/controls/base.py ===================================== @@ -1098,6 +1098,9 @@ def add_info_message(self, text): def add_file_transfer(self, transfer): self.conversation_view.add_file_transfer(transfer) + def add_call_message(self, timestamp, text, event=None): + self.conversation_view.add_call_message(timestamp, text, event) + def add_message(self, text, kind, ===================================== gajim/gtk/controls/chat.py ===================================== @@ -136,6 +136,7 @@ def __init__(self, account, jid): } self._video_widget_other = None self._video_widget_self = None + self.conversation_view.connect('call-answered', self._on_call_answered) self.update_toolbar() self.update_all_pep_types() @@ -831,6 +832,44 @@ def on_sound_hscale_value_changed(self, _widget, value): self._get_audio_content().set_out_volume(value / 100) app.settings.set('audio_output_volume', int(value)) + def _on_call_answered(self, _view, action, event): + if action == 'accept': + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + if not session: + return + + audio = session.get_content('audio') + video = session.get_content('video') + + if audio and not audio.negotiated: + self.set_jingle_state( + 'audio', JingleState.CONNECTING, event.sid) + if video and not video.negotiated: + self.set_jingle_state( + 'video', JingleState.CONNECTING, event.sid) + + if not session.accepted: + session.approve_session() + + for item in event.contents: + session.approve_content(item.media) + + if action == 'reject': + session = self._client.get_module('Jingle').get_jingle_session( + event.fjid, event.sid) + if not session: + return + + if not session.accepted: + session.decline_session() + else: + for item in event.contents: + session.reject_content(item.media) + + def add_incoming_call(self, event): + self.add_call_message(time.time(), '', event=event) + def on_location_eventbox_button_release_event(self, _widget, _event): return # TODO @@ -1200,61 +1239,6 @@ def _got_file_error(self, file_props, type_, pri_txt, sec_txt): file_props, Gtk.MessageType.ERROR) - def _on_reject_call(self, _button, event): - app.events.remove_events( - self.account, event.jid, types='jingle-incoming') - - session = self._client.get_module('Jingle').get_jingle_session( - event.peerjid, event.sid) - if not session: - return - - if not session.accepted: - session.decline_session() - else: - for content in event.content_types: - session.reject_content(content) - - def _on_accept_call(self, _button, event): - app.events.remove_events( - self.account, event.jid, types='jingle-incoming') - - session = self._client.get_module('Jingle').get_jingle_session( - event.peerjid, event.sid) - if not session: - return - - audio = session.get_content('audio') - video = session.get_content('video') - - if audio and not audio.negotiated: - self.set_jingle_state('audio', JingleState.CONNECTING, event.sid) - if video and not video.negotiated: - self.set_jingle_state('video', JingleState.CONNECTING, event.sid) - - if not session.accepted: - session.approve_session() - - for content in event.content_types: - session.approve_content(content) - - def add_call_received_message(self, event): - markup = '%s' % (_('Incoming Call')) - if 'video' in event.content_types: - markup += _('\nVideo Call') - else: - markup += _('\nVoice Call') - - button_reject = Gtk.Button.new_with_mnemonic(_('_Reject')) - button_reject.connect('clicked', self._on_reject_call, event) - button_accept = Gtk.Button.new_with_mnemonic(_('_Accept')) - button_accept.connect('clicked', self._on_accept_call, event) - self._add_info_bar_message( - markup, - [button_reject, button_accept], - event, - Gtk.MessageType.QUESTION) - def on_event_added(self, event): if event.account != self.account: return ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -0,0 +1,112 @@ +# 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 +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ + +from .widgets import SimpleLabel +from .base import BaseRow + + +class CallRow(BaseRow): + def __init__(self, account, contact, timestamp, text, event=None): + BaseRow.__init__(self, account) + + self.type = 'call' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + self._contact = contact + self._event = event + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + if event is None: + icon = Gtk.Image.new_from_icon_name('call-start-symbolic', + Gtk.IconSize.MENU) + self.grid.attach(icon, 1, 0, 1, 1) + + self._label = SimpleLabel() + self._label.set_text(text) + self.grid.attach(self._label, 2, 0, 1, 1) + else: + self._prepare_incoming_call() + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 3, 0, 1, 1) + + self.show_all() + + def _on_accept(self, button): + button.set_sensitive(False) + self._reject_button.set_sensitive(False) + self.get_parent().on_call_answered('accept', self._event) + + def _on_reject(self, button): + button.set_sensitive(False) + self._accept_button.set_sensitive(False) + self.get_parent().on_call_answered('reject', self._event) + + def _prepare_incoming_call(self): + call_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + call_box.set_size_request(350, -1) + call_box.get_style_context().add_class('conversation-call-box') + call_box.get_style_context().add_class('gajim-call-message') + + scale = self.get_scale_factor() + avatar = self._contact.get_avatar( + AvatarSize.CALL, + scale, + add_show=False) + avatar_image = Gtk.Image.new_from_surface(avatar) + call_box.add(avatar_image) + + content_types = [] + for item in self._event.contents: + content_types.append(item.media) + text = _('%s is calling') % self._contact.name + if 'video' in content_types: + text += _(' (Video Call)') + else: + text += _(' (Voice Call)') + label = Gtk.Label(label=text) + label.get_style_context().add_class('bold') + label.set_max_width_chars(40) + label.set_line_wrap(True) + call_box.add(label) + + self._accept_button = Gtk.Button.new_with_label(_('Accept Call')) + self._accept_button.connect('clicked', self._on_accept) + + self._reject_button = Gtk.Button.new_with_label(_('Reject')) + self._reject_button.connect('clicked', self._on_reject) + + button_box = Gtk.Box(spacing=12) + button_box.set_halign(Gtk.Align.CENTER) + button_box.add(self._accept_button) + button_box.add(self._reject_button) + call_box.add(button_box) + + self.grid.attach(call_box, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -29,6 +29,7 @@ from .rows.scroll_hint import ScrollHintRow from .rows.message import MessageRow from .rows.info import InfoMessage +from .rows.call import CallRow from .rows.date import DateRow from .rows.file_transfer import FileTransferRow from .rows.muc_subject import MUCSubject @@ -47,6 +48,11 @@ class ConversationView(Gtk.ListBox): None, (str, ) ), + 'call-answered': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, object) + ), } def __init__(self, account, contact): @@ -168,6 +174,14 @@ def add_file_transfer(self, transfer): transfer_row = FileTransferRow(self._account, transfer) self._insert_message(transfer_row) + def add_call_message(self, timestamp, text, event): + call_row = CallRow(self._account, + self._contact, + timestamp, + text, + event) + self._insert_message(call_row) + def add_message(self, text, kind, @@ -409,5 +423,8 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) + def on_call_answered(self, action, event): + self.emit('call-answered', action, event) + def _on_contact_setting_changed(self, *args): self.invalidate_filter() ===================================== gajim/gui_interface.py ===================================== @@ -1022,32 +1022,22 @@ def _popup_ft_result(self, account, jid, file_props): text=txt) # Jingle AV handling - def handle_event_jingle_incoming(self, event): - # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, - # data...)) + @staticmethod + def handle_event_jingle_incoming(event): + # ('JINGLE_INCOMING', conn, fjid, sid, resource, jingle session, + # tuple-of-contents==(type, data...)) # TODO: conditional blocking if peer is not in roster account = event.conn.name + content_types = [] for item in event.contents: content_types.append(item.media) - # check type of jingle session - if 'audio' in content_types or 'video' in content_types: - # a voip session... - # we now handle only voip, so the only thing we will do here is - # not to return from function - pass - else: - # unknown session type... it should be declined in common/jingle.py - return - notification_event = events.JingleIncomingEvent( - event.fjid, - event.sid, - content_types) + if 'audio' not in content_types and 'video' not in content_types: + return - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl: if 'audio' in content_types: ctrl.set_jingle_state( @@ -1059,25 +1049,24 @@ def handle_event_jingle_incoming(self, event): 'video', JingleState.CONNECTION_RECEIVED, event.sid) - ctrl.add_call_received_message(notification_event) + ctrl.add_incoming_call(event) if helpers.allow_popup_window(account): def _prepare_control(): ctrl = app.window.get_control(account, event.jid) - ctrl.add_call_received_message(notification_event) + ctrl.add_incoming_call(event) if not ctrl: app.window.add_chat( account, event.jid, 'contact', select=True) - GLib.idle_add(_prepare_control) - return - - self.add_event(account, event.fjid, notification_event) + GLib.idle_add(_prepare_control) + return if helpers.allow_showing_notification(account): heading = _('Incoming Call') - contact = app.get_name_from_jid(account, event.jid) - text = _('%s is calling') % contact + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(event.jid) + text = _('%s is calling') % contact.name app.notification.popup( heading, event.jid, @@ -1092,11 +1081,10 @@ def handle_event_jingle_connected(event): # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) if event.media in ('audio', 'video'): account = event.conn.name - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl: - con = app.connections[account] - session = con.get_module('Jingle').get_jingle_session( + client = app.get_client(account) + session = client.get_module('Jingle').get_jingle_session( event.fjid, event.sid) if event.media == 'audio': @@ -1123,8 +1111,7 @@ def handle_event_jingle_connected(event): def handle_event_jingle_disconnected(event): # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) account = event.conn.name - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl: if event.media is None: ctrl.stop_jingle(sid=event.sid, reason=event.reason) @@ -1145,8 +1132,7 @@ def handle_event_jingle_disconnected(event): def handle_event_jingle_error(event): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) account = event.conn.name - ctrl = (app.window.get_control(account, event.fjid) or - app.window.get_control(account, event.jid)) + ctrl = app.window.get_control(account, event.jid) if ctrl and event.sid == ctrl.jingle['audio'].sid: ctrl.set_jingle_state( 'audio', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dce9b3244d5fe56c0bd448aebf0d32d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4dce9b3244d5fe56c0bd448aebf0d32d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Settings: Remove mergeaccounts
by Daniel Brötzmann (＠wurstsalat) 25 Aug '21

25 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 55f91128 by wurstsalat at 2021-08-25T21:22:56+02:00 Settings: Remove mergeaccounts - - - - - 1ed364e0 by wurstsalat at 2021-08-25T21:33:29+02:00 Preferences: Remove window layout settings - - - - - 4f529d61 by wurstsalat at 2021-08-25T21:40:47+02:00 Preferences: Remove obsolete roster specific settings - - - - - 4 changed files: - gajim/app_actions.py - gajim/application.py - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -117,18 +117,6 @@ def on_single_message(_action, param): open_window('SingleMessageWindow', account=account) -def on_merge_accounts(action, param): - action.set_state(param) - value = param.get_boolean() - app.settings.set('mergeaccounts', value) - # Do not merge accounts if only one active - if len(app.connections) >= 2: - app.interface.roster.regroup = value - else: - app.interface.roster.regroup = False - app.interface.roster.setup_and_draw_roster() - - def on_add_account(action, _param): open_window('AccountWizard') ===================================== gajim/application.py ===================================== @@ -389,13 +389,6 @@ def add_actions(self): from gajim import app_actions # General Stateful Actions - - act = Gio.SimpleAction.new_stateful( - 'merge', None, - GLib.Variant.new_boolean(app.settings.get('mergeaccounts'))) - act.connect('change-state', app_actions.on_merge_accounts) - self.add_action(act) - actions = [ ('quit', app_actions.on_quit), ('add-account', app_actions.on_add_account), ===================================== gajim/common/setting_values.py ===================================== @@ -36,7 +36,6 @@ class _ACCOUNT_DEFAULT: 'use_transports_iconsets': True, 'collapsed_rows': '', 'roster_theme': 'default', - 'mergeaccounts': False, 'sort_by_show_in_roster': True, 'sort_by_show_in_muc': False, 'use_speller': False, @@ -82,7 +81,6 @@ class _ACCOUNT_DEFAULT: 'last_save_dir': '', 'last_send_dir': '', 'last_sounds_dir': '', - 'tabs_position': 'left', 'tabs_always_visible': False, 'tabs_border': False, 'tabs_close_button': True, @@ -105,7 +103,6 @@ class _ACCOUNT_DEFAULT: 'roster_window_skip_taskbar': False, 'use_urgency_hint': True, 'notification_timeout': 5, - 'one_message_window': 'always', 'show_roster_on_startup': 'always', 'escape_key_closes': False, 'hide_groupchat_banner': False, @@ -140,7 +137,6 @@ class _ACCOUNT_DEFAULT: 'gc_sync_threshold_public_default': 1, 'gc_sync_threshold_private_default': 0, 'show_subject_on_join': True, - 'show_chatstate_in_roster': True, 'show_chatstate_in_tabs': True, 'show_chatstate_in_banner': True, 'muclumbus_api_jid': 'api(a)search.jabber.network', ===================================== gajim/gtk/preferences.py ===================================== @@ -164,13 +164,6 @@ def __init__(self, settings): class WindowBehaviour(PreferenceBox): def __init__(self, *args): - win_layout_items = { - 'never': _('Detached contact list with detached chats'), - 'always': _('Detached contact list with single chat'), - 'always_with_roster': _('Single window for everything'), - 'peracct': _('Detached contact list with chats grouped by account'), - 'pertype': _('Detached contact list with chats grouped by type'), - } roster_on_startup_items = { 'always': _('Always'), @@ -178,21 +171,7 @@ def __init__(self, *args): 'last_state': _('Restore last state'), } - tab_position_items = { - 'top': _('Top'), - 'bottom': _('Bottom'), - 'left': _('Left'), - 'Right': _('Right'), - } - settings = [ - Setting(SettingKind.POPOVER, - _('Window Layout'), - SettingType.CONFIG, - 'one_message_window', - props={'entries': win_layout_items}, - callback=self._on_win_layout_changed), - Setting(SettingKind.POPOVER, _('Contact List on Startup'), SettingType.CONFIG, @@ -205,33 +184,17 @@ def __init__(self, *args): SettingType.CONFIG, 'quit_on_roster_x_button', desc=_('Quit when closing contact list')), - - Setting(SettingKind.POPOVER, - _('Tab Position'), - SettingType.CONFIG, - 'tabs_position', - props={'entries': tab_position_items}, - desc=_('Placement of chat window tabs'), - callback=self._on_win_layout_changed), ] PreferenceBox.__init__(self, settings) - @staticmethod - def _on_win_layout_changed(*args): - app.interface.msg_win_mgr.reconfig() - class ContactList(PreferenceBox): def __init__(self, *args): - settings = [ - Setting(SettingKind.SWITCH, - _('Merge Accounts'), - SettingType.CONFIG, - 'mergeaccounts', - callback=self._on_merge_accounts), + # TODO: Evaluate settings (and connect them) + settings = [ Setting(SettingKind.SWITCH, _('Enable Metacontacts'), SettingType.CONFIG, @@ -278,10 +241,6 @@ def __init__(self, *args): PreferenceBox.__init__(self, settings) - @staticmethod - def _on_merge_accounts(*args): - app.app.activate_action('merge') - @staticmethod def _on_show_avatar_in_roster_changed(*args): app.interface.roster.setup_and_draw_roster() @@ -351,13 +310,6 @@ def __init__(self, *args): 'show_chatstate_in_banner', desc=_('Show the contact’s chat state (e.g. typing) in ' 'the chats tab’s banner')), - - Setting(SettingKind.SWITCH, - _('Display Chat State In Contact List'), - SettingType.CONFIG, - 'show_chatstate_in_roster', - desc=_('Show the contact’s chat state (e.g. typing) in ' - 'the contact list')), ] PreferenceBox.__init__(self, settings) @@ -414,7 +366,7 @@ def __init__(self, *args): SettingType.CONFIG, 'gc_print_join_left_default', desc=_('Default for new group chats'), - props={'button-text':_('Reset'), + props={'button-text': _('Reset'), 'button-tooltip': _('Reset all group chats to the ' 'current default value'), 'button-style': 'destructive-action', @@ -425,7 +377,7 @@ def __init__(self, *args): SettingType.CONFIG, 'gc_print_status_default', desc=_('Default for new group chats'), - props={'button-text':_('Reset'), + props={'button-text': _('Reset'), 'button-tooltip': _('Reset all group chats to the ' 'current default value'), 'button-style': 'destructive-action', @@ -574,7 +526,7 @@ def __init__(self, account, parent): desc=_('Show notifications even if you are Away, ' 'Busy, etc.'), bind='show_notifications'), - ] + ] SettingsDialog.__init__(self, parent, _('Notifications'), Gtk.DialogFlags.MODAL, settings, account) @@ -682,7 +634,7 @@ def __init__(self, account, parent): SettingType.CONFIG, 'autoaway_message', bind='autoaway'), - ] + ] SettingsDialog.__init__(self, parent, _('Auto Away Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -710,7 +662,7 @@ def __init__(self, account, parent): SettingType.CONFIG, 'autoxa_message', bind='autoxa'), - ] + ] SettingsDialog.__init__(self, parent, _('Auto Extended Away Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -766,8 +718,6 @@ def _on_theme_changed(value, *args): app.css_config.change_theme(value) app.nec.push_incoming_event(NetworkEvent('theme-update')) app.nec.push_incoming_event(NetworkEvent('style-changed')) - app.interface.roster.repaint_themed_widgets() - app.interface.roster.change_roster_style(None) @staticmethod def _on_dark_theme(value, *args): @@ -810,6 +760,8 @@ def _toggle_emoticons(): class StatusIcon(PreferenceBox): def __init__(self, *args): + # TODO: Remove this section completely? + iconset_items = [] for _index, iconset_name in enumerate(get_available_iconsets()): iconset_items.append(iconset_name) @@ -868,7 +820,7 @@ def __init__(self, account, parent): SettingType.CONFIG, 'stun_server', bind='use_stun_server') - ] + ] SettingsDialog.__init__(self, parent, _('STUN Server Settings'), Gtk.DialogFlags.MODAL, settings, account) @@ -986,7 +938,7 @@ def __init__(self, *args): self.set_sensitive(deps_installed) @staticmethod - def _on_video_input_changed(value, *args): + def _on_video_input_changed(_value, *args): preview = get_app_window('Preferences').get_video_preview() if preview is None or not preview.is_active: # changed signal gets triggered when we fill the combobox View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43f27148be3926d4ca5bcfeb817d6d9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43f27148be3926d4ca5bcfeb817d6d9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: Events: Cleanup chat message events
by Daniel Brötzmann (＠wurstsalat) 25 Aug '21

25 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b75e03b3 by wurstsalat at 2021-08-25T18:42:08+02:00 Events: Cleanup chat message events - - - - - 83623983 by wurstsalat at 2021-08-25T20:26:08+02:00 App: Remove obsolete get_groupchat_control - - - - - ec083022 by wurstsalat at 2021-08-25T20:42:54+02:00 Fix Read Markers - - - - - 43f27148 by wurstsalat at 2021-08-25T21:01:50+02:00 Settings: Fix Control handling - - - - - 15 changed files: - gajim/command_system/implementation/standard.py - gajim/common/app.py - gajim/common/events.py - gajim/common/helpers.py - gajim/gtk/accounts.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - gajim/gtk/notification.py - gajim/gtk/preferences.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/remote_control.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -316,8 +316,8 @@ def topic(self, new_topic): @command(raw=True, empty=True) @doc(_("Invite a user to a group chat for a reason")) - def invite(self, jid, reason): - control = app.get_groupchat_control(self.account, self.room_jid) + def invite(self, jid, _reason): + control = app.window.get_control(self.account, self.room_jid) if control is not None: control.invite(jid) ===================================== gajim/common/app.py ===================================== @@ -676,15 +676,6 @@ def get_stored_bob_data(algo_hash: str) -> Optional[bytes]: return data return None -def get_groupchat_control(account, jid): - control = app.interface.msg_win_mgr.get_gc_control(jid, account) - if control is not None: - return control - try: - return app.interface.minimized_controls[account][jid] - except Exception: - return None - def register_task(self, task): _tasks[id(self)].append(task) ===================================== gajim/common/events.py ===================================== @@ -24,7 +24,7 @@ class Event: - def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): + def __init__(self, time_=None, show_in_systray=True): """ type_ in chat, normal, file-request, file-error, file-completed, file-request-error, file-send-error, file-stopped, gc_msg, pm, @@ -32,9 +32,6 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): jingle-incoming parameters is (per type_): - chat, normal, pm: [message, subject, kind, time, encrypted, - resource, msg_log_id] - where kind in error, incoming file-*: file_props printed_chat: [message, subject, control, msg_log_id] printed_*: None @@ -45,60 +42,15 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): self.time_ = time_ else: self.time_ = time.time() - self.show_in_roster = show_in_roster self.show_in_systray = show_in_systray # Set when adding the event self.jid = None self.account = None -class ChatEvent(Event): +class ChatMsgEvent(Event): - type_ = 'chat' - - def __init__(self, - message, - subject, - kind, - time_, - resource, - msg_log_id, - correct_id=None, - message_id=None, - session=None, - displaymarking=None, - sent_forwarded=False, - show_in_roster=False, - show_in_systray=True, - additional_data=None): - Event.__init__(self, - time_, - show_in_roster=show_in_roster, - show_in_systray=show_in_systray) - self.message = message - self.subject = subject - self.kind = kind - self.time = time_ - self.resource = resource - self.msg_log_id = msg_log_id - self.message_id = message_id - self.correct_id = correct_id - self.session = session - self.displaymarking = displaymarking - self.sent_forwarded = sent_forwarded - if additional_data is None: - from gajim.common.helpers import AdditionalDataDict - self.additional_data = AdditionalDataDict() - - -class PmEvent(ChatEvent): - - type_ = 'pm' - - -class PrintedChatEvent(Event): - - type_ = 'printed_chat' + type_ = 'chat-message' def __init__(self, message, @@ -108,11 +60,9 @@ def __init__(self, time_=None, 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) self.message = message self.subject = subject @@ -122,19 +72,14 @@ def __init__(self, self.stanza_id = stanza_id -class PrintedGcMsgEvent(PrintedChatEvent): - - type_ = 'printed_gc_msg' +class GroupChatMsgEvent(ChatMsgEvent): + type_ = 'group-chat-message' -class PrintedMarkedGcMsgEvent(PrintedChatEvent): - type_ = 'printed_marked_gc_msg' +class PrivateChatMsgEvent(ChatMsgEvent): - -class PrintedPmEvent(PrintedChatEvent): - - type_ = 'printed_pm' + type_ = 'private-chat-message' class FileRequestEvent(Event): @@ -144,11 +89,9 @@ class FileRequestEvent(Event): def __init__(self, file_props, time_=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) self.file_props = file_props @@ -192,11 +135,9 @@ def __init__(self, sid, content_types, time_=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) self.peerjid = peerjid self.sid = sid @@ -412,9 +353,8 @@ def _get_nb_events(self, account=None, jid=None, attribute=None, for event in self._events[acct][j]: if types and event.type_ not in types: continue - if (not attribute or - attribute == 'systray' and event.show_in_systray or - attribute == 'roster' and event.show_in_roster): + if (not attribute or attribute == 'systray' and + event.show_in_systray): nb += 1 return nb @@ -428,8 +368,7 @@ def _get_some_events(self, attribute): for jid in self._events[account]: events[account][jid] = [] for event in self._events[account][jid]: - if (attribute == 'systray' and event.show_in_systray or - attribute == 'roster' and event.show_in_roster): + if attribute == 'systray' and event.show_in_systray: events[account][jid].append(event) if not events[account][jid]: del events[account][jid] @@ -460,7 +399,7 @@ def _get_first_event_with_attribute(events): def get_nb_systray_events(self, types=None): """ - Return the number of events displayed in roster + Return the number of events displayed in systray """ if types is None: types = [] @@ -476,21 +415,3 @@ def get_systray_events(self): def get_first_systray_event(self): events = self.get_systray_events() return self._get_first_event_with_attribute(events) - - def get_nb_roster_events(self, account=None, jid=None, types=None): - """ - Return the number of events displayed in roster - """ - if types is None: - types = [] - return self._get_nb_events(attribute='roster', - account=account, - jid=jid, - types=types) - - def get_roster_events(self): - """ - Return all events that must be displayed in roster: - {account1: {jid1: [ev1, ev2], },. } - """ - return self._get_some_events('roster') ===================================== gajim/common/helpers.py ===================================== @@ -602,11 +602,6 @@ def get_icon_name_to_show(contact, account=None): """ Get the icon name to show in online, away, requested, etc """ - if account and app.events.get_nb_roster_events(account, contact.jid): - return 'event' - if account and app.events.get_nb_roster_events(account, - contact.get_full_jid()): - return 'event' if account and account in app.interface.minimized_controls and \ contact.jid in app.interface.minimized_controls[account] and app.interface.\ minimized_controls[account][contact.jid].get_nb_unread_pm() > 0: ===================================== gajim/gtk/accounts.py ===================================== @@ -799,7 +799,7 @@ def _reset_send_read_marker(self, button): 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): + for ctrl in app.window.get_controls(account=self._account): ctrl.update_actions() ===================================== gajim/gtk/controls/base.py ===================================== @@ -37,10 +37,12 @@ from gi.repository import Gio from gajim.common import app -from gajim.common import events 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 @@ -920,6 +922,24 @@ def _on_message_textview_key_press_event(self, textview, event): def _on_autoscroll_changed(self, _widget, autoscroll): self._jump_to_end_button.toggle(not autoscroll) + if not autoscroll: + return + + # Check for unread messages and sendXEP-0333 Send <displayed> marker + type_ = ['chat-message', 'private-chat-message'] + jid = self.contact.jid + if self.is_groupchat: + type_ = ['group-chat-message'] + jid = self.contact.jid.bare + if not app.events.remove_events(self.account, + jid, + types=type_): + # There were events to remove + self._client.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) + self.last_msg_id = None def _on_jump_to_end(self, _button): self.scroll_to_end(force=True) @@ -1205,18 +1225,13 @@ def _add_message_event(self, text, msg_log_id, message_id, stanza_id): return if self.is_groupchat: - needs_highlight = helpers.message_needs_highlight( - text, self.contact.nickname, self._client.get_own_jid().bare) - if needs_highlight: - event_type = events.PrintedMarkedGcMsgEvent - else: - event_type = events.PrintedGcMsgEvent + event_type = GroupChatMsgEvent event = 'gc_message_received' else: if self.is_chat: - event_type = events.PrintedChatEvent + event_type = ChatMsgEvent else: - event_type = events.PrintedPmEvent + event_type = PrivateChatMsgEvent event = 'message_received' show_in_systray = get_show_in_systray( event_type.type_, self.account, self.contact.jid) @@ -1355,9 +1370,11 @@ def set_control_active(self, state): jid = self.contact.jid if self.conversation_view.autoscroll: # we are at the end - type_ = [f'printed_{self._type}'] - if self._type.is_groupchat: - type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] + type_ = ['chat-message'] + if self.is_groupchat: + type_ = ['group-chat-message'] + if self.is_privatechat: + type_ = ['private-chat-message'] if not app.events.remove_events(self.account, self.contact.jid, types=type_): ===================================== gajim/gtk/controls/chat.py ===================================== @@ -508,7 +508,8 @@ def _on_message_received(self, event): correct_id=event.correct_id, additional_data=event.additional_data) - self.conversation_view.set_read_marker(event.properties.id) + if kind == 'outgoing': + self.conversation_view.set_read_marker(event.properties.id) def _on_message_error(self, event): self.conversation_view.show_error(event.message_id, event.error) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -39,4 +39,5 @@ def __init__(self, account, contact): def set_timestamp(self, timestamp): self.timestamp = timestamp self.changed() + self.set_no_show_all(False) self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -213,6 +213,8 @@ def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + if message.kind == 'incoming': + self.set_read_marker(None) GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): ===================================== gajim/gtk/main.py ===================================== @@ -508,7 +508,7 @@ def on_continue(message): # check if we have unread messages # unread = app.events.get_nb_events() - # for event in app.events.get_all_events(['printed_gc_msg']): + # 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 ===================================== gajim/gtk/notification.py ===================================== @@ -130,9 +130,10 @@ def _on_notification(self, event): def _on_event_removed(self, event_list): for event in event_list: - if event.type_ in ('normal', 'printed_chat', 'chat', - 'printed_pm', 'pm', 'printed_marked_gc_msg', - 'printed_gc_msg', 'jingle-incoming'): + 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): ===================================== gajim/gtk/preferences.py ===================================== @@ -29,12 +29,9 @@ from gajim.common.multimedia_helpers import AudioOutputManager from gajim.common.multimedia_helpers import VideoInputManager -from gajim.gui.controls.base import BaseControl - from .const import Setting from .const import SettingKind from .const import SettingType -from .const import ControlType from .emoji_chooser import emoji_chooser from .settings import SettingsBox from .settings import SettingsDialog @@ -143,23 +140,6 @@ def update_theme_list(self): def update_proxy_list(self): self._prefs['miscellaneous'].update_proxy_list() - @staticmethod - def get_all_controls(): - for ctrl in app.interface.msg_win_mgr.get_controls(): - yield ctrl - for account in app.connections: - for ctrl in app.interface.minimized_controls[account].values(): - yield ctrl - - @staticmethod - def get_all_muc_controls(): - for ctrl in app.interface.msg_win_mgr.get_controls( - ControlType.GROUPCHAT): - yield ctrl - for account in app.connections: - for ctrl in app.interface.minimized_controls[account].values(): - yield ctrl - @staticmethod def _check_emoji_theme(): # Ensure selected emoji theme is valid @@ -309,9 +289,10 @@ def _on_show_avatar_in_roster_changed(*args): @staticmethod def _on_show_status_in_roster(*args): app.interface.roster.setup_and_draw_roster() - controls = get_app_window('Preferences').get_all_muc_controls() - for ctrl in controls: - ctrl.roster.draw_contacts() + + for ctrl in app.window.get_controls(): + if ctrl.is_groupchat: + ctrl.roster.draw_contacts() @staticmethod def _on_sort_by_show_in_roster(*args): @@ -395,9 +376,8 @@ def _on_use_speller(value, *args): if gspell_lang is None: gspell_lang = Gspell.language_get_default() app.settings.set('speller_language', gspell_lang.get_code()) - for ctrl in get_app_window('Preferences').get_all_controls(): - if isinstance(ctrl, BaseControl): - ctrl.set_speller() + for ctrl in app.window.get_controls(): + ctrl.set_speller() class GroupChats(PreferenceBox): @@ -457,8 +437,9 @@ def __init__(self, *args): @staticmethod def _on_sort_by_show_in_muc(*args): - for ctrl in get_app_window('Preferences').get_all_muc_controls(): - ctrl.roster.invalidate_sort() + for ctrl in app.window.get_controls(): + if ctrl.is_groupchat: + ctrl.roster.invalidate_sort() @staticmethod def _reset_join_left(button): @@ -822,8 +803,7 @@ def _on_emoticons_theme(self, *args): @staticmethod def _toggle_emoticons(): - controls = get_app_window('Preferences').get_all_controls() - for ctrl in controls: + for ctrl in app.window.get_controls(): ctrl.toggle_emoticons() ===================================== gajim/gtk/util.py ===================================== @@ -509,23 +509,11 @@ def get_metacontact_surface(icon_name, expanded, scale): return state_surface -def get_show_in_roster(event, session=None): - """ - Return True if this event must be shown in roster, else False - """ - if event == 'gc_message_received': - return True - if event == 'message_received': - if session and session.control: - return False - return True - - def get_show_in_systray(type_, account, jid): """ Return True if this event must be shown in systray, else False """ - if type_ == 'printed_gc_msg': + if type_ == 'group-chat-message': client = app.get_client(account) contact = client.get_module('Contacts').get_group_chat_contact(jid) return contact.can_notify() ===================================== gajim/gui_interface.py ===================================== @@ -262,9 +262,7 @@ def add_event(self, account, jid, event): 'file-completed': 'ft_finished' } event_type = event_types.get(event.type_) - # show_in_roster = get_show_in_roster(event_type, jid) show_in_systray = get_show_in_systray(event_type, account, jid) - # event.show_in_roster = show_in_roster event.show_in_systray = show_in_systray app.events.add_event(account, jid, event) @@ -289,15 +287,10 @@ 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 ( - 'gc_msg', - 'printed_gc_msg', - 'printed_marked_gc_msg', - 'pm', - 'printed_pm'): + 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 ('printed_chat', 'chat', ''): + 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 @@ -614,22 +607,18 @@ def handle_event_msgnotsent(event): @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'] + types = ['group-chat-message'] else: - types = ['chat', 'pm', 'printed_chat', 'printed_pm'] jid = event.jid + types = ['chat-message', 'private-chat-message'] - control = app.window.get_control(event.account, jid) + control = app.window.get_control(event.account, jid) + if control is None: + log.warning('No ChatControl found') + return - # Compare with control.last_msg_id. events_ = app.events.get_events(event.account, jid, types) if not events_: log.warning('No Events') @@ -643,10 +632,7 @@ def handle_event_read_state_sync(event): 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) + app.events.remove_events(event.account, jid, types=types) def handle_event_roster_info(self, obj): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) ===================================== gajim/remote_control.py ===================================== @@ -822,7 +822,7 @@ def _contacts_as_dbus_structure(self, contacts): def get_unread_msgs_number(self): unread = app.events.get_nb_events() - for event in app.events.get_all_events(['printed_gc_msg']): + for event in app.events.get_all_events(['group-chat-message']): contact = app.contacts.get_groupchat_contact(event.account, event.jid) if contact is None or not contact.can_notify(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/db1beffd0e5632c790ea935d9329564… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/db1beffd0e5632c790ea935d9329564… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Events: Remove obsolete UnsubscribedEvent
by Daniel Brötzmann (＠wurstsalat) 23 Aug '21

23 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 8598001c by wurstsalat at 2021-08-23T23:36:05+02:00 Events: Remove obsolete UnsubscribedEvent - - - - - de28d56c by wurstsalat at 2021-08-23T23:41:52+02:00 Events: Remove obsolete SubscriptionRequestEvent - - - - - db1beffd by wurstsalat at 2021-08-23T23:42:16+02:00 Events: Remove obsolete GcInvitationEvent - - - - - 4 changed files: - gajim/common/events.py - gajim/gtk/notification.py - gajim/gtk/notification_manager.py - gajim/gui_interface.py Changes: ===================================== gajim/common/events.py ===================================== @@ -29,7 +29,7 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): type_ in chat, normal, file-request, file-error, file-completed, file-request-error, file-send-error, file-stopped, gc_msg, pm, printed_chat, printed_gc_msg, printed_marked_gc_msg, printed_pm, - gc-invitation, subscription_request, unsubscribedm jingle-incoming + jingle-incoming parameters is (per type_): chat, normal, pm: [message, subject, kind, time, encrypted, @@ -39,9 +39,6 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): printed_chat: [message, subject, control, msg_log_id] printed_*: None messages that are already printed in chat, but not read - gc-invitation: [room_jid, reason, password, jid_from] - subscription_request: [text, nick] - unsubscribed: contact jingle-incoming: (fulljid, sessionid, content_types) """ if time_: @@ -140,53 +137,6 @@ class PrintedPmEvent(PrintedChatEvent): type_ = 'printed_pm' -class SubscriptionRequestEvent(Event): - - type_ = 'subscription_request' - - def __init__(self, - text, - nick, - time_=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) - self.text = text - self.nick = nick - - -class UnsubscribedEvent(Event): - - type_ = 'unsubscribed' - - def __init__(self, - contact, - time_=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) - self.contact = contact - - -class GcInvitationEvent(Event): - - type_ = 'gc-invitation' - - def __init__(self, event): - Event.__init__(self, - None, - show_in_roster=False, - show_in_systray=True) - for key, value in vars(event).items(): - setattr(self, key, value) - - class FileRequestEvent(Event): type_ = 'file-request' ===================================== gajim/gtk/notification.py ===================================== @@ -130,8 +130,6 @@ def _on_notification(self, event): def _on_event_removed(self, event_list): for event in event_list: - if event.type_ == 'gc-invitation': - self._withdraw('gc-invitation', event.account, event.muc) if event.type_ in ('normal', 'printed_chat', 'chat', 'printed_pm', 'pm', 'printed_marked_gc_msg', 'printed_gc_msg', 'jingle-incoming'): @@ -190,8 +188,8 @@ def popup(self, event_type, jid, account, type_='', icon_name=None, _('Contact Changed Status'), _('File Transfer Request'), _('File Transfer Error'), _('File Transfer Completed'), _('File Transfer Stopped'), _('Group Chat Invitation'), - _('Connection Failed'), _('Subscription request'), - _('Unsubscribed'), _('Incoming Call')): + _('Connection Failed'), _('Subscription Request'), + _('Contact Unsubscribed'), _('Incoming Call')): if 'actions' in self._daemon_capabilities: # Create Variant Dict dict_ = {'account': GLib.Variant('s', account), @@ -215,8 +213,6 @@ def popup(self, event_type, jid, account, type_='', icon_name=None, # Only one notification per JID if event_type == _('Contact Changed Status'): notif_id = self._make_id('contact-status-changed', account, jid) - elif event_type == _('Group Chat Invitation'): - notif_id = self._make_id('gc-invitation', account, room_jid) elif event_type == _('Connection Failed'): notif_id = self._make_id('connection-failed', account) elif event_type in (_('New Message'), ===================================== gajim/gtk/notification_manager.py ===================================== @@ -20,6 +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.helpers import get_groupchat_name from gajim.common.helpers import get_muc_context @@ -103,7 +104,6 @@ def _on_subscription_accept(self, _action, param): def _on_subscription_block(self, _action, param): jid = param.get_string() - app.events.remove_events(self._account, jid) self._deny_request(jid) self._client.get_module('Blocking').block([jid]) row = self._get_notification_row(jid) @@ -111,7 +111,6 @@ def _on_subscription_block(self, _action, param): def _on_subscription_report(self, _action, param): jid = param.get_string() - app.events.remove_events(self._account, jid) self._deny_request(jid) self._client.get_module('Blocking').block([jid], report='spam') row = self._get_notification_row(jid) @@ -137,6 +136,21 @@ def add_subscription_request(self, event): if row is None: 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) + elif row.type == 'unsubscribed': self.remove(row) @@ -144,6 +158,20 @@ def add_unsubscribed(self, event): row = self._get_notification_row(event.jid) 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) elif row.type == 'subscribe': self.remove(row) @@ -152,6 +180,26 @@ 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) + def add_invitation_declined(self, event): row = self._get_notification_row(event.muc) if row is None: ===================================== gajim/gui_interface.py ===================================== @@ -220,7 +220,6 @@ def _create_core_handlers_list(self): # 'roster-info': [self.handle_event_roster_info], 'metacontacts-received': [self.handle_event_metacontacts], 'roster-item-exchange-received': [self.handle_event_roster_item_exchange], - 'muc-invitation': [self.handle_event_gc_invitation], 'file-send-error': [self.handle_event_file_send_error], 'file-request-error': [self.handle_event_file_request_error], 'file-request-received': [self.handle_event_file_request], @@ -274,10 +273,6 @@ def add_event(self, account, jid, event): # if not has_queue: # We didn't have a queue: we change icons # if app.contacts.get_contact_with_highest_priority(account, jid): # self.roster.draw_contact(jid, account) - # else: - # groupchat = event.type_ == 'gc-invitation' - # self.roster.add_to_not_in_the_roster( - # account, jid, groupchat=groupchat) def handle_event(self, account, jid, type_): jid = JID.from_string(jid) @@ -311,24 +306,10 @@ def handle_event(self, account, jid, type_): app.window.select_chat(account, jid.bare) elif type_ in file_event_types: self._handle_event_jingle_file(account, jid, type_) - elif type_ == 'gc-invitation': - event = app.events.get_first_event(account, jid, type_) - if event is None: - return - app.window.show_account_page(account) - app.events.remove_events(account, jid, event) - elif type_ == 'subscription_request': - event = app.events.get_first_event(account, jid, type_) - if event is None: - return + elif type_ in ('subscription-request', + 'unsubscribed', + 'gc-invitation'): app.window.show_account_page(account) - app.events.remove_events(account, jid, event) - elif type_ == 'unsubscribed': - event = app.events.get_first_event(account, jid, type_) - if event is None: - return - app.window.show_account_page(account) - app.events.remove_events(account, jid, event) app.window.present() @@ -734,32 +715,6 @@ def handle_event_roster_item_exchange(event): event.exchange_items_list, event.fjid) - def handle_event_gc_invitation(self, event): - event = events.GcInvitationEvent(event) - - client = app.get_client(event.account) - if get_muc_context(event.muc) == 'public': - jid = event.from_ - else: - jid = event.from_.bare - - self.add_event(event.account, jid, event) - - if helpers.allow_showing_notification(event.account): - contact = 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), - event.account, - 'gc-invitation', - 'gajim-gc_invitation', - event_type, - text, - room_jid=event.muc) - # Jingle File Transfer def handle_event_file_send_error(self, event): file_transfers = self.instances['file_transfers'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7e50503482c3424197d7df44ec8f4e0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7e50503482c3424197d7df44ec8f4e0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 5 commits: ChatMarkers: Fix markers for PMs
by Daniel Brötzmann (＠wurstsalat) 22 Aug '21

22 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 39579f31 by wurstsalat at 2021-08-22T21:15:34+02:00 ChatMarkers: Fix markers for PMs - - - - - e3621452 by wurstsalat at 2021-08-22T21:41:25+02:00 Refactor MUC highlighting - - - - - c9f2805e by wurstsalat at 2021-08-22T21:51:33+02:00 Bring back message notifications - - - - - 72233d4a by wurstsalat at 2021-08-22T21:55:22+02:00 ChatControl: Fix banner spacing for chatstates - - - - - 7e505034 by wurstsalat at 2021-08-22T23:49:52+02:00 BaseControl: Add message event on new message - - - - - 11 changed files: - gajim/app_actions.py - gajim/common/connection_handlers_events.py - gajim/common/helpers.py - gajim/common/modules/chat_markers.py - gajim/gtk/controls/base.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/manage_sounds.py - gajim/gtk/notification.py - gajim/gui_interface.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -243,10 +243,11 @@ def on_remove_event(_action, param): account, jid, type_ = dict_['account'], dict_['jid'], dict_['type_'] event = app.events.get_first_event(account, jid, type_) app.events.remove_events(account, jid, event) - win = app.interface.msg_win_mgr.get_window(jid, account) - if win: - win.redraw_tab(win.get_control(jid, account)) - win.show_title() + # TODO reset unread counter, urgency hint, etc. + # win = app.interface.msg_win_mgr.get_window(jid, account) + # if win: + # win.redraw_tab(win.get_control(jid, account)) + # win.show_title() # Other Actions ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -130,7 +130,31 @@ def generate(self): self.file_props.transfered_size = [] 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' base_network_events = ['gc-message-received', 'presence-received'] ===================================== gajim/common/helpers.py ===================================== @@ -455,10 +455,11 @@ def get_contact_dict_for_account(account): return contacts_dict -def play_sound(event): - if not app.settings.get('sounds_on'): - return - play_sound_file(app.settings.get_soundevent_settings(event)['path']) +def play_sound(sound_event, account, force=False): + if force or allow_sound_notification(account, sound_event): + play_sound_file( + app.settings.get_soundevent_settings(sound_event)['path']) + def check_soundfile_path(file_, dirs=None): """ @@ -678,6 +679,35 @@ def get_os_info(): info = platform.system() return info + +def message_needs_highlight(text, nickname, own_jid): + """ + Check text to see whether any of the words in (muc_highlight_words and + nick) appear + """ + special_words = app.settings.get('muc_highlight_words').split(';') + special_words.append(nickname) + special_words.append(own_jid) + # Strip empties: ''.split(';') == [''] and would highlight everything. + # Also lowercase everything for case insensitive compare. + special_words = [word.lower() for word in special_words if word] + text = text.lower() + + for special_word in special_words: + found_here = text.find(special_word) + while found_here > -1: + end_here = found_here + len(special_word) + if ((found_here == 0 or not text[found_here - 1].isalpha()) and + (end_here == len(text) or not text[end_here].isalpha())): + # It is beginning of text or char before is not alpha AND + # it is end of text or char after is not alpha + return True + # continue searching + start = found_here + 1 + found_here = text.find(special_word, start) + return False + + def allow_showing_notification(account): if not app.settings.get('show_notifications'): return False @@ -687,24 +717,30 @@ def allow_showing_notification(account): return True return False + def allow_popup_window(account): """ Is it allowed to popup windows? """ autopopup = app.settings.get('autopopup') autopopupaway = app.settings.get('autopopupaway') - if autopopup and (autopopupaway or \ - app.connections[account].status in ('online', 'chat')): + client = app.get_client(account) + if autopopup and (autopopupaway or client.status == 'online'): return True return False + def allow_sound_notification(account, sound_event): - if (app.settings.get('sounddnd') or - app.connections[account].status != 'dnd' and - app.settings.get_soundevent_settings(sound_event)['enabled']): + if not app.settings.get('sounds_on'): + return False + client = app.get_client(account) + if client.status != 'online' and not app.settings.get('sounddnd'): + return False + if app.settings.get_soundevent_settings(sound_event)['enabled']: return True return False + def get_current_show(account): if account not in app.connections: return 'offline' ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -96,7 +96,7 @@ def _raise_event(self, name, properties): def _send_marker(self, contact, marker, id_, type_): jid = contact.jid if contact.is_pm_contact: - jid = app.get_jid_without_resource(contact.jid) + jid = contact.jid.bare if type_ in ('gc', 'pm'): if not app.settings.get_group_chat_setting( ===================================== gajim/gtk/controls/base.py ===================================== @@ -37,6 +37,7 @@ from gi.repository import Gio from gajim.common import app +from gajim.common import events from gajim.common import helpers from gajim.common import ged from gajim.common import i18n @@ -45,6 +46,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.const import KindConstant from gajim.common.structs import OutgoingMessage +from gajim.common.connection_handlers_events import NotificationEvent from gajim import gtkgui_helpers @@ -57,6 +59,7 @@ from gajim.gui.message_input import MessageInputTextView from gajim.gui.util import get_hardware_key_codes from gajim.gui.util import get_builder +from gajim.gui.util import get_show_in_systray from gajim.gui.util import AccountBadge from gajim.gui.const import ControlType # pylint: disable=unused-import from gajim.gui.emoji_chooser import emoji_chooser @@ -1120,15 +1123,113 @@ def add_message(self, # Record the history of received messages self.save_message(text, 'received') + # 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 - if app.window.is_chat_active(self.account, self.contact.jid): - if not self._scrolled_view.get_autoscroll(): - return + chat_active = app.window.is_chat_active( + self.account, self.contact.jid) + if chat_active and self._scrolled_view.get_autoscroll(): self._client.get_module('ChatMarkers').send_displayed_marker( self.contact, self.last_msg_id, self._type) + def _notify(self, name, text, tim): + if app.window.is_chat_active(self.account, self.contact.jid): + if self._scrolled_view.get_autoscroll(): + return + + popup_event_type = _('New Message') + popup_title = _('New message from %s') % name + needs_highlight = False + + if self.is_chat: + popup_msg_type = 'chat' + sound_event = 'first_message_received' + + if self.is_groupchat: + popup_msg_type = 'gc_msg' + popup_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' + else: + sound_event = 'muc_message_received' + if not self.contact.can_notify(): + sound_event = None + + if self.is_privatechat: + popup_msg_type = 'pm' + popup_title += f' (private in {self.room_name})' + sound_event = '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 + + 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 + + popup_enabled = False + if app.settings.get('autopopupaway'): + popup_enabled = True + if self._client.status == 'online': + popup_enabled = True + 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) + + 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: + needs_highlight = helpers.message_needs_highlight( + text, self.contact.nickname, self._client.get_own_jid().bare) + if needs_highlight: + event_type = events.PrintedMarkedGcMsgEvent + else: + event_type = events.PrintedGcMsgEvent + event = 'gc_message_received' + else: + if self.is_chat: + event_type = events.PrintedChatEvent + else: + event_type = events.PrintedPmEvent + event = 'message_received' + show_in_systray = get_show_in_systray( + event_type.type_, self.account, self.contact.jid) + + event = event_type(text, + '', + self, + msg_log_id, + message_id=message_id, + stanza_id=stanza_id, + show_in_systray=show_in_systray) + app.events.add_event(self.account, str(self.contact.jid), event) + def toggle_emoticons(self): """ Hide show emoticons_button ===================================== gajim/gtk/controls/chat.py ===================================== @@ -878,7 +878,7 @@ def draw_banner_text(self): label_text = f'{name}' \ f'' \ - f'{chatstate}' + f' {chatstate}' label_tooltip = f'{name} {chatstate}' else: label_text = f'{name}' ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -683,7 +683,10 @@ def _on_gc_message_received(self, event): message_id=event.properties.id, stanza_id=stanza_id, additional_data=event.additional_data) - event.needs_highlight = self.needs_visual_notification(event.msgtxt) + event.needs_highlight = helpers.message_needs_highlight( + event.msgtxt, + self.contact.nickname, + self._client.get_own_jid().bare) def add_message(self, text, @@ -702,56 +705,23 @@ def add_message(self, # muc-specific chatstate if kind == 'incoming': - # highlighting and sounds - highlight, _sound = self.highlighting_for_message(text, tim) - # other_tags_for_name.append('muc_nickname_color_%s' % contact) - # if highlight: - # other_tags_for_name.append('bold') - # other_tags_for_text.append('marked') + highlight = helpers.message_needs_highlight( + text, self.contact.nickname, self._client.get_own_jid().bare) self._nick_completion.record_message(contact, highlight) # self.check_focus_out_line() BaseControl.add_message(self, - text, - kind, - contact, - tim, - displaymarking=displaymarking, - correct_id=correct_id, - message_id=message_id, - stanza_id=stanza_id, - additional_data=additional_data) - - def highlighting_for_message(self, text, tim): - """ - Returns a 2-Tuple. The first says whether or not to highlight the text, - the second, what sound to play - """ - highlight, sound = None, None - - notify = self.contact.can_notify() - sound_enabled = app.settings.get_soundevent_settings( - 'muc_message_received')['enabled'] - - # Are any of the defined highlighting words in the text? - if self.needs_visual_notification(text): - highlight = True - sound_settings = app.settings.get_soundevent_settings( - 'muc_message_highlight') - if sound_settings['enabled']: - sound = 'highlight' - - # Do we play a sound on every muc message? - elif notify and sound_enabled: - sound = '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 = None - - return highlight, sound + text, + kind, + contact, + tim, + displaymarking=displaymarking, + correct_id=correct_id, + message_id=message_id, + stanza_id=stanza_id, + additional_data=additional_data) def check_focus_out_line(self): """ @@ -765,33 +735,6 @@ def check_focus_out_line(self): # self.conv_textview.show_focus_out_line() - def needs_visual_notification(self, text): - """ - Check text to see whether any of the words in (muc_highlight_words and - nick) appear - """ - special_words = app.settings.get('muc_highlight_words').split(';') - special_words.append(self.contact.nickname) - special_words.append(self._client.get_own_jid().bare) - # Strip empties: ''.split(';') == [''] and would highlight everything. - # Also lowercase everything for case insensitive compare. - special_words = [word.lower() for word in special_words if word] - text = text.lower() - - for special_word in special_words: - found_here = text.find(special_word) - while found_here > -1: - end_here = found_here + len(special_word) - if (found_here == 0 or not text[found_here - 1].isalpha()) and \ - (end_here == len(text) or not text[end_here].isalpha()): - # It is beginning of text or char before is not alpha AND - # it is end of text or char after is not alpha - return True - # continue searching - start = found_here + 1 - found_here = text.find(special_word, start) - return False - def _on_room_subject(self, _contact, _signal_name, properties): if self.subject == properties.subject: # Probably a rejoin, we already showed that subject ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -24,6 +24,7 @@ from gajim.common.const import TRUST_SYMBOL_DATA from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context +from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string from gajim.common.styling import process @@ -156,10 +157,11 @@ def __init__(self, self.show_all() def _check_for_highlight(self, content): - highlight_words = app.settings.get('muc_highlight_words').split(';') - highlight_words.append(app.nicks[self._account]) - highlight_words = [word.lower() for word in highlight_words if word] - if any(match in content.text.lower() for match in highlight_words): + needs_highlight = message_needs_highlight( + content.text, + self._contact.nickname, + self._client.get_own_jid().bare) + if needs_highlight: self.get_style_context().add_class( 'conversation-mention-highlight') ===================================== gajim/gtk/manage_sounds.py ===================================== @@ -131,7 +131,7 @@ def _on_clear(self, *args): def _on_play(self, *args): model, iter_ = self._ui.sounds_treeview.get_selection().get_selected() snd_event_config_name = model[iter_][3] - play_sound(snd_event_config_name) + play_sound(snd_event_config_name, None, force=True) def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: ===================================== gajim/gtk/notification.py ===================================== @@ -96,26 +96,31 @@ def on_proxy_ready(_source, res, _data=None): None, on_proxy_ready) - def _nec_notification(self, obj): - if obj.do_popup: - icon_name = self._get_icon_name(obj) - self.popup(obj.popup_event_type, str(obj.jid), obj.conn.name, - obj.popup_msg_type, icon_name=icon_name, - title=obj.popup_title, text=obj.popup_text, - timeout=obj.popup_timeout) - - if obj.do_sound: - if obj.sound_file: - helpers.play_sound_file(obj.sound_file) - elif obj.sound_event: - helpers.play_sound(obj.sound_event) - - if obj.do_command: + def _nec_notification(self, event): + if event.popup_enabled and app.settings.get('show_notifications'): + 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: + # Used by Triggers plugin try: - helpers.exec_command(obj.command, use_shell=True) + helpers.exec_command(event.command, use_shell=True) except Exception: pass + if event.sound_file: + # Allow override here, used by Triggers plugin + helpers.play_sound_file(event.sound_file) + elif event.sound_event: + helpers.play_sound(event.sound_event, event.account) + def _on_notification(self, event): self.popup(event.type_, None, @@ -137,15 +142,14 @@ def _nec_our_status(self, event): self._withdraw('connection-failed', event.account) @staticmethod - def _get_icon_name(obj): - if obj.notif_type == 'msg': - if obj.base_event.properties.is_muc_pm: - return 'gajim-priv_msg_recv' - - elif obj.notif_type == 'pres': - if obj.transport_name is not None: - return '%s-%s' % (obj.transport_name, obj.show) - return get_icon_name(obj.show) + 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, ===================================== gajim/gui_interface.py ===================================== @@ -610,7 +610,7 @@ def handle_event_msgsent(event): if enabled: if isinstance(event.jid, list) and len(event.jid) > 1: return - helpers.play_sound('message_sent') + helpers.play_sound('message_sent', event.account) @staticmethod def handle_event_msgnotsent(event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/94475a7e1a81706d58b98501165e7ee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/94475a7e1a81706d58b98501165e7ee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] BaseControl: Send chat marker if we're following the chat
by Daniel Brötzmann (＠wurstsalat) 21 Aug '21

21 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 94475a7e by wurstsalat at 2021-08-21T13:53:43+02:00 BaseControl: Send chat marker if we're following the chat - - - - - 1 changed file: - gajim/gtk/controls/base.py Changes: ===================================== gajim/gtk/controls/base.py ===================================== @@ -1121,14 +1121,13 @@ def add_message(self, self.save_message(text, 'received') # Send chat marker if we’re actively following the chat - # if self.parent_win and self.contact.settings.get('send_marker'): - # if (self.parent_win.get_active_control() == self and - # self.parent_win.is_active() and - # self.has_focus() and end): - # self._client.get_module('ChatMarkers').send_displayed_marker( - # self.contact, - # self.last_msg_id, - # self._type) + if app.window.is_chat_active(self.account, self.contact.jid): + if not self._scrolled_view.get_autoscroll(): + return + self._client.get_module('ChatMarkers').send_displayed_marker( + self.contact, + self.last_msg_id, + self._type) def toggle_emoticons(self): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/94475a7e1a81706d58b98501165e7eee… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/94475a7e1a81706d58b98501165e7eee… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 9 commits: Contacts: Add back can_notify
by Daniel Brötzmann (＠wurstsalat) 20 Aug '21

20 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e6b3496b by wurstsalat at 2021-08-21T00:46:57+02:00 Contacts: Add back can_notify - - - - - f96acda2 by wurstsalat at 2021-08-21T00:47:00+02:00 Events: Linting - - - - - 818badbe by wurstsalat at 2021-08-21T00:47:00+02:00 Events: Remove unused method - - - - - 5e75b75d by wurstsalat at 2021-08-21T00:47:00+02:00 ChatControl: Remove group chat invitations from infobar - - - - - 9c29db09 by wurstsalat at 2021-08-21T00:47:00+02:00 Interface: Remove unused method - - - - - 136ffbf9 by wurstsalat at 2021-08-21T00:47:00+02:00 JingleIncoming: Use event.jid for notifications - - - - - 4dbbdad0 by wurstsalat at 2021-08-21T01:23:47+02:00 Interface: Linting - - - - - e512becb by wurstsalat at 2021-08-21T01:23:52+02:00 Interface: Adapt add_event and handle_event - - - - - 8219c428 by wurstsalat at 2021-08-21T01:46:01+02:00 Interface: Reorder functions and methods - - - - - 6 changed files: - gajim/common/events.py - gajim/common/modules/contacts.py - gajim/gtk/controls/chat.py - gajim/gtk/controls/groupchat.py - gajim/gtk/util.py - gajim/gui_interface.py Changes: ===================================== gajim/common/events.py ===================================== @@ -22,14 +22,8 @@ import time -from gajim.common import app - class Event: - """ - Information concerning each event - """ - def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): """ type_ in chat, normal, file-request, file-error, file-completed, @@ -38,18 +32,17 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): gc-invitation, subscription_request, unsubscribedm jingle-incoming parameters is (per type_): - chat, normal, pm: [message, subject, kind, time, encrypted, resource, - msg_log_id] - where kind in error, incoming - file-*: file_props - gc_msg: None - printed_chat: [message, subject, control, msg_log_id] - printed_*: None - messages that are already printed in chat, but not read - gc-invitation: [room_jid, reason, password, jid_from] - subscription_request: [text, nick] - unsubscribed: contact - jingle-incoming: (fulljid, sessionid, content_types) + chat, normal, pm: [message, subject, kind, time, encrypted, + resource, msg_log_id] + where kind in error, incoming + file-*: file_props + printed_chat: [message, subject, control, msg_log_id] + printed_*: None + messages that are already printed in chat, but not read + gc-invitation: [room_jid, reason, password, jid_from] + subscription_request: [text, nick] + unsubscribed: contact + jingle-incoming: (fulljid, sessionid, content_types) """ if time_: self.time_ = time_ @@ -61,14 +54,30 @@ def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): self.jid = None self.account = None + class ChatEvent(Event): + type_ = 'chat' - def __init__(self, message, subject, kind, time_, resource, - msg_log_id, correct_id=None, message_id=None, session=None, - displaymarking=None, sent_forwarded=False, show_in_roster=False, - show_in_systray=True, additional_data=None): - Event.__init__(self, time_, show_in_roster=show_in_roster, - show_in_systray=show_in_systray) + + def __init__(self, + message, + subject, + kind, + time_, + resource, + msg_log_id, + correct_id=None, + message_id=None, + session=None, + displaymarking=None, + sent_forwarded=False, + show_in_roster=False, + show_in_systray=True, + additional_data=None): + Event.__init__(self, + time_, + show_in_roster=show_in_roster, + show_in_systray=show_in_systray) self.message = message self.subject = subject self.kind = kind @@ -82,18 +91,31 @@ def __init__(self, message, subject, kind, time_, resource, self.sent_forwarded = sent_forwarded if additional_data is None: from gajim.common.helpers import AdditionalDataDict - additional_data = AdditionalDataDict() - self.additional_data = additional_data + self.additional_data = AdditionalDataDict() + class PmEvent(ChatEvent): + type_ = 'pm' + class PrintedChatEvent(Event): + type_ = 'printed_chat' - def __init__(self, message, subject, control, msg_log_id, time_=None, - message_id=None, stanza_id=None, show_in_roster=False, + + def __init__(self, + message, + subject, + control, + msg_log_id, + time_=None, + message_id=None, + stanza_id=None, + show_in_roster=False, show_in_systray=True): - Event.__init__(self, time_, show_in_roster=show_in_roster, + Event.__init__(self, + time_, + show_in_roster=show_in_roster, show_in_systray=show_in_systray) self.message = message self.subject = subject @@ -102,90 +124,138 @@ def __init__(self, message, subject, control, msg_log_id, time_=None, self.message_id = message_id self.stanza_id = stanza_id + class PrintedGcMsgEvent(PrintedChatEvent): + type_ = 'printed_gc_msg' + class PrintedMarkedGcMsgEvent(PrintedChatEvent): + type_ = 'printed_marked_gc_msg' + class PrintedPmEvent(PrintedChatEvent): + type_ = 'printed_pm' + class SubscriptionRequestEvent(Event): + type_ = 'subscription_request' - def __init__(self, text, nick, time_=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) + + def __init__(self, + text, + nick, + time_=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) self.text = text self.nick = nick + class UnsubscribedEvent(Event): + type_ = 'unsubscribed' - def __init__(self, contact, time_=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) + + def __init__(self, + contact, + time_=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) self.contact = contact -class GcInvitationtEvent(Event): + +class GcInvitationEvent(Event): + type_ = 'gc-invitation' + def __init__(self, event): - Event.__init__(self, None, show_in_roster=False, show_in_systray=True) + Event.__init__(self, + None, + show_in_roster=False, + show_in_systray=True) for key, value in vars(event).items(): setattr(self, key, value) - def get_inviter_name(self): - if self.from_.bare_match(self.muc): - return self.from_.resource - - contact = app.contacts.get_first_contact_from_jid( - self.account, self.from_.bare) - if contact is None: - return str(self.from_) - return contact.get_shown_name() class FileRequestEvent(Event): + type_ = 'file-request' - def __init__(self, file_props, time_=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) + + def __init__(self, + file_props, + time_=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) self.file_props = file_props + class FileSendErrorEvent(FileRequestEvent): + type_ = 'file-send-error' + class FileErrorEvent(FileRequestEvent): + type_ = 'file-error' + class FileRequestErrorEvent(FileRequestEvent): + type_ = 'file-request-error' + class FileCompletedEvent(FileRequestEvent): + type_ = 'file-completed' + class FileStoppedEvent(FileRequestEvent): + type_ = 'file-stopped' + class FileHashErrorEvent(FileRequestEvent): + type_ = 'file-hash-error' + class JingleIncomingEvent(Event): + type_ = 'jingle-incoming' - def __init__(self, peerjid, sid, content_types, time_=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) + + def __init__(self, + peerjid, + sid, + content_types, + time_=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) self.peerjid = peerjid self.sid = sid self.content_types = content_types -class Events: - """ - Information concerning all events - """ +class Events: def __init__(self): - self._events = {} # list of events {acct: {jid1: [E1, E2]}, } + self._events = {} # list of events {acct: {jid1: [E1, E2]}, } self._event_added_listeners = [] self._event_removed_listeners = [] @@ -193,7 +263,7 @@ def event_added_subscribe(self, listener): """ Add a listener when an event is added to the queue """ - if not listener in self._event_added_listeners: + if listener not in self._event_added_listeners: self._event_added_listeners.append(listener) def event_added_unsubscribe(self, listener): @@ -207,7 +277,7 @@ def event_removed_subscribe(self, listener): """ Add a listener when an event is removed from the queue """ - if not listener in self._event_removed_listeners: + if listener not in self._event_removed_listeners: self._event_removed_listeners.append(listener) def event_removed_unsubscribe(self, listener): @@ -235,16 +305,16 @@ def remove_account(self, account): del self._events[account] def add_event(self, account, jid, event): - # No such account before ? if account not in self._events: self._events[account] = {jid: [event]} - # no such jid before ? 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_events(self, account, jid, event=None, types=None): @@ -258,18 +328,19 @@ def remove_events(self, account, jid, event=None, types=None): return True if jid not in self._events[account]: return True - if event: # remove only one event + + 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 + return False return True if types: - new_list = [] # list of events to keep - removed_list = [] # list of removed events + 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) @@ -277,12 +348,14 @@ def remove_events(self, account, jid, event=None, types=None): 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 + return False + # No event nor type given, remove them all removed_list = self._events[account][jid] del self._events[account][jid] @@ -306,16 +379,19 @@ def get_nb_events(self, types=None, account=None): 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: [] + 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 = {} # list of events + events_list = {} for jid_ in self._events[account]: events = [] for ev in self._events[account][jid_]: @@ -324,9 +400,11 @@ def get_events(self, account, jid=None, types=None): if events: events_list[jid_] = events return events_list + if jid not in self._events[account]: return [] - events_list = [] # list of events + + events_list = [] for ev in self._events[account][jid]: if not types or ev.type_ in types: events_list.append(ev) @@ -348,6 +426,7 @@ def get_first_event(self, account=None, jid=None, type_=None): """ 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 @@ -358,7 +437,8 @@ def get_first_event(self, account=None, jid=None, type_=None): first_event = event return first_event - def _get_nb_events(self, account=None, jid=None, attribute=None, types=None): + def _get_nb_events(self, account=None, jid=None, attribute=None, + types=None): """ Return the number of pending events """ @@ -382,9 +462,9 @@ def _get_nb_events(self, account=None, jid=None, attribute=None, types=None): for event in self._events[acct][j]: if types and event.type_ not in types: continue - if not attribute or \ - attribute == 'systray' and event.show_in_systray or \ - attribute == 'roster' and event.show_in_roster: + if (not attribute or + attribute == 'systray' and event.show_in_systray or + attribute == 'roster' and event.show_in_roster): nb += 1 return nb @@ -398,8 +478,8 @@ def _get_some_events(self, attribute): for jid in self._events[account]: events[account][jid] = [] for event in self._events[account][jid]: - if attribute == 'systray' and event.show_in_systray or \ - attribute == 'roster' and event.show_in_roster: + if (attribute == 'systray' and event.show_in_systray or + attribute == 'roster' and event.show_in_roster): events[account][jid].append(event) if not events[account][jid]: del events[account][jid] @@ -407,10 +487,10 @@ def _get_some_events(self, attribute): del events[account] return events - def _get_first_event_with_attribute(self, events): + @staticmethod + def _get_first_event_with_attribute(events): """ - Get the first event - + Get the first event. events is in the form {account1: {jid1: [ev1, ev2], },. } """ # be sure it's bigger than latest event @@ -453,8 +533,10 @@ def get_nb_roster_events(self, account=None, jid=None, types=None): """ if types is None: types = [] - return self._get_nb_events(attribute='roster', account=account, - jid=jid, types=types) + return self._get_nb_events(attribute='roster', + account=account, + jid=jid, + types=types) def get_roster_events(self): """ ===================================== gajim/common/modules/contacts.py ===================================== @@ -441,6 +441,11 @@ def get_user_nicknames(self): def get_disco(self, max_age=0): return app.storage.cache.get_last_disco_info(self.jid, max_age=max_age) + def can_notify(self): + all_ = app.settings.get('notify_on_all_muc_messages') + room = self.settings.get('notify_on_all_messages') + return all_ or room + class GroupchatParticipant(CommonContact): def __init__(self, logger, jid, account): ===================================== gajim/gtk/controls/chat.py ===================================== @@ -1199,32 +1199,9 @@ def _got_file_error(self, file_props, type_, pri_txt, sec_txt): file_props, Gtk.MessageType.ERROR) - def _on_accept_gc_invitation(self, _widget, event): - app.interface.show_or_join_groupchat(self.account, - str(event.muc), - password=event.password) - app.events.remove_events(self.account, self.contact.jid, event=event) - - def _on_cancel_gc_invitation(self, _widget, event): - app.events.remove_events(self.account, self.contact.jid, event=event) - - def _get_gc_invitation(self, event): - markup = '%s\n%s' % (_('Group Chat Invitation'), event.muc) - if event.reason: - markup += '\n(%s)' % event.reason - button_decline = Gtk.Button.new_with_mnemonic(_('_Decline')) - button_decline.connect('clicked', self._on_cancel_gc_invitation, event) - button_accept = Gtk.Button.new_with_mnemonic(_('_Accept')) - button_accept.connect('clicked', self._on_accept_gc_invitation, event) - self._add_info_bar_message( - markup, - [button_decline, button_accept], - (event.muc, event.reason), - Gtk.MessageType.QUESTION) - def _on_reject_call(self, _button, event): app.events.remove_events( - self.account, self.contact.jid, types='jingle-incoming') + self.account, event.jid, types='jingle-incoming') session = self._client.get_module('Jingle').get_jingle_session( event.peerjid, event.sid) @@ -1239,7 +1216,7 @@ def _on_reject_call(self, _button, event): def _on_accept_call(self, _button, event): app.events.remove_events( - self.account, self.contact.jid, types='jingle-incoming') + self.account, event.jid, types='jingle-incoming') session = self._client.get_module('Jingle').get_jingle_session( event.peerjid, event.sid) @@ -1300,5 +1277,3 @@ def on_event_added(self, event): event.type_, _('File transfer cancelled'), _('Connection with peer cannot be established.')) - elif event.type_ == 'gc-invitation': - self._get_gc_invitation(event) ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -731,9 +731,7 @@ def highlighting_for_message(self, text, tim): """ highlight, sound = None, None - # notify = self.contact.can_notify() - # TODO - notify = False + notify = self.contact.can_notify() sound_enabled = app.settings.get_soundevent_settings( 'muc_message_received')['enabled'] ===================================== gajim/gtk/util.py ===================================== @@ -526,11 +526,10 @@ def get_show_in_systray(type_, account, jid): Return True if this event must be shown in systray, else False """ if type_ == 'printed_gc_msg': - contact = app.contacts.get_groupchat_contact(account, jid) - if contact is not None: - return contact.can_notify() - # it's not an highlighted message, don't show in systray - return False + client = app.get_client(account) + contact = client.get_module('Contacts').get_group_chat_contact(jid) + return contact.can_notify() + return app.settings.get('trayicon_notification_on_events') ===================================== gajim/gui_interface.py ===================================== @@ -46,8 +46,10 @@ from gi.repository import GLib from gi.repository import Gio from gi.repository import Soup + from nbxmpp import idlequeue from nbxmpp import Hashes2 +from nbxmpp import JID from gajim.common import app from gajim.common import events @@ -58,9 +60,6 @@ from gajim import gui_menu_builder from gajim.dialog_messages import get_dialog -from gajim.gui.controls.base import BaseControl -from gajim.gui.controls.groupchat import GroupchatControl - from gajim.common import idle from gajim.common.zeroconf import connection_zeroconf from gajim.common import proxy65_manager @@ -69,8 +68,6 @@ from gajim.common import passwords from gajim.common.helpers import ask_for_status_message from gajim.common.helpers import get_muc_context -from gajim.common.helpers import get_group_chat_nick -from gajim.common.structs import MUCData from gajim.common.structs import OutgoingMessage from gajim.common.nec import NetworkEvent from gajim.common.nec import NetworkEventsController @@ -99,23 +96,20 @@ from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.roster_item_exchange import RosterItemExchangeWindow from gajim.gui.main import MainWindow -from gajim.gui.util import get_show_in_roster from gajim.gui.util import get_show_in_systray -from gajim.gui.util import open_window from gajim.gui.util import get_app_window from gajim.gui.util import get_app_windows from gajim.gui.util import get_color_for_account -from gajim.gui.const import ControlType - log = logging.getLogger('gajim.interface') + class Interface: def __init__(self): app.interface = self app.thread_interface = ThreadInterface - self.pass_dialog = {} + self._passphrase_dialogs = {} self.handlers = {} self.roster = None @@ -143,8 +137,8 @@ def __init__(self): app.nec = NetworkEventsController() app.notification = Notification() - self.create_core_handlers_list() - self.register_core_handlers() + self._create_core_handlers_list() + self._register_core_handlers() # self.create_zeroconf_default_config() # if app.settings.get_account_setting(app.ZEROCONF_ACC_NAME, 'active') \ @@ -163,8 +157,13 @@ def __init__(self): self.instances = {} for a in app.connections: - self.instances[a] = {'infos': {}, 'disco': {}, 'gc_config': {}, - 'search': {}, 'sub_request': {}} + self.instances[a] = { + 'infos': {}, + 'disco': {}, + 'gc_config': {}, + 'search': {}, + 'sub_request': {} + } app.contacts.add_account(a) app.groups[a] = {} app.gc_connected[a] = {} @@ -194,55 +193,264 @@ def __init__(self): from gajim.gui.emoji_chooser import emoji_chooser emoji_chooser.load() - self.last_ftwindow_update = 0 + self._last_ftwindow_update = 0 self._network_monitor = Gio.NetworkMonitor.get_default() self._network_monitor.connect('notify::network-available', self._network_status_changed) - self.network_state = self._network_monitor.get_network_available() + self._network_state = self._network_monitor.get_network_available() + + def _create_core_handlers_list(self): + # pyline: disable=line-too-long + 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], + 'client-cert-passphrase': [self.handle_event_client_cert_passphrase], + 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], + 'signed-in': [self.handle_event_signed_in], + 'presence-received': [self.handle_event_presence], + 'our-show': [self.handle_event_status], + 'message-sent': [self.handle_event_msgsent], + 'message-not-sent': [self.handle_event_msgnotsent], + 'read-state-sync': [self.handle_event_read_state_sync], + # 'roster-info': [self.handle_event_roster_info], + 'metacontacts-received': [self.handle_event_metacontacts], + 'roster-item-exchange-received': [self.handle_event_roster_item_exchange], + 'muc-invitation': [self.handle_event_gc_invitation], + 'file-send-error': [self.handle_event_file_send_error], + 'file-request-error': [self.handle_event_file_request_error], + 'file-request-received': [self.handle_event_file_request], + 'jingle-connected-received': [self.handle_event_jingle_connected], + 'jingle-disconnected-received': [self.handle_event_jingle_disconnected], + 'jingle-error-received': [self.handle_event_jingle_error], + 'jingle-request-received': [self.handle_event_jingle_incoming], + 'jingle-ft-cancelled-received': [self.handle_event_jingleft_cancel], + } + # pylint: enable=line-too-long + + def _register_core_handlers(self): + """ + Register core handlers in Global Events Dispatcher (GED). + + This is part of rewriting whole events handling system to use GED. + """ + for event_name, event_handlers in self.handlers.items(): + for event_handler in event_handlers: + prio = ged.GUI1 + if isinstance(event_handler, tuple): + prio = event_handler[1] + event_handler = event_handler[0] + app.ged.register_event_handler( + event_name, + prio, + event_handler) + + def add_event(self, account, jid, event): + """ + Add an event to the app.events var + """ + # We add it to the app.events queue + # Do we have a queue? + # has_queue = len(app.events.get_events(account, jid)) > 0 + # event can be in common.events.* + # event_type can be in advancedNotificationWindow.events_list + event_types = { + 'file-request': 'ft_request', + 'file-completed': 'ft_finished' + } + event_type = event_types.get(event.type_) + # show_in_roster = get_show_in_roster(event_type, jid) + show_in_systray = get_show_in_systray(event_type, account, jid) + # event.show_in_roster = show_in_roster + event.show_in_systray = show_in_systray + app.events.add_event(account, jid, event) + + # TODO: set urgency hint; show unread count in window title? + # self.roster.show_title() + # if not has_queue: # We didn't have a queue: we change icons + # if app.contacts.get_contact_with_highest_priority(account, jid): + # self.roster.draw_contact(jid, account) + # else: + # groupchat = event.type_ == 'gc-invitation' + # self.roster.add_to_not_in_the_roster( + # account, jid, groupchat=groupchat) + + def handle_event(self, account, jid, type_): + jid = JID.from_string(jid) + file_event_types = [ + 'file-request', + 'file-request-error', + 'file-send-error', + 'file-error', + 'file-stopped', + 'file-completed', + 'file-hash-error' + ] + + if type_ in ('connection-lost', 'connection-failed'): + app.window.show_account_page(account) + app.events.remove_events(account, jid, types=type_) + elif type_ in ( + 'gc_msg', + 'printed_gc_msg', + 'printed_marked_gc_msg', + 'pm', + 'printed_pm'): + app.window.select_chat(account, jid.bare) + app.events.remove_events(account, jid, types=type_) + elif type_ in ('printed_chat', 'chat', ''): + # '' 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 file_event_types: + self._handle_event_jingle_file(account, jid, type_) + elif type_ == 'gc-invitation': + event = app.events.get_first_event(account, jid, type_) + if event is None: + return + app.window.show_account_page(account) + app.events.remove_events(account, jid, event) + elif type_ == 'subscription_request': + event = app.events.get_first_event(account, jid, type_) + if event is None: + return + app.window.show_account_page(account) + app.events.remove_events(account, jid, event) + elif type_ == 'unsubscribed': + event = app.events.get_first_event(account, jid, type_) + if event is None: + return + app.window.show_account_page(account) + app.events.remove_events(account, jid, event) + + app.window.present() @staticmethod - def handle_event_information(obj): - if not obj.popup: + def _handle_event_jingle_file(account, jid, type_): + event = app.events.get_first_event(account, jid, type_) + if not event: return - if obj.dialog_name is not None: - get_dialog(obj.dialog_name, *obj.args, **obj.kwargs) + file_transfers = app.interface.instances['file_transfers'] + if event.type_ == 'file-request': + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + file_transfers.show_file_request(account, contact, event.file_props) + app.events.remove_events(account, jid, event) + return + + if event.type_ in ('file-request-error', 'file-send-error'): + file_transfers.show_send_error(event.file_props) + app.events.remove_events(account, jid, event) + return + + if event.type_ in ('file-error', 'file-stopped'): + msg_err = '' + if event.file_props.error == -1: + msg_err = _('Remote contact stopped transfer') + elif event.file_props.error == -6: + msg_err = _('Error opening file') + file_transfers.show_stopped( + jid, event.file_props, error_msg=msg_err) + app.events.remove_events(account, jid, event) + return + + if event.type_ == 'file-hash-error': + file_transfers.show_hash_error(jid, event.file_props, account) + app.events.remove_events(account, jid, event) return - if obj.level == 'error': + if event.type_ == 'file-completed': + file_transfers.show_completed(jid, event.file_props) + app.events.remove_events(account, jid, event) + return + + @staticmethod + def handle_event_information(event): + if not event.popup: + return + + if event.dialog_name is not None: + get_dialog(event.dialog_name, *event.args, **event.kwargs) + return + + if event.level == 'error': cls = ErrorDialog - elif obj.level == 'warn': + elif event.level == 'warn': cls = WarningDialog - elif obj.level == 'info': + elif event.level == 'info': cls = InformationDialog else: return - cls(obj.pri_txt, GLib.markup_escape_text(obj.sec_txt)) + cls(event.pri_txt, GLib.markup_escape_text(event.sec_txt)) @staticmethod def raise_dialog(name, *args, **kwargs): get_dialog(name, *args, **kwargs) @staticmethod - def handle_event_http_auth(obj): + def handle_event_iq_error(event): + ctrl = app.window.get_control(event.account, event.properties.jid.bare) + if ctrl and ctrl.is_groupchat: + ctrl.add_info_message('Error: %s' % 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( + _('Insecure Connection'), + _('Insecure Connection'), + _('You are about to connect to the account %(account)s ' + '(%(server)s) using an insecure connection method. This means ' + 'conversations will not be encrypted. Connecting PLAIN is ' + 'strongly discouraged.') % { + 'account': event.account, + 'server': app.get_hostname_from_account(event.account)}, + [DialogButton.make('Cancel', + text=_('_Abort'), + callback=event.abort), + DialogButton.make('Remove', + text=_('_Connect Anyway'), + callback=event.connect)]).show() + + @staticmethod + def handle_event_http_auth(event): # ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) - def _response(account, answer): - obj.conn.get_module('HTTPAuth').build_http_auth_answer( - obj.stanza, answer) + def _response(_account, answer): + event.conn.get_module('HTTPAuth').build_http_auth_answer( + event.stanza, answer) - account = obj.conn.name + account = event.conn.name message = _('HTTP (%(method)s) Authorization ' 'for %(url)s (ID: %(id)s)') % { - 'method': obj.method, - 'url': obj.url, - 'id': obj.iq_id} + 'method': event.method, + 'url': event.url, + 'id': event.iq_id} sec_msg = _('Do you accept this request?') if app.get_number_of_connected_accounts() > 1: sec_msg = _('Do you accept this request (account: %s)?') % account - if obj.msg: - sec_msg = obj.msg + '\n' + sec_msg + if event.msg: + sec_msg = event.msg + '\n' + sec_msg message = message + '\n' + sec_msg ConfirmationDialog( @@ -252,27 +460,125 @@ def _response(account, answer): [DialogButton.make('Cancel', text=_('_No'), callback=_response, - args=[obj, 'no']), + args=[event, 'no']), DialogButton.make('Accept', callback=_response, - args=[obj, 'yes'])]).show() + args=[event, 'yes'])]).show() - def handle_event_iq_error(self, event): - ctrl = app.window.get_control(event.account, event.properties.jid.bare) - if ctrl and ctrl.is_groupchat: - ctrl.add_info_message('Error: %s' % event.properties.error) + @staticmethod + def handle_event_client_cert_passphrase(event): + def _on_ok(passphrase, _checked): + event.conn.on_client_cert_passphrase( + passphrase, + event.con, + event.port, + event.secure_tuple) + + def _on_cancel(): + event.conn.on_client_cert_passphrase( + '', + event.con, + event.port, + event.secure_tuple) + + PassphraseDialog(_('Certificate Passphrase Required'), + _('Enter the certificate passphrase for ' + 'account %s') % event.conn.name, + ok_handler=_on_ok, + cancel_handler=_on_cancel) + + def handle_event_password_required(self, event): + # ('PASSWORD_REQUIRED', account, None) + account = event.conn.name + if account in self._passphrase_dialogs: + return + text = _('Enter your password for account %s') % account + + def _on_ok(passphrase, save): + app.settings.set_account_setting(account, 'savepass', save) + passwords.save_password(account, passphrase) + event.on_password(passphrase) + del self._passphrase_dialogs[account] + + def _on_cancel(): + del self._passphrase_dialogs[account] + + self._passphrase_dialogs[account] = PassphraseDialog( + _('Password Required'), + text, _('Save password'), + ok_handler=_on_ok, + cancel_handler=_on_cancel) @staticmethod - def handle_event_connection_lost(obj): - # ('CONNECTION_LOST', account, [title, text]) - account = obj.conn.name - app.notification.popup( - _('Connection Failed'), account, account, - 'connection-lost', 'gajim-connection_lost', obj.title, obj.msg) + def handle_event_zc_name_conflict(event): + def _on_ok(new_name): + app.settings.set_account_setting(event.conn.name, 'name', new_name) + event.conn.username = new_name + event.conn.change_status( + event.conn.status, event.conn.status_message) + + def _on_cancel(*args): + event.conn.change_status('offline', '') + + InputDialog( + _('Username Conflict'), + _('Username Conflict'), + _('Please enter a new username for your local account'), + [DialogButton.make('Cancel', + callback=_on_cancel), + DialogButton.make('Accept', + text=_('_OK'), + callback=_on_ok)], + input_str=event.alt_name, + transient_for=app.window).show() @staticmethod - def unblock_signed_in_notifications(account): - app.block_signed_in_notifications[account] = False + def handle_event_signed_in(event): + """ + SIGNED_IN event is emitted when we sign in, so handle it + """ + # ('SIGNED_IN', account, ()) + # block signed in notifications for 30 seconds + + # Add our own JID into the DB + app.storage.archive.insert_jid(event.conn.get_own_jid().bare) + account = event.conn.name + app.block_signed_in_notifications[account] = True + + pep_supported = event.conn.get_module('PEP').supported + + if event.conn.get_module('MAM').available: + event.conn.get_module('MAM').request_archive_on_signin() + + # enable location listener + if (pep_supported and app.is_installed('GEOCLUE') and + app.settings.get_account_setting(account, 'publish_location')): + location.enable() + + if ask_for_status_message(event.conn.status, signin=True): + app.window.show_account_page(account) + + def handle_event_presence(self, event): + # 'NOTIFY' (account, (jid, status, status message, resource, + # priority, timestamp)) + # + # Contact changed show + account = event.conn.name + jid = event.jid + + if app.jid_is_transport(jid): + # It must be an agent + + # transport just signed in/out, don't show + # popup notifications for 30s + account_jid = account + '/' + jid + app.block_signed_in_notifications[account_jid] = True + GLib.timeout_add_seconds(30, self._unblock_signed_in_notifications, + account_jid) + + ctrl = app.window.get_control(account, jid) + if ctrl and ctrl.session and len(event.contact_list) > 1: + ctrl.remove_session(ctrl.session) def handle_event_status(self, event): if event.show in ('offline', 'error'): @@ -287,30 +593,42 @@ def handle_event_status(self, event): # this prevents from getting the roster items as 'just signed in' # contacts. 30 seconds should be enough time GLib.timeout_add_seconds(30, - self.unblock_signed_in_notifications, + self._unblock_signed_in_notifications, event.account) - def handle_event_presence(self, obj): - # 'NOTIFY' (account, (jid, status, status message, resource, - # priority, timestamp)) - # - # Contact changed show - account = obj.conn.name - jid = obj.jid + @staticmethod + def _unblock_signed_in_notifications(account): + app.block_signed_in_notifications[account] = False - if app.jid_is_transport(jid): - # It must be an agent + @staticmethod + def handle_event_msgsent(event): + if not event.play_sound: + return - # transport just signed in/out, don't show - # popup notifications for 30s - account_jid = account + '/' + jid - app.block_signed_in_notifications[account_jid] = True - GLib.timeout_add_seconds(30, self.unblock_signed_in_notifications, - account_jid) + enabled = app.settings.get_soundevent_settings( + 'message_sent')['enabled'] + if enabled: + if isinstance(event.jid, list) and len(event.jid) > 1: + return + helpers.play_sound('message_sent') - ctrl = app.window.get_control(account, jid) - if ctrl and ctrl.session and len(obj.contact_list) > 1: - ctrl.remove_session(ctrl.session) + @staticmethod + def handle_event_msgnotsent(event): + # ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) + msg = _('error while sending %(message)s ( %(error)s )') % { + 'message': event.message, + 'error': event.error} + if not event.session: + # No session. This can happen when sending a message from + # gajim-remote + log.warning(msg) + return + event.session.roster_message( + event.jid, + msg, + event.time_, + event.conn.name, + msg_type='error') @staticmethod def handle_event_read_state_sync(event): @@ -349,92 +667,6 @@ def handle_event_read_state_sync(event): if control is not None: control.redraw_after_event_removed(event.jid) - @staticmethod - def handle_event_msgsent(obj): - if not obj.play_sound: - return - - enabled = app.settings.get_soundevent_settings('message_sent')['enabled'] - if enabled: - if isinstance(obj.jid, list) and len(obj.jid) > 1: - return - helpers.play_sound('message_sent') - - @staticmethod - def handle_event_msgnotsent(obj): - #('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) - msg = _('error while sending %(message)s ( %(error)s )') % { - 'message': obj.message, 'error': obj.error} - if not obj.session: - # No session. This can happen when sending a message from - # gajim-remote - log.warning(msg) - return - obj.session.roster_message(obj.jid, msg, obj.time_, obj.conn.name, - msg_type='error') - - @staticmethod - def handle_event_gc_invitation(event): - event = events.GcInvitationtEvent(event) - - # TODO: show account page - # self.add_event(event.account, str(event.from_), event) - - if helpers.allow_showing_notification(event.account): - client = app.get_client(event.account) - if get_muc_context(event.muc) == 'public': - jid = event.from_ - else: - jid = event.from_.bare - contact = 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), - event.account, - 'gc-invitation', - 'gajim-gc_invitation', - event_type, - text, - room_jid=event.muc) - - @staticmethod - def handle_event_client_cert_passphrase(obj): - def on_ok(passphrase, checked): - obj.conn.on_client_cert_passphrase(passphrase, obj.con, obj.port, - obj.secure_tuple) - - def on_cancel(): - obj.conn.on_client_cert_passphrase('', obj.con, obj.port, - obj.secure_tuple) - - PassphraseDialog(_('Certificate Passphrase Required'), - _('Enter the certificate passphrase for account %s') % \ - obj.conn.name, ok_handler=on_ok, - cancel_handler=on_cancel) - - def handle_event_password_required(self, obj): - #('PASSWORD_REQUIRED', account, None) - account = obj.conn.name - if account in self.pass_dialog: - return - text = _('Enter your password for account %s') % account - - def on_ok(passphrase, save): - app.settings.set_account_setting(account, 'savepass', save) - passwords.save_password(account, passphrase) - obj.on_password(passphrase) - del self.pass_dialog[account] - - def on_cancel(): - del self.pass_dialog[account] - - self.pass_dialog[account] = PassphraseDialog( - _('Password Required'), text, _('Save password'), ok_handler=on_ok, - cancel_handler=on_cancel) - def handle_event_roster_info(self, obj): #('ROSTER_INFO', account, (jid, name, sub, ask, groups)) account = obj.conn.name @@ -489,12 +721,52 @@ def handle_event_roster_info(self, obj): 'from', 'both'): self.instances[account]['sub_request'][obj.jid].destroy() + @staticmethod + def handle_event_metacontacts(obj): + # TODO: Remove + app.contacts.define_metacontacts(obj.conn.name, obj.meta_list) + + @staticmethod + def handle_event_roster_item_exchange(event): + # data = (action in [add, delete, modify], exchange_list, jid_from) + RosterItemExchangeWindow(event.conn.name, + event.action, + event.exchange_items_list, + event.fjid) + + def handle_event_gc_invitation(self, event): + event = events.GcInvitationEvent(event) + + client = app.get_client(event.account) + if get_muc_context(event.muc) == 'public': + jid = event.from_ + else: + jid = event.from_.bare + + self.add_event(event.account, jid, event) + + if helpers.allow_showing_notification(event.account): + contact = 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), + event.account, + 'gc-invitation', + 'gajim-gc_invitation', + event_type, + text, + room_jid=event.muc) + + # Jingle File Transfer def handle_event_file_send_error(self, event): - ft = self.instances['file_transfers'] - ft.set_status(event.file_props, 'stop') + file_transfers = self.instances['file_transfers'] + file_transfers.set_status(event.file_props, 'stop') if helpers.allow_popup_window(event.account): - ft.show_send_error(event.file_props) + file_transfers.show_send_error(event.file_props) return event = events.FileSendErrorEvent(event.file_props) @@ -503,21 +775,27 @@ def handle_event_file_send_error(self, event): if helpers.allow_showing_notification(event.account): event_type = _('File Transfer Error') app.notification.popup( - event_type, event.jid, event.account, - 'file-send-error', 'dialog-error', - event_type, event.file_props.name) + event_type, + event.jid, + event.account, + 'file-send-error', + 'dialog-error', + event_type, + event.file_props.name) - def handle_event_file_request_error(self, obj): + def handle_event_file_request_error(self, event): # ('FILE_REQUEST_ERROR', account, (jid, file_props, error_msg)) - ft = self.instances['file_transfers'] - ft.set_status(obj.file_props, 'stop') - errno = obj.file_props.error + file_transfers = self.instances['file_transfers'] + file_transfers.set_status(event.file_props, 'stop') + errno = event.file_props.error + account = event.conn.name - if helpers.allow_popup_window(obj.conn.name): + if helpers.allow_popup_window(account): if errno in (-4, -5): - ft.show_stopped(obj.jid, obj.file_props, obj.error_msg) + file_transfers.show_stopped( + event.jid, event.file_props, event.error_msg) else: - ft.show_request_error(obj.file_props) + file_transfers.show_request_error(event.file_props) return if errno in (-4, -5): @@ -527,51 +805,52 @@ def handle_event_file_request_error(self, obj): event_class = events.FileRequestErrorEvent msg_type = 'file-request-error' - event = event_class(obj.file_props) - self.add_event(obj.conn.name, obj.jid, event) + file_event = event_class(event.file_props) + self.add_event(account, event.jid, file_event) - if helpers.allow_showing_notification(obj.conn.name): + if helpers.allow_showing_notification(account): # Check if we should be notified event_type = _('File Transfer Error') app.notification.popup( event_type, - obj.jid, - obj.conn.name, + event.jid, + account, msg_type, 'dialog-error', title=event_type, - text=obj.file_props.name) + text=event.file_props.name) - def handle_event_file_request(self, obj): - account = obj.conn.name - if obj.jid not in app.contacts.get_jid_list(account): + def handle_event_file_request(self, event): + # TODO + account = event.conn.name + if event.jid not in app.contacts.get_jid_list(account): contact = app.contacts.create_not_in_roster_contact( - jid=obj.jid, account=account) + jid=event.jid, account=account) app.contacts.add_contact(account, contact) - self.roster.add_contact(obj.jid, account) - contact = app.contacts.get_first_contact_from_jid(account, obj.jid) - if obj.file_props.session_type == 'jingle': + self.roster.add_contact(event.jid, account) + contact = app.contacts.get_first_contact_from_jid(account, event.jid) + if event.file_props.session_type == 'jingle': request = \ - obj.stanza.getTag('jingle').getTag('content').getTag( + event.stanza.getTag('jingle').getTag('content').getTag( 'description').getTag('request') if request: # If we get a request instead - ft_win = self.instances['file_transfers'] - ft_win.add_transfer(account, contact, obj.file_props) + self.instances['file_transfers'].add_transfer( + account, contact, event.file_props) return if helpers.allow_popup_window(account): self.instances['file_transfers'].show_file_request( - account, contact, obj.file_props) + account, contact, event.file_props) return - event = events.FileRequestEvent(obj.file_props) - self.add_event(account, obj.jid, event) + file_event = events.FileRequestEvent(event.file_props) + self.add_event(account, event.jid, file_event) if helpers.allow_showing_notification(account): txt = _('%s wants to send you a file.') % app.get_name_from_jid( - account, obj.jid) + account, event.jid) event_type = _('File Transfer Request') app.notification.popup( event_type, - obj.jid, + event.jid, account, 'file-request', icon_name='document-send', @@ -582,43 +861,31 @@ def handle_event_file_request(self, obj): def handle_event_file_error(title, message): ErrorDialog(title, message) - def handle_event_file_progress(self, account, file_props): - if time.time() - self.last_ftwindow_update > 0.5: + def handle_event_file_progress(self, _account, file_props): + if time.time() - self._last_ftwindow_update > 0.5: # Update ft window every 500ms - self.last_ftwindow_update = time.time() + self._last_ftwindow_update = time.time() self.instances['file_transfers'].set_progress( file_props.type_, file_props.sid, file_props.received_len) - def __compare_hashes(self, account, file_props): - session = app.connections[account].get_module( - 'Jingle').get_jingle_session(jid=None, sid=file_props.sid) - ft_win = self.instances['file_transfers'] - h = Hashes2() - try: - file_ = open(file_props.file_name, 'rb') - except Exception: + def handle_event_jingleft_cancel(self, event): + file_transfers = self.instances['file_transfers'] + file_props = None + # get the file_props of our session + file_props = FilesProp.getFileProp(event.conn.name, event.sid) + if not file_props: return - hash_ = h.calculateHash(file_props.algo, file_) - file_.close() - # If the hash we received and the hash of the file are the same, - # then the file is not corrupt - jid = file_props.sender - if file_props.hash_ == hash_: - GLib.idle_add(self.popup_ft_result, account, jid, file_props) - GLib.idle_add(ft_win.set_status, file_props, 'ok') - else: - # Wrong hash, we need to get the file again! - file_props.error = -10 - GLib.idle_add(self.popup_ft_result, account, jid, file_props) - GLib.idle_add(ft_win.set_status, file_props, 'hash_error') - # End jingle session - if session: - session.end_session() + file_transfers.set_status(file_props, 'stop') + file_props.error = -4 # is it the right error code? + file_transfers.show_stopped( + event.jid, + file_props, + 'Peer cancelled the transfer') def handle_event_file_rcv_completed(self, account, file_props): - ft = self.instances['file_transfers'] + file_transfers = self.instances['file_transfers'] if file_props.error == 0: - ft.set_progress( + file_transfers.set_progress( file_props.type_, file_props.sid, file_props.received_len) jid = app.get_jid_without_resource(str(file_props.receiver)) app.nec.push_incoming_event( @@ -627,9 +894,9 @@ def handle_event_file_rcv_completed(self, account, file_props): jid=jid)) else: - ft.set_status(file_props, 'stop') - if not file_props.completed and (file_props.stalled or - file_props.paused): + file_transfers.set_status(file_props, 'stop') + if (not file_props.completed and ( + file_props.stalled or file_props.paused)): return if file_props.type_ == 'r': # We receive a file @@ -644,13 +911,12 @@ def handle_event_file_rcv_completed(self, account, file_props): # We didn't get the hash, sender probably doesn't # support that jid = file_props.sender - self.popup_ft_result(account, jid, file_props) + self._popup_ft_result(account, jid, file_props) if file_props.error == 0: - ft.set_status(file_props, 'ok') - session = \ - app.connections[account].get_module( - 'Jingle').get_jingle_session(jid=None, - sid=file_props.sid) + file_transfers.set_status(file_props, 'ok') + client = app.get_client(account) + session = client.get_module('Jingle').get_jingle_session( + jid=None, sid=file_props.sid) # End jingle session # TODO: Only if there are no other parallel downloads in # this session @@ -659,31 +925,58 @@ def handle_event_file_rcv_completed(self, account, file_props): else: # We send a file jid = file_props.receiver app.socks5queue.remove_sender(file_props.sid, True, True) - self.popup_ft_result(account, jid, file_props) + self._popup_ft_result(account, jid, file_props) + + def __compare_hashes(self, account, file_props): + client = app.get_client(account) + session = client.get_module('Jingle').get_jingle_session( + jid=None, sid=file_props.sid) + file_transfers = self.instances['file_transfers'] + hashes = Hashes2() + try: + file_ = open(file_props.file_name, 'rb') + except Exception: + return + hash_ = hashes.calculateHash(file_props.algo, file_) + file_.close() + # If the hash we received and the hash of the file are the same, + # then the file is not corrupt + jid = file_props.sender + if file_props.hash_ == hash_: + GLib.idle_add(self._popup_ft_result, account, jid, file_props) + GLib.idle_add(file_transfers.set_status, file_props, 'ok') + else: + # Wrong hash, we need to get the file again! + file_props.error = -10 + GLib.idle_add(self._popup_ft_result, account, jid, file_props) + GLib.idle_add(file_transfers.set_status, file_props, 'hash_error') + # End jingle session + if session: + session.end_session() - def popup_ft_result(self, account, jid, file_props): - ft = self.instances['file_transfers'] + def _popup_ft_result(self, account, jid, file_props): + file_transfers = self.instances['file_transfers'] if helpers.allow_popup_window(account): if file_props.error == 0: if app.settings.get('notify_on_file_complete'): - ft.show_completed(jid, file_props) + file_transfers.show_completed(jid, file_props) elif file_props.error == -1: - ft.show_stopped( + file_transfers.show_stopped( jid, file_props, error_msg=_('Remote Contact Stopped Transfer')) elif file_props.error == -6: - ft.show_stopped( + file_transfers.show_stopped( jid, file_props, error_msg=_('Error Opening File')) elif file_props.error == -10: - ft.show_hash_error( + file_transfers.show_hash_error( jid, file_props, account) elif file_props.error == -12: - ft.show_stopped( + file_transfers.show_stopped( jid, file_props, error_msg=_('SSL Certificate Error')) @@ -736,7 +1029,7 @@ def popup_ft_result(self, account, jid, file_props): 'filename': filename, 'name': name} icon_name = 'process-stop' - else: # File transfer hash error + else: # File transfer hash error txt = _('File transfer of %(filename)s from %(name)s ' 'failed.') % { 'filename': filename, @@ -763,7 +1056,7 @@ def popup_ft_result(self, account, jid, file_props): 'filename': filename, 'name': name} icon_name = 'process-stop' - else: # File transfer hash error + else: # File transfer hash error txt = _('File transfer of %(filename)s to %(name)s ' 'failed.') % { 'filename': filename, @@ -775,7 +1068,7 @@ def popup_ft_result(self, account, jid, file_props): if (app.settings.get('notify_on_file_complete') and (app.settings.get('autopopupaway') or - app.connections[account].status in ('online', 'chat'))): + app.connections[account].status in ('online', 'chat'))): # We want to be notified and we are online/chat or we don't mind # to be bugged when away/na/busy app.notification.popup( @@ -787,125 +1080,6 @@ def popup_ft_result(self, account, jid, file_props): title=event_type, text=txt) - @staticmethod - def handle_event_signed_in(obj): - """ - SIGNED_IN event is emitted when we sign in, so handle it - """ - # ('SIGNED_IN', account, ()) - # block signed in notifications for 30 seconds - - # Add our own JID into the DB - app.storage.archive.insert_jid(obj.conn.get_own_jid().bare) - account = obj.conn.name - app.block_signed_in_notifications[account] = True - - pep_supported = obj.conn.get_module('PEP').supported - - if obj.conn.get_module('MAM').available: - obj.conn.get_module('MAM').request_archive_on_signin() - - # enable location listener - if (pep_supported and app.is_installed('GEOCLUE') and - app.settings.get_account_setting(account, 'publish_location')): - location.enable() - - if ask_for_status_message(obj.conn.status, signin=True): - app.window.show_app_page() - - def send_httpupload(self, chat_control, path=None): - if path is not None: - self._send_httpupload(chat_control, path) - return - - accept_cb = partial(self.on_file_dialog_ok, chat_control) - FileChooserDialog(accept_cb, - select_multiple=True, - transient_for=app.window) - - def on_file_dialog_ok(self, chat_control, paths): - for path in paths: - self._send_httpupload(chat_control, path) - - def _send_httpupload(self, chat_control, path): - client = app.get_client(chat_control.account) - try: - transfer = client.get_module('HTTPUpload').make_transfer( - path, - chat_control.encryption, - chat_control.contact, - chat_control.is_groupchat) - except FileError as error: - app.nec.push_incoming_event(InformationEvent( - None, dialog_name='open-file-error2', args=error)) - return - - transfer.connect('cancel', self._on_cancel_upload) - transfer.connect('state-changed', - self._on_http_upload_state_changed) - chat_control.add_file_transfer(transfer) - client.get_module('HTTPUpload').start_transfer(transfer) - - def _on_http_upload_state_changed(self, transfer, _signal_name, state): - # Note: This has to be a bound method in order to connect the signal - if state.is_finished: - uri = transfer.get_transformed_uri() - - type_ = 'chat' - if transfer.is_groupchat: - type_ = 'groupchat' - - message = OutgoingMessage(account=transfer.account, - contact=transfer.contact, - message=uri, - type_=type_, - oob_url=uri) - - client = app.get_client(transfer.account) - client.send_message(message) - - def _on_cancel_upload(self, transfer, _signal_name): - # Note: This has to be a bound method in order to connect the signal - client = app.get_client(transfer.account) - client.get_module('HTTPUpload').cancel_transfer(transfer) - - @staticmethod - def handle_event_metacontacts(obj): - app.contacts.define_metacontacts(obj.conn.name, obj.meta_list) - - def handle_event_zc_name_conflict(self, obj): - def _on_ok(new_name): - app.settings.set_account_setting(obj.conn.name, 'name', new_name) - obj.conn.username = new_name - obj.conn.change_status(obj.conn.status, obj.conn.status_message) - - def _on_cancel(*args): - obj.conn.change_status('offline', '') - - InputDialog( - _('Username Conflict'), - _('Username Conflict'), - _('Please enter a new username for your local account'), - [DialogButton.make('Cancel', - callback=_on_cancel), - DialogButton.make('Accept', - text=_('_OK'), - callback=_on_ok)], - input_str=obj.alt_name, - transient_for=self.roster.window).show() - - def handle_event_jingleft_cancel(self, obj): - ft = self.instances['file_transfers'] - file_props = None - # get the file_props of our session - file_props = FilesProp.getFileProp(obj.conn.name, obj.sid) - if not file_props: - return - ft.set_status(file_props, 'stop') - file_props.error = -4 # is it the right error code? - ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' + - 'the transfer') - # Jingle AV handling def handle_event_jingle_incoming(self, event): # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, @@ -927,7 +1101,9 @@ def handle_event_jingle_incoming(self, event): return notification_event = events.JingleIncomingEvent( - event.fjid, event.sid, content_types) + event.fjid, + event.sid, + content_types) ctrl = (app.window.get_control(account, event.fjid) or app.window.get_control(account, event.jid)) @@ -963,7 +1139,7 @@ def _prepare_control(): text = _('%s is calling') % contact app.notification.popup( heading, - event.fjid, + event.jid, account, 'jingle-incoming', icon_name='call-start-symbolic', @@ -1036,223 +1212,64 @@ def handle_event_jingle_error(event): JingleState.ERROR, reason=event.reason) - @staticmethod - def handle_event_roster_item_exchange(obj): - # data = (action in [add, delete, modify], exchange_list, jid_from) - RosterItemExchangeWindow(obj.conn.name, obj.action, - obj.exchange_items_list, obj.fjid) - - @staticmethod - def handle_event_plain_connection(event): - ConfirmationDialog( - _('Insecure Connection'), - _('Insecure Connection'), - _('You are about to connect to the account %(account)s ' - '(%(server)s) using an insecure connection method. This means ' - 'conversations will not be encrypted. Connecting PLAIN is ' - 'strongly discouraged.') % { - 'account': event.account, - 'server': app.get_hostname_from_account(event.account)}, - [DialogButton.make('Cancel', - text=_('_Abort'), - callback=event.abort), - DialogButton.make('Remove', - text=_('_Connect Anyway'), - callback=event.connect)]).show() - - def create_core_handlers_list(self): - self.handlers = { - 'file-send-error': [self.handle_event_file_send_error], - 'client-cert-passphrase': [ - self.handle_event_client_cert_passphrase], - 'connection-lost': [self.handle_event_connection_lost], - 'file-request-error': [self.handle_event_file_request_error], - 'file-request-received': [self.handle_event_file_request], - 'muc-invitation': [self.handle_event_gc_invitation], - 'http-auth-received': [self.handle_event_http_auth], - 'information': [self.handle_event_information], - 'iq-error-received': [self.handle_event_iq_error], - 'jingle-connected-received': [self.handle_event_jingle_connected], - 'jingle-disconnected-received': [ - self.handle_event_jingle_disconnected], - 'jingle-error-received': [self.handle_event_jingle_error], - 'jingle-request-received': [self.handle_event_jingle_incoming], - 'jingle-ft-cancelled-received': [self.handle_event_jingleft_cancel], - 'message-not-sent': [self.handle_event_msgnotsent], - 'message-sent': [self.handle_event_msgsent], - 'metacontacts-received': [self.handle_event_metacontacts], - 'our-show': [self.handle_event_status], - 'password-required': [self.handle_event_password_required], - 'plain-connection': [self.handle_event_plain_connection], - 'presence-received': [self.handle_event_presence], - # 'roster-info': [self.handle_event_roster_info], - 'roster-item-exchange-received': \ - [self.handle_event_roster_item_exchange], - 'signed-in': [self.handle_event_signed_in], - 'zeroconf-name-conflict': [self.handle_event_zc_name_conflict], - 'read-state-sync': [self.handle_event_read_state_sync], - } - - def register_core_handlers(self): - """ - Register core handlers in Global Events Dispatcher (GED). - - This is part of rewriting whole events handling system to use GED. - """ - for event_name, event_handlers in self.handlers.items(): - for event_handler in event_handlers: - prio = ged.GUI1 - if isinstance(event_handler, tuple): - prio = event_handler[1] - event_handler = event_handler[0] - app.ged.register_event_handler(event_name, prio, - event_handler) + def send_httpupload(self, chat_control, path=None): + if path is not None: + self._send_httpupload(chat_control, path) + return - def add_event(self, account, jid, event): - """ - Add an event to the app.events var - """ - # We add it to the app.events queue - # Do we have a queue? - jid = app.get_jid_without_resource(jid) - no_queue = len(app.events.get_events(account, jid)) == 0 - # event can be in common.events.* - # event_type can be in advancedNotificationWindow.events_list - event_types = {'file-request': 'ft_request', - 'file-completed': 'ft_finished'} - event_type = event_types.get(event.type_) - show_in_roster = get_show_in_roster(event_type, jid) - show_in_systray = get_show_in_systray(event_type, account, jid) - event.show_in_roster = show_in_roster - event.show_in_systray = show_in_systray - app.events.add_event(account, jid, event) + accept_cb = partial(self._on_file_dialog_ok, chat_control) + FileChooserDialog(accept_cb, + select_multiple=True, + transient_for=app.window) - self.roster.show_title() - if no_queue: # We didn't have a queue: we change icons - if app.contacts.get_contact_with_highest_priority(account, jid): - self.roster.draw_contact(jid, account) - else: - groupchat = event.type_ == 'gc-invitation' - self.roster.add_to_not_in_the_roster( - account, jid, groupchat=groupchat) - - # Select the big brother contact in roster, it's visible because it has - # events. - family = app.contacts.get_metacontacts_family(account, jid) - if family: - _nearby_family, bb_jid, bb_account = \ - app.contacts.get_nearby_family_and_big_brother(family, - account) - else: - bb_jid, bb_account = jid, account - self.roster.select_contact(bb_jid, bb_account) + def _on_file_dialog_ok(self, chat_control, paths): + for path in paths: + self._send_httpupload(chat_control, path) - def handle_event(self, account, fjid, type_): - if type_ in ('connection-lost', 'connection-failed'): - app.interface.roster.window.present() + def _send_httpupload(self, chat_control, path): + client = app.get_client(chat_control.account) + try: + transfer = client.get_module('HTTPUpload').make_transfer( + path, + chat_control.encryption, + chat_control.contact, + chat_control.is_groupchat) + except FileError as error: + app.nec.push_incoming_event( + InformationEvent( + None, + dialog_name='open-file-error2', + args=error)) return - w = None - ctrl = None - - resource = app.get_resource_from_jid(fjid) - jid = app.get_jid_without_resource(fjid) + transfer.connect('cancel', self._on_cancel_upload) + transfer.connect('state-changed', + self._on_http_upload_state_changed) + chat_control.add_file_transfer(transfer) + client.get_module('HTTPUpload').start_transfer(transfer) - if type_ in ('printed_gc_msg', 'printed_marked_gc_msg', 'gc_msg'): - w = self.msg_win_mgr.get_window(jid, account) - if jid in self.minimized_controls[account]: - self.roster.on_groupchat_maximized(None, jid, account) - return - ctrl = self.msg_win_mgr.get_gc_control(jid, account) + def _on_http_upload_state_changed(self, transfer, _signal_name, state): + # Note: This has to be a bound method in order to connect the signal + if state.is_finished: + uri = transfer.get_transformed_uri() - elif type_ in ('printed_chat', 'chat', ''): - # '' is for log in/out notifications + type_ = 'chat' + if transfer.is_groupchat: + type_ = 'groupchat' - ctrl = self.msg_win_mgr.search_control(jid, account, resource) + message = OutgoingMessage(account=transfer.account, + contact=transfer.contact, + message=uri, + type_=type_, + oob_url=uri) - if not ctrl: - highest_contact = app.contacts.\ - get_contact_with_highest_priority(account, jid) - # jid can have a window if this resource was lower when he sent - # message and is now higher because the other one is offline - if resource and highest_contact.resource == resource and \ - not self.msg_win_mgr.has_window(jid, account): - # remove resource of events too - app.events.change_jid(account, fjid, jid) - resource = None - fjid = jid - - contact = None - if resource: - contact = app.contacts.get_contact(account, jid, resource) - if not contact: - contact = highest_contact - if not contact: - # Maybe we deleted the contact from the roster - return - - ctrl = self.new_chat(contact, account, resource=resource) - - app.last_message_time[account][jid] = 0 # long time ago - - w = ctrl.parent_win - elif type_ in ('printed_pm', 'pm'): - - ctrl = self.msg_win_mgr.get_control(fjid, account) + client = app.get_client(transfer.account) + client.send_message(message) - if not ctrl: - room_jid = jid - nick = resource - gc_contact = app.contacts.get_gc_contact( - account, room_jid, nick) - ctrl = self.new_private_chat(gc_contact, account) - - w = ctrl.parent_win - elif type_ in ('file-request', 'file-request-error', - 'file-send-error', 'file-error', 'file-stopped', 'file-completed', - 'file-hash-error', 'jingle-incoming'): - # Get the first single message event - event = app.events.get_first_event(account, fjid, type_) - if not event: - # default to jid without resource - event = app.events.get_first_event(account, jid, type_) - if not event: - return - # Open the window - self.roster.open_event(account, jid, event) - else: - # Open the window - self.roster.open_event(account, fjid, event) - elif type_ == 'gc-invitation': - event = app.events.get_first_event(account, jid, type_) - if event is None: - return - # TODO: Show account page - # open_window('GroupChatInvitation', - # account=account, - # event=event) - app.events.remove_events(account, jid, event) - # self.roster.draw_contact(jid, account) - elif type_ == 'subscription_request': - event = app.events.get_first_event(account, jid, type_) - if event is None: - return - # TODO: Show account page - app.events.remove_events(account, jid, event) - # self.roster.draw_contact(jid, account) - elif type_ == 'unsubscribed': - event = app.events.get_first_event(account, jid, type_) - if event is None: - return - # TODO: Show account page - app.events.remove_events(account, jid, event) - # self.roster.draw_contact(jid, account) - if w: - w.set_active_tab(ctrl) - w.window.present() - # Using isinstance here because we want to catch all derived types - if isinstance(ctrl, BaseControl): - ctrl.scroll_to_end() + def _on_cancel_upload(self, transfer, _signal_name): + # Note: This has to be a bound method in order to connect the signal + client = app.get_client(transfer.account) + client.get_module('HTTPUpload').cancel_transfer(transfer) def create_groupchat(self, account, room_jid, config): if app.window.chat_exists(account, room_jid): @@ -1437,7 +1454,8 @@ def autoconnect(self): status_message = '' if app.settings.get_account_setting(account, 'restore_last_status'): - status = app.settings.get_account_setting(account, 'last_status') + status = app.settings.get_account_setting( + account, 'last_status') status_message = app.settings.get_account_setting( account, 'last_status_msg') status_message = helpers.from_one_line(status_message) @@ -1461,12 +1479,12 @@ def change_status(self, status, account=None): self._change_status(account, status) return - for account in app.connections: - if not app.settings.get_account_setting(account, + for acc in app.connections: + if not app.settings.get_account_setting(acc, 'sync_with_global_status'): continue - self._change_status(account, status) + self._change_status(acc, status) def change_account_status(self, account, status): ask = ask_for_status_message(status) @@ -1534,7 +1552,7 @@ def process_connections(self): else: GLib.timeout_add(timeout, self.process_connections) raise - return True # renew timeout (loop for ever) + return True # renew timeout (loop for ever) @staticmethod def save_config(): @@ -1559,18 +1577,6 @@ def get_avatar(self, def avatar_exists(self, filename): return self.avatar_storage.get_avatar_path(filename) is not None - # does JID exist only within a groupchat? - def is_pm_contact(self, fjid, account): - bare_jid = app.get_jid_without_resource(fjid) - - gc_ctrl = self.msg_win_mgr.get_gc_control(bare_jid, account) - - if not gc_ctrl and \ - bare_jid in self.minimized_controls[account]: - gc_ctrl = self.minimized_controls[account][bare_jid] - - return gc_ctrl and gc_ctrl.is_groupchat - @staticmethod def create_ipython_window(): # Check if IPython is installed @@ -1604,19 +1610,20 @@ def create_ipython_window(): sw.add(view) window.add(sw) window.show_all() - def on_delete(win, event): + + def _on_delete(win, _event): win.hide() return True - window.connect('delete_event', on_delete) + window.connect('delete_event', _on_delete) view.updateNamespace({'gajim': app}) app.ipython_window = window def _network_status_changed(self, monitor, _param): connected = monitor.get_network_available() - if connected == self.network_state: + if connected == self._network_state: return - self.network_state = connected + self._network_state = connected if connected: log.info('Network connection available') else: @@ -1751,5 +1758,8 @@ def thread_function(func, func_args, callback, callback_args): if callback: GLib.idle_add(callback, output, *callback_args) - Thread(target=thread_function, args=(func, func_args, callback, - callback_args)).start() + Thread(target=thread_function, + args=(func, + func_args, + callback, + callback_args)).start() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b7e368f9e4f266084c516237e70b444… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b7e368f9e4f266084c516237e70b444… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix HTTP Upload tranfsers
by Daniel Brötzmann (＠wurstsalat) 17 Aug '21

17 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b7e368f9 by wurstsalat at 2021-08-17T21:10:24+02:00 Fix HTTP Upload tranfsers - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -846,8 +846,8 @@ def _send_httpupload(self, chat_control, path): chat_control.add_file_transfer(transfer) client.get_module('HTTPUpload').start_transfer(transfer) - @staticmethod - def _on_http_upload_state_changed(transfer, _signal_name, state): + def _on_http_upload_state_changed(self, transfer, _signal_name, state): + # Note: This has to be a bound method in order to connect the signal if state.is_finished: uri = transfer.get_transformed_uri() @@ -864,8 +864,8 @@ def _on_http_upload_state_changed(transfer, _signal_name, state): client = app.get_client(transfer.account) client.send_message(message) - @staticmethod - def _on_cancel_upload(transfer, _signal_name): + def _on_cancel_upload(self, transfer, _signal_name): + # Note: This has to be a bound method in order to connect the signal client = app.get_client(transfer.account) client.get_module('HTTPUpload').cancel_transfer(transfer) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7e368f9e4f266084c516237e70b4442… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7e368f9e4f266084c516237e70b4442… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Interface: Remove show_groupchat
by Daniel Brötzmann (＠wurstsalat) 16 Aug '21

16 Aug '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ab628b69 by wurstsalat at 2021-08-16T20:55:54+02:00 Interface: Remove show_groupchat - - - - - 73a86eb8 by wurstsalat at 2021-08-16T21:33:42+02:00 Interface: Fix some events - - - - - 5 changed files: - gajim/gtk/chat_page.py - gajim/gtk/main.py - gajim/gtk/main_stack.py - gajim/gtk/start_chat.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -174,6 +174,9 @@ def remove_chat_list(self, workspace_id): def chat_exists(self, account, jid): return self._chat_list_stack.contains_chat(account, jid) + def select_chat(self, account, jid): + self._chat_list_stack.select_chat(account, jid) + def chat_exists_for_workspace(self, workspace_id, account, jid): return self._chat_list_stack.contains_chat( account, jid, workspace_id=workspace_id) ===================================== gajim/gtk/main.py ===================================== @@ -332,6 +332,10 @@ def add_private_chat(self, account, jid, select=False): 'pm', select=select) + def select_chat(self, account, jid): + self._main_stack.show_chat_page() + self._chat_page.select_chat(account, jid) + @staticmethod def _add_to_roster(_action, param): _workspace, account, jid = param.unpack() ===================================== gajim/gtk/main_stack.py ===================================== @@ -58,6 +58,9 @@ def show_chats(self, workspace_id): self._chat_page.show_workspace_chats(workspace_id) self.set_visible_child_name('chats') + def show_chat_page(self): + self.set_visible_child_name('chats') + def show_account(self, account): self.set_visible_child_name(account) ===================================== gajim/gtk/start_chat.py ===================================== @@ -313,7 +313,9 @@ def _start_new_chat(self, row): return self.ready_to_destroy = True - if app.interface.show_groupchat(row.account, row.jid): + if app.window.chat_exists(row.account, row.jid): + app.window.select_chat(row.account, row.jid) + self.destroy() return self.ready_to_destroy = False ===================================== gajim/gui_interface.py ===================================== @@ -787,7 +787,8 @@ def popup_ft_result(self, account, jid, file_props): title=event_type, text=txt) - def handle_event_signed_in(self, obj): + @staticmethod + def handle_event_signed_in(obj): """ SIGNED_IN event is emitted when we sign in, so handle it """ @@ -845,7 +846,8 @@ def _send_httpupload(self, chat_control, path): chat_control.add_file_transfer(transfer) client.get_module('HTTPUpload').start_transfer(transfer) - def _on_http_upload_state_changed(self, transfer, _signal_name, state): + @staticmethod + def _on_http_upload_state_changed(transfer, _signal_name, state): if state.is_finished: uri = transfer.get_transformed_uri() @@ -862,7 +864,8 @@ def _on_http_upload_state_changed(self, transfer, _signal_name, state): client = app.get_client(transfer.account) client.send_message(message) - def _on_cancel_upload(self, transfer, _signal_name): + @staticmethod + def _on_cancel_upload(transfer, _signal_name): client = app.get_client(transfer.account) client.get_module('HTTPUpload').cancel_transfer(transfer) @@ -926,8 +929,8 @@ def handle_event_jingle_incoming(self, event): notification_event = events.JingleIncomingEvent( event.fjid, event.sid, content_types) - ctrl = (self.msg_win_mgr.get_control(event.fjid, account) - or self.msg_win_mgr.get_control(event.jid, account)) + ctrl = (app.window.get_control(account, event.fjid) or + app.window.get_control(account, event.jid)) if ctrl: if 'audio' in content_types: ctrl.set_jingle_state( @@ -942,8 +945,14 @@ def handle_event_jingle_incoming(self, event): ctrl.add_call_received_message(notification_event) if helpers.allow_popup_window(account): - app.interface.new_chat_from_jid(account, event.fjid) - ctrl.add_call_received_message(notification_event) + def _prepare_control(): + ctrl = app.window.get_control(account, event.jid) + ctrl.add_call_received_message(notification_event) + + if not ctrl: + app.window.add_chat( + account, event.jid, 'contact', select=True) + GLib.idle_add(_prepare_control) return self.add_event(account, event.fjid, notification_event) @@ -961,12 +970,13 @@ def handle_event_jingle_incoming(self, event): title=heading, text=text) - def handle_event_jingle_connected(self, event): + @staticmethod + def handle_event_jingle_connected(event): # ('JINGLE_CONNECTED', account, (peerjid, sid, media)) if event.media in ('audio', 'video'): account = event.conn.name - ctrl = (self.msg_win_mgr.get_control(event.fjid, account) - or self.msg_win_mgr.get_control(event.jid, account)) + ctrl = (app.window.get_control(account, event.fjid) or + app.window.get_control(account, event.jid)) if ctrl: con = app.connections[account] session = con.get_module('Jingle').get_jingle_session( @@ -992,11 +1002,12 @@ def handle_event_jingle_connected(self, event): for content in event.media: session.approve_content(content) - def handle_event_jingle_disconnected(self, event): + @staticmethod + def handle_event_jingle_disconnected(event): # ('JINGLE_DISCONNECTED', account, (peerjid, sid, reason)) account = event.conn.name - ctrl = (self.msg_win_mgr.get_control(event.fjid, account) - or self.msg_win_mgr.get_control(event.jid, account)) + ctrl = (app.window.get_control(account, event.fjid) or + app.window.get_control(account, event.jid)) if ctrl: if event.media is None: ctrl.stop_jingle(sid=event.sid, reason=event.reason) @@ -1013,11 +1024,12 @@ def handle_event_jingle_disconnected(self, event): sid=event.sid, reason=event.reason) - def handle_event_jingle_error(self, event): + @staticmethod + def handle_event_jingle_error(event): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) account = event.conn.name - ctrl = (self.msg_win_mgr.get_control(event.fjid, account) - or self.msg_win_mgr.get_control(event.jid, account)) + ctrl = (app.window.get_control(account, event.fjid) or + app.window.get_control(account, event.jid)) if ctrl and event.sid == ctrl.jingle['audio'].sid: ctrl.set_jingle_state( 'audio', @@ -1030,7 +1042,8 @@ def handle_event_roster_item_exchange(obj): RosterItemExchangeWindow(obj.conn.name, obj.action, obj.exchange_items_list, obj.fjid) - def handle_event_plain_connection(self, event): + @staticmethod + def handle_event_plain_connection(event): ConfirmationDialog( _('Insecure Connection'), _('Insecure Connection'), @@ -1241,20 +1254,6 @@ def handle_event(self, account, fjid, type_): if isinstance(ctrl, BaseControl): ctrl.scroll_to_end() - def show_groupchat(self, account, room_jid): - return False - minimized_control = self.minimized_controls[account].get(room_jid) - if minimized_control is not None: - self.roster.on_groupchat_maximized(None, room_jid, account) - return True - - if self.msg_win_mgr.has_window(room_jid, account): - gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) - # FIXME: Access message window directly - gc_ctrl.parent_win.set_active_tab(gc_ctrl) - return True - return False - def create_groupchat(self, account, room_jid, config): if app.window.chat_exists(account, room_jid): log.error('Trying to create groupchat ' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/12b031ee093cdeecd31f3f3302a9f31… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/12b031ee093cdeecd31f3f3302a9f31… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Fix date for Gajim 1.3.0-beta2
by Daniel Brötzmann (＠wurstsalat) 10 Aug '21

10 Aug '21

Daniel Brötzmann pushed to branch gajim_1.3 at gajim / gajim Commits: 47908d9b by Daniel Brötzmann at 2021-08-10T08:20:35+00:00 Fix date for Gajim 1.3.0-beta2 - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -60,7 +60,7 @@ Gajim 1.3.0 (08 February 2021) * #10421 Chat: Fix race condition when closing with ESC -Gajim 1.3.0-beta2 (10 January 2020) +Gajim 1.3.0-beta2 (10 January 2021) Changes View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47908d9bb93e1f65bc60c10cbe415688… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/47908d9bb93e1f65bc60c10cbe415688… 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 August 2021