Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
cd858eb7 by wurstsalat at 2025-03-10T18:48:18+01:00
cq: GroupChatInfo: Improve type annotations
- - - - -
2 changed files:
- gajim/gtk/groupchat_info.py
- pyproject.toml
Changes:
=====================================
gajim/gtk/groupchat_info.py
=====================================
@@ -167,7 +167,9 @@ def set_account(self, account: str) -> None:
def get_jid(self) -> JID | None:
if self._contact is not None:
return self._contact.jid
- return self._info.jid
+ if self._info is not None:
+ return self._info.jid
+ return None
def set_subject(self, muc_subject: MucSubject | None) -> None:
if muc_subject is None:
@@ -209,6 +211,7 @@ def set_from_disco_info(self, info: DiscoInfo) -> None:
name = info.muc_name
else:
client = app.get_client(self._account)
+ assert info.jid is not None
name = get_groupchat_name(client, info.jid)
contact = client.get_module("Contacts").get_contact(
info.jid, groupchat=True
@@ -243,8 +246,7 @@ def set_from_disco_info(self, info: DiscoInfo) -> None:
# Set contacts
container_remove_all(self._ui.contact_box)
- has_contacts = bool(info.muc_contacts)
- if has_contacts:
+ if info.muc_contacts:
for contact in info.muc_contacts:
try:
jid = JID.from_string(contact).new_as_bare()
@@ -253,8 +255,8 @@ def set_from_disco_info(self, info: DiscoInfo) -> None:
else:
self._ui.contact_box.append(self._get_contact_button(jid))
- self._ui.contact_box.set_visible(has_contacts)
- self._ui.contact_label.set_visible(has_contacts)
+ self._ui.contact_box.set_visible(bool(info.muc_contacts))
+ self._ui.contact_label.set_visible(bool(info.muc_contacts))
# Set discussion logs
has_log_uri = bool(info.muc_log_uri)
@@ -264,13 +266,12 @@ def set_from_disco_info(self, info: DiscoInfo) -> None:
self._ui.logs_label.set_visible(has_log_uri)
# Set room language
- has_lang = bool(info.muc_lang)
lang = ""
- if has_lang:
+ if info.muc_lang:
lang = RFC5646_LANGUAGE_TAGS.get(info.muc_lang, info.muc_lang)
self._ui.lang.set_text(lang)
- self._ui.lang.set_visible(has_lang)
- self._ui.lang_image.set_visible(has_lang)
+ self._ui.lang.set_visible(bool(info.muc_lang))
+ self._ui.lang_image.set_visible(bool(info.muc_lang))
self._add_features(info.features)
@@ -304,10 +305,16 @@ def _add_features(self, features: list[str]) -> None:
row += 1
def _on_copy_address(self, _button: Gtk.Button) -> None:
+ jid = None
if self._contact is not None:
jid = self._contact.jid
else:
- jid = self._info.jid
+ if self._info is not None:
+ jid = self._info.jid
+
+ if jid is None:
+ return
+
self.get_clipboard().set(jid.to_iri(XmppUriQuery.JOIN.value))
@staticmethod
=====================================
pyproject.toml
=====================================
@@ -142,7 +142,6 @@ exclude = [
"gajim/gtk/adhoc.py",
"gajim/gtk/dataform.py",
"gajim/gtk/filetransfer.py",
- "gajim/gtk/groupchat_info.py",
"gajim/gtk/server_info.py",
"gajim/gtk/settings.py",
"gajim/gtk/start_chat.py",
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/cd858eb70294ca97562a745fe855b312a9120e12
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/cd858eb70294ca97562a745fe855b312a9120e12
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
