GitLab

at 2022-09-26T21:32:26+02:00

imprv: StartChat: Pass message body from XMPP URI

Fixes #11140

     "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"],

                         '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))

         options = command_line.get_options_dict()

 

         remote_commands = [

-            ('start-chat', GLib.Variant('s', '')),

+            ('start-chat', GLib.Variant('as', ['', ''])),

             ('show', None)

         ]

 

     @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,

 

     @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

 

 from typing import Any

 from typing import Literal

+from typing import Optional

 from typing import TYPE_CHECKING

 

 import logging

 

     @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:

                                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)

 

             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,

         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', ['', '']))
     ('remove-history', 'a{sv}'),

     ('shortcuts', None),

     ('show', None),

-    ('start-chat', 's'),

+    ('start-chat', 'as'),

     ('xml-console', None),

 ]

 

                  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,

 

 

 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)

         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:

             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()

 

 

     @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:

                 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,

Philipp Hörist pushed to branch master at gajim / gajim

Commits:

10 changed files:

Changes: