Philipp Hörist pushed to branch master at gajim / gajim
Commits: 4920bc38 by lovetox at 2022-01-11T23:44:21+01:00 RemoteControl: Remove unused code
- - - - - 8aaab336 by lovetox at 2022-01-11T23:55:25+01:00 App: Add type annotations
- - - - - 75439a55 by lovetox at 2022-01-11T23:55:41+01:00 ChatListStack: Add type annotations
- - - - - 143a2afe by lovetox at 2022-01-12T00:06:01+01:00 GroupChatInviter: Add type annotations
- - - - - 355be294 by lovetox at 2022-01-12T00:06:11+01:00 Update pyrightconfig.json
- - - - -
5 changed files:
- gajim/common/app.py - gajim/gtk/chat_list_stack.py - gajim/gtk/groupchat_inviter.py - gajim/remote_control.py - pyrightconfig.json
Changes:
===================================== gajim/common/app.py ===================================== @@ -58,6 +58,7 @@ from gajim.gui.application import GajimApplication from gajim.common.storage.cache import CacheStorage from gajim.common.storage.archive import MessageArchiveStorage + from gajim.common.cert_store import CertificateStore
interface = cast(types.InterfaceT, None) @@ -111,7 +112,7 @@ def __init__(self):
proxy65_manager = None
-cert_store = None +cert_store = cast('CertificateStore', None)
task_manager = None
===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -26,24 +26,24 @@ from nbxmpp import JID
from gajim.common import app -from gajim.common.events import ApplicationEvent +from gajim.common import events
from . import structs from .chat_filter import ChatFilter from .chat_list import ChatList from .chat_list import ChatRow
-HANDLED_EVENTS = [ - 'message-received', - 'mam-message-received', - 'gc-message-received', - 'message-updated', - 'presence-received', - 'message-sent', - 'chatstate-received', - 'jingle-request-received', - 'file-request-received' -] + +HANDLED_EVENTS = ( + events.MessageReceived, + events.MamMessageReceived, + events.GcMessageReceived, + events.MessageUpdated, + events.PresenceReceived, + events.MessageSent, + events.JingleRequestReceived, + events.FileRequestReceivedEvent +)
class ChatListStack(Gtk.Stack): @@ -296,11 +296,13 @@ def mark_as_read(self, account: str, jid: JID) -> None: for chat_list in self._chat_lists.values(): chat_list.mark_as_read(account, jid)
- def process_event(self, event: ApplicationEvent) -> None: - if event.name not in HANDLED_EVENTS: + def process_event(self, event: events.ApplicationEvent) -> None: + if not isinstance(event, HANDLED_EVENTS): return
- chat_list = self.find_chat(event.account, event.jid) + jid = JID.from_string(event.jid) + + chat_list = self.find_chat(event.account, jid) if chat_list is None: return chat_list.process_event(event)
===================================== gajim/gtk/groupchat_inviter.py ===================================== @@ -13,12 +13,13 @@ # along with Gajim. If not, see http://www.gnu.org/licenses/.
from __future__ import annotations + from typing import List from typing import Optional
import locale
-from gi.repository import Gdk +from gi.repository import Gdk, GdkPixbuf from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk @@ -110,6 +111,7 @@ def _get_avatar_image(self,
scale = self.get_scale_factor() surface = contact.get_avatar(AvatarSize.ROSTER, scale) + assert not isinstance(surface, GdkPixbuf.Pixbuf) return Gtk.Image.new_from_surface(surface)
def update_jid(self, jid: str) -> None: @@ -233,10 +235,10 @@ def _on_invitee_removed(self, client = app.get_client(account) contact = client.get_module('Contacts').get_contact(jid) row = ContactRow(account, - contact, - str(contact.jid), - contact.name, - show_account) + contact, + str(contact.jid), + contact.name, + show_account) self._ui.contacts_listbox.add(row) self._ui.search_entry.grab_focus() self.emit('listbox-changed', flowbox.has_contacts())
===================================== gajim/remote_control.py ===================================== @@ -295,16 +295,9 @@ def __init__(self): self.on_account_created) app.ged.register_event_handler('vcard-received', ged.POSTGUI, self.on_vcard_received) - app.ged.register_event_handler('chatstate-received', ged.POSTGUI, - self.on_chatstate_received) app.ged.register_event_handler('message-sent', ged.POSTGUI, self.on_message_sent)
- def on_chatstate_received(self, event): - self.raise_signal( - 'ChatState', - (event.account, [event.contact.jid, event.contact.chatstate])) - def on_message_sent(self, obj): try: chatstate = obj.chatstate
===================================== pyrightconfig.json ===================================== @@ -19,6 +19,7 @@ "gajim/gtk/account_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/chat_filter.py", + "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", "gajim/gtk/conversation/code_widget.py", "gajim/gtk/conversation/jump_to_end_button.py", @@ -36,10 +37,15 @@ "gajim/gtk/conversation/rows/scroll_hint.py", "gajim/gtk/conversation/rows/widgets.py", "gajim/gtk/conversation/scrolled.py", + "gajim/gtk/groupchat_invitation.py", + "gajim/gtk/groupchat_inviter.py", + "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_state.py", "gajim/gtk/main_stack.py", "gajim/gtk/notification.py", "gajim/gtk/structs.py", "gajim/gtk/sidebar_switcher.py", + "gajim/gtk/ssl_error_dialog.py", "gajim/gtk/status_icon.py", "gajim/gtk/status_message_selector.py", "gajim/gtk/status_selector.py",
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/c615db3f18c78fbff0b72b336d37d554...