Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] refactor: HTTPUpload: Simplify dict access
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 84d86503 by lovetox at 2022-08-12T22:44:06+02:00 refactor: HTTPUpload: Simplify dict access - - - - - 1 changed file: - gajim/common/modules/httpupload.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -24,6 +24,7 @@ import io from urllib.parse import urlparse import mimetypes +from collections import defaultdict from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError @@ -69,7 +70,7 @@ def __init__(self, con: types.Client) -> None: self._session.props.user_agent = f'Gajim {app.version}' self._running_transfers: dict[ - tuple[str, str], set[HTTPFileTransfer]] = {} + tuple[str, JID], set[HTTPFileTransfer]] = defaultdict(set) def _set_proxy_if_available(self) -> None: proxy = get_account_proxy(self._account) @@ -102,7 +103,7 @@ def get_running_transfers(self, contact: types.ChatContactT ) -> Optional[set[HTTPFileTransfer]]: - return self._running_transfers.get((contact.account, str(contact.jid))) + return self._running_transfers.get((contact.account, contact.jid)) def make_transfer(self, path: str, @@ -148,22 +149,16 @@ def make_transfer(self, encryption, groupchat) - running_transfers = self._running_transfers.get( - (contact.account, str(contact.jid))) - if running_transfers is None: - self._running_transfers[ - (contact.account, str(contact.jid))] = {transfer} - else: - running_transfers.add(transfer) + key = (contact.account, contact.jid) + self._running_transfers[key].add(transfer) return transfer def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: transfer.set_cancelled() - transfer_set = self._running_transfers.get( - (transfer.account, str(transfer.contact.jid))) - if transfer_set is not None: - transfer_set.discard(transfer) + + key = (transfer.account, transfer.contact.jid) + self._running_transfers[key].discard(transfer) message = self._queued_messages.get(id(transfer)) if message is None: @@ -285,12 +280,11 @@ def _on_finish(self, message: Soup.Message, transfer: HTTPFileTransfer ) -> None: + self._queued_messages.pop(id(transfer), None) - transfer_set = self._running_transfers.get( - (transfer.account, str(transfer.contact.jid))) - if transfer_set is not None: - transfer_set.discard(transfer) + key = (transfer.account, transfer.contact.jid) + self._running_transfers[key].discard(transfer) if message.props.status_code == Soup.Status.CANCELLED: self._log.info('Upload cancelled') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84d865031208e204cf1171b13d9aaddf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84d865031208e204cf1171b13d9aaddf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: refactor: MessageActionsBox: Register events
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 13b61fe8 by lovetox at 2022-08-12T21:28:46+02:00 refactor: MessageActionsBox: Register events - - - - - 3aa0c042 by lovetox at 2022-08-12T21:42:15+02:00 refactor: ChatStack: Register events - - - - - c29838b7 by lovetox at 2022-08-12T22:06:28+02:00 refactor: ChatPage: Remove unused method - - - - - 10ee7c7b by lovetox at 2022-08-12T22:28:23+02:00 refactor: ChatListStack: Register events - - - - - 9 changed files: - gajim/common/events.py - gajim/gtk/app_page.py - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/main.py - gajim/gtk/main_stack.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/events.py ===================================== @@ -44,20 +44,17 @@ from gajim.plugins.pluginmanager import PluginManifest -MainEventT = Union['PresenceReceived', - 'MessageSent', - 'MessageReceived', - 'MamMessageReceived', - 'GcMessageReceived', - 'MessageUpdated', - 'ReceiptReceived', - 'DisplayedReceived', - 'MessageError', - 'MucDiscoUpdate', - 'JingleConnectedReceived', - 'JingleDisconnectedReceived', - 'JingleErrorReceived', - 'FileRequestSent'] +ChatListEventT = Union[ + 'MessageReceived', + 'MamMessageReceived', + 'GcMessageReceived', + 'MessageUpdated', + 'MessageModerated', + 'PresenceReceived', + 'MessageSent', + 'JingleRequestReceived', + 'FileRequestReceivedEvent' +] @dataclass ===================================== gajim/gtk/app_page.py ===================================== @@ -21,7 +21,6 @@ from gi.repository import Gtk from gajim.common import app -from gajim.common.events import ApplicationEvent from gajim.common.helpers import open_uri from gajim.common.i18n import _ from gajim.plugins.pluginmanager import PluginManifest @@ -91,9 +90,6 @@ def remove_app_message(self) -> None: self._unread_count -= 1 self.emit('unread-count-changed', self._unread_count) - def process_event(self, event: ApplicationEvent) -> None: - pass - class AppMessageListBox(Gtk.ListBox): def __init__(self) -> None: ===================================== gajim/gtk/chat_list.py ===================================== @@ -366,7 +366,7 @@ def update_time(self) -> None: for _key, row in self._chats.items(): row.update_time() - def process_event(self, event: events.ApplicationEvent) -> None: + def process_event(self, event: events.ChatListEventT) -> None: if isinstance(event, (events.MessageReceived, events.MamMessageReceived, events.GcMessageReceived)): @@ -381,7 +381,7 @@ def process_event(self, event: events.ApplicationEvent) -> None: self._on_message_sent(event) elif isinstance(event, events.JingleRequestReceived): self._on_jingle_request_received(event) - elif isinstance(event, events.FileRequestReceivedEvent): + elif isinstance(event, events.FileRequestReceivedEvent): # pyright: ignore [reportUnnecessaryIsInstance] # noqa self._on_file_request_received(event) else: log.warning('Unhandled Event: %s', event.name) ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -27,6 +27,8 @@ from gajim.common import app from gajim.common import events +from gajim.common import ged +from gajim.common.ged import EventHelper from gajim.common.i18n import _ from . import structs @@ -37,20 +39,7 @@ from .dialogs import ConfirmationCheckDialog -HANDLED_EVENTS = ( - events.MessageReceived, - events.MamMessageReceived, - events.GcMessageReceived, - events.MessageUpdated, - events.MessageModerated, - events.PresenceReceived, - events.MessageSent, - events.JingleRequestReceived, - events.FileRequestReceivedEvent -) - - -class ChatListStack(Gtk.Stack): +class ChatListStack(Gtk.Stack, EventHelper): __gsignals__ = { 'unread-count-changed': (GObject.SignalFlags.RUN_LAST, @@ -72,6 +61,7 @@ def __init__(self, search_entry: Gtk.SearchEntry ) -> None: Gtk.Stack.__init__(self) + EventHelper.__init__(self) self.set_hexpand(True) self.set_vexpand(True) self.set_vhomogeneous(False) @@ -89,6 +79,18 @@ def __init__(self, self._add_actions() self.show_all() + self.register_events([ + ('message-received', ged.GUI2, self._on_event), + ('mam-message-received', ged.GUI2, self._on_event), + ('gc-message-received', ged.GUI2, self._on_event), + ('message-updated', ged.GUI2, self._on_event), + ('message-moderated', ged.GUI2, self._on_event), + ('presence-received', ged.GUI2, self._on_event), + ('message-sent', ged.GUI2, self._on_event), + ('file-request-received', ged.GUI2, self._on_event), + ('jingle-request-received', ged.GUI2, self._on_event), + ]) + def _add_actions(self) -> None: actions = [ ('toggle-chat-pinned', 'a{sv}', self._toggle_chat_pinned), @@ -332,10 +334,7 @@ def mark_as_read(self, account: str, jid: JID) -> None: for chat_list in self._chat_lists.values(): chat_list.mark_as_read(account, jid) - def process_event(self, event: events.ApplicationEvent) -> None: - if not isinstance(event, HANDLED_EVENTS): - return - + def _on_event(self, event: events.ChatListEventT) -> None: jid = JID.from_string(event.jid) chat_list = self.find_chat(event.account, jid) ===================================== gajim/gtk/chat_page.py ===================================== @@ -26,7 +26,6 @@ from nbxmpp import JID from gajim.common import app -from gajim.common.events import ApplicationEvent from .builder import get_builder from .chat_filter import ChatFilter @@ -182,10 +181,6 @@ def _on_chat_list_changed(self, self._ui.workspace_label.set_text(name) self._ui.search_entry.set_text('') - def process_event(self, event: ApplicationEvent): - self._chat_stack.process_event(event) - self._chat_list_stack.process_event(event) - def add_chat_list(self, workspace_id: str) -> None: self._chat_list_stack.add_chat_list(workspace_id) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -14,7 +14,6 @@ from __future__ import annotations -from typing import Any from typing import Optional import sys @@ -139,6 +138,11 @@ def __init__(self): self._connect_actions() self.show_all() + self.register_events([ + ('message-received', 85, self._on_message_received), + ('muc-disco-update', 85, self._on_muc_disco_update), + ]) + def _get_current_contact(self) -> ChatContactT: assert self._current_contact is not None return self._current_contact @@ -305,14 +309,13 @@ def _on_user_affiliation_changed(self, self._update_group_chat_actions(contact) def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: - if self._current_contact is None: + if not isinstance(self._current_contact, GroupchatContact): return if event.jid != self._current_contact.jid: return - if isinstance(self._current_contact, GroupchatContact): - self._update_group_chat_actions(self._current_contact) + self._update_group_chat_actions(self._current_contact) def _on_message_received(self, event: events.MessageReceived) -> None: if not event.msgtxt or event.properties.is_sent_carbon: @@ -725,15 +728,6 @@ def clear(self) -> None: self._message_action_box.clear() self._chat_control.clear() - def process_event(self, event: Any) -> None: - if isinstance(event, events.MucDiscoUpdate): - self._on_muc_disco_update(event) - - if isinstance(event, events.MessageReceived): - self._on_message_received(event) - - self._message_action_box.process_event(event) - class ChatPlaceholderBox(Gtk.Box): def __init__(self): ===================================== gajim/gtk/main.py ===================================== @@ -109,23 +109,11 @@ def __init__(self) -> None: self._ui.connect_signals(self) self.register_events([ - ('presence-received', ged.GUI1, self._on_event), - ('message-sent', ged.GUI1, self._on_event), - ('message-received', ged.CORE, self._on_message_received), - ('mam-message-received', ged.CORE, self._on_event), - ('gc-message-received', ged.CORE, self._on_event), - ('message-updated', ged.CORE, self._on_event), - ('message-moderated', ged.CORE, self._on_event), - ('receipt-received', ged.GUI1, self._on_event), - ('displayed-received', ged.GUI1, self._on_event), + ('message-received', ged.GUI1, self._on_message_received), ('read-state-sync', ged.GUI1, self._on_read_state_sync), - ('message-error', ged.GUI1, self._on_event), - ('muc-disco-update', ged.GUI1, self._on_event), ('call-started', ged.GUI1, self._on_call_started), - ('call-stopped', ged.GUI1, self._on_event), ('jingle-request-received', ged.GUI1, self._on_jingle_request), ('file-request-received', ged.GUI1, self._on_file_request), - ('file-request-sent', ged.GUI1, self._on_event), ('account-enabled', ged.GUI1, self._on_account_enabled), ('account-disabled', ged.GUI1, self._on_account_disabled), ('allow-gajim-update-check', ged.GUI1, self._on_allow_gajim_update), @@ -907,12 +895,6 @@ def _load_chats(self) -> None: self._set_startup_finished() - def _on_event(self, event: events.MainEventT) -> None: - if not self.chat_exists(event.account, event.jid): - return - - self._main_stack.process_event(event) - def _on_message_received(self, event: events.MessageReceived) -> None: if not self.chat_exists(event.account, event.jid): if not event.properties.body: @@ -927,8 +909,6 @@ def _on_message_received(self, event: events.MessageReceived) -> None: jid = event.properties.jid.new_as_bare() self.add_chat(event.account, jid, 'contact') - self._main_stack.process_event(event) - def _on_read_state_sync(self, event: events.ReadStateSync) -> None: if event.is_muc_pm: jid = JID.from_string(event.jid.bare) @@ -960,14 +940,10 @@ def _on_jingle_request(self, event: events.JingleRequestReceived) -> None: self.add_chat(event.account, event.jid, 'contact') break - self._main_stack.process_event(event) - def _on_file_request(self, event: events.FileRequestReceivedEvent) -> None: if not self.chat_exists(event.account, event.jid): self.add_chat(event.account, event.jid, 'contact') - self._main_stack.process_event(event) - def quit(self) -> None: save_main_window_position() window_width, window_height = self.get_size() ===================================== gajim/gtk/main_stack.py ===================================== @@ -15,14 +15,12 @@ from __future__ import annotations from typing import Union -from typing import cast from nbxmpp.protocol import JID from gi.repository import Gtk from gajim.common import app -from gajim.common.events import ApplicationEvent from .app_page import AppPage from .chat_list import ChatList @@ -88,18 +86,6 @@ def get_chat_page(self) -> ChatPage: assert isinstance(chat_page, ChatPage) return chat_page - def process_event(self, event: ApplicationEvent) -> None: - empty_box = self.get_child_by_name('empty') - pages = cast(list[PageT], self.get_children()) - for page in pages: - if page is empty_box: - continue - - if isinstance(page, AccountPage): - continue - - page.process_event(event) - def _on_chat_selected(self, _chat_list: ChatList, _workspace_id: str, ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -37,6 +37,7 @@ from gajim.common import app from gajim.common import events from gajim.common import i18n +from gajim.common import ged from gajim.common.i18n import _ from gajim.common.client import Client from gajim.common.const import SimpleClientState @@ -65,9 +66,10 @@ log = logging.getLogger('gajim.gui.messageactionsbox') -class MessageActionsBox(Gtk.Grid): +class MessageActionsBox(Gtk.Grid, ged.EventHelper): def __init__(self) -> None: Gtk.Grid.__init__(self) + ged.EventHelper.__init__(self) self._client: Optional[Client] = None self._contact: Optional[ChatContactT] = None @@ -120,6 +122,10 @@ def __init__(self) -> None: self._connect_actions() + self.register_events([ + ('message-sent', ged.GUI2, self._on_message_sent) + ]) + def get_current_contact(self) -> ChatContactT: assert self._contact is not None return self._contact @@ -689,7 +695,3 @@ def _on_message_sent(self, event: events.MessageSent) -> None: self.msg_textview.get_style_context().remove_class( 'gajim-msg-correcting') - - def process_event(self, event: events.ApplicationEvent) -> None: - if isinstance(event, events.MessageSent): - self._on_message_sent(event) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eb6ce2dcdce5918aa60c1452214f70e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eb6ce2dcdce5918aa60c1452214f70e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: AccountPage: Remove boilerplate code for event handling
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4965174b by lovetox at 2022-08-12T21:15:11+02:00 refactor: AccountPage: Remove boilerplate code for event handling No actual events are currently handled - - - - - eb6ce2dc by lovetox at 2022-08-12T21:16:24+02:00 refactor: ChatControl: Register events Register events directly in the widget instead of depending on process_events(). This is better for clarity and readability. - - - - - 6 changed files: - gajim/common/ged.py - gajim/gtk/account_page.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/main_stack.py - gajim/gtk/roster.py Changes: ===================================== gajim/common/ged.py ===================================== @@ -114,6 +114,9 @@ class EventHelper: def __init__(self): self.__event_handlers: list[EventHandlerT] = [] + def has_events_registered(self) -> bool: + return bool(self.__event_handlers) + def register_event(self, event_name: str, priority: int, ===================================== gajim/gtk/account_page.py ===================================== @@ -21,7 +21,6 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize -from gajim.common.events import ApplicationEvent from gajim.common.events import SubscribePresenceReceived from gajim.common.events import UnsubscribedPresenceReceived from gajim.common.events import MucInvitation @@ -151,6 +150,3 @@ def _muc_invitation_declined(self, event: MucDecline) -> None: if event.account != self._account: return self._notification_manager.add_invitation_declined(event) - - def process_event(self, event: ApplicationEvent) -> None: - self._roster.process_event(event) ===================================== gajim/gtk/chat_stack.py ===================================== @@ -732,7 +732,6 @@ def process_event(self, event: Any) -> None: if isinstance(event, events.MessageReceived): self._on_message_received(event) - self._chat_control.process_event(event) self._message_action_box.process_event(event) ===================================== gajim/gtk/control.py ===================================== @@ -35,6 +35,7 @@ from gajim.common import app from gajim.common import events +from gajim.common import ged from gajim.common import helpers from gajim.common import types from gajim.common.helpers import get_file_path_from_dnd_dropped_uri @@ -152,6 +153,7 @@ def clear(self) -> None: self._scrolled_view.clear() self._groupchat_state.clear() self._roster.clear() + self.unregister_events() def switch_contact(self, contact: Union[BareContact, GroupchatContact, @@ -172,6 +174,8 @@ def switch_contact(self, contact: Union[BareContact, self.encryption = self.get_encryption_state() + self._register_events() + if isinstance(contact, GroupchatParticipant): contact.multi_connect({ 'user-status-show-changed': self._on_user_status_show_changed, @@ -206,60 +210,174 @@ def switch_contact(self, contact: Union[BareContact, for transfer in transfers: self.add_file_transfer(transfer) - def process_event(self, event: events.MainEventT) -> None: - if self._contact is None: + def _register_events(self) -> None: + if self.has_events_registered(): return + self.register_events([ + ('presence-received', ged.GUI2, self._on_presence_received), + ('message-sent', ged.GUI2, self._on_message_sent), + ('message-received', ged.GUI2, self._on_message_received), + ('mam-message-received', ged.GUI2, self._on_mam_message_received), + ('gc-message-received', ged.GUI2, self._on_gc_message_received), + ('message-updated', ged.GUI2, self._on_message_updated), + ('message-moderated', ged.GUI2, self._on_message_moderated), + ('receipt-received', ged.GUI2, self._on_receipt_received), + ('displayed-received', ged.GUI2, self._on_displayed_received), + ('message-error', ged.GUI2, self._on_message_error), + ('call-stopped', ged.GUI2, self._on_call_stopped), + ('jingle-request-received', + ged.GUI2, self._on_jingle_request_received), + ('file-request-received', ged.GUI2, self._on_file_request_event), + ('file-request-sent', ged.GUI2, self._on_file_request_event), + ]) + + def _is_event_processable(self, event: Any) -> bool: + if self._contact is None: + return False + if event.account != self._contact.account: + return False + + if event.jid != self._contact.jid: + return False + return True + + def _on_presence_received(self, event: events.PresenceReceived) -> None: + if not self._is_event_processable(event): + return + + if not app.settings.get('print_status_in_chats'): + return + + contact = self.client.get_module('Contacts').get_contact(event.fjid) + if isinstance(contact, BareContact): return + self.conversation_view.add_user_status(self.contact.name, + contact.show.value, + contact.status) - if event.jid not in (self._contact.jid, self._contact.jid.bare): + def _on_message_sent(self, event: events.MessageSent) -> None: + if not self._is_event_processable(event): return - file_transfer_events = ( - events.FileRequestReceivedEvent, - events.FileRequestSent - ) + if not event.message: + return - if isinstance(event, file_transfer_events): - self.add_jingle_file_transfer(event=event) + if self.contact.is_groupchat: return - if isinstance(event, events.JingleRequestReceived): - active_jid = app.call_manager.get_active_call_jid() - # Don't add a second row if contact upgrades to video - if active_jid is None: - self.add_call_message(event=event) + message_id = event.message_id + + if event.label: + displaymarking = event.label.displaymarking + else: + displaymarking = None + + if event.correct_id: + self.conversation_view.correct_message( + event.correct_id, event.message, self.get_our_nick()) return - if isinstance(event, events.CallStopped): - self.conversation_view.update_call_rows() + self.add_message(event.message, + 'outgoing', + tim=event.timestamp, + displaymarking=displaymarking, + message_id=message_id, + additional_data=event.additional_data) + + def _on_message_received(self, event: events.MessageReceived) -> None: + if not self._is_event_processable(event): return - if isinstance(event, events.MessageReceived) and not self.is_groupchat: - self._on_message_received(event) + if self.is_groupchat: return - if isinstance(event, events.MessageSent): - self._on_message_sent(event) + if not event.msgtxt: return - if isinstance(event, events.MessageError): - self._on_message_error(event) + kind = 'incoming' + if event.properties.is_sent_carbon: + kind = 'outgoing' + + self.add_message(event.msgtxt, + kind, + tim=event.properties.timestamp, + displaymarking=event.displaymarking, + msg_log_id=event.msg_log_id, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) + + def _on_mam_message_received(self, + event: events.MamMessageReceived) -> None: + + if not self._is_event_processable(event): return - method_name = event.name.replace('-', '_') - method_name = f'_on_{method_name}' - getattr(self, method_name)(event) + if isinstance(self.contact, GroupchatContact): - def _on_message_error(self, event: events.MessageError) -> None: - self.conversation_view.show_error(event.message_id, event.error) + if not event.properties.type.is_groupchat: + return + if event.archive_jid != self.contact.jid: + return + self.add_muc_message(event.msgtxt, + tim=event.properties.mam.timestamp, + contact=event.properties.muc_nickname, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) + + else: + + if event.properties.is_muc_pm: + if not event.properties.jid == self.contact.jid: + return + else: + if not event.properties.jid.bare_match(self.contact.jid): + return + + kind = 'incoming' + if event.kind == KindConstant.CHAT_MSG_SENT: + kind = 'outgoing' + + self.add_message(event.msgtxt, + kind, + tim=event.properties.mam.timestamp, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) + + def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: + if not self._is_event_processable(event): + return + + if event.properties.muc_nickname is None: + # message from server + self.add_muc_message(event.msgtxt, + tim=event.properties.timestamp, + displaymarking=event.displaymarking, + additional_data=event.additional_data) + else: + self.add_muc_message(event.msgtxt, + tim=event.properties.timestamp, + contact=event.properties.muc_nickname, + displaymarking=event.displaymarking, + message_id=event.properties.id, + stanza_id=event.stanza_id, + additional_data=event.additional_data) def _on_message_updated(self, event: events.MessageUpdated) -> None: + if not self._is_event_processable(event): + return + self.conversation_view.correct_message( event.correct_id, event.msgtxt, event.nickname) def _on_message_moderated(self, event: events.MessageModerated) -> None: + if not self._is_event_processable(event): + return + text = get_retraction_text( self.contact.account, event.moderation.moderator_jid, @@ -267,6 +385,52 @@ def _on_message_moderated(self, event: events.MessageModerated) -> None: self.conversation_view.show_message_retraction( event.moderation.stanza_id, text) + def _on_receipt_received(self, event: events.ReceiptReceived) -> None: + if not self._is_event_processable(event): + return + + self.conversation_view.show_receipt(event.receipt_id) + + def _on_displayed_received(self, event: events.DisplayedReceived) -> None: + if not self._is_event_processable(event): + return + + self.conversation_view.set_read_marker(event.marker_id) + + def _on_message_error(self, event: events.MessageError) -> None: + if not self._is_event_processable(event): + return + + self.conversation_view.show_error(event.message_id, event.error) + + def _on_call_stopped(self, event: events.CallStopped) -> None: + if not self._is_event_processable(event): + return + + self.conversation_view.update_call_rows() + + def _on_jingle_request_received(self, + event: events.JingleRequestReceived + ) -> None: + + if not self._is_event_processable(event): + return + + active_jid = app.call_manager.get_active_call_jid() + # Don't add a second row if contact upgrades to video + if active_jid is None: + self.add_call_message(event=event) + + def _on_file_request_event(self, + event: Union[events.FileRequestReceivedEvent, + events.FileRequestSent] + ) -> None: + + if not self._is_event_processable(event): + return + + self.add_jingle_file_transfer(event=event) + @property def is_chat(self) -> bool: return isinstance(self.contact, BareContact) @@ -279,9 +443,6 @@ def is_privatechat(self) -> bool: def is_groupchat(self) -> bool: return isinstance(self.contact, GroupchatContact) - def _on_ping_event(self, event: events.PingEventT) -> None: - raise NotImplementedError - def mark_as_read(self, send_marker: bool = True) -> None: self._jump_to_end_button.reset_unread_count() @@ -523,91 +684,6 @@ def add_messages(self, messages: list[ConversationRow]): marker=msg.marker, error=msg.error) - def _on_mam_message_received(self, - event: events.MamMessageReceived) -> None: - - if isinstance(self.contact, GroupchatContact): - - if not event.properties.type.is_groupchat: - return - if event.archive_jid != self.contact.jid: - return - self.add_muc_message(event.msgtxt, - tim=event.properties.mam.timestamp, - contact=event.properties.muc_nickname, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) - - else: - - if event.properties.is_muc_pm: - if not event.properties.jid == self.contact.jid: - return - else: - if not event.properties.jid.bare_match(self.contact.jid): - return - - kind = 'incoming' - if event.kind == KindConstant.CHAT_MSG_SENT: - kind = 'outgoing' - - self.add_message(event.msgtxt, - kind, - tim=event.properties.mam.timestamp, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) - - def _on_message_received(self, event: events.MessageReceived) -> None: - if not event.msgtxt: - return - - kind = 'incoming' - if event.properties.is_sent_carbon: - kind = 'outgoing' - - self.add_message(event.msgtxt, - kind, - tim=event.properties.timestamp, - displaymarking=event.displaymarking, - msg_log_id=event.msg_log_id, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) - - def _on_message_sent(self, event: events.MessageSent) -> None: - if not event.message: - return - - if self.contact.is_groupchat: - return - - message_id = event.message_id - - if event.label: - displaymarking = event.label.displaymarking - else: - displaymarking = None - - if event.correct_id: - self.conversation_view.correct_message( - event.correct_id, event.message, self.get_our_nick()) - return - - self.add_message(event.message, - 'outgoing', - tim=event.timestamp, - displaymarking=displaymarking, - message_id=message_id, - additional_data=event.additional_data) - - def _on_receipt_received(self, event: events.ReceiptReceived) -> None: - self.conversation_view.show_receipt(event.receipt_id) - - def _on_displayed_received(self, event: events.DisplayedReceived) -> None: - self.conversation_view.set_read_marker(event.marker_id) - def add_message(self, text: str, kind: str, @@ -634,17 +710,6 @@ def add_message(self, stanza_id=stanza_id, additional_data=additional_data) - def _on_presence_received(self, event: events.PresenceReceived) -> None: - if not app.settings.get('print_status_in_chats'): - return - - contact = self.client.get_module('Contacts').get_contact(event.fjid) - if isinstance(contact, BareContact): - return - self.conversation_view.add_user_status(self.contact.name, - contact.show.value, - contact.status) - def _on_user_nickname_changed(self, _user_contact: GroupchatParticipant, _signal_name: str, @@ -708,9 +773,6 @@ def _on_user_status_show_changed(self, status=status) self.add_info_message(message) - def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: - pass - def invite(self, invited_jid: JID) -> None: # TODO: Remove, used by command system self.client.get_module('MUC').invite( @@ -743,22 +805,6 @@ def on_approve() -> None: callback=on_approve)], modal=False).show() - def _on_gc_message_received(self, event: events.GcMessageReceived) -> None: - if event.properties.muc_nickname is None: - # message from server - self.add_muc_message(event.msgtxt, - tim=event.properties.timestamp, - displaymarking=event.displaymarking, - additional_data=event.additional_data) - else: - self.add_muc_message(event.msgtxt, - tim=event.properties.timestamp, - contact=event.properties.muc_nickname, - displaymarking=event.displaymarking, - message_id=event.properties.id, - stanza_id=event.stanza_id, - additional_data=event.additional_data) - def add_muc_message(self, text: str, tim: float, ===================================== gajim/gtk/main_stack.py ===================================== @@ -94,6 +94,10 @@ def process_event(self, event: ApplicationEvent) -> None: for page in pages: if page is empty_box: continue + + if isinstance(page, AccountPage): + continue + page.process_event(event) def _on_chat_selected(self, ===================================== gajim/gtk/roster.py ===================================== @@ -56,8 +56,6 @@ log = logging.getLogger('gajim.gui.roster') -HANDLED_EVENTS = [] - DEFAULT_GROUP = _('Contacts') @@ -727,10 +725,6 @@ def _clear(self): self._group_refs.clear() self._store.clear() - def process_event(self, event: ApplicationEvent) -> None: - if event.name not in HANDLED_EVENTS: - return - def _on_destroy(self, _roster: Roster) -> None: app.settings.disconnect_signals(self) self._contact_refs.clear() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/61889089ad09bfba371c8adc3c67200… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/61889089ad09bfba371c8adc3c67200… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: fix: FileTransferRow: Don’t cancel transfer when switching chat
by Daniel Brötzmann (＠wurstsalat) 12 Aug '22

12 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 04b7998d by wurstsalat at 2022-08-12T20:32:23+02:00 fix: FileTransferRow: Don’t cancel transfer when switching chat - - - - - 61889089 by wurstsalat at 2022-08-12T20:32:23+02:00 imprv: Store and restore running HTTP File Transfer uploads - - - - - 3 changed files: - gajim/common/modules/httpupload.py - gajim/gtk/control.py - gajim/gtk/conversation/rows/file_transfer.py Changes: ===================================== gajim/common/modules/httpupload.py ===================================== @@ -68,6 +68,9 @@ def __init__(self, con: types.Client) -> None: self._session.props.ssl_strict = False self._session.props.user_agent = f'Gajim {app.version}' + self._running_transfers: dict[ + tuple[str, str], set[HTTPFileTransfer]] = {} + def _set_proxy_if_available(self) -> None: proxy = get_account_proxy(self._account) if proxy is None: @@ -95,6 +98,12 @@ def pass_disco(self, info: DiscoInfo) -> None: GLib.FormatSizeFlags.IEC_UNITS) self._log.info('Component has a maximum file size of: %s', size) + def get_running_transfers(self, + contact: types.ChatContactT + ) -> Optional[set[HTTPFileTransfer]]: + + return self._running_transfers.get((contact.account, str(contact.jid))) + def make_transfer(self, path: str, encryption: Optional[str], @@ -132,15 +141,30 @@ def make_transfer(self, mime = 'application/octet-stream' # fallback mime type self._log.info('Detected MIME type of file: %s', mime) - return HTTPFileTransfer(self._account, - path, - contact, - mime, - encryption, - groupchat) + transfer = HTTPFileTransfer(self._account, + path, + contact, + mime, + encryption, + groupchat) + + running_transfers = self._running_transfers.get( + (contact.account, str(contact.jid))) + if running_transfers is None: + self._running_transfers[ + (contact.account, str(contact.jid))] = {transfer} + else: + running_transfers.add(transfer) + + return transfer def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: transfer.set_cancelled() + transfer_set = self._running_transfers.get( + (transfer.account, str(transfer.contact.jid))) + if transfer_set is not None: + transfer_set.discard(transfer) + message = self._queued_messages.get(id(transfer)) if message is None: return @@ -263,6 +287,11 @@ def _on_finish(self, ) -> None: self._queued_messages.pop(id(transfer), None) + transfer_set = self._running_transfers.get( + (transfer.account, str(transfer.contact.jid))) + if transfer_set is not None: + transfer_set.discard(transfer) + if message.props.status_code == Soup.Status.CANCELLED: self._log.info('Upload cancelled') return ===================================== gajim/gtk/control.py ===================================== @@ -200,6 +200,12 @@ def switch_contact(self, contact: Union[BareContact, self._client.get_module('Chatstate').set_active(contact) + transfers = self._client.get_module('HTTPUpload').get_running_transfers( + contact) + if transfers is not None: + for transfer in transfers: + self.add_file_transfer(transfer) + def process_event(self, event: events.MainEventT) -> None: if self._contact is None: return ===================================== gajim/gtk/conversation/rows/file_transfer.py ===================================== @@ -70,6 +70,8 @@ def __init__(self, account: str, transfer: HTTPFileTransfer) -> None: self._ui = get_builder('file_transfer.ui') self.grid.attach(self._ui.transfer_box, 1, 1, 1, 1) self._ui.file_name.set_text(transfer.filename) + self._ui.transfer_description.set_text( + transfer.get_state_description()) self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) @@ -79,14 +81,14 @@ def __init__(self, account: str, transfer: HTTPFileTransfer) -> None: def _on_destroy(self, *args: Any) -> None: self._destroyed = True - if self._transfer.state.is_active: - self._transfer.cancel() - del self._transfer if self._pulse is not None: GLib.source_remove(self._pulse) def _on_cancel_clicked(self, _button: Gtk.Button) -> None: + if self._transfer.state.is_active: + self._transfer.cancel() + self.destroy() def _on_transfer_state_change(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b24d9286cbe8e1fa106e41701911fb5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b24d9286cbe8e1fa106e41701911fb5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: MessageRow: Simplify code
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: b24d9286 by lovetox at 2022-08-12T18:44:25+02:00 refactor: MessageRow: Simplify code kind can only be 'incoming' or 'outgoing' - - - - - 1 changed file: - gajim/gtk/conversation/rows/message.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -141,11 +141,10 @@ def __init__(self, timestamp_label = self.create_timestamp_widget(self.timestamp) self._meta_box.pack_start(timestamp_label, False, True, 0) - if kind in ('incoming', 'incoming_queue', 'outgoing'): - if additional_data is not None: - encryption_img = self._get_encryption_image(additional_data) - if encryption_img: - self._meta_box.pack_start(encryption_img, False, True, 0) + if additional_data is not None: + encryption_img = self._get_encryption_image(additional_data) + if encryption_img: + self._meta_box.pack_start(encryption_img, False, True, 0) if display_marking and app.settings.get_account_setting( account, 'enable_security_labels'): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b24d9286cbe8e1fa106e41701911fb58… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b24d9286cbe8e1fa106e41701911fb58… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: ChatStack: Allow Any for event processing
by Daniel Brötzmann (＠wurstsalat) 12 Aug '22

12 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 74755fb5 by wurstsalat at 2022-08-12T18:27:01+02:00 chore: ChatStack: Allow Any for event processing - - - - - c7139cf4 by wurstsalat at 2022-08-12T18:27:11+02:00 chore: Update pyrightconfig - - - - - 2 changed files: - gajim/gtk/chat_stack.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -14,6 +14,7 @@ from __future__ import annotations +from typing import Any from typing import Optional import sys @@ -724,9 +725,10 @@ def clear(self) -> None: self._message_action_box.clear() self._chat_control.clear() - def process_event(self, event: events.MainEventT) -> None: + def process_event(self, event: Any) -> None: if isinstance(event, events.MucDiscoUpdate): self._on_muc_disco_update(event) + if isinstance(event, events.MessageReceived): self._on_message_received(event) ===================================== pyrightconfig.json ===================================== @@ -95,7 +95,7 @@ "gajim/gtk/mam_preferences.py", "gajim/gtk/manage_sounds.py", "gajim/gtk/menus.py", - "gajim/gtk/message_action_box.py", + "gajim/gtk/message_actions_box.py", "gajim/gtk/message_input.py", "gajim/gtk/notification_manager.py", "gajim/gtk/notification.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/35d8a2fb27486ba34ea8afd7016cb10… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/35d8a2fb27486ba34ea8afd7016cb10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Events: Add 'MessageReceived' to 'MainEventT'
by Daniel Brötzmann (＠wurstsalat) 12 Aug '22

12 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 35d8a2fb by wurstsalat at 2022-08-12T18:15:17+02:00 chore: Events: Add 'MessageReceived' to 'MainEventT' - - - - - 1 changed file: - gajim/common/events.py Changes: ===================================== gajim/common/events.py ===================================== @@ -46,6 +46,7 @@ MainEventT = Union['PresenceReceived', 'MessageSent', + 'MessageReceived', 'MamMessageReceived', 'GcMessageReceived', 'MessageUpdated', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35d8a2fb27486ba34ea8afd7016cb103… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/35d8a2fb27486ba34ea8afd7016cb103… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Move notification logic from Control to ChatStack
by Daniel Brötzmann (＠wurstsalat) 12 Aug '22

12 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 5ed1791e by wurstsalat at 2022-08-12T18:03:52+02:00 refactor: Move notification logic from Control to ChatStack - - - - - 2 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -14,11 +14,11 @@ from __future__ import annotations -from typing import Any from typing import Optional import sys import logging +import time from gi.repository import Gdk from gi.repository import GLib @@ -31,8 +31,9 @@ from nbxmpp.structs import PresenceProperties from gajim.common import app +from gajim.common import events from gajim.common import helpers -from gajim.common.events import MucDiscoUpdate +from gajim.common import preview_helpers from gajim.common.i18n import _ from gajim.common.const import CallType from gajim.common.modules.contacts import BareContact @@ -47,7 +48,9 @@ from .control import ChatControl from .message_actions_box import MessageActionsBox from .message_input import MessageInputTextView -from .util import EventHelper, open_window +from .util import EventHelper +from .util import open_window +from .util import set_urgency_hint log = logging.getLogger('gajim.gui.chatstack') @@ -300,7 +303,7 @@ def _on_user_affiliation_changed(self, ) -> None: self._update_group_chat_actions(contact) - def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: + def _on_muc_disco_update(self, event: events.MucDiscoUpdate) -> None: if self._current_contact is None: return @@ -310,6 +313,84 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: if isinstance(self._current_contact, GroupchatContact): self._update_group_chat_actions(self._current_contact) + def _on_message_received(self, event: events.MessageReceived) -> None: + if not event.msgtxt or event.properties.is_sent_carbon: + return + + if app.window.is_chat_active(event.account, event.jid): + return + + self._issue_notification(event) + + def _issue_notification(self, event: events.MessageReceived) -> None: + text = event.msgtxt + tim = event.properties.timestamp + additional_data = event.additional_data + client = app.get_client(event.account) + contact = client.get_module('Contacts').get_contact(event.jid) + + title = _('New message from') + + is_previewable = app.preview_manager.is_previewable( + text, additional_data) + if is_previewable: + if text.startswith('geo:'): + text = _('Location') + else: + file_name = preview_helpers.filename_from_uri(text) + _icon, file_type = preview_helpers.guess_simple_file_type(text) + text = f'{file_type} ({file_name})' + + sound: Optional[str] = None + msg_type = 'chat-message' + if isinstance(contact, BareContact): + msg_type = 'chat-message' + title += f' {contact.name}' + sound = 'first_message_received' + set_urgency_hint(app.window, True) + + if isinstance(contact, GroupchatContact): + msg_type = 'group-chat-message' + title += f' {contact.nickname} ({contact.name})' + assert contact.nickname is not None + needs_highlight = helpers.message_needs_highlight( + text, contact.nickname, client.get_own_jid().bare) + if needs_highlight: + sound = 'muc_message_highlight' + else: + sound = 'muc_message_received' + + if not contact.can_notify() and not needs_highlight: + return + + if contact.can_notify() or needs_highlight: + set_urgency_hint(app.window, True) + + if isinstance(contact, GroupchatParticipant): + msg_type = 'private-chat-message' + title += f' {contact.name} (private in {contact.room.name})' + sound = 'first_message_received' + + # Is it a history message? Don't want sound-floods when we join. + if tim is not None and time.mktime(time.localtime()) - tim > 1: + sound = None + + if app.settings.get('notification_preview_message'): + if text.startswith('/me') or text.startswith('/me\n'): + name = contact.name + if isinstance(contact, GroupchatContact): + name = contact.nickname + text = f'* {name} {text[3:]}' + + app.ged.raise_event( + events.Notification(account=contact.account, + jid=contact.jid, + type='incoming-message', + sub_type=msg_type, + title=title, + text=text, + sound=sound)) + def _connect_actions(self) -> None: actions = [ 'add-to-roster', @@ -643,9 +724,12 @@ def clear(self) -> None: self._message_action_box.clear() self._chat_control.clear() - def process_event(self, event: Any) -> None: - if isinstance(event, MucDiscoUpdate): + def process_event(self, event: events.MainEventT) -> None: + if isinstance(event, events.MucDiscoUpdate): self._on_muc_disco_update(event) + if isinstance(event, events.MessageReceived): + self._on_message_received(event) + self._chat_control.process_event(event) self._message_action_box.process_event(event) ===================================== gajim/gtk/control.py ===================================== @@ -37,7 +37,6 @@ from gajim.common import events from gajim.common import helpers from gajim.common import types -from gajim.common.helpers import message_needs_highlight from gajim.common.helpers import get_file_path_from_dnd_dropped_uri from gajim.common.helpers import to_user_string from gajim.common.i18n import _ @@ -49,14 +48,11 @@ from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.httpupload import HTTPFileTransfer -from gajim.common.preview_helpers import filename_from_uri -from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.storage.archive import ConversationRow from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.conversation.jump_to_end_button import JumpToEndButton from gajim.gui.builder import get_builder -from gajim.gui.util import set_urgency_hint from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.groupchat_roster import GroupchatRoster @@ -367,7 +363,6 @@ def _add_message(self, kind: str, name: str, tim: float, - notify: bool, displaymarking: Optional[Displaymarking] = None, msg_log_id: Optional[int] = None, message_id: Optional[str] = None, @@ -378,9 +373,6 @@ def _add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - chat_active = app.window.is_chat_active( - self.contact.account, self.contact.jid) - if self._allow_add_message(): self.conversation_view.add_message( text, @@ -407,89 +399,6 @@ def _add_message(self, else: self.last_msg_id = message_id - if kind == 'incoming': - if notify: - # Issue notification - self._notify(name, text, tim, additional_data) - - if not chat_active and notify: - if isinstance(self._contact, GroupchatContact): - assert self._contact.nickname is not None - needs_highlight = message_needs_highlight( - text, - self._contact.nickname, - self.client.get_own_jid().bare) - if needs_highlight or self._contact.can_notify(): - set_urgency_hint(app.window, True) - else: - set_urgency_hint(app.window, True) - - def _notify(self, - name: str, - text: str, - tim: Optional[float], - additional_data: AdditionalDataDict - ) -> None: - if app.window.is_chat_active(self.contact.account, self.contact.jid): - if self._scrolled_view.get_autoscroll(): - return - - title = _('New message from %s') % name - - is_previewable = app.preview_manager.is_previewable( - text, additional_data) - if is_previewable: - if text.startswith('geo:'): - text = _('Location') - else: - file_name = filename_from_uri(text) - _icon, file_type = guess_simple_file_type(text) - text = f'{file_type} ({file_name})' - - sound: Optional[str] = None - msg_type = 'chat-message' - if self.is_chat: - msg_type = 'chat-message' - sound = 'first_message_received' - - if isinstance(self._contact, GroupchatContact): - msg_type = 'group-chat-message' - title += f' ({self._contact.name})' - assert self._contact.nickname is not None - needs_highlight = message_needs_highlight( - text, self._contact.nickname, self.client.get_own_jid().bare) - if needs_highlight: - sound = 'muc_message_highlight' - else: - sound = 'muc_message_received' - - if not self._contact.can_notify() and not needs_highlight: - return - - if self.is_privatechat: - room_contact = self.client.get_module('Contacts').get_contact( - self.contact.jid.bare) - msg_type = 'private-chat-message' - title += f' (private in {room_contact.name})' - sound = 'first_message_received' - - # Is it a history message? Don't want sound-floods when we join. - if tim is not None and time.mktime(time.localtime()) - tim > 1: - sound = None - - if app.settings.get('notification_preview_message'): - if text.startswith('/me') or text.startswith('/me\n'): - text = f'* {name} {text[3:]}' - - app.ged.raise_event( - events.Notification(account=self.contact.account, - jid=self.contact.jid, - type='incoming-message', - sub_type=msg_type, - title=title, - text=text, - sound=sound)) - def reset_view(self) -> None: self._scrolled_view.reset() @@ -622,8 +531,7 @@ def _on_mam_message_received(self, contact=event.properties.muc_nickname, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data, - notify=False) + additional_data=event.additional_data) else: @@ -643,8 +551,7 @@ def _on_mam_message_received(self, tim=event.properties.mam.timestamp, message_id=event.properties.id, stanza_id=event.stanza_id, - additional_data=event.additional_data, - notify=False) + additional_data=event.additional_data) def _on_message_received(self, event: events.MessageReceived) -> None: if not event.msgtxt: @@ -703,8 +610,7 @@ def add_message(self, msg_log_id: Optional[int] = None, stanza_id: Optional[str] = None, message_id: Optional[str] = None, - additional_data: Optional[AdditionalDataDict] = None, - notify: bool = True + additional_data: Optional[AdditionalDataDict] = None ) -> None: if kind == 'incoming': @@ -716,7 +622,6 @@ def add_message(self, kind, name, tim, - notify, displaymarking=displaymarking, msg_log_id=msg_log_id, message_id=message_id, @@ -856,7 +761,6 @@ def add_muc_message(self, message_id: Optional[str] = None, stanza_id: Optional[str] = None, additional_data: Optional[AdditionalDataDict] = None, - notify: bool = True ) -> None: assert isinstance(self._contact, GroupchatContact) @@ -871,7 +775,6 @@ def add_muc_message(self, kind, contact, tim, - notify, displaymarking=displaymarking, message_id=message_id, stanza_id=stanza_id, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ed1791e52cc058b849ce4b7baf4c3be… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5ed1791e52cc058b849ce4b7baf4c3be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Simplify showing current encryption state
by Philipp Hörist (＠lovetox) 12 Aug '22

12 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8aed5d2d by lovetox at 2022-08-12T17:54:53+02:00 refactor: Simplify showing current encryption state - - - - - 4 changed files: - gajim/gtk/control.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -175,7 +175,6 @@ def switch_contact(self, contact: Union[BareContact, self._roster.switch_contact(contact) self.encryption = self.get_encryption_state() - self.conversation_view.encryption_enabled = self.encryption is not None if isinstance(contact, GroupchatParticipant): contact.multi_connect({ @@ -293,7 +292,6 @@ def mark_as_read(self, send_marker: bool = True) -> None: def set_encryption_state(self, encryption: Optional[str]) -> None: self.encryption = encryption - self.conversation_view.encryption_enabled = encryption is not None self.contact.settings.set('encryption', self.encryption or '') def get_encryption_state(self) -> Optional[str]: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -74,7 +74,6 @@ def __init__(self, display_marking: Optional[Displaymarking] = None, marker: Optional[str] = None, error: Union[CommonError, StanzaError, None] = None, - encryption_enabled: bool = False, log_line_id: Optional[int] = None) -> None: BaseRow.__init__(self, account) @@ -144,8 +143,7 @@ def __init__(self, if kind in ('incoming', 'incoming_queue', 'outgoing'): if additional_data is not None: - encryption_img = self._get_encryption_image( - additional_data, encryption_enabled) + encryption_img = self._get_encryption_image(additional_data) if encryption_img: self._meta_box.pack_start(encryption_img, False, True, 0) @@ -344,12 +342,12 @@ def _on_retract(reason: str) -> None: def _get_encryption_image(self, additional_data: AdditionalDataDict, - encryption_enabled: bool = False ) -> Optional[Gtk.Image]: + details = self._get_encryption_details(additional_data) if details is None: # Message was not encrypted - if not encryption_enabled: + if not self._contact.settings.get('encryption'): return None icon = 'channel-insecure-symbolic' color = 'unencrypted-color' ===================================== gajim/gtk/conversation/view.py ===================================== @@ -75,8 +75,6 @@ def __init__(self) -> None: self._contact = None self._client = None - self.encryption_enabled: bool = False - # Keeps track of the number of rows shown in ConversationView self._row_count: int = 0 self._max_row_count: int = 100 @@ -265,7 +263,6 @@ def add_message(self, display_marking=display_marking, marker=marker, error=error, - encryption_enabled=self.encryption_enabled, log_line_id=log_line_id) if message_id is not None: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -120,11 +120,6 @@ def __init__(self) -> None: self._connect_actions() - def _get_encryption_state(self) -> tuple[bool, str]: - assert self._contact is not None - encryption = self._contact.settings.get('encryption') - return bool(encryption), encryption - def get_current_contact(self) -> ChatContactT: assert self._contact is not None return self._contact @@ -322,7 +317,6 @@ def _change_encryption(self, return self._set_encryption_state(new_state) - # self.conversation_view.encryption_enabled = encryption is not None contact = self.get_current_contact() contact.settings.set('encryption', new_state) @@ -514,9 +508,10 @@ def _on_buffer_changed(self, textbuffer: Gtk.TextBuffer) -> None: send_message_action = app.window.get_action('send-message') send_message_action.set_enabled(has_text) - encryption_enabled, encryption_name = self._get_encryption_state() + assert self._contact is not None + encryption_name = self._contact.settings.get('encryption') - if has_text and encryption_enabled: + if has_text and encryption_name: app.plugin_manager.extension_point('typing' + encryption_name, self) assert self._contact View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8aed5d2dd79004df46c9567f802c43ce… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8aed5d2dd79004df46c9567f802c43ce… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatBanner: Don’t show phone icon for group chats
by Daniel Brötzmann (＠wurstsalat) 12 Aug '22

12 Aug '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: cd21fb0e by wurstsalat at 2022-08-12T16:38:05+02:00 fix: ChatBanner: Don’t show phone icon for group chats - - - - - 1 changed file: - gajim/gtk/chat_banner.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -243,7 +243,7 @@ def _on_message_received(self, event: MessageReceived) -> None: if kind == 'outgoing': return - if event.resource is not None: + if event.resource is not None and not self._contact.is_groupchat: resource_contact = self._contact.get_resource(event.resource) self._ui.phone_image.set_visible(resource_contact.is_phone) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd21fb0e7a3485acdd14185bd4cd5597… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd21fb0e7a3485acdd14185bd4cd5597… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits