Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][unify-control] 2 commits: fix: ChatControl: Fix type discovery
by Philipp Hörist (＠lovetox) 08 Aug '22

08 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: d35e20ed by lovetox at 2022-08-08T14:34:06+02:00 fix: ChatControl: Fix type discovery - - - - - 65d64165 by lovetox at 2022-08-08T14:56:31+02:00 fix: Disable user status show callback - - - - - 1 changed file: - gajim/gtk/control.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -256,25 +256,17 @@ def _on_message_moderated(self, event: events.MessageModerated) -> None: self.conversation_view.show_message_retraction( event.moderation.stanza_id, text) - @property - def type(self) -> ControlType: - assert self._type is not None - return self._type - @property def is_chat(self) -> bool: - assert self._type is not None - return self._type.is_chat + return isinstance(self.contact, BareContact) @property def is_privatechat(self) -> bool: - assert self._type is not None - return self._type.is_privatechat + return isinstance(self.contact, GroupchatParticipant) @property def is_groupchat(self) -> bool: - assert self._type is not None - return self._type.is_groupchat + return isinstance(self.contact, GroupchatContact) def _on_ping_event(self, event: events.PingEventT) -> None: raise NotImplementedError @@ -769,7 +761,7 @@ def _on_user_status_show_changed(self, ) -> None: # TODO: This cant work - + return if isinstance(self.contact, GroupchatContact): if not contact.settings.get('print_status'): return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b07384caf5f4d60e5fa0f183d8fc500… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b07384caf5f4d60e5fa0f183d8fc500… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 4 commits: fix: Remove unused import
by Philipp Hörist (＠lovetox) 07 Aug '22

07 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 69c22ce9 by lovetox at 2022-08-07T23:27:38+02:00 fix: Remove unused import - - - - - 257272d8 by lovetox at 2022-08-07T23:58:45+02:00 other: Contacts: Add dedicated methods for adding contacts - - - - - b875983e by lovetox at 2022-08-07T23:59:15+02:00 other: Add contacts when opening chats - - - - - b07384ca by lovetox at 2022-08-07T23:59:26+02:00 fix: Check for None - - - - - 4 changed files: - gajim/common/modules/contacts.py - gajim/gtk/chat_page.py - gajim/gtk/control.py - gajim/gtk/main.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -21,6 +21,7 @@ from typing import overload import cairo +from gi.repository.GObject import Value from nbxmpp.const import Affiliation from nbxmpp.const import Chatstate from nbxmpp.const import Role @@ -122,6 +123,56 @@ def _on_client_state_changed(self, if state.is_disconnected: self._reset_presence() + def add_chat_contact(self, jid: Union[str, JID]) -> BareContact: + if isinstance(jid, str): + jid = JID.from_string(jid) + + contact = self._contacts.get(jid) + if contact is not None: + if not isinstance(contact, BareContact): + raise ValueError(f'Trying to add GroupchatContact {jid}, ' + f'but contact exists already as {contact}') + return contact + + contact = BareContact(self._log, jid, self._account) + + self._contacts[jid] = contact + return contact + + def add_group_chat_contact(self, jid: Union[str, JID]) -> GroupchatContact: + if isinstance(jid, str): + jid = JID.from_string(jid) + + contact = self._contacts.get(jid) + if contact is not None: + if not isinstance(contact, GroupchatContact): + raise ValueError(f'Trying to add GroupchatContact {jid}, ' + f'but contact exists already as {contact}') + return contact + + contact = GroupchatContact(self._log, jid, self._account) + + self._contacts[jid] = contact + return contact + + def add_private_contact(self, jid: Union[str, JID]) -> GroupchatParticipant: + if isinstance(jid, str): + jid = JID.from_string(jid) + + if jid.resource is None: + raise ValueError(f'Trying to add a bare JID as private {jid}') + + contact = self._contacts.get(jid.bare) + if not isinstance(contact, GroupchatContact): + raise ValueError(f'Trying to add GroupchatParticipant {jid}, ' + f'to BareContact {contact}') + + if contact is None: + group_chat_contact = self.add_group_chat_contact(jid.bare) + return group_chat_contact.add_resource(jid.resource) + + return contact.add_resource(jid.resource) + def add_contact(self, jid: Union[str, JID], groupchat: bool = False) -> Union[BareContact, @@ -597,6 +648,10 @@ def add_resource(self, resource: str) -> GroupchatParticipant: # codebase is type checked and it creates hard to track # problems if we create a GroupchatParticipant without resource + contact = self._resources.get(resource) + if contact is not None: + return contact + jid = self._jid.new_with(resource=resource) assert isinstance(self._log, LogAdapter) contact = GroupchatParticipant(self._log, jid, self._account) ===================================== gajim/gtk/chat_page.py ===================================== @@ -224,6 +224,18 @@ def add_chat_for_workspace(self, type_: str, pinned: bool = False, select: bool = False) -> None: + + client = app.get_client(account) + + if type_ == 'chat': + client.get_module('Contacts').add_chat_contact(jid) + + elif type_ == 'groupchat': + client.get_module('Contacts').add_group_chat_contact(jid) + + elif type_ == 'pm': + client.get_module('Contacts').add_group_private_contact(jid) + if self.chat_exists(account, jid): if select: self._chat_list_stack.select_chat(account, jid) ===================================== gajim/gtk/control.py ===================================== @@ -134,7 +134,9 @@ def has_active_chat(self) -> bool: return self.contact is not None def clear(self) -> None: - self.contact.disconnect_all_from_obj(self) + if self.contact is not None: + self.contact.disconnect_all_from_obj(self) + self.contact = None self._clinet = None self.account = None ===================================== gajim/gtk/main.py ===================================== @@ -16,7 +16,6 @@ from typing import Any from typing import cast -from typing import Generator from typing import Optional import logging View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/07c857c3be2c811b6ccb659b70a251a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/07c857c3be2c811b6ccb659b70a251a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] fix: Set timeout for host-meta http query
by Philipp Hörist (＠lovetox) 07 Aug '22

07 Aug '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5ea00ba8 by lovetox at 2022-08-07T23:07:14+02:00 fix: Set timeout for host-meta http query The default timeout seems to be 60 seconds which is much too long. Fixes #130 - - - - - 1 changed file: - nbxmpp/addresses.py Changes: ===================================== nbxmpp/addresses.py ===================================== @@ -137,6 +137,7 @@ class ServerAddresses(Observable): def _resolve_alternatives(self) -> None: session = Soup.Session() + session.props.timeout = 5 session.props.user_agent = f'nbxmpp/{nbxmpp.__version__}' message = Soup.Message.new( 'GET', f'https://{self._domain}/.well-known/host-meta') View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5ea00ba89882bd13a8488cb9… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/5ea00ba89882bd13a8488cb9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] refactor: Remove unused arg
by Philipp Hörist (＠lovetox) 07 Aug '22

07 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: 07c857c3 by lovetox at 2022-08-07T17:27:25+02:00 refactor: Remove unused arg - - - - - 2 changed files: - gajim/gtk/control.py - gajim/gtk/groupchat_roster.py Changes: ===================================== gajim/gtk/control.py ===================================== @@ -98,7 +98,7 @@ def __init__(self) -> None: self._scrolled_view.connect('request-history', self.fetch_n_lines_history, 20) - self.roster = GroupchatRoster(self) + self.roster = GroupchatRoster() self.roster.connect('row-activated', self._on_roster_row_activated) self._show_roster_setting = app.settings.get( ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -72,7 +72,7 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): (str, )) } - def __init__(self, control: ControlT) -> None: + def __init__(self) -> None: Gtk.ScrolledWindow.__init__(self) EventHelper.__init__(self) self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) @@ -80,7 +80,6 @@ def __init__(self, control: ControlT) -> None: self._contact = None - self._control = control self._tooltip = GCTooltip() self._ui = get_builder('groupchat_roster.ui') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07c857c3be2c811b6ccb659b70a251a6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/07c857c3be2c811b6ccb659b70a251a6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 11 commits: fix: ConversationsView: Make it switch contact
by Philipp Hörist (＠lovetox) 07 Aug '22

07 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: e718aafb by lovetox at 2022-08-07T15:24:45+02:00 fix: ConversationsView: Make it switch contact - - - - - 0c923879 by lovetox at 2022-08-07T15:25:15+02:00 fix: ChatControl: Determine encryption on contact switch - - - - - 7eed9c80 by lovetox at 2022-08-07T15:26:24+02:00 refactor: ChatControl: Rename builder attribute - - - - - ff7e33c1 by lovetox at 2022-08-07T15:45:47+02:00 refactor: Determine anonymous state from contact - - - - - a55ca7b2 by lovetox at 2022-08-07T15:49:23+02:00 refactor: Determine room jid from contact - - - - - d3796175 by lovetox at 2022-08-07T15:50:12+02:00 refactor: Remove comments - - - - - 3ecb05f9 by lovetox at 2022-08-07T15:58:28+02:00 refactor: Remove abstract methods - - - - - 3c9bed65 by lovetox at 2022-08-07T16:14:15+02:00 refactor: GroupChatState: Make it switch contacts - - - - - b6b3342c by lovetox at 2022-08-07T16:40:27+02:00 refactor: GroupchatRoster: Make it switch contacts - - - - - 5725d8d4 by lovetox at 2022-08-07T16:46:35+02:00 refactor: Make subject text cache work - - - - - 0bfc1113 by lovetox at 2022-08-07T17:21:43+02:00 fix: Fix some bugs - - - - - 5 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/control.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_roster.py - gajim/gtk/groupchat_state.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -75,7 +75,7 @@ def __init__(self): box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box.add(self._chat_banner) box.add(Gtk.Separator()) - box.add(self._chat_control) + box.add(self._chat_control.widget) box.add(Gtk.Separator()) box.add(self._message_action_box) ===================================== gajim/gtk/control.py ===================================== @@ -76,63 +76,55 @@ def __init__(self) -> None: self.contact = None self._client = None - self.xml = get_builder('chat_control.ui') - self.widget = cast(Gtk.Box, self.xml.get_object('control_box')) + self._ui = get_builder('chat_control.ui') - # Create ConversationView and connect signals self.conversation_view = ConversationView() self._scrolled_view = ScrolledView() self._scrolled_view.add(self.conversation_view) self._scrolled_view.set_focus_vadjustment(Gtk.Adjustment()) - self.xml.conv_view_overlay.add(self._scrolled_view) + self._ui.conv_view_overlay.add(self._scrolled_view) + + self._groupchat_state = GroupchatState() + self._ui.conv_view_overlay.add_overlay(self._groupchat_state) self._jump_to_end_button = JumpToEndButton() self._jump_to_end_button.connect('clicked', self._on_jump_to_end) - self.xml.conv_view_overlay.add_overlay(self._jump_to_end_button) + self._ui.conv_view_overlay.add_overlay(self._jump_to_end_button) self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) self._scrolled_view.connect('request-history', self.fetch_n_lines_history, 20) + self.roster = GroupchatRoster(self) + self.roster.connect('row-activated', self._on_roster_row_activated) + + self._show_roster_setting = app.settings.get( + 'hide_groupchat_occupants_list') + app.settings.connect_signal( + 'hide_groupchat_occupants_list', self._show_roster) + + self._roster_revealer = Gtk.Revealer() + self._roster_revealer.add(self.roster) + self._ui.conv_view_box.add(self._roster_revealer) + # Keeps track of whether the ConversationView is populated self._chat_loaded: bool = False # XEP-0333 Chat Markers self.last_msg_id: Optional[str] = None - self.encryption: Optional[str] = self.get_encryption_state() - self.conversation_view.encryption_enabled = self.encryption is not None - - self.widget.show_all() - - # GROUPCHAT INIT - - # self.is_anonymous: bool = True + self.encryption: Optional[str] = None - # self.room_jid = str(self.contact.jid) - - # self._groupchat_state = GroupchatState(self.contact) - # self.xml.conv_view_overlay.add_overlay(self._groupchat_state) - - # self.roster = GroupchatRoster(self.account, self.room_jid, self) - # self.roster.connect('row-activated', self._on_roster_row_activated) - - # show_roster = app.settings.get('hide_groupchat_occupants_list') - # self._roster_revealer = Gtk.Revealer(no_show_all=not show_roster) - # self._roster_revealer.add(self.roster) - # self._roster_revealer.set_reveal_child(show_roster) - # self.xml.conv_view_box.add(self._roster_revealer) - - # app.settings.connect_signal( - # 'hide_groupchat_occupants_list', self._show_roster) - - # self._subject_text = '' + self._subject_text_cache: dict[JID, str] = {} # self._set_control_inactive() + self.widget = cast(Gtk.Box, self._ui.get_object('control_box')) + self.widget.show_all() + def is_loaded(self, account: str, jid: JID) -> bool: if self.contact is None: return False @@ -146,13 +138,19 @@ def clear(self) -> None: self.contact = None self._clinet = None self.account = None + self.encryption = None + self.last_msg_id = None self.reset_view() + self._groupchat_state.clear() + self.roster.clear() def switch_contact(self, contact: Union[BareContact, GroupchatContact, GroupchatParticipant]) -> None: - self.contact.disconnect_all_from_obj(self) + if self.contact is not None: + self.contact.disconnect_all_from_obj(self) + self.contact = contact self.account = contact.account @@ -160,6 +158,15 @@ def switch_contact(self, contact: Union[BareContact, self._jump_to_end_button.switch_contact(contact) self.conversation_view.switch_contact(contact) + self._groupchat_state.switch_contact(contact) + self.roster.switch_contact(contact) + + show_roster = (isinstance(contact, GroupchatContact) and + self._show_roster_setting) + self._roster_revealer.set_reveal_child(show_roster) + + self.encryption = self.get_encryption_state() + self.conversation_view.encryption_enabled = self.encryption is not None if isinstance(self.contact, GroupchatParticipant): self.contact.multi_connect({ @@ -232,16 +239,6 @@ def process_event(self, event: events.ApplicationEvent) -> None: method_name = f'_on_{method_name}' getattr(self, method_name)(event) - def _on_message_sent(self, event: events.MessageSent) -> None: - ''' - Derived types MAY implement this - ''' - - def _on_message_received(self, event: events.MessageReceived) -> None: - ''' - Derived types MAY implement this - ''' - def _on_message_error(self, event: events.MessageError) -> None: self.conversation_view.show_error(event.message_id, event.error) @@ -618,9 +615,6 @@ def add_messages(self, messages: list[ConversationRow]): marker=msg.marker, error=msg.error) - -# Chat - def _on_mam_message_received(self, event: events.MamMessageReceived) -> None: @@ -628,7 +622,7 @@ def _on_mam_message_received(self, if not event.properties.type.is_groupchat: return - if event.archive_jid != self.room_jid: + if event.archive_jid != self.contact.jid: return self.add_muc_message(event.msgtxt, contact=event.properties.muc_nickname, @@ -808,6 +802,7 @@ def _on_muc_state_changed(self, _contact: GroupchatContact, _signal_name: str ) -> None: + if self.contact.is_joined: self._set_control_active() @@ -827,6 +822,7 @@ def invite(self, invited_jid: JID) -> None: _('%s has been invited to this group chat') % invited_contact.name) def _show_roster(self, show_roster: bool, *args: Any) -> None: + self._show_roster_setting = show_roster transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show_roster: self._roster_revealer.set_no_show_all(False) @@ -839,8 +835,10 @@ def _on_roster_row_activated(self, _roster: GroupchatRoster, nick: str ) -> None: + + disco = self.contact.get_disco() muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') - if not self.is_anonymous and muc_prefer_direct_msg: + if disco.muc_is_nonanonymous and muc_prefer_direct_msg: participant = self.contact.get_resource(nick) app.window.add_chat(self.account, participant.real_jid, @@ -861,7 +859,7 @@ def _on_room_voice_request(self, def on_approve() -> None: self._client.get_module('MUC').approve_voice_request( - self.room_jid, voice_request) + self.contact.jid, voice_request) ConfirmationDialog( _('Voice Request'), @@ -918,7 +916,7 @@ def add_muc_message(self, additional_data=additional_data) def _on_room_subject(self, - _contact: GroupchatContact, + contact: GroupchatContact, _signal_name: str, subject: Optional[MucSubject] ) -> None: @@ -926,11 +924,11 @@ def _on_room_subject(self, if subject is None: return - if self._subject_text == subject.text: + if self._subject_text_cache.get(contact.jid) == subject.text: # Probably a rejoin, we already showed that subject return - self._subject_text = subject.text + self._subject_text_cache[contact.jid] = subject.text if (app.settings.get('show_subject_on_join') or not self.contact.is_joining): @@ -957,7 +955,7 @@ def _on_room_config_changed(self, if StatusCode.CONFIG_NON_PRIVACY_RELATED in status_codes: changes.append(_('A setting not related to privacy has been ' 'changed')) - self._client.get_module('Discovery').disco_muc(self.room_jid) + self._client.get_module('Discovery').disco_muc(self.contact.jid) if StatusCode.CONFIG_ROOM_LOGGING in status_codes: # Can be a presence (see chg_contact_status in groupchat_control.py) @@ -968,15 +966,12 @@ def _on_room_config_changed(self, if StatusCode.CONFIG_NON_ANONYMOUS in status_codes: changes.append(_('Group chat is now non-anonymous')) - self.is_anonymous = False if StatusCode.CONFIG_SEMI_ANONYMOUS in status_codes: changes.append(_('Group chat is now semi-anonymous')) - self.is_anonymous = True if StatusCode.CONFIG_FULL_ANONYMOUS in status_codes: changes.append(_('Group chat is now fully anonymous')) - self.is_anonymous = True for change in changes: self.add_info_message(change) @@ -989,12 +984,12 @@ def _set_control_active(self) -> None: def _set_control_inactive(self) -> None: assert self.roster is not None self.roster.enable_sort(False) - self.roster.clear() + self.roster.reset() self._client.get_module('Chatstate').remove_delay_timeout(self.contact) def rejoin(self) -> None: - self._client.get_module('MUC').join(self.room_jid) + self._client.get_module('MUC').join(self.contact.jid) def _on_user_joined(self, _contact: GroupchatContact, @@ -1002,6 +997,7 @@ def _on_user_joined(self, user_contact: GroupchatParticipant, properties: PresenceProperties ) -> None: + nick = user_contact.name if not properties.is_muc_self_presence: if self.contact.is_joined: @@ -1017,7 +1013,6 @@ def _on_user_joined(self, if StatusCode.NON_ANONYMOUS in status_codes: self.add_info_message( _('Any participant is allowed to see your full XMPP Address')) - self.is_anonymous = False if StatusCode.CONFIG_ROOM_LOGGING in status_codes: self.add_info_message(_('Conversations are stored on the server')) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -67,18 +67,15 @@ class ConversationView(Gtk.ListBox): - def __init__(self, account: str, contact: ChatContactT) -> None: + def __init__(self) -> None: Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_sort_func(self._sort_func) - self._account = account - self._client: Optional[Client] = None - if account is not None: - self._client = app.get_client(account) - self._contact = contact + + self._contact = None + self._client = None self.encryption_enabled: bool = False - self.autoscroll: bool = True self.locked: bool = False # Keeps track of the number of rows shown in ConversationView @@ -91,45 +88,52 @@ def __init__(self, account: str, contact: ChatContactT) -> None: # message_id -> row mapping self._message_id_row_map: dict[str, MessageRow] = {} + def clear(self) -> None: + self._contact = None + self._client = None + + app.settings.disconnect_signals(self) + + self._reset_conversation_view() + + def switch_contact(self, contact: ChatContactT) -> None: + self._contact = contact + self._client = app.get_client(contact.account) + + self._reset_conversation_view() + + app.settings.disconnect_signals(self) + app.settings.connect_signal('print_join_left', self._on_contact_setting_changed, - account=self._account, - jid=self._contact.jid) + account=contact.account, + jid=contact.jid) app.settings.connect_signal('print_status', self._on_contact_setting_changed, - account=self._account, - jid=self._contact.jid) + account=contact.account, + jid=contact.jid) - if self._contact is not None: - self._read_marker_row = ReadMarkerRow(self._account, self._contact) - self.add(self._read_marker_row) + self._read_marker_row = ReadMarkerRow(contact.account, self._contact) + self.add(self._read_marker_row) - self._scroll_hint_row = ScrollHintRow(self._account) + self._scroll_hint_row = ScrollHintRow(contact.account) self.add(self._scroll_hint_row) - self.connect('destroy', self._on_destroy) def get_row_at_index(self, index: int) -> BaseRow: return cast(BaseRow, Gtk.ListBox.get_row_at_index(self, index)) - def _on_destroy(self, *args: Any) -> None: - app.check_finalize(self) - def lock(self) -> None: self.locked = True def unlock(self) -> None: self.locked = False - def clear(self) -> None: + def _reset_conversation_view(self) -> None: for row in self.get_children()[2:]: - if isinstance(row, ReadMarkerRow): - continue row.destroy() - self._reset_conversation_view() - - def _reset_conversation_view(self) -> None: + self.locked = False self._row_count = 0 self._active_date_rows = set() self._message_id_row_map = {} @@ -158,7 +162,7 @@ def _sort_func(row1: BaseRow, row2: BaseRow) -> int: return -1 if row1.timestamp < row2.timestamp else 1 def add_muc_subject(self, subject: MucSubject) -> None: - muc_subject = MUCSubject(self._account, subject) + muc_subject = MUCSubject(self._contact.account, subject) self._insert_message(muc_subject) def add_muc_user_left(self, @@ -169,7 +173,7 @@ def add_muc_user_left(self, if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-left', - self._account, + self._contact.account, nick, reason=reason, error=error) @@ -180,20 +184,20 @@ def add_muc_user_joined(self, nick: str) -> None: if not self._contact.settings.get('print_join_left'): return join_left = MUCJoinLeft('muc-user-joined', - self._account, + self._contact.account, nick) self._insert_message(join_left) def add_user_status(self, name: str, show: str, status: str) -> None: - user_status = UserStatus(self._account, name, show, status) + user_status = UserStatus(self._contact.account, name, show, status) self._insert_message(user_status) def add_info_message(self, text: str) -> None: - message = InfoMessage(self._account, text) + message = InfoMessage(self._contact.account, text) self._insert_message(message) def add_file_transfer(self, transfer: HTTPFileTransfer) -> None: - transfer_row = FileTransferRow(self._account, transfer) + transfer_row = FileTransferRow(self._contact.account, transfer) self._insert_message(transfer_row) def add_jingle_file_transfer(self, @@ -203,9 +207,13 @@ def add_jingle_file_transfer(self, None] = None, db_message: Optional[ConversationRow] = None ) -> None: + assert isinstance(self._contact, BareContact) jingle_transfer_row = FileTransferJingleRow( - self._account, self._contact, event=event, db_message=db_message) + self._contact.account, + self._contact, + event=event, + db_message=db_message) self._insert_message(jingle_transfer_row) def add_call_message(self, @@ -214,11 +222,15 @@ def add_call_message(self, ) -> None: assert isinstance(self._contact, BareContact) call_row = CallRow( - self._account, self._contact, event=event, db_message=db_message) + self._contact.account, + self._contact, + event=event, + db_message=db_message) self._insert_message(call_row) def add_command_output(self, text: str, is_error: bool) -> None: - command_output_row = CommandOutputRow(self._account, text, is_error) + command_output_row = CommandOutputRow( + self._contact.account, text, is_error) self._insert_message(command_output_row) def add_message(self, @@ -239,7 +251,7 @@ def add_message(self, timestamp = time.time() message_row = MessageRow( - self._account, + self._contact.account, self._contact, message_id, stanza_id, @@ -282,7 +294,7 @@ def _add_date_row(self, timestamp: datetime) -> None: if start_of_day in self._active_date_rows: return - date_row = DateRow(self._account, start_of_day) + date_row = DateRow(self._contact.account, start_of_day) self._active_date_rows.add(start_of_day) self.add(date_row) @@ -471,6 +483,7 @@ def correct_message(self, text: str, nickname: Optional[str] ) -> None: + message_row = self._get_row_by_message_id(correct_id) if message_row is not None: message_row.set_correction(text, nickname) @@ -497,6 +510,7 @@ def _on_contact_setting_changed(self, setting: str, _account: Optional[str], _jid: Optional[JID]) -> None: + if setting == 'print_join_left': if value: return ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -72,32 +72,16 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): (str, )) } - def __init__(self, - account: str, - room_jid: str, - control: ControlT - ) -> None: + def __init__(self, control: ControlT) -> None: Gtk.ScrolledWindow.__init__(self) EventHelper.__init__(self) self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self.get_style_context().add_class('groupchat-roster') - self._account = account - self.room_jid = room_jid + + self._contact = None + self._control = control self._tooltip = GCTooltip() - self._group_chat_contact = cast(GroupchatContact, control.contact) - self._group_chat_contact.connect( - 'user-avatar-update', self._on_user_avatar_update) - self._group_chat_contact.connect('user-joined', self._on_user_joined) - self._group_chat_contact.connect('user-left', self._on_user_left) - self._group_chat_contact.connect( - 'user-affiliation-changed', self._update_contact) - self._group_chat_contact.connect( - 'user-role-changed', self._update_contact) - self._group_chat_contact.connect( - 'user-status-show-changed', self._on_user_status_show_changed) - self._group_chat_contact.connect( - 'user-nickname-changed', self._on_user_nickname_changed) self._ui = get_builder('groupchat_roster.ui') self._ui.roster_treeview.set_model(None) @@ -119,13 +103,36 @@ def __init__(self, self._ui.contact_column.set_cell_data_func(self._ui.text_renderer, self._text_cell_data_func) - self.connect('destroy', self._on_destroy) self._ui.connect_signals(self) self.register_events([ ('theme-update', ged.GUI2, self._on_theme_update), ]) + def clear(self) -> None: + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) + + self._contact = None + self.reset() + + def switch_contact(self, contact: types.ChatContactT) -> None: + self.clear() + + if not isinstance(contact, GroupchatContact): + return + + contact.connect('user-avatar-update', self._on_user_avatar_update) + contact.connect('user-joined', self._on_user_joined) + contact.connect('user-left', self._on_user_left) + contact.connect('user-affiliation-changed', self._update_contact) + contact.connect('user-role-changed', self._update_contact) + contact.connect('user-nickname-changed', self._on_user_nickname_changed) + contact.connect('user-status-show-changed', + self._on_user_status_show_changed) + + self._contact = contact + @staticmethod def _on_focus_out(treeview: Gtk.TreeView, _param: Gdk.EventFocus) -> None: treeview.get_selection().unselect_all() @@ -164,7 +171,7 @@ def _query_tooltip(self, nickname = self._store[iter_][Column.NICK_OR_GROUP] - contact = self._group_chat_contact.get_resource(nickname) + contact = self._contact.get_resource(nickname) value, widget = self._tooltip.get_tooltip(contact) tooltip.set_custom(widget) @@ -335,7 +342,7 @@ def _on_roster_row_activated(self, # This is a group row return nick = self._store[iter_][Column.NICK_OR_GROUP] - if self._control.contact.nickname == nick: + if self._contact.nickname == nick: return self.emit('row-activated', nick) @@ -360,7 +367,7 @@ def _on_roster_button_press_event(self, return nick = self._store[iter_][Column.NICK_OR_GROUP] - if self._group_chat_contact.nickname == nick: + if self._contact.nickname == nick: return if event.button == 3: # right click @@ -373,9 +380,9 @@ def _on_roster_button_press_event(self, self.emit('row-activated', nick) def _show_contact_menu(self, nick: str, rect: Gdk.Rectangle) -> None: - self_contact = self._group_chat_contact.get_self() + self_contact = self._contact.get_self() assert self_contact is not None - contact = self._group_chat_contact.get_resource(nick) + contact = self._contact.get_resource(nick) menu = get_groupchat_roster_menu(self._account, self_contact, contact) @@ -410,8 +417,8 @@ def _tree_compare_iters(self, if not app.settings.get('sort_by_show_in_muc'): return locale.strcoll(nick1.lower(), nick2.lower()) - contact1 = self._group_chat_contact.get_resource(nick1) - contact2 = self._group_chat_contact.get_resource(nick2) + contact1 = self._contact.get_resource(nick1) + contact2 = self._contact.get_resource(nick2) if contact1.show != contact2.show: return -1 if contact1.show > contact2.show else 1 @@ -451,7 +458,7 @@ def _draw_contact(self, nick: str) -> None: if not iter_: return - contact = self._group_chat_contact.get_resource(nick) + contact = self._contact.get_resource(nick) self._draw_avatar(contact) @@ -460,8 +467,8 @@ def _draw_contact(self, nick: str) -> None: name = GLib.markup_escape_text(contact.name) # Strike name if blocked - fjid = f'{self.room_jid}/{nick}' - if jid_is_blocked(self._account, fjid): + fjid = f'{self._contact.jid}/{nick}' + if jid_is_blocked(self._contact.account, fjid): name = f'<span strikethrough="true">{name}</span>' # add status msg, if not empty, under contact name @@ -527,22 +534,7 @@ def _get_total_user_count(self) -> int: def _on_theme_update(self, _event: ApplicationEvent) -> None: self._redraw() - def clear(self) -> None: - self._contact_refs = {} - self._group_refs = {} - self._store.clear() - - def _on_destroy(self, _roster: Any) -> None: - self._group_chat_contact.disconnect(self) + def reset(self) -> None: self._contact_refs = {} self._group_refs = {} - self._roster.set_model(None) self._store.clear() - # Store keeps a ref on the object if we dont unset the sort func - self._store.set_sort_func(Column.TEXT, print) - self._tooltip.destroy() - del self._roster - del self._store - del self._control - del self._tooltip - app.check_finalize(self) ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -18,25 +18,42 @@ from gi.repository import Gtk from gajim.common import app +from gajim.common.types import ChatContactT from gajim.common.modules.contacts import GroupchatContact from gajim.gui.builder import get_builder class GroupchatState(Gtk.Box): - def __init__(self, contact: GroupchatContact) -> None: + def __init__(self) -> None: Gtk.Box.__init__(self) self.set_halign(Gtk.Align.CENTER) self.set_valign(Gtk.Align.END) self.set_no_show_all(True) - self._contact = contact - self._contact.connect('state-changed', self._on_muc_state_changed) + self._contact = None self._ui = get_builder('groupchat_state.ui') self._ui.connect_signals(self) self.add(self._ui.groupchat_state) self.show_all() + self.hide() + + def clear(self) -> None: + if self._contact is not None: + self._contact.disconnect_all_from_obj(self) + + self._contact = None + self.hide() + + def switch_contact(self, contact: ChatContactT) -> None: + self.clear() + + if not isinstance(contact, GroupchatContact): + return + + self._contact = contact + self._contact.connect('state-changed', self._on_muc_state_changed) self._update_state(contact) @@ -44,6 +61,7 @@ def _on_muc_state_changed(self, contact: GroupchatContact, _signal_name: str ) -> None: + self._update_state(contact) def _update_state(self, contact: GroupchatContact) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/77f81d8b02cdf54846ae218c92c6b00… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/77f81d8b02cdf54846ae218c92c6b00… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][unify-control] 2 commits: fix: Remove ControlStack and rework all methods using it
by Philipp Hörist (＠lovetox) 07 Aug '22

