Daniel Brötzmann pushed to branch master at gajim / gajim
Commits: 618d62d1 by wurstsalat at 2022-01-11T16:34:40+01:00 CreateGroupchatWindow: Typing
- - - - -
2 changed files:
- gajim/gtk/groupchat_creation.py - gajim/gtk/groupchat_info.py
Changes:
===================================== gajim/gtk/groupchat_creation.py ===================================== @@ -12,6 +12,8 @@ # 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 + import logging import random
@@ -19,6 +21,7 @@ from gi.repository import Gdk
from nbxmpp.errors import StanzaError +from nbxmpp.task import Task
from gajim.common import app from gajim.common.const import MUC_CREATION_EXAMPLES @@ -57,15 +60,15 @@ def __init__(self, account: str) -> None: self._fill_placeholders()
self._ui.connect_signals(self) - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy)
self.show_all() self.set_focus(self._ui.address_entry)
def _get_muc_service_jid(self) -> str: - con = app.connections[self._account] - return str(con.get_module('MUC').service_jid or 'muc.example.com') + client = app.get_client(self._account) + return str(client.get_module('MUC').service_jid or 'muc.example.com')
def _fill_account_combo(self, account: str) -> str: accounts = app.get_enabled_accounts_with_labels(connected_only=True) @@ -106,15 +109,15 @@ def _fill_placeholders(self) -> None: self._ui.address_entry.set_placeholder_text( f'{placeholder[2]}@{server}')
- def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy()
- def _on_account_combo_changed(self, combo): + def _on_account_combo_changed(self, combo: Gtk.ComboBox) -> None: self._account = combo.get_active_id() self._fill_placeholders()
- def _update_entry_completion(self, entry, text): + def _update_entry_completion(self, entry: Gtk.Entry, text: str) -> None: text = entry.get_text() if '@' in text: text = text.split('@', 1)[0] @@ -174,15 +177,15 @@ def _set_warning_from_error(self, error: StanzaError) -> None: def _set_warning_from_error_code(self, error_code: str) -> None: self._set_warning(MUC_DISCO_ERRORS[error_code])
- def _on_address_entry_changed(self, entry): + def _on_address_entry_changed(self, entry: Gtk.Entry) -> None: text = entry.get_text() self._update_entry_completion(entry, text) self._validate_jid(text)
- def _on_address_entry_activate(self, _widget): + def _on_address_entry_activate(self, _entry: Gtk.Entry) -> None: self._on_create_clicked()
- def _on_create_clicked(self, *args): + def _on_create_clicked(self, *args: Any) -> None: if not app.account_is_available(self._account): ErrorDialog( _('Not Connected'), @@ -192,12 +195,12 @@ def _on_create_clicked(self, *args): room_jid = self._ui.address_entry.get_text()
self._set_processing_state(True) - con = app.connections[self._account] - con.get_module('Discovery').disco_info( + client = app.get_client(self._account) + client.get_module('Discovery').disco_info( room_jid, callback=self._disco_info_received)
@ensure_not_destroyed - def _disco_info_received(self, task): + def _disco_info_received(self, task: Task) -> None: try: result = task.finish() except StanzaError as error: @@ -238,5 +241,5 @@ def _create_muc(self, room_jid: str) -> None:
self.destroy()
- def _on_destroy(self, *args): + def _on_destroy(self, _widget: Gtk.Widget) -> None: self._destroyed = True
===================================== gajim/gtk/groupchat_info.py ===================================== @@ -12,7 +12,6 @@ # 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 List from typing import Optional
import time @@ -168,7 +167,6 @@ def set_from_disco_info(self, info: DiscoInfo) -> None: else: client = app.get_client(self._account) name = get_groupchat_name(client, info.jid) - contact = client.get_module('Contacts').get_contact( info.jid, groupchat=True) surface = contact.get_avatar(
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/618d62d1af438a11674b9361cf022e117...