Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: Styling: Allow dots in local part of email addresses
by Philipp Hörist (＠lovetox) 27 Sep '22

27 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7af1dc66 by André Apitzsch at 2022-09-27T15:14:02+00:00 fix: Styling: Allow dots in local part of email addresses - - - - - 2 changed files: - gajim/common/styling.py - test/no_gui/test_styling.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -44,7 +44,7 @@ UNQUOTE_RX = re.compile(r'^> |^>', re.M) URI_RX = r'(?P<uri>([\w-]+://|www[.])[\S()<>]+?(?=[,>]?(\s|\Z)+))' -ADDRESS_RX = r'(?P<address>\b((xmpp|mailto):)?[\w-]*@([\w-]*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' # noqa: E501 +ADDRESS_RX = r'(?P<address>\b((xmpp|mailto):)?[\w-]+(\.[\w-]+)*@([\w-]*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' # noqa: E501 URI_ADDRESS_RX = URI_RX + '|' + ADDRESS_RX URI_RX = re.compile(URI_RX) ===================================== test/no_gui/test_styling.py ===================================== @@ -326,8 +326,10 @@ 'asd(a)asd.at', 'asd(a)asd.asd.at', 'asd(a)asd.asd-asd.at', + 'asd.asd(a)asd.asd-asd.at', 'asd-asd(a)asd.asdasd.at', 'mailto:foo@bar.com.uk', + 'mailto:foo.foo.foo@bar.com.uk', ] EMAILS_WITH_TEXT = [ View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7af1dc666fe673723ac5ed5962ae8dbf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7af1dc666fe673723ac5ed5962ae8dbf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Chat Menu: Fix blocking contact
by Daniel Brötzmann (＠wurstsalat) 27 Sep '22

27 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b7c95991 by wurstsalat at 2022-09-27T16:18:20+02:00 cfix: Chat Menu: Fix blocking contact - - - - - 1 changed file: - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/menus.py ===================================== @@ -74,9 +74,11 @@ def get_self_contact_menu(contact: types.BareContact) -> GajimMenu: def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: account = contact.account + value = f'"{contact.jid}"' + menu = GajimMenu() menu.add_item(_('Details'), 'win.show-contact-info') - menu.add_item(_('Block Contact…'), f'app.{account}-block-contact') + menu.add_item(_('Block Contact…'), f'app.{account}-block-contact', value) submenu = get_send_file_submenu() menu.append_submenu(_('Send File'), submenu) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7c95991c7191230db081d07fd01560a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b7c95991c7191230db081d07fd01560a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: StartChat: Use correct target type for application menu entry
by Daniel Brötzmann (＠wurstsalat) 27 Sep '22

27 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3f7f704e by wurstsalat at 2022-09-27T13:12:34+02:00 cfix: StartChat: Use correct target type for application menu entry - - - - - 1 changed file: - gajim/data/gui/application_menu.ui Changes: ===================================== gajim/data/gui/application_menu.ui ===================================== @@ -7,7 +7,7 @@ <item> <attribute name="label" translatable="yes">_Start / Join Chat…</attribute> <attribute name="action">app.start-chat</attribute> - <attribute name="target"></attribute> + <attribute name="target" type="as">['', '']</attribute> </item> <item> <attribute name="label" translatable="yes">Create _Group Chat…</attribute> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f7f704ea3ec757680aae7b5061f63e9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3f7f704ea3ec757680aae7b5061f63e9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Add shortcut to restore chats after closing
by Philipp Hörist (＠lovetox) 26 Sep '22

26 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: dfba6786 by Philipp Hörist at 2022-09-26T23:17:45+02:00 feat: Add shortcut to restore chats after closing Fixes #11088 - - - - - 5 changed files: - gajim/data/gui/shortcuts_window.ui - gajim/data/other/shortcuts.json - gajim/gtk/chat_page.py - gajim/gtk/const.py - gajim/gtk/main.py Changes: ===================================== gajim/data/gui/shortcuts_window.ui ===================================== @@ -203,6 +203,13 @@ <property name="title" translatable="yes">Close chat</property> </object> </child> + <child> + <object class="GtkShortcutsShortcut"> + <property name="visible">1</property> + <property name="accelerator"><primary><shift>w</property> + <property name="title" translatable="yes">Restore chat</property> + </object> + </child> <child> <object class="GtkShortcutsShortcut"> <property name="visible">1</property> ===================================== gajim/data/other/shortcuts.json ===================================== @@ -15,6 +15,7 @@ "win.show-emoji-chooser": ["<Primary><Shift>M"], "win.input-clear": ["<Primary>U"], "win.close-chat": ["<Primary>W"], + "win.restore-chat": ["<Primary><Shift>W"], "win.switch-next-chat": ["<Primary>Page_Down"], "win.switch-prev-chat": ["<Primary>Page_Up"], "win.switch-next-unread-chat": ["<Primary>Tab"], ===================================== gajim/gtk/chat_page.py ===================================== @@ -98,6 +98,7 @@ def __init__(self): self._ui.paned.connect('button-release-event', self._on_button_release) self._startup_finished: bool = False + self._closed_chat_memory: list[tuple[str, JID, str]] = [] self._add_actions() @@ -273,6 +274,21 @@ def load_workspace_chats(self, workspace_id: str) -> None: def is_chat_active(self, account: str, jid: JID) -> bool: return self._chat_list_stack.is_chat_active(account, jid) + def restore_chat(self) -> None: + if not self._closed_chat_memory: + return + + account, jid, workspace_id = self._closed_chat_memory.pop() + + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + + self.add_chat_for_workspace(workspace_id, + account, + jid, + contact.type_string, + select=True) + def _remove_chat(self, _action: Gio.SimpleAction, param: GLib.Variant) -> None: @@ -285,6 +301,7 @@ def _remove_chat(self, def remove_chat(self, account: str, jid: JID) -> None: for workspace_id in app.settings.get_workspaces(): if self.chat_exists_for_workspace(workspace_id, account, jid): + self._closed_chat_memory.append((account, jid, workspace_id)) self._chat_list_stack.remove_chat(workspace_id, account, jid) return ===================================== gajim/gtk/const.py ===================================== @@ -220,6 +220,7 @@ def __str__(self): ('change-subject', None, True), ('escape', None, True), ('close-chat', None, True), + ('restore-chat', None, True), ('switch-next-chat', None, True), ('switch-prev-chat', None, True), ('switch-next-unread-chat', None, True), ===================================== gajim/gtk/main.py ===================================== @@ -341,6 +341,7 @@ def _connect_actions(self) -> None: ('change-subject', self._on_action), ('escape', self._on_action), ('close-chat', self._on_action), + ('restore-chat', self._on_action), ('switch-next-chat', self._on_action), ('switch-prev-chat', self._on_action), ('switch-next-unread-chat', self._on_action), @@ -414,7 +415,10 @@ def _on_action(self, control.contact.jid) return None - if action_name == 'switch-next-chat': + if action_name == 'restore-chat': + self._chat_page.restore_chat() + + elif action_name == 'switch-next-chat': self.select_next_chat(Direction.NEXT) elif action_name == 'switch-prev-chat': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dfba6786224cd747211d2f70d75c75e7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dfba6786224cd747211d2f70d75c75e7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: AddContact: Add missing discovery timeout
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 86690d0b by wurstsalat at 2022-09-26T23:12:27+02:00 cfix: AddContact: Add missing discovery timeout - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -26,6 +26,7 @@ from nbxmpp import JID from nbxmpp import Namespace from nbxmpp.errors import is_error +from nbxmpp.errors import BaseError from nbxmpp.errors import StanzaError from nbxmpp.structs import DiscoInfo @@ -145,9 +146,11 @@ def _disco_info(self, account: str, address: str) -> Any: client = app.get_client(account) - result = yield client.get_module('Discovery').disco_info(address) + result = yield client.get_module('Discovery').disco_info( + address, + timeout=10) if is_error(result): - assert isinstance(result, StanzaError) + assert isinstance(result, BaseError) self._process_error(account, result) raise result @@ -155,7 +158,11 @@ def _disco_info(self, account: str, address: str) -> Any: assert isinstance(result, DiscoInfo) self._process_info(account, result) - def _process_error(self, account: str, result: StanzaError) -> None: + def _process_error(self, + account: str, + result: BaseError + ) -> None: + log.debug('Error received: %s', result) self._result = result @@ -163,12 +170,14 @@ def _process_error(self, account: str, result: StanzaError) -> None: 'service-unavailable', # Prosody 'subscription-required' # ejabberd ] - if result.condition in contact_conditions: + if (isinstance(self._result, StanzaError) and + result.condition in contact_conditions): # It seems to be a contact address_page = cast(Contact, self.get_page('contact')) address_page.prepare(account, result) self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) else: + # TimeoutStanzaError is handled here error_page = cast(ErrorPage, self.get_page('error')) error_page.set_text(result.get_text()) self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) @@ -342,7 +351,7 @@ def __init__(self) -> None: Page.__init__(self) self.title = _('Add Contact') - self._result: Union[DiscoInfo, StanzaError, None] = None + self._result: Union[DiscoInfo, BaseError, None] = None self._account: Optional[str] = None self._contact: Optional[types.BareContact] = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86690d0b3f46001dd1ddcbd28414bc98… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/86690d0b3f46001dd1ddcbd28414bc98… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: StartChat: Pass message body from XMPP URI
by Philipp Hörist (＠lovetox) 26 Sep '22

26 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8474c016 by wurstsalat at 2022-09-26T21:32:26+02:00 imprv: StartChat: Pass message body from XMPP URI Fixes #11140 - - - - - 10 changed files: - gajim/data/other/shortcuts.json - gajim/gtk/application.py - gajim/gtk/chat_list.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/status_icon.py - gajim/gui_interface.py Changes: ===================================== gajim/data/other/shortcuts.json ===================================== @@ -5,7 +5,7 @@ "app.plugins": ["<Primary>E"], "app.xml-console": ["<Primary><Shift>X"], "app.file-transfer": ["<Primary>T"], - "app.start-chat::": ["<Primary>N"], + "app.start-chat(['', ''])": ["<Primary>N"], "app.create-groupchat::": ["<Primary>G"], "win.change-nickname": ["<Primary><Shift>N"], "win.change-subject": ["<Primary><Shift>S"], ===================================== gajim/gtk/application.py ===================================== @@ -305,7 +305,8 @@ def _open_uris(self, uris: list[str]) -> None: 'groupchat-join', GLib.Variant('as', [accounts[0], jid])) else: - self.activate_action('start-chat', GLib.Variant('s', jid)) + self.activate_action( + 'start-chat', GLib.Variant('as', [jid, ''])) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) @@ -338,7 +339,7 @@ def _command_line(self, options = command_line.get_options_dict() remote_commands = [ - ('start-chat', GLib.Variant('s', '')), + ('start-chat', GLib.Variant('as', ['', ''])), ('show', None) ] @@ -562,10 +563,11 @@ def _on_quit_action(_action: Gio.SimpleAction, @staticmethod def _on_new_chat_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - window = open_window('StartChatDialog') - search_text = param.get_string() - if search_text: - window.set_search_text(search_text) + + jid, initial_message = param.get_strv() + open_window('StartChatDialog', + jid=jid or None, + initial_message=initial_message or None) @staticmethod def _on_profile_action(_action: Gio.SimpleAction, ===================================== gajim/gtk/chat_list.py ===================================== @@ -337,7 +337,7 @@ def _set_placeholder(self) -> None: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) def set_filter(self, name: str) -> None: self._current_filter = name ===================================== gajim/gtk/chat_page.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Literal +from typing import Optional from typing import TYPE_CHECKING import logging @@ -127,7 +128,7 @@ def get_chat_stack(self) -> ChatStack: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_button_release(paned: Gtk.Paned, event: Gdk.EventButton) -> None: @@ -222,7 +223,8 @@ def add_chat_for_workspace(self, type_: str, pinned: bool = False, position: int = -1, - select: bool = False) -> None: + select: bool = False, + message: Optional[str] = None) -> None: client = app.get_client(account) @@ -247,6 +249,9 @@ def add_chat_for_workspace(self, if select: self._chat_list_stack.select_chat(account, jid) self._chat_list_stack.store_open_chats(workspace_id) + if message is not None: + message_input = self._chat_stack.get_message_input() + message_input.insert_text(message) def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -794,4 +794,4 @@ def __init__(self): self.add(button) def _on_start_chatting(self, _button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) ===================================== gajim/gtk/const.py ===================================== @@ -181,7 +181,7 @@ def __str__(self): ('remove-history', 'a{sv}'), ('shortcuts', None), ('show', None), - ('start-chat', 's'), + ('start-chat', 'as'), ('xml-console', None), ] ===================================== gajim/gtk/main.py ===================================== @@ -712,18 +712,23 @@ def add_chat(self, jid: JID, type_: str, select: bool = False, - workspace: str = 'default') -> None: + workspace: str = 'default', + message: Optional[str] = None + ) -> None: + if workspace == 'current': workspace_id = self.get_active_workspace() if workspace_id is None: workspace_id = self._workspace_side_bar.get_first_workspace() else: workspace_id = self._workspace_side_bar.get_first_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, account, jid, type_, - select=select) + select=select, + message=message) def add_private_chat(self, account: str, ===================================== gajim/gtk/start_chat.py ===================================== @@ -68,7 +68,11 @@ class Search(IntEnum): class StartChatDialog(Gtk.ApplicationWindow): - def __init__(self, jid: Optional[str] = None) -> None: + def __init__(self, + jid: Optional[str] = None, + initial_message: Optional[str] = None + ) -> None: + Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) @@ -138,16 +142,15 @@ def __init__(self, jid: Optional[str] = None) -> None: if rows: self._load_contacts(rows) + self._initial_message: dict[str, Optional[str]] = {} if jid is not None: - self.set_search_text(jid) + self._initial_message[jid] = initial_message + self._ui.search_entry.set_text(jid) self.select_first_row() self._ui.connect_signals(self) self.show_all() - def set_search_text(self, text: str) -> None: - self._ui.search_entry.set_text(text) - def remove_row(self, account: str, jid: str) -> None: for row in cast(list[ContactRow], self._ui.listbox.get_children()): if row.account == account and row.jid == jid: @@ -362,12 +365,14 @@ def _start_new_chat(self, row: ContactRow) -> None: self._disco_muc(row.account, jid, request_vcard=row.is_new) else: + initial_message = self._initial_message.get(str(jid)) app.window.add_chat( row.account, jid, 'contact', select=True, - workspace='current') + workspace='current', + message=initial_message) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/status_icon.py ===================================== @@ -179,7 +179,7 @@ def _on_account_state(self, @staticmethod def _on_new_chat(_widget: Gtk.MenuItem) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: ===================================== gajim/gui_interface.py ===================================== @@ -466,8 +466,8 @@ def start_chat_from_jid(account: str, message_input.insert_text(message) return - # TODO: handle message arg in StartChat - app.app.activate_action('start-chat', GLib.Variant('s', str(jid))) + app.app.activate_action( + 'start-chat', GLib.Variant('as', [str(jid), message or ''])) @staticmethod def create_account(account: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8474c016624fbe9086c3cb78b1a93d9b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8474c016624fbe9086c3cb78b1a93d9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch start-chat-message
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann deleted branch start-chat-message at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][start-chat-message] imprv: StartChat: Pass message body from XMPP URI
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch start-chat-message at gajim / gajim Commits: 8474c016 by wurstsalat at 2022-09-26T21:32:26+02:00 imprv: StartChat: Pass message body from XMPP URI Fixes #11140 - - - - - 10 changed files: - gajim/data/other/shortcuts.json - gajim/gtk/application.py - gajim/gtk/chat_list.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/status_icon.py - gajim/gui_interface.py Changes: ===================================== gajim/data/other/shortcuts.json ===================================== @@ -5,7 +5,7 @@ "app.plugins": ["<Primary>E"], "app.xml-console": ["<Primary><Shift>X"], "app.file-transfer": ["<Primary>T"], - "app.start-chat::": ["<Primary>N"], + "app.start-chat(['', ''])": ["<Primary>N"], "app.create-groupchat::": ["<Primary>G"], "win.change-nickname": ["<Primary><Shift>N"], "win.change-subject": ["<Primary><Shift>S"], ===================================== gajim/gtk/application.py ===================================== @@ -305,7 +305,8 @@ def _open_uris(self, uris: list[str]) -> None: 'groupchat-join', GLib.Variant('as', [accounts[0], jid])) else: - self.activate_action('start-chat', GLib.Variant('s', jid)) + self.activate_action( + 'start-chat', GLib.Variant('as', [jid, ''])) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) @@ -338,7 +339,7 @@ def _command_line(self, options = command_line.get_options_dict() remote_commands = [ - ('start-chat', GLib.Variant('s', '')), + ('start-chat', GLib.Variant('as', ['', ''])), ('show', None) ] @@ -562,10 +563,11 @@ def _on_quit_action(_action: Gio.SimpleAction, @staticmethod def _on_new_chat_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - window = open_window('StartChatDialog') - search_text = param.get_string() - if search_text: - window.set_search_text(search_text) + + jid, initial_message = param.get_strv() + open_window('StartChatDialog', + jid=jid or None, + initial_message=initial_message or None) @staticmethod def _on_profile_action(_action: Gio.SimpleAction, ===================================== gajim/gtk/chat_list.py ===================================== @@ -337,7 +337,7 @@ def _set_placeholder(self) -> None: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) def set_filter(self, name: str) -> None: self._current_filter = name ===================================== gajim/gtk/chat_page.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Literal +from typing import Optional from typing import TYPE_CHECKING import logging @@ -127,7 +128,7 @@ def get_chat_stack(self) -> ChatStack: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_button_release(paned: Gtk.Paned, event: Gdk.EventButton) -> None: @@ -222,7 +223,8 @@ def add_chat_for_workspace(self, type_: str, pinned: bool = False, position: int = -1, - select: bool = False) -> None: + select: bool = False, + message: Optional[str] = None) -> None: client = app.get_client(account) @@ -247,6 +249,9 @@ def add_chat_for_workspace(self, if select: self._chat_list_stack.select_chat(account, jid) self._chat_list_stack.store_open_chats(workspace_id) + if message is not None: + message_input = self._chat_stack.get_message_input() + message_input.insert_text(message) def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -794,4 +794,4 @@ def __init__(self): self.add(button) def _on_start_chatting(self, _button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) ===================================== gajim/gtk/const.py ===================================== @@ -181,7 +181,7 @@ def __str__(self): ('remove-history', 'a{sv}'), ('shortcuts', None), ('show', None), - ('start-chat', 's'), + ('start-chat', 'as'), ('xml-console', None), ] ===================================== gajim/gtk/main.py ===================================== @@ -712,18 +712,23 @@ def add_chat(self, jid: JID, type_: str, select: bool = False, - workspace: str = 'default') -> None: + workspace: str = 'default', + message: Optional[str] = None + ) -> None: + if workspace == 'current': workspace_id = self.get_active_workspace() if workspace_id is None: workspace_id = self._workspace_side_bar.get_first_workspace() else: workspace_id = self._workspace_side_bar.get_first_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, account, jid, type_, - select=select) + select=select, + message=message) def add_private_chat(self, account: str, ===================================== gajim/gtk/start_chat.py ===================================== @@ -68,7 +68,11 @@ class Search(IntEnum): class StartChatDialog(Gtk.ApplicationWindow): - def __init__(self, jid: Optional[str] = None) -> None: + def __init__(self, + jid: Optional[str] = None, + initial_message: Optional[str] = None + ) -> None: + Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) @@ -138,16 +142,15 @@ def __init__(self, jid: Optional[str] = None) -> None: if rows: self._load_contacts(rows) + self._initial_message: dict[str, Optional[str]] = {} if jid is not None: - self.set_search_text(jid) + self._initial_message[jid] = initial_message + self._ui.search_entry.set_text(jid) self.select_first_row() self._ui.connect_signals(self) self.show_all() - def set_search_text(self, text: str) -> None: - self._ui.search_entry.set_text(text) - def remove_row(self, account: str, jid: str) -> None: for row in cast(list[ContactRow], self._ui.listbox.get_children()): if row.account == account and row.jid == jid: @@ -362,12 +365,14 @@ def _start_new_chat(self, row: ContactRow) -> None: self._disco_muc(row.account, jid, request_vcard=row.is_new) else: + initial_message = self._initial_message.get(str(jid)) app.window.add_chat( row.account, jid, 'contact', select=True, - workspace='current') + workspace='current', + message=initial_message) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/status_icon.py ===================================== @@ -179,7 +179,7 @@ def _on_account_state(self, @staticmethod def _on_new_chat(_widget: Gtk.MenuItem) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: ===================================== gajim/gui_interface.py ===================================== @@ -466,8 +466,8 @@ def start_chat_from_jid(account: str, message_input.insert_text(message) return - # TODO: handle message arg in StartChat - app.app.activate_action('start-chat', GLib.Variant('s', str(jid))) + app.app.activate_action( + 'start-chat', GLib.Variant('as', [str(jid), message or ''])) @staticmethod def create_account(account: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8474c016624fbe9086c3cb78b1a93d9b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8474c016624fbe9086c3cb78b1a93d9b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][start-chat-message] 2 commits: fix: ChatList: Set message_id correctly
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch start-chat-message at gajim / gajim Commits: 337fb835 by wurstsalat at 2022-09-26T16:51:08+02:00 fix: ChatList: Set message_id correctly Fixes #11168 - - - - - c8bf500d by wurstsalat at 2022-09-26T21:23:11+02:00 imprv: StartChat: Pass message body from XMPP URI Fixes #11140 - - - - - 10 changed files: - gajim/data/other/shortcuts.json - gajim/gtk/application.py - gajim/gtk/chat_list.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/status_icon.py - gajim/gui_interface.py Changes: ===================================== gajim/data/other/shortcuts.json ===================================== @@ -5,7 +5,7 @@ "app.plugins": ["<Primary>E"], "app.xml-console": ["<Primary><Shift>X"], "app.file-transfer": ["<Primary>T"], - "app.start-chat::": ["<Primary>N"], + "app.start-chat(['', ''])": ["<Primary>N"], "app.create-groupchat::": ["<Primary>G"], "win.change-nickname": ["<Primary><Shift>N"], "win.change-subject": ["<Primary><Shift>S"], ===================================== gajim/gtk/application.py ===================================== @@ -305,7 +305,8 @@ def _open_uris(self, uris: list[str]) -> None: 'groupchat-join', GLib.Variant('as', [accounts[0], jid])) else: - self.activate_action('start-chat', GLib.Variant('s', jid)) + self.activate_action( + 'start-chat', GLib.Variant('as', [jid, ''])) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) @@ -338,7 +339,7 @@ def _command_line(self, options = command_line.get_options_dict() remote_commands = [ - ('start-chat', GLib.Variant('s', '')), + ('start-chat', GLib.Variant('as', ['', ''])), ('show', None) ] @@ -562,10 +563,11 @@ def _on_quit_action(_action: Gio.SimpleAction, @staticmethod def _on_new_chat_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - window = open_window('StartChatDialog') - search_text = param.get_string() - if search_text: - window.set_search_text(search_text) + + jid, initial_message = param.get_strv() + open_window('StartChatDialog', + jid=jid or None, + initial_message=initial_message or None) @staticmethod def _on_profile_action(_action: Gio.SimpleAction, ===================================== gajim/gtk/chat_list.py ===================================== @@ -337,7 +337,7 @@ def _set_placeholder(self) -> None: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) def set_filter(self, name: str) -> None: self._current_filter = name @@ -539,8 +539,9 @@ def _on_message_received(self, event: MessageEventT) -> None: row.set_timestamp(event.properties.mam.timestamp) else: row.set_timestamp(event.properties.timestamp) + row.set_stanza_id(event.stanza_id) - row.set_message_id(event.unique_id) + row.set_message_id(event.properties.id) row.set_message_text( event.msgtxt, nickname=nick, ===================================== gajim/gtk/chat_page.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Literal +from typing import Optional from typing import TYPE_CHECKING import logging @@ -127,7 +128,7 @@ def get_chat_stack(self) -> ChatStack: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_button_release(paned: Gtk.Paned, event: Gdk.EventButton) -> None: @@ -222,7 +223,8 @@ def add_chat_for_workspace(self, type_: str, pinned: bool = False, position: int = -1, - select: bool = False) -> None: + select: bool = False, + message: Optional[str] = None) -> None: client = app.get_client(account) @@ -247,6 +249,9 @@ def add_chat_for_workspace(self, if select: self._chat_list_stack.select_chat(account, jid) self._chat_list_stack.store_open_chats(workspace_id) + if message is not None: + message_input = self._chat_stack.get_message_input() + message_input.insert_text(message) def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -794,4 +794,4 @@ def __init__(self): self.add(button) def _on_start_chatting(self, _button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) ===================================== gajim/gtk/const.py ===================================== @@ -181,7 +181,7 @@ def __str__(self): ('remove-history', 'a{sv}'), ('shortcuts', None), ('show', None), - ('start-chat', 's'), + ('start-chat', 'as'), ('xml-console', None), ] ===================================== gajim/gtk/main.py ===================================== @@ -712,18 +712,23 @@ def add_chat(self, jid: JID, type_: str, select: bool = False, - workspace: str = 'default') -> None: + workspace: str = 'default', + message: Optional[str] = None + ) -> None: + if workspace == 'current': workspace_id = self.get_active_workspace() if workspace_id is None: workspace_id = self._workspace_side_bar.get_first_workspace() else: workspace_id = self._workspace_side_bar.get_first_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, account, jid, type_, - select=select) + select=select, + message=message) def add_private_chat(self, account: str, ===================================== gajim/gtk/start_chat.py ===================================== @@ -68,7 +68,11 @@ class Search(IntEnum): class StartChatDialog(Gtk.ApplicationWindow): - def __init__(self, jid: Optional[str] = None) -> None: + def __init__(self, + jid: Optional[str] = None, + initial_message: Optional[str] = None + ) -> None: + Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) @@ -138,16 +142,17 @@ def __init__(self, jid: Optional[str] = None) -> None: if rows: self._load_contacts(rows) + self._initial_message: dict[str, Optional[str]] = {} if jid is not None: - self.set_search_text(jid) + self._initial_message[jid] = initial_message + + if jid is not None: + self._ui.search_entry.set_text(jid) self.select_first_row() self._ui.connect_signals(self) self.show_all() - def set_search_text(self, text: str) -> None: - self._ui.search_entry.set_text(text) - def remove_row(self, account: str, jid: str) -> None: for row in cast(list[ContactRow], self._ui.listbox.get_children()): if row.account == account and row.jid == jid: @@ -362,12 +367,14 @@ def _start_new_chat(self, row: ContactRow) -> None: self._disco_muc(row.account, jid, request_vcard=row.is_new) else: + initial_message = self._initial_message.get(str(jid)) app.window.add_chat( row.account, jid, 'contact', select=True, - workspace='current') + workspace='current', + message=initial_message) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/status_icon.py ===================================== @@ -179,7 +179,7 @@ def _on_account_state(self, @staticmethod def _on_new_chat(_widget: Gtk.MenuItem) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: ===================================== gajim/gui_interface.py ===================================== @@ -466,8 +466,8 @@ def start_chat_from_jid(account: str, message_input.insert_text(message) return - # TODO: handle message arg in StartChat - app.app.activate_action('start-chat', GLib.Variant('s', str(jid))) + app.app.activate_action( + 'start-chat', GLib.Variant('as', [str(jid), message or ''])) @staticmethod def create_account(account: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ea55cc37ed527559f43cb96d331420f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ea55cc37ed527559f43cb96d331420f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch chatlist-fix-correction
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann deleted branch chatlist-fix-correction at gajim / gajim -- 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