07 Aug '22

Philipp Hörist pushed to branch unify-control at gajim / gajim Commits: f47e790f by lovetox at 2022-08-07T13:50:12+02:00 fix: Remove ControlStack and rework all methods using it - - - - - 77f81d8b by lovetox at 2022-08-07T14:47:12+02:00 fix: Make control init work - - - - - 16 changed files: - gajim/gtk/application.py - gajim/gtk/chat_action_processor.py - gajim/gtk/chat_list.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/control.py - − gajim/gtk/control_stack.py - gajim/gtk/conversation/jump_to_end_button.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/message_actions_box.py - gajim/gtk/preferences.py - gajim/gtk/search_view.py - gajim/gtk/types.py - gajim/gui_interface.py - pyrightconfig.json Changes: ===================================== gajim/gtk/application.py ===================================== @@ -787,14 +787,14 @@ def _on_remove_history_action(_action: Gio.SimpleAction, params: structs.RemoveHistoryActionParams ) -> None: def _remove() -> None: + app.storage.archive.remove_history(params.account, params.jid) + control = app.window.get_control() if params.jid is not None: - app.storage.archive.remove_history(params.account, params.jid) - control = app.window.get_control(params.account, params.jid) - if control is not None: - control.reset_view() - else: - for control in app.window.get_controls(params.account): - control.reset_view() + if not control.is_loaded(params.account, params.jid): + return + + control.reset_view() + ConfirmationDialog( _('Remove Chat History'), _('Remove Chat History?'), ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -122,11 +122,13 @@ def _replace_text(self, selected_action: str) -> None: self._buf.insert(start_iter, selected_action) def _get_commands(self) -> list[str]: + # TODO + return [] + commands: list[str] = [] assert self._account assert self._contact - control = app.window.get_control(self._account, self._contact.jid) - assert control is not None + control = app.window.get_control() for command in control.list_commands(): for name in command.names: commands.append(name) ===================================== gajim/gtk/chat_list.py ===================================== @@ -819,8 +819,10 @@ def _get_unread_string(count: int) -> str: return '999+' def add_unread(self, text: str) -> None: - control = app.window.get_control(self.account, self.jid) - if self.is_active and control is not None and control.get_autoscroll(): + control = app.window.get_control() + if (self.is_active and + control.is_loaded(self.account, self.jid) and + control.get_autoscroll()): return self._unread_count += 1 ===================================== gajim/gtk/chat_page.py ===================================== @@ -35,7 +35,6 @@ from .chat_list import ChatList from .chat_list_stack import ChatListStack from .chat_stack import ChatStack -from .control_stack import ControlStack from .search_view import SearchView from .types import ControlT @@ -61,7 +60,7 @@ def __init__(self): self._chat_stack = ChatStack() self._ui.right_grid_overlay.add(self._chat_stack) - self._control_stack = self._chat_stack.get_control_stack() + self._chat_control = self._chat_stack.get_chat_control() self._search_view = SearchView() self._search_view.connect('hide-search', self._on_search_hide) @@ -124,9 +123,6 @@ def get_chat_list_stack(self) -> ChatListStack: def get_chat_stack(self) -> ChatStack: return self._chat_stack - def get_control_stack(self) -> ControlStack: - return self._control_stack - @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('s', '')) @@ -166,9 +162,10 @@ def _on_search_history(self, _action: Gio.SimpleAction, _param: Literal[None]) -> None: - control = self.get_active_control() - if control is not None: - self._search_view.set_context(control.account, control.contact.jid) + if self._chat_control.has_active_chat(): + self._search_view.set_context(self._chat_control.account, + self._chat_control.contact.jid) + self._search_view.clear() self._search_revealer.set_reveal_child(True) self._search_view.set_focus() @@ -232,16 +229,6 @@ def add_chat_for_workspace(self, self._chat_list_stack.select_chat(account, jid) return - if type_ == 'groupchat': - self._control_stack.add_group_chat(account, jid) - elif type_ == 'pm': - if not self._startup_finished: - # TODO: Currently we can’t load private chats at start - # because the Contacts dont exist yet - return - self._control_stack.add_private_chat(account, jid) - else: - self._control_stack.add_chat(account, jid) self._chat_list_stack.add_chat(workspace_id, account, jid, type_, pinned) @@ -285,7 +272,8 @@ def remove_chat(self, account: str, jid: JID) -> None: def _on_chat_removed(self, _chat_list: ChatList, account: str, jid: JID, type_: str) -> None: - self._control_stack.remove_chat(account, jid) + + self._chat_control.clear() if type_ == 'groupchat': client = app.get_client(account) client.get_module('MUC').leave(jid) @@ -296,23 +284,12 @@ def remove_chats_for_account(self, account: str) -> None: chat_list.unselect_all() self._chat_list_stack.remove_chats_for_account(account) - self._control_stack.remove_chats_for_account(account) - - def get_control(self, account: str, jid: JID) -> Optional[ControlT]: - return self._control_stack.get_control(account, jid) - - def get_active_control(self) -> Optional[ControlT]: - chat = self._chat_list_stack.get_selected_chat() - if chat is None: - return None - return self.get_control(chat.account, chat.jid) - - def is_chat_loaded(self, account: str, jid: JID) -> bool: - return self._control_stack.is_chat_loaded(account, jid) + if self._chat_control.has_active_chat(): + if self._chat_control.contact.account == account: + self._chat_control.clear() - def get_controls(self, account: Optional[str] - ) -> Generator[ControlT, None, None]: - return self._control_stack.get_controls(account) + def get_control(self) -> ControlT: + return self._chat_control def hide_search(self) -> bool: if self._search_revealer.get_reveal_child(): ===================================== gajim/gtk/chat_stack.py ===================================== @@ -44,8 +44,7 @@ from .chat_banner import ChatBanner from .chat_function_page import ChatFunctionPage from .const import TARGET_TYPE_URI_LIST -from .control_stack import ControlStack -from .controls.groupchat import GroupchatControl +from .control import ChatControl from .message_actions_box import MessageActionsBox from .util import EventHelper, open_window @@ -70,13 +69,13 @@ def __init__(self): self.add_named(self._chat_function_page, 'function') self._chat_banner = ChatBanner() - self._control_stack = ControlStack() + self._chat_control = ChatControl() self._message_action_box = MessageActionsBox() box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL) box.add(self._chat_banner) box.add(Gtk.Separator()) - box.add(self._control_stack) + box.add(self._chat_control) box.add(Gtk.Separator()) box.add(self._message_action_box) @@ -139,8 +138,8 @@ def process_escape(self) -> bool: return True return False - def get_control_stack(self) -> ControlStack: - return self._control_stack + def get_chat_control(self) -> ChatControl: + return self._chat_control def get_message_action_box(self) -> MessageActionsBox: return self._message_action_box @@ -157,7 +156,7 @@ def show_chat(self, account: str, jid: JID) -> None: self._current_contact = client.get_module('Contacts').get_contact(jid) self._chat_banner.switch_contact(account, jid) - self._control_stack.show_chat(account, jid) + self._chat_control.switch_contact(self._current_contact) self._message_action_box.switch_contact(self._current_contact) self._update_base_actions(self._current_contact) @@ -409,7 +408,6 @@ def _on_action(self, account = contact.account client = app.get_client(account) jid = contact.jid - current_control = self._control_stack.get_current_control() if action_name == 'send-message': self._on_send_message() @@ -442,8 +440,7 @@ def _on_action(self, open_window('AddContact', account=account, jid=jid) elif action_name == 'clear-chat': - assert current_control is not None - current_control.reset_view() + self._chat_control.reset_view() elif action_name == 'show-contact-info': if isinstance(contact, GroupchatContact): @@ -466,7 +463,6 @@ def _on_action(self, self._show_chat_function_page('change-nickname') elif action_name == 'muc-execute-command': - assert isinstance(current_control, GroupchatControl) nick = None if param is not None: nick = param.get_string() @@ -477,13 +473,11 @@ def _on_action(self, open_window('AdHocCommands', account=account, jid=jid) elif action_name == 'muc-kick': - assert isinstance(current_control, GroupchatControl) assert param is not None kick_nick = param.get_string() self._show_chat_function_page('kick', data=kick_nick) elif action_name == 'muc-ban': - assert isinstance(current_control, GroupchatControl) assert param is not None ban_jid = param.get_string() self._show_chat_function_page('ban', data=ban_jid) @@ -519,9 +513,8 @@ def _on_drag_data_received(self, # TODO: Contact drag and drop for invitations (AdHoc MUC/MUC) if target_type == TARGET_TYPE_URI_LIST: - control = app.window.get_active_control() - if control is not None: - control.drag_data_file_transfer(selection) + if self._chat_control.has_active_chat(): + self._chat_control.drag_data_file_transfer(selection) def _on_drag_leave(self, _widget: Gtk.Widget, @@ -569,17 +562,13 @@ def _on_function_message(self, _function_page: ChatFunctionPage, message: str ) -> None: - control = self._control_stack.get_current_control() - assert control is not None - control.add_info_message(message) + + self._chat_control.add_info_message(message) def _on_send_message(self) -> None: self._message_action_box.msg_textview.replace_emojis() message = self._message_action_box.msg_textview.get_text() - control = self._control_stack.get_current_control() - assert control is not None - contact = self._current_contact assert contact is not None @@ -588,7 +577,7 @@ def _on_send_message(self) -> None: self.sendmessage = True app.plugin_manager.extension_point( 'send_message' + encryption, - control) + self._chat_control) if not self.sendmessage: return @@ -622,7 +611,7 @@ def _on_send_message(self) -> None: type_=type_, chatstate=chatstate, label=label, - control=control, + control=self._chat_control, correct_id=correct_id) client.send_message(message_) @@ -647,12 +636,12 @@ def clear(self) -> None: self.set_visible_child_name('empty') self._chat_banner.clear() self._message_action_box.clear() - self._control_stack.clear() + self._chat_control.clear() def process_event(self, event: Any) -> None: if isinstance(event, MucDiscoUpdate): self._on_muc_disco_update(event) - self._control_stack.process_event(event) + self._chat_control.process_event(event) self._message_action_box.process_event(event) ===================================== gajim/gtk/control.py ===================================== @@ -22,7 +22,6 @@ import os import logging import time -import uuid from gi.repository import Gtk from gi.repository import GLib @@ -36,11 +35,9 @@ from gajim.common import app from gajim.common import events -from gajim.common import ged from gajim.common import helpers 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 event_filter from gajim.common.helpers import to_user_string from gajim.common.i18n import _ from gajim.common.ged import EventHelper @@ -66,33 +63,24 @@ from gajim.gui.groupchat_roster import GroupchatRoster from gajim.gui.groupchat_state import GroupchatState -log = logging.getLogger('gajim.gui.controls.base') +log = logging.getLogger('gajim.gui.control') class ChatControl(EventHelper): - - _type: Optional[ControlType] = None - - def __init__(self, widget_name: str, account: str, jid: JID) -> None: + def __init__(self) -> None: EventHelper.__init__(self) self.handlers: dict[int, Any] = {} - self.account = account - - self._client = app.get_client(account) - - groupchat = self._type != ControlType.CHAT - self.contact = self._client.get_module('Contacts').get_contact( - jid, groupchat=groupchat) - - self.control_id: str = str(uuid.uuid4()) + self.account = None + self.contact = None + self._client = None self.xml = get_builder('chat_control.ui') self.widget = cast(Gtk.Box, self.xml.get_object('control_box')) # Create ConversationView and connect signals - self.conversation_view = ConversationView(self.account, self.contact) + self.conversation_view = ConversationView() self._scrolled_view = ScrolledView() self._scrolled_view.add(self.conversation_view) @@ -100,7 +88,7 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: self.xml.conv_view_overlay.add(self._scrolled_view) - self._jump_to_end_button = JumpToEndButton(self.contact) + self._jump_to_end_button = JumpToEndButton() self._jump_to_end_button.connect('clicked', self._on_jump_to_end) self.xml.conv_view_overlay.add_overlay(self._jump_to_end_button) @@ -115,12 +103,6 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # XEP-0333 Chat Markers self.last_msg_id: Optional[str] = None - # XEP-0172 User Nickname - # TODO: - self.user_nick: Optional[str] = None - - self._client.get_module('Chatstate').set_active(self.contact) - self.encryption: Optional[str] = self.get_encryption_state() self.conversation_view.encryption_enabled = self.encryption is not None @@ -151,12 +133,33 @@ def __init__(self, widget_name: str, account: str, jid: JID) -> None: # self._set_control_inactive() + def is_loaded(self, account: str, jid: JID) -> bool: + if self.contact is None: + return False + return self.contact.account == account and self.contact.jid == jid + + def has_active_chat(self) -> bool: + return self.contact is not None + + def clear(self) -> None: + self.contact.disconnect_all_from_obj(self) + self.contact = None + self._clinet = None + self.account = None + self.reset_view() + def switch_contact(self, contact: Union[BareContact, GroupchatContact, GroupchatParticipant]) -> None: self.contact.disconnect_all_from_obj(self) self.contact = contact + self.account = contact.account + + self._client = app.get_client(contact.account) + + self._jump_to_end_button.switch_contact(contact) + self.conversation_view.switch_contact(contact) if isinstance(self.contact, GroupchatParticipant): self.contact.multi_connect({ @@ -184,6 +187,8 @@ def switch_contact(self, contact: Union[BareContact, 'room-subject': self._on_room_subject, }) + self._client.get_module('Chatstate').set_active(self.contact) + def process_event(self, event: events.ApplicationEvent) -> None: if event.account != self.account: return @@ -338,7 +343,7 @@ def get_our_nick(self) -> str: def _allow_add_message(self) -> bool: # Only add messages if the view is already populated - return self.is_chat_loaded and self._scrolled_view.get_lower_complete() + return self._chat_loaded and self._scrolled_view.get_lower_complete() def add_info_message(self, text: str) -> None: self.conversation_view.add_info_message(text) @@ -491,10 +496,6 @@ def load_messages(self) -> None: self.fetch_n_lines_history(self._scrolled_view, True, 20) - @property - def is_chat_loaded(self) -> bool: - return self._chat_loaded - def reset_view(self) -> None: self._chat_loaded = False self.conversation_view.clear() ===================================== gajim/gtk/control_stack.py deleted ===================================== @@ -1,137 +0,0 @@ -# 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/>. - -from typing import Any -from typing import Optional -from typing import Generator - -import logging - -from gi.repository import Gtk - -from nbxmpp import JID - -from .controls.chat import ChatControl -from .controls.groupchat import GroupchatControl -from .controls.private import PrivateChatControl - -from .types import ControlT - -log = logging.getLogger('gajim.gui.controlstack') - - -class ControlStack(Gtk.Stack): - def __init__(self): - Gtk.Stack.__init__(self) - self.set_vexpand(True) - self.set_hexpand(True) - - self.add_named(Gtk.Box(), 'empty') - - self.show_all() - self._controls: dict[tuple[str, JID], ControlT] = {} - self._current_control: Optional[ControlT] = None - - def get_control(self, account: str, jid: JID) -> Optional[ControlT]: - try: - return self._controls[(account, jid)] - except KeyError: - return None - - def get_current_control(self) -> Optional[ControlT]: - return self._current_control - - def get_controls(self, account: Optional[str] - ) -> Generator[ControlT, None, None]: - if account is None: - for control in self._controls.values(): - yield control - return - - for key, control in self._controls.items(): - if key[0] == account: - yield control - - def add_chat(self, account: str, jid: JID) -> None: - if self._controls.get((account, jid)) is not None: - # Control is already in the Stack - return - - chat_control = ChatControl(account, jid) - self._controls[(account, jid)] = chat_control - self.add_named(chat_control.widget, f'{account}:{jid}') - chat_control.widget.show_all() - - def add_group_chat(self, account: str, jid: JID) -> None: - if self._controls.get((account, jid)) is not None: - return - - control = GroupchatControl(account, jid) - self._controls[(account, jid)] = control - self.add_named(control.widget, f'{account}:{jid}') - control.widget.show_all() - - def add_private_chat(self, account: str, jid: JID) -> None: - control = PrivateChatControl(account, jid) - self._controls[(account, jid)] = control - self.add_named(control.widget, f'{account}:{jid}') - control.widget.show_all() - - def remove_chat(self, account: str, jid: JID) -> None: - control = self._controls.pop((account, jid)) - self.remove(control.widget) - control.shutdown() - - def show_chat(self, account: str, jid: JID) -> None: - new_name = f'{account}:{jid}' - current_name = self.get_visible_child_name() - assert current_name is not None - - if current_name == new_name: - return - - control = self.get_control(account, jid) - if control is None: - log.warning('No Control found for %s, %s', account, jid) - return - - if self._current_control is not None: - self._current_control.reset_view() - - control.load_messages() - self._current_control = control - - self.set_visible_child_name(new_name) - - def is_chat_loaded(self, account: str, jid: JID) -> bool: - control = self.get_control(account, jid) - if control is None: - return False - return control.is_chat_loaded - - def clear(self) -> None: - self.set_visible_child_name('empty') - self._current_control = None - - def process_event(self, event: Any) -> None: - control = self.get_control(event.account, event.jid) - if control is None: - return - control.process_event(event) - - def remove_chats_for_account(self, account: str) -> None: - for chat_account, jid in list(self._controls.keys()): - if chat_account != account: - continue - self.remove_chat(account, jid) ===================================== gajim/gtk/conversation/jump_to_end_button.py ===================================== @@ -36,15 +36,13 @@ class JumpToEndButton(Gtk.Overlay): ()), } - def __init__(self, contact: ContactT) -> None: + def __init__(self) -> None: Gtk.Overlay.__init__(self) self.set_halign(Gtk.Align.END) self.set_valign(Gtk.Align.END) self.set_margin_end(6) self.set_margin_bottom(12) - self._contact = contact - icon = Gtk.Image.new_from_icon_name( 'go-bottom-symbolic', Gtk.IconSize.BUTTON) icon.set_margin_start(4) @@ -59,13 +57,7 @@ def __init__(self, contact: ContactT) -> None: self.add(button) self._unread_label = Gtk.Label() - self._unread_label.get_style_context().add_class( - 'unread-counter') - - if isinstance(contact, GroupchatContact) and not contact.can_notify(): - self._unread_label.get_style_context().add_class( - 'unread-counter-silent') - + self._unread_label.get_style_context().add_class('unread-counter') self._unread_label.set_no_show_all(True) self._unread_label.set_halign(Gtk.Align.END) self._unread_label.set_valign(Gtk.Align.START) @@ -76,6 +68,14 @@ def __init__(self, contact: ContactT) -> None: self._count = 0 self.set_no_show_all(True) + def switch_contact(self, contact: ContactT) -> None: + if isinstance(contact, GroupchatContact) and not contact.can_notify(): + self._unread_label.get_style_context().add_class( + 'unread-counter-silent') + else: + self._unread_label.get_style_context().remove_class( + 'unread-counter-silent') + def _on_jump_clicked(self, _button: Gtk.Button) -> None: self.reset_unread_count() self.emit('clicked') ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -42,7 +42,7 @@ from .menus import get_groupchat_roster_menu from .tooltips import GCTooltip from .builder import get_builder -from .types import GroupchatControlT +from .types import ControlT from .util import EventHelper @@ -75,7 +75,7 @@ class GroupchatRoster(Gtk.ScrolledWindow, EventHelper): def __init__(self, account: str, room_jid: str, - control: GroupchatControlT + control: ControlT ) -> None: Gtk.ScrolledWindow.__init__(self) EventHelper.__init__(self) @@ -84,7 +84,6 @@ def __init__(self, self._account = account self.room_jid = room_jid self._control = control - self._control_id = control.control_id self._tooltip = GCTooltip() self._group_chat_contact = cast(GroupchatContact, control.contact) self._group_chat_contact.connect( ===================================== gajim/gtk/main.py ===================================== @@ -409,8 +409,8 @@ def _on_action(self, if action_name == 'escape' and chat_stack.process_escape(): return None - control = self.get_active_control() - if control is not None: + control = self.get_control() + if control.has_active_chat(): if action_name == 'change-nickname': app.window.activate_action('muc-change-nickname', None) return None @@ -487,8 +487,8 @@ def _on_window_motion_notify(self, _widget: Gtk.ApplicationWindow, _event: Gdk.EventMotion ) -> None: - control = self.get_active_control() - if control is None: + control = self.get_control() + if not control.has_active_chat(): return if self.get_property('has-toplevel-focus'): @@ -759,18 +759,8 @@ def add_app_message(self, message: Optional[str] = None) -> None: self._app_page.add_app_message(category, message) - def get_control(self, account: str, jid: JID) -> Optional[ControlT]: - return self._chat_page.get_control(account, jid) - - def get_controls(self, account: Optional[str] = None - ) -> Generator[ControlT, None, None]: - return self._chat_page.get_controls(account) - - def get_active_control(self) -> Optional[ControlT]: - return self._chat_page.get_active_control() - - def is_chat_loaded(self, account: str, jid: JID) -> bool: - return self._chat_page.is_chat_loaded(account, jid) + def get_control(self) -> ControlT: + return self._chat_page.get_control() def chat_exists(self, account: str, jid: JID) -> bool: return self._chat_page.chat_exists(account, jid) @@ -805,6 +795,8 @@ def get_chat_unread_count(self, def mark_as_read(self, account: str, jid: JID, send_marker: bool = True) -> None: + # TODO + return set_urgency_hint(self, False) control = self.get_control(account, jid) if control is not None: @@ -824,8 +816,8 @@ def _on_window_active(self, return set_urgency_hint(self, False) - control = self.get_active_control() - if control is None: + control = self.get_control() + if not control.has_active_chat(): return if control.get_autoscroll(): @@ -933,6 +925,9 @@ def _on_message_received(self, event: events.MessageReceived) -> None: self._main_stack.process_event(event) def _on_read_state_sync(self, event: events.ReadStateSync) -> None: + # TODO + return + if event.is_muc_pm: jid = JID.from_string(event.jid.bare) else: ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -318,7 +318,7 @@ def _change_encryption(self, # TODO: Add GUI error here return - if not plugin.activate_encryption(app.window.get_active_control()): + if not plugin.activate_encryption(app.window.get_control()): return self._set_encryption_state(new_state) @@ -360,7 +360,7 @@ def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') app.plugin_manager.extension_point( - f'encryption_dialog{encryption}', app.window.get_active_control()) + f'encryption_dialog{encryption}', app.window.get_control()) def _set_settings_menu(self, contact: ChatContactT) -> None: if isinstance(contact, GroupchatContact): @@ -559,8 +559,8 @@ def _on_msg_textview_key_press_event(self, return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - control = app.window.get_active_control() - if control is not None: + control = app.window.get_control() + if control.has_active_chat(): control.conversation_view.event(event) return True ===================================== gajim/gtk/preferences.py ===================================== @@ -40,7 +40,6 @@ from .const import Setting from .const import SettingKind from .const import SettingType -from .controls.groupchat import GroupchatControl from .dialogs import DialogButton from .dialogs import ConfirmationDialog from .emoji_chooser import emoji_chooser @@ -320,6 +319,8 @@ def _speller_available() -> bool: @staticmethod def _on_use_speller(value: bool, *args: Any) -> None: + # TODO + return if not value: return @@ -401,17 +402,19 @@ def __init__(self, *args: Any) -> None: @staticmethod def _on_sort_by_show_in_muc(_value: bool, *args: Any) -> None: + # TODO + return for ctrl in app.window.get_controls(): if ctrl.is_groupchat: - assert isinstance(ctrl, GroupchatControl) if ctrl.roster is not None: ctrl.roster.invalidate_sort() @staticmethod def _on_show_status_in_roster(_value: bool, *args: Any) -> None: + # TODO + return for ctrl in app.window.get_controls(): if ctrl.is_groupchat: - assert isinstance(ctrl, GroupchatControl) if ctrl.roster is not None: ctrl.roster.draw_contacts() @@ -755,6 +758,8 @@ def _on_emoticons_theme(self, *args: Any) -> None: @staticmethod def _toggle_emoticons() -> None: + # TODO + return for ctrl in app.window.get_controls(): ctrl.toggle_emoticons() ===================================== gajim/gtk/search_view.py ===================================== @@ -307,8 +307,8 @@ def _select_date(self, self._ui.calendar.select_day(date.day) def _scroll_to_date(self, date: datetime) -> None: - control = app.window.get_active_control() - if control is None: + control = app.window.get_control() + if not control.has_active_chat(): return if control.contact.jid == self._jid: meta_row = app.storage.archive.get_first_message_meta_for_date( @@ -336,8 +336,8 @@ def _get_accounts() -> dict[int, str]: @staticmethod def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: - control = app.window.get_active_control() - if control is not None: + control = app.window.get_control() + if control.has_active_chat(): if control.contact.jid == row.jid: control.scroll_to_message(row.log_line_id, row.timestamp) return @@ -346,8 +346,8 @@ def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: # TODO: type 'pm' is KindConstant.CHAT_MSG_RECV, too jid = JID.from_string(row.jid) app.window.add_chat(row.account, jid, row.type, select=True) - control = app.window.get_active_control() - if control is not None: + control = app.window.get_control() + if control.has_active_chat(): control.scroll_to_message(row.log_line_id, row.timestamp) def set_focus(self) -> None: ===================================== gajim/gtk/types.py ===================================== @@ -19,10 +19,7 @@ if TYPE_CHECKING: - from .controls.base import BaseControl - from .controls.chat import ChatControl - from .controls.private import PrivateChatControl - from .controls.groupchat import GroupchatControl + from .control import ChatControl from .conversation.message_widget import MessageWidget # noqa: F401 from .conversation.view import ConversationView # noqa: F401 from .conversation.rows.call import CallRow # noqa: F401 @@ -39,13 +36,6 @@ from .conversation.rows.scroll_hint import ScrollHintRow # noqa: F401 -ControlT = Union[ - 'BaseControl', - 'ChatControl', - 'PrivateChatControl', - 'GroupchatControl' -] - -GroupchatControlT = Union['GroupchatControl'] +ControlT = Union['ChatControl'] ConversationViewT = Union['ConversationView'] ===================================== gajim/gui_interface.py ===================================== @@ -403,13 +403,12 @@ def start_file_transfer(self, if method is None: return - current_control = app.window.get_active_control() - if current_control is None: + if app.window.get_control().has_active_chat(): return if path is None: if method == 'httpupload': - self.send_httpupload(current_control) + self.send_httpupload(control) return if method == 'jingle': self.instances['file_transfers'].show_file_send_request( @@ -417,7 +416,7 @@ def start_file_transfer(self, return if method == 'httpupload': - self.send_httpupload(current_control, path) + self.send_httpupload(control, path) else: assert isinstance(contact, BareContact) send_callback = partial( @@ -457,6 +456,7 @@ def start_chat_from_jid(account: str, jid: str, message: Optional[str] = None ) -> None: + # TODO jid_ = JID.from_string(jid) if app.window.chat_exists(account, jid_): app.window.select_chat(account, jid_) ===================================== pyrightconfig.json ===================================== @@ -41,7 +41,7 @@ "gajim/common/sound.py", "gajim/common/storage/", "gajim/common/task_manager.py", - "gajim/gtk/controls/private.py", + "gajim/gtk/control.py", "gajim/gtk/conversation", "gajim/gtk/about.py", "gajim/gtk/account_page.py", @@ -65,7 +65,6 @@ "gajim/gtk/chat_list.py", "gajim/gtk/chat_page.py", "gajim/gtk/chat_stack.py", - "gajim/gtk/control_stack.py", "gajim/gtk/const.py", "gajim/gtk/contact_info.py", "gajim/gtk/contact_settings.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c91a3813fc7d0ecc942653b1d5da322… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c91a3813fc7d0ecc942653b1d5da322… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: refactor: Add type annotations
by Philipp Hörist (＠lovetox) 06 Aug '22

06 Aug '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a256fa5 by Daniel Brötzmann at 2022-08-05T23:10:42+02:00 refactor: Add type annotations - - - - - 513333cf by lovetox at 2022-08-05T23:10:51+02:00 refactor: GroupchatState: Use contact state-changed signal refactor: Update GroupchatState on creation - - - - - f56ba920 by Daniel Brötzmann at 2022-08-05T23:10:54+02:00 refactor: Contacts: Add is_irc() - - - - - 0dadde62 by Daniel Brötzmann at 2022-08-06T12:17:41+02:00 feat: Refactor ChatWidgets so they are only created once Previously all ChatWidgets were created per Chat. Now we create them only once and load data into them when we switch chat. This should have a positive impact on memory and performance all around. - Improve text input undo logic - Improve text input enbaled logic - Don’t clear selection clipboard on chat switch - Add menu for triggering message correction - Improve text wrapping in conversation view - Make main window top row have a consistent height across columns Fixes #10987, #11038, #10973, #10119, #11052, #10945 - - - - - c91eb9ed by Daniel Brötzmann at 2022-08-06T12:23:59+02:00 fix: Make nick completion test pass - - - - - dcc9102f by lovetox at 2022-08-06T12:23:59+02:00 chore: Update pyrightconfig.json - - - - - f2a8e592 by lovetox at 2022-08-06T12:23:59+02:00 chore: Update pylintrc - - - - - 19 changed files: - gajim/command_system/implementation/middleware.py - gajim/common/const.py - gajim/common/events.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/httpupload.py - gajim/common/modules/muc.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/common/types.py - + gajim/data/gui/chat_banner.ui - gajim/data/gui/chat_control.ui - gajim/data/gui/chat_paned.ui - − gajim/data/gui/groupchat_control.ui - gajim/data/gui/main.ui - + gajim/data/gui/message_actions_box.ui - gajim/data/gui/shortcuts_window.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/66e6169d670bc0591f1a352ebcb3e87… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/66e6169d670bc0591f1a352ebcb3e87… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch newcontrol
by Philipp Hörist (＠lovetox) 06 Aug '22

06 Aug '22

Philipp Hörist deleted branch newcontrol at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 4 commits: feat: Refactor ChatWidgets so they are only created once
by Philipp Hörist (＠lovetox) 06 Aug '22

06 Aug '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: 0dadde62 by Daniel Brötzmann at 2022-08-06T12:17:41+02:00 feat: Refactor ChatWidgets so they are only created once Previously all ChatWidgets were created per Chat. Now we create them only once and load data into them when we switch chat. This should have a positive impact on memory and performance all around. - Improve text input undo logic - Improve text input enbaled logic - Don’t clear selection clipboard on chat switch - Add menu for triggering message correction - Improve text wrapping in conversation view - Make main window top row have a consistent height across columns Fixes #10987, #11038, #10973, #10119, #11052, #10945 - - - - - c91eb9ed by Daniel Brötzmann at 2022-08-06T12:23:59+02:00 fix: Make nick completion test pass - - - - - dcc9102f by lovetox at 2022-08-06T12:23:59+02:00 chore: Update pyrightconfig.json - - - - - f2a8e592 by lovetox at 2022-08-06T12:23:59+02:00 chore: Update pylintrc - - - - - 19 changed files: - gajim/command_system/implementation/middleware.py - gajim/common/const.py - gajim/common/modules/httpupload.py - gajim/common/modules/muc.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/common/structs.py - + gajim/data/gui/chat_banner.ui - gajim/data/gui/chat_control.ui - gajim/data/gui/chat_paned.ui - − gajim/data/gui/groupchat_control.ui - gajim/data/gui/main.ui - + gajim/data/gui/message_actions_box.ui - gajim/data/gui/shortcuts_window.ui - gajim/data/other/shortcuts.json - gajim/data/style/gajim.css - gajim/gtk/account_page.py - gajim/gtk/accounts.py - gajim/gtk/application.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9553fb39653e26a2f2358c96457edcf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9553fb39653e26a2f2358c96457edcf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch unify-control
by Philipp Hörist (＠lovetox) 06 Aug '22

06 Aug '22

Philipp Hörist pushed new branch unify-control at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/unify-control 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