Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: fix: Don’t redefine class
by Philipp Hörist (＠lovetox) 28 May '22

28 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3f5191ab by lovetox at 2022-05-28T07:43:47+02:00 fix: Don’t redefine class - - - - - cad2fd95 by lovetox at 2022-05-28T07:51:42+02:00 chore: Iq: Fix pylint errors - - - - - 2bdb296a by lovetox at 2022-05-28T07:53:18+02:00 fix: Iq: Remove condition for not existing attribute - - - - - 1 changed file: - gajim/common/modules/iq.py Changes: ===================================== gajim/common/modules/iq.py ===================================== @@ -17,7 +17,6 @@ from __future__ import annotations import nbxmpp -from nbxmpp.protocol import Iq from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler @@ -43,10 +42,11 @@ def __init__(self, con: types.Client) -> None: def _iq_error_received(self, _con: types.xmppClient, - _stanza: Iq, + _stanza: nbxmpp.protocol.Iq, properties: IqProperties ) -> None: self._log.info('Error: %s', properties.error) + assert properties.error is not None if properties.error.condition in ('jid-malformed', 'forbidden', 'not-acceptable'): @@ -68,18 +68,17 @@ def _iq_error_received(self, raise nbxmpp.NodeProcessed if properties.error.condition == 'item-not-found': - if not properties.is_pubsub: - sid = self._get_sid(properties.id) - file_props = FilesProp.getFileProp(self._account, sid) - if file_props: - app.ged.raise_event( - FileSendError(account=self._account, - jid=str(properties.jid), - file_props=file_props, - error_msg='')) - self._con.get_module('Bytestream').disconnect_transfer( - file_props) - raise nbxmpp.NodeProcessed + sid = self._get_sid(properties.id) + file_props = FilesProp.getFileProp(self._account, sid) + if file_props: + app.ged.raise_event( + FileSendError(account=self._account, + jid=str(properties.jid), + file_props=file_props, + error_msg='')) + self._con.get_module('Bytestream').disconnect_transfer( + file_props) + raise nbxmpp.NodeProcessed self._log.error('Received iq error with unknown id: %s', properties.error) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/16dc125b389a2929a1ead85b8cc7230… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/16dc125b389a2929a1ead85b8cc7230… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: chore: Gateway: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 28 May '22

28 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 20b33a7e by wurstsalat at 2022-05-28T02:04:03+02:00 chore: Gateway: Add type annotations - - - - - 1987c330 by wurstsalat at 2022-05-28T02:05:41+02:00 chore: Iq: Add type annotations - - - - - b7ab4045 by wurstsalat at 2022-05-28T02:05:58+02:00 chore: UserAvatar: Add type annotations - - - - - 16dc125b by wurstsalat at 2022-05-28T02:06:11+02:00 chore: Util: Add type annotations - - - - - 4 changed files: - gajim/common/modules/gateway.py - gajim/common/modules/iq.py - gajim/common/modules/user_avatar.py - gajim/common/modules/util.py Changes: ===================================== gajim/common/modules/gateway.py ===================================== @@ -14,20 +14,26 @@ # XEP-0100: Gateway Interaction +from __future__ import annotations + +from typing import Optional + import nbxmpp +from nbxmpp.protocol import Iq from nbxmpp.namespaces import Namespace from gajim.common import app +from gajim.common import types from gajim.common.events import AgentRemoved from gajim.common.events import GatewayPromptReceived from gajim.common.modules.base import BaseModule class Gateway(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) - def unsubscribe(self, agent): + def unsubscribe(self, agent: str) -> None: if not app.account_is_available(self._account): return iq = nbxmpp.Iq('set', Namespace.REGISTER, to=agent) @@ -37,7 +43,10 @@ def unsubscribe(self, agent): iq, self._on_unsubscribe_result) self._con.get_module('Roster').delete_item(agent) - def _on_unsubscribe_result(self, _nbxmpp_client, stanza): + def _on_unsubscribe_result(self, + _nbxmpp_client: types.xmppClient, + stanza: nbxmpp.Node + ) -> None: if not nbxmpp.isResultNode(stanza): self._log.info('Error: %s', stanza.getError()) return @@ -63,7 +72,10 @@ def _on_unsubscribe_result(self, _nbxmpp_client, stanza): agent=agent, jid_list=jid_list)) - def request_gateway_prompt(self, jid, prompt=None): + def request_gateway_prompt(self, + jid: str, + prompt: Optional[str] = None + ) -> None: typ_ = 'get' if prompt: typ_ = 'set' @@ -73,7 +85,10 @@ def request_gateway_prompt(self, jid, prompt=None): query.setTagData('prompt', prompt) self._con.connection.SendAndCallForResponse(iq, self._on_prompt_result) - def _on_prompt_result(self, _nbxmpp_client, stanza): + def _on_prompt_result(self, + _nbxmpp_client: types.xmppClient, + stanza: Iq + ) -> None: jid = str(stanza.getFrom()) fjid = stanza.getFrom().bare resource = stanza.getFrom().resource ===================================== gajim/common/modules/iq.py ===================================== @@ -14,10 +14,15 @@ # Iq handler +from __future__ import annotations + import nbxmpp +from nbxmpp.protocol import Iq +from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler from gajim.common import app +from gajim.common import types from gajim.common.events import FileRequestError from gajim.common.events import FileSendError from gajim.common.helpers import to_user_string @@ -26,7 +31,7 @@ class Iq(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -36,7 +41,11 @@ def __init__(self, con): priority=51), ] - def _iq_error_received(self, _con, _stanza, properties): + def _iq_error_received(self, + _con: types.xmppClient, + _stanza: Iq, + properties: IqProperties + ) -> None: self._log.info('Error: %s', properties.error) if properties.error.condition in ('jid-malformed', 'forbidden', @@ -78,7 +87,7 @@ def _iq_error_received(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed @staticmethod - def _get_sid(id_): + def _get_sid(id_: str) -> str: sid = id_ if len(id_) > 3 and id_[2] == '_': sid = id_[3:] ===================================== gajim/common/modules/user_avatar.py ===================================== @@ -14,10 +14,19 @@ # XEP-0084: User Avatar +from __future__ import annotations + +from typing import Generator +from typing import Optional + from nbxmpp.namespaces import Namespace +from nbxmpp.modules.user_avatar import AvatarData from nbxmpp.modules.util import is_error +from nbxmpp.protocol import Message +from nbxmpp.structs import MessageProperties from gajim.common import app +from gajim.common import types from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node from gajim.common.modules.util import as_task @@ -32,12 +41,16 @@ class UserAvatar(BaseModule): 'set_access_model' ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self._register_pubsub_handler(self._avatar_metadata_received) @event_node(Namespace.AVATAR_METADATA) - def _avatar_metadata_received(self, _con, _stanza, properties): + def _avatar_metadata_received(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: if properties.pubsub_event.retracted: return @@ -65,7 +78,10 @@ def _avatar_metadata_received(self, _con, _stanza, properties): self._request_avatar_data(contact, metadata.default) @as_task - def _request_avatar_data(self, contact, sha): + def _request_avatar_data(self, + contact: types.ChatContactT, + sha: str + ) -> Generator[Optional[AvatarData], None, None]: _task = yield avatar = yield self._nbxmpp('UserAvatar').request_avatar_data( ===================================== gajim/common/modules/util.py ===================================== @@ -14,15 +14,23 @@ # Util module +from __future__ import annotations + +from typing import Any from typing import Union from logging import LoggerAdapter from functools import wraps from functools import partial +import nbxmpp +from nbxmpp.protocol import Message +from nbxmpp.structs import EMEData +from nbxmpp.structs import MessageProperties from nbxmpp.task import Task from gajim.common import app +from gajim.common import types from gajim.common.const import EME_MESSAGES @@ -36,7 +44,7 @@ def from_xs_boolean(value: Union[str, bool]) -> bool: if value in ('0', 'false', 'False', ''): return False - raise ValueError('Cant convert %s to python boolean' % value) + raise ValueError(f'Cant convert {value} to python boolean') def to_xs_boolean(value: Union[bool, None]) -> str: @@ -51,14 +59,17 @@ def to_xs_boolean(value: Union[bool, None]) -> str: if value is None: return 'false' - raise ValueError( - 'Cant convert %s to xs:boolean' % value) + raise ValueError(f'Cant convert {value} to xs:boolean') -def event_node(node): - def event_node_decorator(func): +def event_node(node: nbxmpp.Node) -> Any: + def event_node_decorator(func: Any): @wraps(func) - def func_wrapper(self, _con, _stanza, properties): + def func_wrapper(self: Any, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> Any: if not properties.is_pubsub_event: return if properties.pubsub_event.node != node: @@ -69,9 +80,9 @@ def func_wrapper(self, _con, _stanza, properties): return event_node_decorator -def store_publish(func): +def store_publish(func: Any): @wraps(func) - def func_wrapper(self, *args, **kwargs): + def func_wrapper(self: Any, *args: Any, **kwargs: Any): # pylint: disable=protected-access if not app.account_is_connected(self._account): self._stored_publish = partial(func, self, *args, **kwargs) @@ -80,7 +91,7 @@ def func_wrapper(self, *args, **kwargs): return func_wrapper -def get_eme_message(eme_data): +def get_eme_message(eme_data: EMEData) -> str: try: return EME_MESSAGES[eme_data.namespace] except KeyError: @@ -88,8 +99,8 @@ def get_eme_message(eme_data): class LogAdapter(LoggerAdapter): - def process(self, msg, kwargs): - return '(%s) %s' % (self.extra['account'], msg), kwargs + def process(self, msg: str, kwargs: Any) -> tuple[str, Any]: + return f'({self.extra["account"]}) {msg}', kwargs def as_task(func): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f79f7c7f2347f280ad8f8e6a50c7bde… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f79f7c7f2347f280ad8f8e6a50c7bde… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: imprv: Smaller Jingle file transfer widget
by Daniel Brötzmann (＠wurstsalat) 27 May '22

27 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: aede87a1 by wurstsalat at 2022-05-28T01:33:20+02:00 imprv: Smaller Jingle file transfer widget - - - - - d4435639 by wurstsalat at 2022-05-28T01:33:45+02:00 chore: JingleTransport: Add type annotations - - - - - 3644ba0c by wurstsalat at 2022-05-28T01:34:10+02:00 chore: JingleContent: Add type annotations - - - - - 8ee6677a by wurstsalat at 2022-05-28T01:34:25+02:00 chore: JingleSession: Add type annotations - - - - - 48db9a10 by wurstsalat at 2022-05-28T01:34:46+02:00 chore: JingleRTP: Add type annotations - - - - - c63f6f80 by wurstsalat at 2022-05-28T01:35:11+02:00 chore: JingleFileTransfer: Add type annotations - - - - - f79f7c7f by wurstsalat at 2022-05-28T01:35:45+02:00 chore: JingleFileTransferStates: Add type annotations - - - - - 7 changed files: - gajim/common/jingle_content.py - gajim/common/jingle_ft.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/data/gui/file_transfer_jingle.ui Changes: ===================================== gajim/common/jingle_content.py ===================================== @@ -18,19 +18,20 @@ from __future__ import annotations -import typing -from typing import Any +from typing import Any, Callable from typing import Optional +from typing import TYPE_CHECKING import nbxmpp from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import configpaths +from gajim.common.file_props import FileProp from gajim.common.jingle_xtls import SELF_SIGNED_CERTIFICATE from gajim.common.jingle_xtls import load_cert_file -if typing.TYPE_CHECKING: +if TYPE_CHECKING: from gajim.common.jingle_transport import JingleTransport from gajim.common.jingle_session import JingleSession @@ -38,7 +39,7 @@ contents: dict[str, Any] = {} -def get_jingle_content(node): +def get_jingle_content(node: nbxmpp.Node): namespace = node.getNamespace() if namespace in contents: return contents[namespace](node) @@ -58,32 +59,36 @@ class JingleContent: def __init__(self, session: JingleSession, transport: Optional[JingleTransport], - senders: Optional[str]) -> None: + senders: Optional[str] + ) -> None: self.session = session self.transport = transport # will be filled by JingleSession.add_content() # don't uncomment these lines, we will catch more buggy code then # (a JingleContent not added to session shouldn't send anything) - self.creator = None - self.name = None + self.creator: Optional[str] = None + self.name: Optional[str] = None self.accepted = False self.sent = False self.negotiated = False - self.media = None + self.media: Optional[str] = None self.senders = senders if self.senders is None: self.senders = 'both' - self.allow_sending = True # Used for stream direction, attribute 'senders' + # Used for stream direction, attribute 'senders' + self.allow_sending = True # These were found by the Politie - self.file_props = None + self.file_props: Optional[FileProp] = None self.use_security: Optional[bool] = None - self.callbacks = { + self.callbacks: dict[str, list[Callable[ + [nbxmpp.Node, nbxmpp.Node, Optional[nbxmpp.Node], str], + None]]] = { # these are called when *we* get stanzas 'content-accept': [self.__on_transport_info, self.__on_content_accept], @@ -114,13 +119,18 @@ def __init__(self, 'session-terminate-sent': [], } - def is_ready(self): + def is_ready(self) -> bool: return self.accepted and not self.sent - def __on_content_accept(self, stanza, content, error, action): + def __on_content_accept(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: self.on_negotiated() - def on_negotiated(self): + def on_negotiated(self) -> None: if self.accepted: self.negotiated = True self.session.content_negotiated(self.media) @@ -131,7 +141,12 @@ def add_remote_candidates(self, candidates): """ self.transport.remote_candidates = candidates - def on_stanza(self, stanza, content, error, action): + def on_stanza(self, + stanza: nbxmpp.Node, + content: Optional[nbxmpp.Node], + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Called when something related to our content was sent by peer """ @@ -139,10 +154,20 @@ def on_stanza(self, stanza, content, error, action): for callback in self.callbacks[action]: callback(stanza, content, error, action) - def __on_transport_replace(self, stanza, content, error, action): + def __on_transport_replace(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: content.addChild(node=self.transport.make_transport()) - def __on_transport_info(self, stanza, content, error, action): + def __on_transport_info(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Got a new transport candidate """ @@ -151,7 +176,9 @@ def __on_transport_info(self, stanza, content, error, action): if candidates: self.add_remote_candidates(candidates) - def __content(self, payload=None): + def __content(self, + payload: Optional[list[nbxmpp.Node]] = None + ) -> nbxmpp.Node: """ Build a XML content-wrapper for our data """ @@ -163,7 +190,7 @@ def __content(self, payload=None): 'senders': self.senders}, payload=payload) - def send_candidate(self, candidate): + def send_candidate(self, candidate: dict[str, Any]) -> None: """ Send a transport candidate for a previously defined transport. """ @@ -171,7 +198,7 @@ def send_candidate(self, candidate): content.addChild(node=self.transport.make_transport([candidate])) self.session.send_transport_info(content) - def send_error_candidate(self): + def send_error_candidate(self) -> None: """ Sends a candidate-error when we can't connect to a candidate. """ @@ -182,12 +209,17 @@ def send_error_candidate(self): self.session.send_transport_info(content) - def send_description_info(self): + def send_description_info(self) -> None: content = self.__content() self._fill_content(content) self.session.send_description_info(content) - def __fill_jingle_stanza(self, stanza, content, error, action): + def __fill_jingle_stanza(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Add our things to session-initiate stanza """ @@ -195,7 +227,7 @@ def __fill_jingle_stanza(self, stanza, content, error, action): self.sent = True content.addChild(node=self.transport.make_transport()) - def _fill_content(self, content): + def _fill_content(self, content: nbxmpp.Node) -> None: description_node = nbxmpp.simplexml.Node( tag=Namespace.JINGLE_FILE_TRANSFER_5 + ' description') file_tag = description_node.setTag('file') @@ -253,6 +285,6 @@ def _fill_content(self, content): content.addChild(node=security) content.addChild(node=description_node) - def destroy(self): + def destroy(self) -> None: self.callbacks = None del self.session.contents[(self.creator, self.name)] ===================================== gajim/common/jingle_ft.py ===================================== @@ -18,13 +18,15 @@ from __future__ import annotations -import typing +from typing import Any from typing import Optional +from typing import TYPE_CHECKING import logging import threading import time -from enum import IntEnum, unique +from enum import IntEnum +from enum import unique import nbxmpp from nbxmpp import JID @@ -50,7 +52,7 @@ from gajim.common.jingle_ftstates import StateCandSentAndRecv from gajim.common.jingle_ftstates import StateTransportReplace -if typing.TYPE_CHECKING: +if TYPE_CHECKING: from gajim.common.jingle_session import JingleSession from gajim.common.jingle_transport import JingleTransport @@ -101,7 +103,7 @@ def __init__(self, self.callbacks['iq-result'] += [self.__on_iq_result] self.use_security = use_security - self.x509_fingerprint = None + self.x509_fingerprint: Optional[str] = None self.file_props = file_props self.weinitiate = self.session.weinitiate self.werequest = self.session.werequest @@ -143,7 +145,10 @@ def __init__(self, and cert_name.with_suffix('.pkey').exists()): jingle_xtls.make_certs(cert_name, 'gajim') - def __state_changed(self, nextstate, args=None): + def __state_changed(self, + nextstate: State, + args: Optional[dict[str, Any]] =None + ) -> None: # Executes the next state action and sets the next state current_state = self.state st = self.states[nextstate] @@ -152,7 +157,12 @@ def __state_changed(self, nextstate, args=None): if self.state == current_state: self.state = nextstate - def __on_session_initiate(self, stanza, content, error, action): + def __on_session_initiate(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.debug("Jingle FT request received") self._raise_event(stanza, content) @@ -177,7 +187,10 @@ def __on_session_initiate(self, stanza, content, error, action): self.session.approve_content(self.media, self.name) self.session.accept_session() - def _raise_event(self, stanza, content): + def _raise_event(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node + ) -> None: con = self.session.connection id_ = stanza.getID() fjid = con.get_module('Bytestream')._ft_get_from(stanza) @@ -260,10 +273,15 @@ def _raise_event(self, stanza, content): jid=jid, file_props=file_props)) - def __on_session_initiate_sent(self, stanza, content, error, action): + def __on_session_initiate_sent(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: pass - def __send_hash(self): + def __send_hash(self) -> None: # Send hash in a session info checksum = nbxmpp.Node(tag='checksum', payload=[nbxmpp.Node(tag='file', @@ -280,7 +298,7 @@ def __send_hash(self): } self.session.connection.get_module('Jingle').set_file_info(file_info) - def _compute_hash(self): + def _compute_hash(self) -> Optional[nbxmpp.Hashes2]: # Calculates the hash and returns a xep-300 hash stanza if self.file_props.algo is None: return @@ -301,11 +319,16 @@ def _compute_hash(self): h.addHash(hash_, self.file_props.algo) return h - def on_cert_received(self): + def on_cert_received(self) -> None: self.session.approve_session() self.session.approve_content('file', name=self.name) - def __on_session_accept(self, stanza, content, error, action): + def __on_session_accept(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_session_accept") con = self.session.connection security = content.getTag('security') @@ -326,7 +349,7 @@ def __on_session_accept(self, stanza, content, error, action): raise nbxmpp.NodeProcessed self.continue_session_accept(stanza) - def continue_session_accept(self, stanza): + def continue_session_accept(self, stanza: nbxmpp.Node) -> None: if self.state == State.TRANSPORT_REPLACE: # If we are requesting we don't have the file if self.session.werequest: @@ -351,31 +374,61 @@ def continue_session_accept(self, stanza): if self.transport.type_ == TransportType.SOCKS5: sid = self.file_props.transport_sid app.socks5queue.connect_to_hosts(self.session.connection.name, - sid, - self.on_connect, - self._on_connect_error, - fingerprint=fingerprint, - receiving=False) + sid, + self.on_connect, + self._on_connect_error, + fingerprint=fingerprint, + receiving=False) raise nbxmpp.NodeProcessed self.__state_changed(State.TRANSFERRING) raise nbxmpp.NodeProcessed - def __on_session_terminate(self, stanza, content, error, action): + def __on_session_terminate(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_session_terminate") - def __on_session_info(self, stanza, content, error, action): + def __on_session_info(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: pass - def __on_transport_accept(self, stanza, content, error, action): + def __on_transport_accept(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_transport_accept") - def __on_transport_replace(self, stanza, content, error, action): + def __on_transport_replace(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_transport_replace") - def __on_transport_reject(self, stanza, content, error, action): + def __on_transport_reject(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_transport_reject") - def __on_transport_info(self, stanza, content, error, action): + def __on_transport_info(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_transport_info") cand_error = content.getTag('transport').getTag('candidate-error') cand_used = content.getTag('transport').getTag('candidate-used') @@ -426,7 +479,12 @@ def __on_transport_info(self, stanza, content, error, action): raise nbxmpp.NodeProcessed self.__state_changed(State.CAND_RECEIVED, args) - def __on_iq_result(self, stanza, content, error, action): + def __on_iq_result(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: log.info("__on_iq_result") if self.state in (State.NOT_STARTED, State.CAND_RECEIVED): @@ -441,8 +499,12 @@ def __on_iq_result(self, stanza, content, error, action): # initiate transfer self.__state_changed(State.TRANSFERRING) - def __transport_setup(self, stanza=None, content=None, error=None, - action=None): + def __transport_setup(self, + stanza: nbxmpp.Node, + content: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: # Sets up a few transport specific things for the file transfer if self.transport.type_ == TransportType.IBB: # No action required, just set the state to transferring @@ -462,23 +524,23 @@ def on_connect(self, streamhost): self.nominated_cand['our-cand'] = streamhost self.__send_candidate(args) - def _on_connect_error(self, sid): + def _on_connect_error(self, sid: str) -> None: log.info('connect error, sid=%s', sid) args = {'candError' : True, 'sendCand' : True} self.__send_candidate(args) - def __send_candidate(self, args): + def __send_candidate(self, args: dict[str, Any]) -> None: if self.state == State.CAND_RECEIVED: self.__state_changed(State.CAND_SENT_AND_RECEIVED, args) else: self.__state_changed(State.CAND_SENT, args) - def _store_socks5_sid(self, sid, hash_id): + def _store_socks5_sid(self, sid: str, hash_id: str) -> None: # callback from socsk5queue.start_listener self.file_props.hash_ = hash_id - def _listen_host(self): + def _listen_host(self) -> None: receiver = self.file_props.receiver sender = self.file_props.sender sha_str = helpers.get_auth_sha(self.file_props.sid, sender, @@ -497,7 +559,7 @@ def _listen_host(self): # send error message, notify the user return - def is_our_candidate_used(self): + def is_our_candidate_used(self) -> bool: ''' If this method returns true then the candidate we nominated will be used, if false, the candidate nominated by peer will be used @@ -513,12 +575,12 @@ def is_our_candidate_used(self): return our_pr > peer_pr return self.weinitiate - def start_ibb_transfer(self): + def start_ibb_transfer(self) -> None: if self.file_props.type_ == 's': self.__state_changed(State.TRANSFERRING) -def get_content(desc): +def get_content(desc) -> JingleFileTransfer: return JingleFileTransfer contents[Namespace.JINGLE_FILE_TRANSFER_5] = get_content ===================================== gajim/common/jingle_ftstates.py ===================================== @@ -12,16 +12,26 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + +from typing import Any +from typing import Optional +from typing import TYPE_CHECKING + import logging import nbxmpp from nbxmpp.namespaces import Namespace from gajim.common import app +from gajim.common import types from gajim.common.jingle_transport import TransportType from gajim.common.socks5 import Socks5ReceiverClient from gajim.common.socks5 import Socks5SenderClient +if TYPE_CHECKING: + from gajim.common.jingle_ft import JingleFileTransfer + log = logging.getLogger('gajim.c.jingle_ftstates') @@ -30,10 +40,10 @@ class JingleFileTransferStates: This class implements the state machine design pattern ''' - def __init__(self, jingleft): + def __init__(self, jingleft: JingleFileTransfer) -> None: self.jft = jingleft - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: ''' This method MUST be overridden by a subclass ''' @@ -45,7 +55,7 @@ class StateInitialized(JingleFileTransferStates): This state initializes the file transfer ''' - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: if self.jft.weinitiate: # update connection's fileprops self.jft._listen_host() @@ -65,7 +75,7 @@ class StateCandSent(JingleFileTransferStates): This state sends our nominated candidate ''' - def _send_candidate(self, args): + def _send_candidate(self, args: dict[str, Any]) -> None: if 'candError' in args: self.jft.nominated_cand['our-cand'] = False self.jft.send_error_candidate() @@ -85,7 +95,7 @@ def _send_candidate(self, args): content.addChild(node=transport) self.jft.session.send_transport_info(content) - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: self._send_candidate(args) @@ -95,7 +105,7 @@ class StateCandReceived(JingleFileTransferStates): It takes the arguments: canError if we receive a candidate-error ''' - def _recv_candidate(self, args): + def _recv_candidate(self, args: dict[str, Any]) -> None: if 'candError' in args: return content = args['content'] @@ -112,7 +122,7 @@ def _recv_candidate(self, args): # We save the candidate nominated by peer self.jft.nominated_cand['peer-cand'] = streamhost_used - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: self._recv_candidate(args) @@ -123,7 +133,7 @@ class StateCandSentAndRecv(StateCandSent, StateCandReceived): we should execute the action of when we receive or send a candidate. ''' - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: if args['sendCand']: self._send_candidate(args) else: @@ -135,7 +145,7 @@ class StateTransportReplace(JingleFileTransferStates): This state initiates transport replace ''' - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: self.jft.session.transport_replace() @@ -145,14 +155,14 @@ class StateTransfering(JingleFileTransferStates): we have. ''' - def _start_ibb_transfer(self, con): + def _start_ibb_transfer(self, con: types.Client) -> None: self.jft.file_props.transport_sid = self.jft.transport.sid fp = open(self.jft.file_props.file_name, 'rb') con.get_module('IBB').send_open(self.jft.session.peerjid, self.jft.file_props.sid, fp) - def _start_sock5_transfer(self): + def _start_sock5_transfer(self) -> None: # It tells whether we start the transfer as client or server mode = None if self.jft.is_our_candidate_used(): @@ -221,7 +231,7 @@ def _start_sock5_transfer(self): app.socks5queue.send_file(self.jft.file_props, self.jft.session.connection.name, mode) - def action(self, args=None): + def action(self, args: Optional[dict[str, Any]] = None) -> None: if self.jft.transport.type_ == TransportType.IBB: self._start_ibb_transfer(self.jft.session.connection) elif self.jft.transport.type_ == TransportType.SOCKS5: ===================================== gajim/common/jingle_rtp.py ===================================== @@ -16,6 +16,13 @@ Handles Jingle RTP sessions (XEP 0167) """ +from __future__ import annotations + +from typing import Any +from typing import Callable +from typing import Iterator +from typing import Optional + import os import logging import socket @@ -40,13 +47,18 @@ from gajim.common.jingle_content import JingleContent from gajim.common.jingle_content import JingleContentSetupException from gajim.common.jingle_session import FailedApplication - +from gajim.common.jingle_session import JingleSession +from gajim.common.jingle_transport import JingleTransport log = logging.getLogger('gajim.c.jingle_rtp') class JingleRTPContent(JingleContent): - def __init__(self, session, media, transport=None): + def __init__(self, + session: JingleSession, + media: str, + transport: Optional[JingleTransport] = None + ) -> None: if transport is None: transport = JingleTransportICEUDP(None) JingleContent.__init__(self, session, transport, None) @@ -56,17 +68,17 @@ def __init__(self, session, media, transport=None): 'audio': Farstream.MediaType.AUDIO, 'video': Farstream.MediaType.VIDEO}[media] - self.pipeline = None - self.src_bin = None + self.pipeline: Optional[Gst.Pipeline] = None + self.src_bin: Optional[Gst.Bin] = None self.stream_failed_once = False - self.candidates_ready = False # True when local candidates are prepared + self.candidates_ready = False # True when local candidates are prepared # TODO - self.conference = None - self.funnel = None - self.p2psession = None - self.p2pstream = None + self.conference: Optional[Farstream.Conference] = None + self.funnel: Optional[Gst.Element] = None + self.p2psession: Optional[Farstream.Session] = None + self.p2pstream: Optional[Farstream.Stream] = None self.callbacks['session-initiate'] += [self.__on_remote_codecs] self.callbacks['content-add'] += [self.__on_remote_codecs] @@ -76,7 +88,10 @@ def __init__(self, session, media, transport=None): self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] - def setup_stream(self, on_src_pad_added): + def setup_stream(self, + on_src_pad_added: Callable[ + [Farstream.Stream, Gst.Pad, Farstream.Codec], None] + ) -> None: # pipeline and bus self.pipeline = Gst.Pipeline() bus = self.pipeline.get_bus() @@ -114,10 +129,14 @@ def setup_stream(self, on_src_pad_added): self.p2pstream.connect('src-pad-added', on_src_pad_added) self.p2pstream.set_transmitter_ht('nice', params) - def is_ready(self): + def is_ready(self) -> bool: return JingleContent.is_ready(self) and self.candidates_ready - def make_bin_from_config(self, config_key, pipeline, text): + def make_bin_from_config(self, + config_key: str, + pipeline: str, + text: str + ) -> Optional[Gst.Bin]: pipeline = pipeline % app.settings.get(config_key) log.debug('Pipeline: %s', str(pipeline)) try: @@ -136,18 +155,18 @@ def add_remote_candidates(self, candidates): if self.sent: self.p2pstream.add_remote_candidates(candidates) - def batch_dtmf(self, events): + def batch_dtmf(self, events: list[str]) -> None: """ Send several DTMF tones """ if self._dtmf_running: raise Exception("There is a DTMF batch already running") - events = deque(events) + d_events = deque(events) self._dtmf_running = True - self.start_dtmf(events.popleft()) - GLib.timeout_add(500, self._next_dtmf, events) + self.start_dtmf(d_events.popleft()) + GLib.timeout_add(500, self._next_dtmf, d_events) - def _next_dtmf(self, events): + def _next_dtmf(self, events: deque[str]): self.stop_dtmf() if events: self.start_dtmf(events.popleft()) @@ -164,28 +183,32 @@ def start_dtmf(self, key: str) -> None: event = int(key) self.p2psession.start_telephony_event(event, 2) - def stop_dtmf(self): + def stop_dtmf(self) -> None: self.p2psession.stop_telephony_event() - def _fill_content(self, content): + def _fill_content(self, content: nbxmpp.Node) -> None: content.addChild(Namespace.JINGLE_RTP + ' description', attrs={'media': self.media}, payload=list(self.iter_codecs())) - def _setup_funnel(self): + def _setup_funnel(self) -> None: self.funnel = Gst.ElementFactory.make('funnel', None) self.pipeline.add(self.funnel) self.funnel.link(self.sink) self.sink.set_state(Gst.State.PLAYING) self.funnel.set_state(Gst.State.PLAYING) - def _on_src_pad_added(self, _stream, pad, codec): + def _on_src_pad_added(self, + _stream: Farstream.Stream, + pad: Gst.Pad, + codec: Farstream.Codec + ) -> None: log.info('Used codec: %s', codec.to_string()) if not self.funnel: self._setup_funnel() pad.link(self.funnel.get_request_pad('sink_%u')) - def _on_gst_message(self, _bus, message): + def _on_gst_message(self, _bus: Gst.Bus, message: Gst.Message) -> None: if message.type == Gst.MessageType.ELEMENT: name = message.get_structure().get_name() message_string = message.get_structure().to_string() @@ -257,10 +280,10 @@ def _on_gst_message(self, _bus, message): self.pipeline.set_state(Gst.State.PLAYING) @staticmethod - def get_fallback_src(): + def get_fallback_src() -> Optional[Gst.Element]: return Gst.ElementFactory.make('fakesrc', None) - def on_negotiated(self): + def on_negotiated(self) -> None: if self.accepted: if self.p2psession.get_property('codecs'): # those lines MUST be done after we get info on our codecs @@ -273,11 +296,16 @@ def on_negotiated(self): # Farstream.StreamDirection.BOTH) JingleContent.on_negotiated(self) - def __on_remote_codecs(self, _stanza, content, _error, _action): + def __on_remote_codecs(self, + _stanza: nbxmpp.Node, + content: nbxmpp.Node, + _error: Optional[nbxmpp.Node], + _action: str + ) -> None: """ Get peer codecs from what we get from peer """ - codecs = [] + codecs: list[Farstream.Codec] = [] for codec in content.getTag('description').iterTags('payload-type'): if not codec['id'] or not codec['name'] or not codec['clockrate']: # ignore invalid payload-types @@ -303,7 +331,7 @@ def __on_remote_codecs(self, _stanza, content, _error, _action): except GLib.Error: raise FailedApplication - def iter_codecs(self): + def iter_codecs(self) -> Iterator[nbxmpp.Node]: codecs = self.p2psession.props.codecs_without_config for codec in codecs: attrs = { @@ -322,13 +350,13 @@ def iter_codecs(self): payload = [] yield nbxmpp.Node('payload-type', attrs, payload) - def __stop(self, *things): + def __stop(self, *args: Any) -> None: self.pipeline.set_state(Gst.State.NULL) - def __del__(self): + def __del__(self) -> None: self.__stop() - def destroy(self): + def destroy(self) -> None: JingleContent.destroy(self) self.p2pstream.disconnect_by_func(self._on_src_pad_added) self.pipeline.get_bus().disconnect_by_func(self._on_gst_message) @@ -340,7 +368,10 @@ class JingleAudio(JingleRTPContent): protocol """ - def __init__(self, session, transport=None): + def __init__(self, + session: JingleSession, + transport: Optional[JingleTransport] = None + ) -> None: JingleRTPContent.__init__(self, session, 'audio', transport) self.setup_stream() @@ -356,11 +387,11 @@ def set_out_volume(self, vol: float) -> None: """ self.out_volume.set_property('volume', vol) - def setup_stream(self): + def setup_stream(self) -> None: JingleRTPContent.setup_stream(self, self._on_src_pad_added) # list of codecs that are explicitly allowed - allow_codecs = [ + allow_codecs: list[Farstream.Codec] = [ Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'OPUS', Farstream.MediaType.AUDIO, 48000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'SPEEX', @@ -380,7 +411,7 @@ def setup_stream(self): ] # disable all other codecs - disable_codecs = [] + disable_codecs: list[Farstream.Codec] = [] codecs_without_config = self.p2psession.props.codecs_without_config allowed_encoding_names = [c.encoding_name for c in allow_codecs] allowed_encoding_names.append('telephone-event') @@ -428,12 +459,15 @@ def setup_stream(self): class JingleVideo(JingleRTPContent): - def __init__(self, session, transport=None): + def __init__(self, + session: JingleSession, + transport: Optional[JingleTransport] = None + ) -> None: JingleRTPContent.__init__(self, session, 'video', transport) self.sink = None self.setup_stream() - def setup_stream(self): + def setup_stream(self) -> None: # TODO: Everything is not working properly: # sometimes, one window won't show up, # sometimes it'll freeze... @@ -443,7 +477,7 @@ def setup_stream(self): # list of codecs that are explicitly allowed # for now only VP8/H264 (available in gst-plugins-good) - allow_codecs = [ + allow_codecs: list[Farstream.Codec] = [ #Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'VP9', # Farstream.MediaType.VIDEO, 90000), Farstream.Codec.new(Farstream.CODEC_ID_ANY, 'VP8', @@ -453,7 +487,7 @@ def setup_stream(self): ] # disable all other codecs - disable_codecs = [] + disable_codecs: list[Farstream.Codec] = [] codecs_without_config = self.p2psession.props.codecs_without_config allowed_encoding_names = [c.encoding_name for c in allow_codecs] for codec in codecs_without_config: @@ -466,7 +500,10 @@ def setup_stream(self): self.p2psession.set_codec_preferences(allow_codecs + disable_codecs) - def do_setup(self, self_display_sink, other_sink): + def do_setup(self, + self_display_sink: Gst.Element, + other_sink: Gst.Element + ) -> None: if app.settings.get('video_see_self'): tee = ('! tee name=split ! queue name=self-display-queue split. ! ' 'queue name=network-queue') @@ -510,7 +547,8 @@ def do_setup(self, self_display_sink, other_sink): log.debug('Could not save pipeline graph. Make sure ' 'graphviz is installed.') - def get_fallback_src(self): + @staticmethod + def get_fallback_src() -> Optional[Gst.Bin]: # TODO: Use avatar? pipeline = ('videotestsrc is-live=true ! video/x-raw,framerate=10/1 ! ' 'videoconvert') ===================================== gajim/common/jingle_session.py ===================================== @@ -29,7 +29,10 @@ from __future__ import annotations +from typing import Any +from typing import Callable from typing import Optional +from typing import TYPE_CHECKING import time import logging @@ -38,6 +41,7 @@ import nbxmpp from nbxmpp import JID from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq from nbxmpp.util import generate_id from gajim.common import app @@ -52,6 +56,8 @@ from gajim.common.jingle_content import JingleContentSetupException from gajim.common.jingle_ft import State from gajim.common.file_props import FilesProp +if TYPE_CHECKING: + from gajim.common.jingle_transport import JingleTransport log = logging.getLogger("app.c.jingle_session") @@ -144,7 +150,9 @@ def __init__(self, # callbacks to call on proper contents # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack - self.callbacks = { + self.callbacks: dict[str, list[Callable[ + [nbxmpp.Node, nbxmpp.Node, Optional[nbxmpp.Node], str], + None]]] = { 'content-accept': [self.__ack, self.__on_content_accept, self.__broadcast], 'content-add': [self.__ack, @@ -175,17 +183,17 @@ def __init__(self, 'iq-error': [self.__on_error], } - def collect_iq_id(self, iq_id): + def collect_iq_id(self, iq_id: str) -> None: if iq_id is not None: self.iq_ids.append(iq_id) - def approve_session(self): + def approve_session(self) -> None: """ Called when user accepts session in UI (when we aren't the initiator) """ self.accept_session() - def decline_session(self): + def decline_session(self) -> None: """ Called when user declines session in UI (when we aren't the initiator) """ @@ -193,7 +201,7 @@ def decline_session(self): reason.addChild('decline') self._session_terminate(reason) - def cancel_session(self): + def cancel_session(self) -> None: """ Called when user declines session in UI (when we aren't the initiator) """ @@ -215,7 +223,7 @@ def reject_content(self, media: str, name: Optional[str] = None) -> None: content.destroy() self.on_session_state_changed() - def end_session(self): + def end_session(self) -> None: """ Called when user stops or cancel session in UI """ @@ -263,7 +271,11 @@ def add_content(self, # The content is from us, accept it content.accepted = True - def remove_content(self, creator, name, reason=None): + def remove_content(self, + creator: str, + name: str, + reason: Optional[nbxmpp.Node] = None + ) -> None: """ Remove the content `name` created by `creator` by sending content-remove, or by sending session-terminate if @@ -276,7 +288,11 @@ def remove_content(self, creator, name, reason=None): if not self.contents: self.end_session() - def modify_content(self, creator, name, transport=None): + def modify_content(self, + creator: str, + name: str, + transport: Optional[JingleTransport] = None + ) -> None: ''' Currently used for transport replacement ''' @@ -320,50 +336,50 @@ def on_session_state_changed(self, # The other side created this content, we accept it. self.__content_accept(content) - def is_ready(self): + def is_ready(self) -> bool: """ Return True when all codecs and candidates are ready (for all contents) """ return (all((content.is_ready() for content in self.contents.values())) and self.accepted) - def accept_session(self): + def accept_session(self) -> None: """ Mark the session as accepted """ self.accepted = True self.on_session_state_changed() - def start_session(self): + def start_session(self) -> None: """ Mark the session as ready to be started """ self.accepted = True self.on_session_state_changed() - def send_session_info(self): + def send_session_info(self) -> Any: pass - def send_content_accept(self, content): + def send_content_accept(self, content: nbxmpp.Node) -> None: assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('content-accept') jingle.addChild(node=content) self.connection.connection.send(stanza) - def send_transport_info(self, content): + def send_transport_info(self, content: nbxmpp.Node) -> None: assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('transport-info') jingle.addChild(node=content) self.connection.connection.send(stanza) self.collect_iq_id(stanza.getID()) - def send_description_info(self, content): + def send_description_info(self, content: nbxmpp.Node) -> None: assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('description-info') jingle.addChild(node=content) self.connection.connection.send(stanza) - def on_stanza(self, stanza): + def on_stanza(self, stanza: nbxmpp.Node) -> None: """ A callback for ConnectionJingle. It gets stanza, then tries to send it to all internally registered callbacks. First one to raise @@ -404,7 +420,12 @@ def on_stanza(self, stanza): reason.addChild('failed-application') self._session_terminate(reason) - def __ack(self, stanza, jingle, error, action): + def __ack(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Default callback for action stanzas -- simple ack and stop processing """ @@ -412,7 +433,12 @@ def __ack(self, stanza, jingle, error, action): response.delChild(response.getQuery()) self.connection.connection.send(response) - def __on_error(self, stanza, jingle, error, action): + def __on_error(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: nbxmpp.Node, + action: str + ) -> None: # FIXME text = error.getTagData('text') error_name = None @@ -424,7 +450,7 @@ def __on_error(self, stanza, jingle, error, action): error_name = child.getName() self.__dispatch_error(error_name, text, error.getAttr('type')) - def transport_replace(self): + def transport_replace(self) -> None: transport = JingleTransportIBB() # For debug only, delete this and replace for a function # that will identify contents by its sid @@ -438,7 +464,12 @@ def transport_replace(self): self.connection.connection.send(stanza) self.state = JingleStates.PENDING - def __on_transport_replace(self, stanza, jingle, error, action): + def __on_transport_replace(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: for content in jingle.iterTags('content'): creator = content['creator'] name = content['name'] @@ -474,7 +505,12 @@ def __on_transport_replace(self, stanza, jingle, error, action): self.connection.connection.send(stanza) raise nbxmpp.NodeProcessed - def __on_session_info(self, stanza, jingle, error, action): + def __on_session_info(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: # TODO: active, (un)hold, (un)mute ringing = jingle.getTag('ringing') if ringing is not None: @@ -499,7 +535,12 @@ def __on_session_info(self, stanza, jingle, error, action): type_='modify') raise nbxmpp.NodeProcessed - def __on_content_remove(self, stanza, jingle, error, action): + def __on_content_remove(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: for content in jingle.iterTags('content'): creator = content['creator'] name = content['name'] @@ -515,14 +556,23 @@ def __on_content_remove(self, stanza, jingle, error, action): reason.setTag('success') self._session_terminate(reason) - def __on_session_accept(self, stanza, jingle, error, action): + def __on_session_accept(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: # FIXME if self.state != JingleStates.PENDING: raise OutOfOrder self.state = JingleStates.ACTIVE @staticmethod - def __on_content_accept(stanza, jingle, error, action): + def __on_content_accept(stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Called when we get content-accept stanza or equivalent one (like session-accept) @@ -533,7 +583,12 @@ def __on_content_accept(stanza, jingle, error, action): # name = content['name'] return - def __on_content_add(self, stanza, jingle, error, action): + def __on_content_add(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: if self.state == JingleStates.ENDED: raise OutOfOrder parse_result = self.__parse_contents(jingle) @@ -546,7 +601,12 @@ def __on_content_add(self, stanza, jingle, error, action): # self.contents[(content.creator, content.name)].destroy() self._raise_event('jingle-request-received', contents=contents) - def __on_session_initiate(self, stanza, jingle, error, action): + def __on_session_initiate(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ We got a jingle session request from other entity, therefore we are the receiver... Unpack the data, inform the user @@ -619,7 +679,7 @@ def __on_session_initiate(self, stanza, jingle, error, action): self._raise_event('jingle-request-received', contents=contents) # Check if it's an A/V call and add it to the archive - content_types = [] + content_types: list[str] = [] for item in contents: content_types.append(item.media) if not any(item in ('audio', 'video') for item in content_types): @@ -637,7 +697,12 @@ def __on_session_initiate(self, stanza, jingle, error, action): KindConstant.CALL_INCOMING, additional_data=additional_data) - def __broadcast(self, stanza, jingle, error, action): + def __broadcast(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Broadcast the stanza contents to proper content handlers """ @@ -661,7 +726,12 @@ def __broadcast(self, stanza, jingle, error, action): cn = self.contents[(creator, name)] cn.on_stanza(stanza, content, error, action) - def __on_session_terminate(self, stanza, jingle, error, action): + def __on_session_terminate(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: self.connection.get_module('Jingle').delete_jingle_session(self.sid) reason, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): @@ -684,18 +754,28 @@ def __on_session_terminate(self, stanza, jingle, error, action): media=None, reason=text) - def __broadcast_all(self, stanza, jingle, error, action): + def __broadcast_all(self, + stanza: nbxmpp.Node, + jingle: nbxmpp.Node, + error: Optional[nbxmpp.Node], + action: str + ) -> None: """ Broadcast the stanza to all content handlers """ for content in self.contents.values(): content.on_stanza(stanza, None, error, action) - def __parse_contents(self, jingle): + def __parse_contents(self, + jingle: nbxmpp.Node + ) -> tuple[ + list[JingleContent], + list[tuple[str, str]], + Optional[str]]: # TODO: Needs some reworking - contents = [] - contents_rejected = [] - reasons = set() + contents: list[JingleContent] = [] + contents_rejected: list[tuple[str, str]] = [] + reasons: set[str] = set() for element in jingle.iterTags('content'): transport = get_jingle_transport(element.getTag('transport')) if transport: @@ -706,7 +786,8 @@ def __parse_contents(self, jingle): if transport: content = content_type(self, transport=transport) self.add_content(element['name'], - content, 'peer') + content, + 'peer') contents.append(content) else: reasons.add('unsupported-transports') @@ -725,14 +806,18 @@ def __parse_contents(self, jingle): break return (contents, contents_rejected, failure_reason) - def __dispatch_error(self, error=None, text=None, type_=None): + def __dispatch_error(self, + error: Optional[str] = None, + text: Optional[str] = None, + type_: Optional[str] = None + ) -> None: if text: text = '%s (%s)' % (error, text) if type_ != 'modify': self._raise_event('jingle-error-received', reason=text or error) @staticmethod - def __reason_from_stanza(stanza): + def __reason_from_stanza(stanza: nbxmpp.Node) -> tuple[str, str]: # TODO: Move to GUI? reason = 'success' reasons = [ @@ -752,7 +837,10 @@ def __reason_from_stanza(stanza): break return (reason, text) - def __make_jingle(self, action, reason=None): + def __make_jingle(self, + action: str, + reason: Optional[nbxmpp.Node] = None + ) -> tuple[Iq, nbxmpp.Node]: stanza = nbxmpp.Iq(typ='set', to=nbxmpp.JID.from_string(self.peerjid), frm=self.ourjid) attrs = { @@ -766,7 +854,13 @@ def __make_jingle(self, action, reason=None): jingle.addChild(node=reason) return stanza, jingle - def __send_error(self, stanza, error, jingle_error=None, text=None, type_=None): + def __send_error(self, + stanza: nbxmpp.Node, + error: Optional[str], + jingle_error: Optional[str] = None, + text: Optional[str] = None, + type_: Optional[str] = None + ) -> None: err_stanza = nbxmpp.Error(stanza, '%s %s' % (Namespace.STANZAS, error)) err = err_stanza.getTag('error') if type_: @@ -779,7 +873,7 @@ def __send_error(self, stanza, error, jingle_error=None, text=None, type_=None): self.__dispatch_error(jingle_error or error, text, type_) @staticmethod - def __append_content(jingle, content): + def __append_content(jingle: nbxmpp.Node, content: JingleContent) -> None: """ Append <content/> element to <jingle/> element """ @@ -788,7 +882,7 @@ def __append_content(jingle, content): 'creator': content.creator, 'senders': content.senders}) - def __append_contents(self, jingle): + def __append_contents(self, jingle: nbxmpp.Node) -> None: """ Append all <content/> elements to <jingle/> """ @@ -798,7 +892,7 @@ def __append_contents(self, jingle): if content.is_ready(): self.__append_content(jingle, content) - def __session_initiate(self): + def __session_initiate(self) -> None: assert self.state == JingleStates.ENDED stanza, jingle = self.__make_jingle('session-initiate') self.__append_contents(jingle) @@ -807,7 +901,7 @@ def __session_initiate(self): self.collect_iq_id(stanza.getID()) self.state = JingleStates.PENDING - def __session_accept(self): + def __session_accept(self) -> None: assert self.state == JingleStates.PENDING stanza, jingle = self.__make_jingle('session-accept') self.__append_contents(jingle) @@ -816,33 +910,33 @@ def __session_accept(self): self.collect_iq_id(stanza.getID()) self.state = JingleStates.ACTIVE - def __session_info(self, payload=None): + def __session_info(self, payload: Optional[nbxmpp.Node] = None) -> None: assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('session-info') if payload: jingle.addChild(node=payload) self.connection.connection.send(stanza) - def _JingleFileTransfer__session_info(self, payload): + def _JingleFileTransfer__session_info(self, payload: nbxmpp.Node) -> None: # For some strange reason when I call # self.session.__session_info(payload) from the jingleFileTransfer object # within a thread, this method gets called instead. Even though, it # isn't being called explicitly. self.__session_info(payload) - def _session_terminate(self, reason=None): + def _session_terminate(self, reason: Optional[nbxmpp.Node] = None) -> None: stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') if self.connection.connection and self.connection.state.is_available: self.connection.connection.send(stanza) # TODO: Move to GUI? - reason, text = self.__reason_from_stanza(jingle) + reason_text, text = self.__reason_from_stanza(jingle) if reason not in ('success', 'cancel', 'decline'): - self.__dispatch_error(reason, text) + self.__dispatch_error(reason_text, text) if text: - text = '%s (%s)' % (reason, text) + text = f'{reason_text} ({text})' else: - text = reason + text = reason_text self.connection.get_module('Jingle').delete_jingle_session(self.sid) self._raise_event('jingle-disconnected-received', media=None, @@ -876,7 +970,10 @@ def __content_reject(self, content: JingleContent) -> None: media=content.media, reason='rejected') - def __content_remove(self, content, reason=None): + def __content_remove(self, + content: JingleContent, + reason: Optional[nbxmpp.Node] = None + ) -> None: assert self.state != JingleStates.ENDED if self.connection.connection and self.connection.state.is_available: stanza, jingle = self.__make_jingle('content-remove', reason=reason) @@ -887,10 +984,10 @@ def __content_remove(self, content, reason=None): media=content.media, reason='removed') - def content_negotiated(self, media): + def content_negotiated(self, media: str) -> None: self._raise_event('jingle-connected-received', media=media) - def __transport_accept(self, transport): + def __transport_accept(self, transport: JingleTransport) -> None: assert self.state != JingleStates.ENDED stanza, jingle = self.__make_jingle('transport-accept') self.__append_contents(jingle) @@ -899,7 +996,7 @@ def __transport_accept(self, transport): self.collect_iq_id(stanza.getID()) self.state = JingleStates.ACTIVE - def _raise_event(self, name: str, **kwargs): + def _raise_event(self, name: str, **kwargs: Any) -> None: jid, resource = app.get_room_and_nick_from_fjid( str(self.peerjid)) jid = JID.from_string(jid) ===================================== gajim/common/jingle_transport.py ===================================== @@ -31,13 +31,14 @@ from gajim.common import app from gajim.common.client import Client from gajim.common.file_props import FileProp +from gajim.common.jingle_content import JingleContent log = logging.getLogger('gajim.c.jingle_transport') transports: dict[str, Any] = {} -def get_jingle_transport(node): +def get_jingle_transport(node: nbxmpp.Node): namespace = node.getNamespace() if namespace in transports: return transports[namespace](node) @@ -63,8 +64,8 @@ class JingleTransport: def __init__(self, type_: TransportType) -> None: self.type_ = type_ - self.candidates = [] - self.remote_candidates = [] + self.candidates: list[dict[str, Any]] = [] + self.remote_candidates: list[dict[str, Any]] = [] self.connection: Optional[Client] = None self.file_props: Optional[FileProp] = None @@ -75,12 +76,14 @@ def _iter_candidates(self): for candidate in self.candidates: yield self.make_candidate(candidate) - def make_candidate(self, candidate): + def make_candidate(self, candidate: dict[str, Any]) -> Any: """ Build a candidate stanza for the given candidate """ - def make_transport(self, candidates=None): + def make_transport(self, + candidates: Optional[list[dict[str, Any]]] = None + ) -> nbxmpp.Node: """ Build a transport stanza with the given candidates (or self.candidates if candidates is None) @@ -92,7 +95,7 @@ def make_transport(self, candidates=None): transport = nbxmpp.Node('transport', payload=candidates) return transport - def parse_transport_stanza(self, transport): + def parse_transport_stanza(self, transport: nbxmpp.Node) -> list[Any]: """ Return the list of transport candidates from a transport stanza """ @@ -118,16 +121,16 @@ class JingleTransportSocks5(JingleTransport): Socks5 transport in jingle scenario Note: Don't forget to call set_file_props after initialization """ - def __init__(self, node=None): + def __init__(self, node: Optional[nbxmpp.Node] = None) -> None: JingleTransport.__init__(self, TransportType.SOCKS5) self.connection = None - self.remote_candidates = [] - self.sid = None + self.remote_candidates: list[dict[str, Any]] = [] + self.sid: Optional[str] = None if node and node.getAttr('sid'): self.sid = node.getAttr('sid') - def make_candidate(self, candidate): + def make_candidate(self, candidate) -> nbxmpp.Node: log.info('candidate dict, %s', candidate) attrs = { 'cid': candidate['candidate_id'], @@ -140,7 +143,10 @@ def make_candidate(self, candidate): return nbxmpp.Node('candidate', attrs=attrs) - def make_transport(self, candidates=None, add_candidates=True): + def make_transport(self, + candidates: Optional[list[dict[str, Any]]] = None, + add_candidates: bool = True + ) -> nbxmpp.Node: if add_candidates: self._add_local_ips_as_candidates() self._add_additional_candidates() @@ -154,8 +160,10 @@ def make_transport(self, candidates=None, add_candidates=True): transport.setAttr('dstaddr', self.file_props.dstaddr) return transport - def parse_transport_stanza(self, transport): - candidates = [] + def parse_transport_stanza(self, + transport: nbxmpp.Node + ) -> list[dict[str, Any]]: + candidates: list[dict[str, Any]] = [] for candidate in transport.iterTags('candidate'): cand = { 'state': 0, @@ -174,7 +182,7 @@ def parse_transport_stanza(self, transport): return candidates - def _add_candidates(self, candidates): + def _add_candidates(self, candidates: list[dict[str, Any]]) -> None: for cand in candidates: in_remote = False for cand2 in self.remote_candidates: @@ -185,7 +193,7 @@ def _add_candidates(self, candidates): if not in_remote: self.candidates.append(cand) - def _add_local_ips_as_candidates(self): + def _add_local_ips_as_candidates(self) -> None: if not app.settings.get_account_setting(self.connection.name, 'ft_send_local_ips'): return @@ -196,8 +204,8 @@ def _add_local_ips_as_candidates(self): type_preference = 126 priority = (2**16) * type_preference - hosts = set() - local_ip_cand = [] + hosts: set[Optional[str]] = set() + local_ip_cand: list[dict[str, Any]] = [] my_ip = self.connection.local_address if my_ip is None: @@ -280,7 +288,7 @@ def _add_local_ips_as_candidates(self): self._add_candidates(local_ip_cand) - def _add_additional_candidates(self): + def _add_additional_candidates(self) -> None: if not self.connection: return type_preference = 126 @@ -306,7 +314,7 @@ def _add_additional_candidates(self): self._add_candidates(additional_ip_cand) - def _add_proxy_candidates(self): + def _add_proxy_candidates(self) -> None: if not self.connection: return type_preference = 10 @@ -333,12 +341,13 @@ def _add_proxy_candidates(self): self._add_candidates(proxy_cand) - def get_content(self): + def get_content(self) -> Optional[JingleContent]: sesn = self.connection.get_module('Jingle').get_jingle_session( self.ourjid, self.file_props.sid) for content in sesn.contents.values(): if content.transport == self: return content + return None def _on_proxy_auth_ok(self, proxy): log.info('proxy auth ok for %s', str(proxy)) @@ -389,7 +398,10 @@ def _on_proxy_auth_ok(self, proxy): class JingleTransportIBB(JingleTransport): - def __init__(self, node=None, block_sz=None): + def __init__(self, + node: Optional[nbxmpp.Node] = None, + block_sz: Optional[str] = None + ) -> None: JingleTransport.__init__(self, TransportType.IBB) @@ -399,13 +411,11 @@ def __init__(self, node=None, block_sz=None): self.block_sz = '4096' self.connection = None - self.sid = None + self.sid: Optional[str] = None if node and node.getAttr('sid'): self.sid = node.getAttr('sid') - - def make_transport(self): - + def make_transport(self) -> nbxmpp.Node: transport = nbxmpp.Node('transport') transport.setNamespace(Namespace.JINGLE_IBB) transport.setAttr('block-size', self.block_sz) @@ -417,11 +427,12 @@ def make_transport(self): except ImportError: pass + class JingleTransportICEUDP(JingleTransport): - def __init__(self, node): + def __init__(self, node: Optional[nbxmpp.Node]) -> None: JingleTransport.__init__(self, TransportType.ICEUDP) - def make_candidate(self, candidate): + def make_candidate(self, candidate) -> nbxmpp.Node: types = { Farstream.CandidateType.HOST: 'host', Farstream.CandidateType.SRFLX: 'srflx', @@ -429,7 +440,7 @@ def make_candidate(self, candidate): Farstream.CandidateType.RELAY: 'relay', Farstream.CandidateType.MULTICAST: 'multicast' } - attrs = { + attrs: dict[str, Any] = { 'component': candidate.component_id, 'foundation': '1', # hack 'generation': '0', @@ -448,7 +459,9 @@ def make_candidate(self, candidate): attrs['protocol'] = 'tcp' return nbxmpp.Node('candidate', attrs=attrs) - def make_transport(self, candidates=None): + def make_transport(self, + candidates: Optional[list[dict[str, Any]]] = None + ) -> nbxmpp.Node: transport = JingleTransport.make_transport(self, candidates) transport.setNamespace(Namespace.JINGLE_ICE_UDP) if self.candidates and self.candidates[0].username and \ @@ -457,8 +470,10 @@ def make_transport(self, candidates=None): transport.setAttr('pwd', self.candidates[0].password) return transport - def parse_transport_stanza(self, transport): - candidates = [] + def parse_transport_stanza(self, + transport: nbxmpp.Node + ) -> list[Farstream.Candidate]: + candidates: list[Farstream.Candidate] = [] for candidate in transport.iterTags('candidate'): foundation = str(candidate['foundation']) component_id = int(candidate['component']) ===================================== gajim/data/gui/file_transfer_jingle.ui ===================================== @@ -121,6 +121,8 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">start</property> + <property name="hhomogeneous">False</property> + <property name="vhomogeneous">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fba9f814a8f66b6135512cad028706f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/fba9f814a8f66b6135512cad028706f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 4 commits: chore: PEP: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 26 May '22

26 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ec7a7e22 by wurstsalat at 2022-05-27T00:11:43+02:00 chore: PEP: Add type annotations - - - - - 3c844f9a by wurstsalat at 2022-05-27T00:11:56+02:00 chore: IBB: Add type annotations - - - - - 124f7ab8 by wurstsalat at 2022-05-27T00:14:16+02:00 chore: SoftwareVersion: Add type annotations - - - - - fba9f814 by wurstsalat at 2022-05-27T00:20:43+02:00 chore: UserLocation: Add type annotations - - - - - 5 changed files: - gajim/common/modules/ibb.py - gajim/common/modules/pep.py - gajim/common/modules/software_version.py - gajim/common/modules/user_location.py - pyrightconfig.json Changes: ===================================== gajim/common/modules/ibb.py ===================================== @@ -14,15 +14,22 @@ # XEP-0047: In-Band Bytestreams +from __future__ import annotations + import time import nbxmpp +from nbxmpp.errors import StanzaError from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq from nbxmpp.protocol import NodeProcessed +from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler -from nbxmpp.errors import StanzaError +from nbxmpp.task import Task from gajim.common import app +from gajim.common import types +from gajim.common.file_props import FileProp from gajim.common.helpers import to_user_string from gajim.common.modules.base import BaseModule from gajim.common.file_props import FilesProp @@ -38,7 +45,7 @@ class IBB(BaseModule): 'send_reply', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -47,7 +54,11 @@ def __init__(self, con): ns=Namespace.IBB), ] - def _ibb_received(self, _con, stanza, properties): + def _ibb_received(self, + _con: types.xmppClient, + stanza: Iq, + properties: IqProperties + ) -> None: if not properties.is_ibb: return @@ -106,7 +117,11 @@ def _ibb_received(self, _con, stanza, properties): raise NodeProcessed - def _on_data_received(self, stanza, file_props, properties): + def _on_data_received(self, + stanza: Iq, + file_props: FileProp, + properties: IqProperties + ) -> None: ibb = properties.ibb if ibb.seq != file_props.seq: self.send_reply(stanza, nbxmpp.ERR_UNEXPECTED_REQUEST) @@ -127,7 +142,7 @@ def _on_data_received(self, stanza, file_props, properties): if file_props.received_len >= file_props.size: file_props.completed = True - def send_open(self, to, sid, fp): + def send_open(self, to: str, sid: str, fp: FileProp) -> FileProp: self._log.info('Send open to %s, sid: %s', to, sid) file_props = FilesProp.getFilePropBySid(sid) file_props.direction = '>' @@ -149,7 +164,7 @@ def send_open(self, to, sid, fp): user_data=file_props) return file_props - def _on_open_result(self, task): + def _on_open_result(self, task: Task) -> None: try: task.finish() except StanzaError as error: @@ -160,7 +175,7 @@ def _on_open_result(self, task): file_props = task.get_user_data() self.send_data(file_props) - def send_close(self, file_props): + def send_close(self, file_props: FileProp) -> None: file_props.connected = False file_props.fp.close() file_props.stopped = True @@ -187,7 +202,7 @@ def send_close(self, file_props): if session.weinitiate: session.cancel_session() - def _on_close_result(self, task): + def _on_close_result(self, task: Task) -> None: try: task.finish() except StanzaError as error: @@ -195,7 +210,7 @@ def _on_close_result(self, task): self._log.warning(error) return - def send_data(self, file_props): + def send_data(self, file_props: FileProp) -> None: if file_props.completed: self.send_close(file_props) return @@ -223,7 +238,7 @@ def send_data(self, file_props): file_props.completed = True app.socks5queue.progress_transfer_cb(self._account, file_props) - def _on_data_result(self, task): + def _on_data_result(self, task: Task) -> None: try: task.finish() except StanzaError as error: ===================================== gajim/common/modules/pep.py ===================================== @@ -14,17 +14,21 @@ # XEP-0163: Personal Eventing Protocol -from gajim.common.types import ConnectionT +from __future__ import annotations + +from nbxmpp.structs import DiscoInfo + +from gajim.common import types from gajim.common.modules.base import BaseModule class PEP(BaseModule): - def __init__(self, con: ConnectionT) -> None: + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.supported = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: for identity in info.identities: if identity.category == 'pubsub': if identity.type == 'pep': ===================================== gajim/common/modules/software_version.py ===================================== @@ -14,7 +14,12 @@ # XEP-0092: Software Version +from __future__ import annotations + +from nbxmpp.protocol import JID + from gajim.common import app +from gajim.common import types from gajim.common.helpers import get_os_info from gajim.common.modules.base import BaseModule @@ -28,10 +33,10 @@ class SoftwareVersion(BaseModule): 'disable', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) - def set_enabled(self, enabled): + def set_enabled(self, enabled: bool) -> None: if enabled and app.settings.get_account_setting(self._account, 'send_os_info'): os_info = get_os_info() @@ -41,10 +46,10 @@ def set_enabled(self, enabled): 'Gajim', app.version, os_info) self._nbxmpp('SoftwareVersion').set_allow_reply_func(self._allow_reply) - def _allow_reply(self, jid): + def _allow_reply(self, jid: JID) -> bool: item = self._con.get_module('Roster').get_item(jid.bare) if item is None: return False - contact = self._get_contact(jid.bare) + contact = self._get_contact(JID.from_string(jid.bare)) return contact.is_subscribed ===================================== gajim/common/modules/user_location.py ===================================== @@ -20,10 +20,15 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID +from nbxmpp.protocol import Message from nbxmpp.structs import LocationData +from nbxmpp.structs import MessageProperties from gajim.common import app from gajim.common import ged +from gajim.common import types +from gajim.common.events import SignedIn +from gajim.common.events import LocationChanged from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node from gajim.common.modules.util import store_publish @@ -38,12 +43,12 @@ class UserLocation(BaseModule): 'set_location', ] - def __init__(self, con) -> None: + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self._register_pubsub_handler(self._location_received) self._current_location: Optional[LocationData] = None - self._contact_locations: dict[JID, LocationData] = {} + self._contact_locations: dict[JID, Optional[LocationData]] = {} def get_current_location(self) -> Optional[LocationData]: return self._current_location @@ -52,7 +57,12 @@ def get_contact_location(self, jid: JID) -> Optional[LocationData]: return self._contact_locations.get(jid) @event_node(Namespace.LOCATION) - def _location_received(self, _con, _stanza, properties): + def _location_received(self, + _con: types.xmppClient, + _stanza: Message, + properties: MessageProperties + ) -> None: + assert properties.pubsub_event is not None if properties.pubsub_event.retracted: return @@ -60,13 +70,17 @@ def _location_received(self, _con, _stanza, properties): if properties.is_self_message: self._current_location = data + assert properties.jid is not None self._contact_locations[properties.jid] = data contact = self._get_contact(properties.jid) contact.notify('location-update', data) @store_publish - def set_location(self, location, force=False): + def set_location(self, + location: Optional[LocationData], + force: bool = False + ) -> None: if not self._con.get_module('PEP').supported: return @@ -81,7 +95,7 @@ def set_location(self, location, force=False): self._log.info('Send %s', location) self._nbxmpp('Location').set_location(location) - def set_enabled(self, enable): + def set_enabled(self, enable: bool) -> None: if enable: self.register_events([ ('location-changed', ged.CORE, self._on_location_changed), @@ -96,10 +110,10 @@ def _publish_current_location(self): self.set_location(LocationListener.get().current_location) @event_filter(['account']) - def _on_signed_in(self, _event): + def _on_signed_in(self, _event: SignedIn) -> None: self._publish_current_location() - def _on_location_changed(self, event): + def _on_location_changed(self, event: LocationChanged) -> None: if self._current_location == event.info: return ===================================== pyrightconfig.json ===================================== @@ -30,6 +30,7 @@ "gajim/common/idle.py", "gajim/common/logging_helpers.py", "gajim/common/modules/chat_markers.py", + "gajim/common/modules/pep.py", "gajim/common/modules/register.py", "gajim/common/passwords.py", "gajim/common/regex.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59e9fffabf1c4ce46df46ec97a200e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/59e9fffabf1c4ce46df46ec97a200e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 18 commits: chore: HTTPUpload: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 26 May '22

26 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1a09bf93 by wurstsalat at 2022-05-26T20:11:45+02:00 chore: HTTPUpload: Add type annotations - - - - - ac6b0ae0 by wurstsalat at 2022-05-26T20:12:57+02:00 chore: Annotations: Add type annotations - - - - - ab9acfb7 by wurstsalat at 2022-05-26T20:52:43+02:00 chore: Bookmarks: Add type annotations - - - - - 3c9084de by wurstsalat at 2022-05-26T20:52:44+02:00 chore: Blocking: Add type annotations - - - - - 6feac48c by wurstsalat at 2022-05-26T20:57:35+02:00 chore: SecLabels: Add type annotations - - - - - 4a04c5aa by wurstsalat at 2022-05-26T21:03:50+02:00 chore: Misc: Add type annotations - - - - - a6af6369 by wurstsalat at 2022-05-26T21:29:43+02:00 chore: Jingle: Add type annotations - - - - - 36260318 by wurstsalat at 2022-05-26T21:33:01+02:00 chore: LastActivity: Add type annotations - - - - - 9f6847d8 by wurstsalat at 2022-05-26T21:37:09+02:00 chore: Carbons: Add type annotations - - - - - 476b2fd4 by wurstsalat at 2022-05-26T22:13:06+02:00 chore: Chatstates: Add type annotations - - - - - 085cba6b by wurstsalat at 2022-05-26T22:18:16+02:00 chore: Roster: Add type annotations - - - - - 231bd80c by wurstsalat at 2022-05-26T22:22:02+02:00 chore: EntityTime: Add type annotations - - - - - c09d9494 by wurstsalat at 2022-05-26T22:29:57+02:00 chore: RosterItemExchange: Add type annotations - - - - - 91944ee2 by wurstsalat at 2022-05-26T22:36:13+02:00 chore: UserTune: Add type annotations - - - - - 9cc7f9ab by wurstsalat at 2022-05-26T22:39:22+02:00 chore: Register: Add type annotations - - - - - 2191fd9d by wurstsalat at 2022-05-26T22:44:44+02:00 chore: Receipts: Add type annotations - - - - - c694344b by wurstsalat at 2022-05-26T22:47:17+02:00 chore: Delimiter: Add type annotations - - - - - 59e9fffa by wurstsalat at 2022-05-26T22:49:54+02:00 chore: UserNickname: Add type annotations - - - - - 22 changed files: - gajim/common/events.py - gajim/common/modules/annotations.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/carbons.py - gajim/common/modules/chatstates.py - gajim/common/modules/delimiter.py - gajim/common/modules/entity_time.py - gajim/common/modules/httpupload.py - gajim/common/modules/jingle.py - gajim/common/modules/last_activity.py - gajim/common/modules/misc.py - gajim/common/modules/receipts.py - gajim/common/modules/register.py - gajim/common/modules/roster.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/security_labels.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/types.py - gajim/gtk/filetransfer.py - pyrightconfig.json Changes: ===================================== gajim/common/events.py ===================================== @@ -24,6 +24,7 @@ from dataclasses import field from nbxmpp.protocol import JID +from nbxmpp.modules.security_labels import Catalog from nbxmpp.structs import HTTPAuthData from nbxmpp.structs import ModerationData from nbxmpp.structs import LocationData @@ -606,7 +607,7 @@ class SecCatalogReceived(ApplicationEvent): name: str = field(init=False, default='sec-catalog-received') account: str jid: str - catalog: dict[str, Any] + catalog: dict[str, Catalog] @dataclass ===================================== gajim/common/modules/annotations.py ===================================== @@ -14,8 +14,6 @@ # XEP-0145: Annotations -from typing import Any -from typing import Dict from typing import Union from typing import Optional @@ -23,6 +21,7 @@ from nbxmpp.errors import MalformedStanzaError from nbxmpp.structs import AnnotationNote from nbxmpp.protocol import JID +from nbxmpp.task import Task from gajim.common.types import ConnectionT from gajim.common.modules.base import BaseModule @@ -39,13 +38,13 @@ class Annotations(BaseModule): def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) - self._annotations: Dict[Union[JID, str], AnnotationNote] = {} + self._annotations: dict[Union[JID, str], AnnotationNote] = {} def request_annotations(self) -> None: self._nbxmpp('Annotations').request_annotations( callback=self._annotations_received) - def _annotations_received(self, task: Any) -> None: + def _annotations_received(self, task: Task) -> None: try: annotations = task.finish() except (StanzaError, MalformedStanzaError) as error: ===================================== gajim/common/modules/blocking.py ===================================== @@ -14,13 +14,21 @@ # XEP-0191: Blocking Command +from __future__ import annotations + +from typing import Generator + import nbxmpp -from nbxmpp.protocol import JID from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID +from nbxmpp.structs import BlockingProperties +from nbxmpp.structs import DiscoInfo from nbxmpp.structs import StanzaHandler from nbxmpp.modules.util import raise_if_error from gajim.common import app +from gajim.common import types from gajim.common.events import FeatureDiscovered from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -35,10 +43,10 @@ class Blocking(BaseModule): 'request_blocking_list', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) - self.blocked = set() + self.blocked: set[JID] = set() self.handlers = [ StanzaHandler(name='iq', @@ -49,7 +57,7 @@ def __init__(self, con): self.supported = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.BLOCKING not in info.features: return @@ -60,11 +68,11 @@ def pass_disco(self, info): self._log.info('Discovered blocking: %s', info.jid) - def is_blocked(self, jid): + def is_blocked(self, jid: JID) -> bool: return jid in self.blocked @as_task - def get_blocking_list(self): + def get_blocking_list(self) -> Generator[set[JID], None, None]: _task = yield blocking_list = yield self._nbxmpp('Blocking').request_blocking_list() @@ -78,7 +86,10 @@ def get_blocking_list(self): yield blocking_list @as_task - def update_blocking_list(self, block, unblock): + def update_blocking_list(self, + block: set[JID], + unblock: set[JID] + ) -> Generator[bool, None, None]: _task = yield if block: @@ -91,7 +102,11 @@ def update_blocking_list(self, block, unblock): yield True - def _blocking_push_received(self, _con, _stanza, properties): + def _blocking_push_received(self, + _con: types.xmppClient, + _stanza: Iq, + properties: BlockingProperties + ) -> None: if not properties.is_blocking: return @@ -114,13 +129,15 @@ def _blocking_push_received(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed - def _unblock_jids(self, jids): + def _unblock_jids(self, jids: set[JID]) -> None: for contact in self._get_contacts_from_jids(jids): contact.set_unblocked() self._presence_probe(contact.jid) self._log.info('Unblock Push: %s', contact.jid) - def _get_contacts_from_jids(self, jids): + def _get_contacts_from_jids(self, + jids: set[JID] + ) -> Generator[types.BareContactT, None, None]: for jid in jids: if jid.resource is not None: # Currently not supported by GUI ===================================== gajim/common/modules/bookmarks.py ===================================== @@ -14,10 +14,9 @@ # XEP-0048: Bookmarks +from __future__ import annotations + from typing import Any -from typing import List -from typing import Set -from typing import Tuple from typing import Union from typing import Optional from typing import cast @@ -27,22 +26,24 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID from nbxmpp.structs import BookmarkData +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import MessageProperties from nbxmpp.task import Task + from gi.repository import GLib from gajim.common import app +from gajim.common import types from gajim.common.events import BookmarksReceived -from gajim.common.types import BookmarksDict from gajim.common.modules.base import BaseModule from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.util import event_node - NODE_MAX_NS = 'http://jabber.org/protocol/pubsub#config-node-max' class Bookmarks(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self._register_pubsub_handler(self._bookmark_event_received) self._register_pubsub_handler(self._bookmark_1_event_received) @@ -50,8 +51,8 @@ def __init__(self, con): self._compat = False self._compat_pep = False self._node_max = False - self._bookmarks: BookmarksDict = {} - self._join_timeouts: List[int] = [] + self._bookmarks: types.BookmarksDict = {} + self._join_timeouts: list[int] = [] self._request_in_progress = True @property @@ -67,7 +68,7 @@ def compat_pep(self) -> bool: return self._compat_pep @property - def bookmarks(self) -> List[BookmarkData]: + def bookmarks(self) -> list[BookmarkData]: return list(self._bookmarks.values()) @property @@ -79,7 +80,11 @@ def nativ_bookmarks_used(self) -> bool: return self._bookmark_module() == 'NativeBookmarks' @event_node(Namespace.BOOKMARKS) - def _bookmark_event_received(self, _con, _stanza, properties): + def _bookmark_event_received(self, + _con: types.xmppClient, + _stanza: Any, + properties: MessageProperties + ) -> None: if properties.pubsub_event.retracted: return @@ -104,7 +109,11 @@ def _bookmark_event_received(self, _con, _stanza, properties): BookmarksReceived(account=self._account)) @event_node(Namespace.BOOKMARKS_1) - def _bookmark_1_event_received(self, _con, _stanza, properties): + def _bookmark_1_event_received(self, + _con: types.xmppClient, + _stanza: Any, + properties: MessageProperties + ) -> None: if not properties.is_self_message: self._log.warning('%s has an open access bookmarks node', properties.jid) @@ -138,14 +147,14 @@ def _bookmark_1_event_received(self, _con, _stanza, properties): app.ged.raise_event( BookmarksReceived(account=self._account)) - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: self._node_max = NODE_MAX_NS in info.features self._compat_pep = Namespace.BOOKMARKS_COMPAT_PEP in info.features self._compat = Namespace.BOOKMARKS_COMPAT in info.features self._conversion = Namespace.BOOKMARK_CONVERSION in info.features @functools.lru_cache(maxsize=1) - def _bookmark_module(self): + def _bookmark_module(self) -> str: if not self._con.get_module('PubSub').publish_options: return 'PrivateBookmarks' @@ -160,7 +169,8 @@ def _bookmark_module(self): return 'PrivateBookmarks' def _act_on_changed_bookmarks(self, - current_bookmarks: BookmarksDict) -> None: + current_bookmarks: types.BookmarksDict + ) -> None: new_bookmarks = self._convert_to_set(self._bookmarks) old_bookmarks = self._convert_to_set(current_bookmarks) changed = new_bookmarks - old_bookmarks @@ -168,7 +178,7 @@ def _act_on_changed_bookmarks(self, return join = [jid for jid, autojoin in changed if autojoin] - bookmarks: List[BookmarkData] = [] + bookmarks: list[BookmarkData] = [] for jid in join: self._log.info('Schedule autojoin in 10s for: %s', jid) bookmarks.append(cast(BookmarkData, self._bookmarks.get(jid))) @@ -183,16 +193,17 @@ def _act_on_changed_bookmarks(self, # leave = [jid for jid, autojoin in changed if not autojoin] @staticmethod - def _convert_to_set(bookmarks: BookmarksDict) -> Set[Tuple[JID, bool]]: - set_: Set[Tuple[JID, bool]] = set() + def _convert_to_set(bookmarks: types.BookmarksDict + ) -> set[tuple[JID, bool]]: + set_: set[tuple[JID, bool]] = set() for jid, bookmark in bookmarks.items(): set_.add((jid, bookmark.autojoin)) return set_ @staticmethod - def _convert_to_dict( - bookmarks: Optional[List[BookmarkData]]) -> BookmarksDict: - _dict: BookmarksDict = {} + def _convert_to_dict(bookmarks: Optional[list[BookmarkData]] + ) -> types.BookmarksDict: + _dict: types.BookmarksDict = {} if not bookmarks: return _dict @@ -213,7 +224,7 @@ def request_bookmarks(self) -> None: def _bookmarks_received(self, task: Task) -> None: try: - bookmarks: List[BookmarkData] = task.finish() + bookmarks: list[BookmarkData] = task.finish() except Exception as error: self._log.warning(error) bookmarks = [] @@ -237,7 +248,7 @@ def _cleanup_bookmarks(self, bookmarks: list[BookmarkData]) -> None: 'a groupchat: %s', bookmark.jid) bookmarks.remove(bookmark) - def store_bookmarks(self, bookmarks: List[BookmarkData]) -> None: + def store_bookmarks(self, bookmarks: list[BookmarkData]) -> None: if not app.account_is_available(self._account): return @@ -249,11 +260,11 @@ def store_bookmarks(self, bookmarks: List[BookmarkData]) -> None: app.ged.raise_event( BookmarksReceived(account=self._account)) - def _join_with_timeout(self, bookmarks: List[BookmarkData]) -> None: + def _join_with_timeout(self, bookmarks: list[BookmarkData]) -> None: self._join_timeouts.pop(0) self.auto_join_bookmarks(bookmarks) - def auto_join_bookmarks(self, bookmarks: List[BookmarkData]) -> None: + def auto_join_bookmarks(self, bookmarks: list[BookmarkData]) -> None: for bookmark in bookmarks: if bookmark.autojoin: self._log.info('Autojoin Bookmark: %s', bookmark.jid) @@ -304,9 +315,9 @@ def get_name_from_bookmark(self, jid: Union[str, JID]) -> Optional[str]: def is_bookmark(self, jid: Union[str, JID]) -> bool: return jid in self._bookmarks - def _remove_timeouts(self): + def _remove_timeouts(self) -> None: for _id in self._join_timeouts: GLib.source_remove(_id) - def cleanup(self): + def cleanup(self) -> None: self._remove_timeouts() ===================================== gajim/common/modules/carbons.py ===================================== @@ -14,19 +14,23 @@ # XEP-0280: Message Carbons +from __future__ import annotations + import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.structs import DiscoInfo +from gajim.common import types from gajim.common.modules.base import BaseModule class Carbons(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.supported = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.CARBONS not in info.features: return ===================================== gajim/common/modules/chatstates.py ===================================== @@ -14,33 +14,36 @@ # XEP-0085: Chat State Notifications +from __future__ import annotations + from typing import Any -from typing import Dict # pylint: disable=unused-import -from typing import List # pylint: disable=unused-import from typing import Optional import time from functools import wraps -import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.protocol import Presence +from nbxmpp.structs import MessageProperties +from nbxmpp.structs import PresenceProperties from nbxmpp.structs import StanzaHandler from nbxmpp.const import Chatstate as State + from gi.repository import GLib +from gajim.common import types +from gajim.common.const import ClientState from gajim.common.structs import OutgoingMessage from gajim.common.modules.base import BaseModule -from gajim.common.types import ConnectionT - - INACTIVE_AFTER = 60 PAUSED_AFTER = 10 -def ensure_enabled(func): +def ensure_enabled(func: Any) -> Any: @wraps(func) - def func_wrapper(self, *args, **kwargs): + def func_wrapper(self: Any, *args: Any, **kwargs: Any): # pylint: disable=protected-access if not self._enabled: return None @@ -49,7 +52,7 @@ def func_wrapper(self, *args, **kwargs): class Chatstate(BaseModule): - def __init__(self, con: ConnectionT) -> None: + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -62,31 +65,38 @@ def __init__(self, con: ConnectionT) -> None: ] # Our current chatstate with a specific contact - self._chatstates = {} # type: Dict[str, State] + self._chatstates: dict[JID, State] = {} # The current chatstate we received from a contact - self._remote_chatstate = {} + self._remote_chatstate: dict[JID, State] = {} - self._last_keyboard_activity = {} # type: Dict[str, float] - self._last_mouse_activity = {} # type: Dict[str, float] + self._last_keyboard_activity: dict[JID, float] = {} + self._last_mouse_activity: dict[JID, float] = {} self._timeout_id = None - self._delay_timeout_ids = {} # type: Dict[str, str] - self._blocked = [] # type: List[str] + self._delay_timeout_ids: dict[JID, int] = {} + self._blocked: list[JID] = [] self._enabled = False self._con.connect_signal('state-changed', self._on_client_state_changed) self._con.connect_signal('resume-failed', self._on_client_resume_failed) - def _on_client_resume_failed(self, _client, _signal_name): + def _on_client_resume_failed(self, + _client: types.Client, + _signal_name: str + ) -> None: self._set_enabled(False) - def _on_client_state_changed(self, _client, _signal_name, state): + def _on_client_state_changed(self, + _client: types.Client, + _signal_name: str, + state: ClientState + ) -> None: if state.is_disconnected: self._set_enabled(False) elif state.is_connected: self._set_enabled(True) - def _set_enabled(self, value): + def _set_enabled(self, value: bool) -> None: if self._enabled == value: return @@ -103,10 +113,10 @@ def _set_enabled(self, value): @ensure_enabled def _presence_received(self, - _con: ConnectionT, - _stanza: nbxmpp.Presence, - properties: Any) -> None: - + _con: types.xmppClient, + _stanza: Presence, + properties: PresenceProperties + ) -> None: if not properties.type.is_unavailable and not properties.type.is_error: return @@ -115,6 +125,7 @@ def _presence_received(self, jid = properties.jid + assert jid is not None self._remote_chatstate.pop(jid, None) self._chatstates.pop(jid, None) self._last_mouse_activity.pop(jid, None) @@ -128,7 +139,11 @@ def _presence_received(self, contact.notify('chatstate-update') - def _process_chatstate(self, _con, _stanza, properties): + def _process_chatstate(self, + _con: types.xmppClient, + _stanza: Any, + properties: MessageProperties + ) -> None: if properties.type.is_error: return @@ -141,6 +156,7 @@ def _process_chatstate(self, _con, _stanza, properties): properties.is_carbon_message and properties.carbon.is_sent): return + assert properties.jid is not None self._remote_chatstate[properties.jid] = properties.chatstate self._log.info('Recv: %-10s - %s', properties.chatstate, properties.jid) @@ -152,7 +168,7 @@ def _process_chatstate(self, _con, _stanza, properties): contact.notify('chatstate-update') @ensure_enabled - def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: + def _check_last_interaction(self) -> bool: now = time.time() for jid in list(self._last_mouse_activity.keys()): time_ = self._last_mouse_activity[jid] @@ -181,17 +197,19 @@ def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: return GLib.SOURCE_CONTINUE - def get_remote_chatstate(self, jid): + def get_remote_chatstate(self, jid: JID) -> Chatstate: return self._remote_chatstate.get(jid) @ensure_enabled - def set_active(self, contact) -> None: + def set_active(self, contact: types.ChatContactT) -> None: if contact.settings.get('send_chatstate') == 'disabled': return self._last_mouse_activity[contact.jid] = time.time() self._chatstates[contact.jid] = State.ACTIVE - def get_active_chatstate(self, contact) -> Optional[str]: + def get_active_chatstate(self, + contact: types.ChatContactT + ) -> Optional[str]: # determines if we add 'active' on outgoing messages if contact.settings.get('send_chatstate') == 'disabled': return None @@ -208,7 +226,10 @@ def get_active_chatstate(self, contact) -> Optional[str]: return 'active' @ensure_enabled - def block_chatstates(self, contact, block: bool) -> None: + def block_chatstates(self, + contact: types.ChatContactT, + block: bool + ) -> None: # Block sending chatstates to a contact # Used for example if we cycle through the MUC nick list, which # produces a lot of buffer 'changed' signals from the input textview. @@ -219,7 +240,10 @@ def block_chatstates(self, contact, block: bool) -> None: self._blocked.remove(contact.jid) @ensure_enabled - def set_chatstate_delayed(self, contact, state: State) -> None: + def set_chatstate_delayed(self, + contact: types.ChatContactT, + state: State + ) -> None: # Used when we go from Composing -> Active after deleting all text # from the Textview. We delay the Active state because maybe the # User starts writing again. @@ -228,7 +252,7 @@ def set_chatstate_delayed(self, contact, state: State) -> None: 2, self.set_chatstate, contact, state) @ensure_enabled - def set_chatstate(self, contact, state: State) -> None: + def set_chatstate(self, contact: types.ChatContactT, state: State) -> None: # Don’t send chatstates to ourself if self._con.get_own_jid().bare_match(contact.jid): return @@ -287,7 +311,10 @@ def set_chatstate(self, contact, state: State) -> None: self._chatstates[contact.jid] = state - def _send_chatstate(self, contact, chatstate): + def _send_chatstate(self, + contact: types.ChatContactT, + chatstate: State + ) -> None: type_ = 'groupchat' if contact.is_groupchat else 'chat' message = OutgoingMessage(account=self._account, contact=contact, @@ -299,7 +326,10 @@ def _send_chatstate(self, contact, chatstate): self._con.send_message(message) @ensure_enabled - def set_mouse_activity(self, contact, was_paused: bool) -> None: + def set_mouse_activity(self, + contact: types.ChatContactT, + was_paused: bool + ) -> None: if contact.settings.get('send_chatstate') == 'disabled': return self._last_mouse_activity[contact.jid] = time.time() @@ -310,21 +340,21 @@ def set_mouse_activity(self, contact, was_paused: bool) -> None: self.set_chatstate(contact, State.ACTIVE) @ensure_enabled - def set_keyboard_activity(self, contact) -> None: + def set_keyboard_activity(self, contact: types.ChatContactT) -> None: self._last_keyboard_activity[contact.jid] = time.time() - def remove_delay_timeout(self, contact): + def remove_delay_timeout(self, contact: types.ChatContactT) -> None: timeout = self._delay_timeout_ids.get(contact.jid) if timeout is not None: GLib.source_remove(timeout) del self._delay_timeout_ids[contact.jid] - def remove_all_delay_timeouts(self): + def remove_all_delay_timeouts(self) -> None: for timeout in self._delay_timeout_ids.values(): GLib.source_remove(timeout) self._delay_timeout_ids.clear() - def cleanup(self): + def cleanup(self) -> None: self.remove_all_delay_timeouts() if self._timeout_id is not None: GLib.source_remove(self._timeout_id) ===================================== gajim/common/modules/delimiter.py ===================================== @@ -14,9 +14,14 @@ # XEP-0083: Nested Roster Groups +from __future__ import annotations + +from typing import Generator +from typing import Optional from nbxmpp.errors import is_error +from gajim.common import types from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -29,13 +34,13 @@ class Delimiter(BaseModule): 'set_delimiter' ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.available = False self.delimiter = '::' @as_task - def get_roster_delimiter(self): + def get_roster_delimiter(self) -> Generator[Optional[str], None, None]: _task = yield delimiter = yield self.request_delimiter() ===================================== gajim/common/modules/entity_time.py ===================================== @@ -14,7 +14,12 @@ # XEP-0202: Entity Time +from __future__ import annotations + +from nbxmpp.protocol import JID + from gajim.common import app +from gajim.common import types from gajim.common.modules.base import BaseModule @@ -27,12 +32,12 @@ class EntityTime(BaseModule): 'disable', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [] - def set_enabled(self, enabled): + def set_enabled(self, enabled: bool) -> None: if not enabled: self._nbxmpp('EntityTime').disable() return @@ -44,7 +49,7 @@ def set_enabled(self, enabled): self._nbxmpp('EntityTime').enable() self._nbxmpp('EntityTime').set_allow_reply_func(self._allow_reply) - def _allow_reply(self, jid): + def _allow_reply(self, jid: JID) -> bool: item = self._con.get_module('Roster').get_item(jid.bare) if item is None: return False ===================================== gajim/common/modules/httpupload.py ===================================== @@ -14,21 +14,33 @@ # XEP-0363: HTTP File Upload +from __future__ import annotations + +from typing import cast +from typing import Callable +from typing import Optional import os import io from urllib.parse import urlparse import mimetypes -from nbxmpp.namespaces import Namespace from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError from nbxmpp.errors import HTTPUploadStanzaError +from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import JID +from nbxmpp.structs import DiscoInfo +from nbxmpp.structs import HTTPUploadData +from nbxmpp.task import Task from nbxmpp.util import convert_tls_error_flags + +from gi.repository import Gio from gi.repository import GLib from gi.repository import Soup from gajim.common import app +from gajim.common import types from gajim.common.i18n import _ from gajim.common.helpers import get_tls_error_phrase from gajim.common.helpers import get_account_proxy @@ -42,21 +54,21 @@ class HTTPUpload(BaseModule): _nbxmpp_extends = 'HTTPUpload' - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.available = False - self.component = None - self.httpupload_namespace = None - self.max_file_size = None # maximum file size in bytes + self.component: Optional[JID] = None + self.httpupload_namespace: Optional[str] = None + self.max_file_size: Optional[float] = None # max file size in bytes - self._proxy_resolver = None - self._queued_messages = {} + self._proxy_resolver: Optional[Gio.SimpleProxyResolver] = None + self._queued_messages: dict[int, Soup.Message] = {} self._session = Soup.Session() self._session.props.ssl_strict = False - self._session.props.user_agent = 'Gajim %s' % app.version + self._session.props.user_agent = f'Gajim {app.version}' - def _set_proxy_if_available(self): + def _set_proxy_if_available(self) -> None: proxy = get_account_proxy(self._account) if proxy is None: self._proxy_resolver = None @@ -65,7 +77,7 @@ def _set_proxy_if_available(self): self._proxy_resolver = proxy.get_resolver() self._session.props.proxy_resolver = self._proxy_resolver - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if not info.has_httpupload: return @@ -79,18 +91,24 @@ def pass_disco(self, info): if self.max_file_size is None: self._log.warning('Component does not provide maximum file size') else: - size = GLib.format_size_full(self.max_file_size, + size = GLib.format_size_full(int(self.max_file_size), GLib.FormatSizeFlags.IEC_UNITS) self._log.info('Component has a maximum file size of: %s', size) for ctrl in app.window.get_controls(account=self._account): ctrl.update_actions() - def make_transfer(self, path, encryption, contact, groupchat=False): + def make_transfer(self, + path: str, + encryption: Optional[str], + contact: types.ContactT, + groupchat: bool = False + ) -> HTTPFileTransfer: if not path or not os.path.exists(path): raise FileError(_('Could not access file')) invalid_file = False + msg = '' stat = os.stat(path) if os.path.isfile(path): @@ -101,10 +119,10 @@ def make_transfer(self, path, encryption, contact, groupchat=False): invalid_file = True msg = _('File does not exist') - if self.max_file_size is not None and \ - stat.st_size > self.max_file_size: + if (self.max_file_size is not None and + stat.st_size > self.max_file_size): invalid_file = True - size = GLib.format_size_full(self.max_file_size, + size = GLib.format_size_full(int(self.max_file_size), GLib.FormatSizeFlags.IEC_UNITS) msg = _('File is too large, ' 'maximum allowed file size is: %s') % size @@ -124,7 +142,7 @@ def make_transfer(self, path, encryption, contact, groupchat=False): encryption, groupchat) - def cancel_transfer(self, transfer): + def cancel_transfer(self, transfer: HTTPFileTransfer) -> None: transfer.set_cancelled() message = self._queued_messages.get(id(transfer)) if message is None: @@ -132,7 +150,7 @@ def cancel_transfer(self, transfer): self._session.cancel_message(message, Soup.Status.CANCELLED) - def start_transfer(self, transfer): + def start_transfer(self, transfer: HTTPFileTransfer) -> None: if transfer.encryption is not None and not transfer.is_encrypted: transfer.set_encrypting() plugin = app.plugin_manager.encryption_plugins[transfer.encryption] @@ -155,8 +173,8 @@ def start_transfer(self, transfer): callback=self._received_slot, user_data=transfer) - def _received_slot(self, task): - transfer = task.get_user_data() + def _received_slot(self, task: Task) -> None: + transfer = cast(HTTPFileTransfer, task.get_user_data()) try: result = task.finish() @@ -190,9 +208,10 @@ def _received_slot(self, task): self._upload_file(transfer) - def _upload_file(self, transfer): + def _upload_file(self, transfer: HTTPFileTransfer) -> None: transfer.set_started() + assert transfer.put_uri is not None message = Soup.Message.new('PUT', transfer.put_uri) message.connect('starting', self._check_certificate, transfer) @@ -201,8 +220,10 @@ def _upload_file(self, transfer): message.set_flags(Soup.MessageFlags.CAN_REBUILD | Soup.MessageFlags.NO_REDIRECT) + assert message.props.request_body is not None message.props.request_body.set_accumulate(False) + assert message.props.request_headers is not None message.props.request_headers.set_content_type(transfer.mime, None) message.props.request_headers.set_content_length(transfer.size) for name, value in transfer.headers.items(): @@ -215,7 +236,10 @@ def _upload_file(self, transfer): self._set_proxy_if_available() self._session.queue_message(message, self._on_finish, transfer) - def _check_certificate(self, message, transfer): + def _check_certificate(self, + message: Soup.Message, + transfer: HTTPFileTransfer + ) -> None: https_used, tls_certificate, tls_errors = message.get_https_status() if not https_used: self._log.warning('HTTPS was not used for upload') @@ -234,7 +258,11 @@ def _check_certificate(self, message, transfer): transfer.set_error('tls-verification-failed', phrase) self._session.cancel_message(message, Soup.Status.CANCELLED) - def _on_finish(self, _session, message, transfer): + def _on_finish(self, + _session: Soup.Session, + message: Soup.Message, + transfer: HTTPFileTransfer + ) -> None: self._queued_messages.pop(id(transfer), None) if message.props.status_code == Soup.Status.CANCELLED: @@ -252,25 +280,36 @@ def _on_finish(self, _session, message, transfer): phrase) transfer.set_error('http-response', phrase) - def _on_wrote_chunk(self, message, transfer): + def _on_wrote_chunk(self, + message: Soup.Message, + transfer: HTTPFileTransfer + ) -> None: transfer.update_progress() if transfer.is_complete: + assert message.props.request_body is not None message.props.request_body.complete() return bytes_ = transfer.get_chunk() + assert bytes_ is not None self._session.pause_message(message) GLib.idle_add(self._append, message, bytes_) - def _append(self, message, bytes_): + def _append(self, message: Soup.Message, bytes_: bytes) -> None: if message.props.status_code == Soup.Status.CANCELLED: return self._session.unpause_message(message) + assert message.props.request_body is not None message.props.request_body.append(bytes_) @staticmethod - def _on_wrote_headers(message, transfer): - message.props.request_body.append(transfer.get_chunk()) + def _on_wrote_headers(message: Soup.Message, + transfer: HTTPFileTransfer + ) -> None: + bytes_ = transfer.get_chunk() + assert bytes_ is not None + assert message.props.request_body is not None + message.props.request_body.append(bytes_) class HTTPFileTransfer(FileTransfer): @@ -288,12 +327,13 @@ class HTTPFileTransfer(FileTransfer): } def __init__(self, - account, - path, - contact, - mime, - encryption, - groupchat): + account: str, + path: str, + contact: types.ContactT, + mime: str, + encryption: Optional[str], + groupchat: bool + ) -> None: FileTransfer.__init__(self, account) @@ -304,76 +344,76 @@ def __init__(self, self._mime = mime self.size = os.stat(path).st_size - self.put_uri = None - self.get_uri = None - self._uri_transform_func = None + self.put_uri: Optional[str] = None + self.get_uri: Optional[str] = None + self._uri_transform_func: Optional[Callable[[str], str]] = None self._stream = None - self._data = None - self._headers = {} + self._data: Optional[bytes] = None + self._headers: dict[str, str] = {} self._is_encrypted = False @property - def mime(self): + def mime(self) -> str: return self._mime @property - def contact(self): + def contact(self) -> types.ContactT: return self._contact @property - def is_groupchat(self): + def is_groupchat(self) -> bool: return self._groupchat @property - def encryption(self): + def encryption(self) -> Optional[str]: return self._encryption @property - def headers(self): + def headers(self) -> dict[str, str]: return self._headers @property - def path(self): + def path(self) -> str: return self._path @property - def is_encrypted(self): + def is_encrypted(self) -> bool: return self._is_encrypted - def get_transformed_uri(self): + def get_transformed_uri(self) -> str: if self._uri_transform_func is not None: return self._uri_transform_func(self.get_uri) return self.get_uri - def set_uri_transform_func(self, func): + def set_uri_transform_func(self, func: Callable[[str], str]) -> None: self._uri_transform_func = func @property def filename(self) -> str: return os.path.basename(self._path) - def set_error(self, domain, text=''): + def set_error(self, domain: str, text: str = '') -> None: if not text: text = self._errors[domain] self._close() super().set_error(domain, text) - def set_finished(self): + def set_finished(self) -> None: self._close() super().set_finished() - def set_encrypted_data(self, data): + def set_encrypted_data(self, data: bytes) -> None: self._data = data self._is_encrypted = True - def _close(self): + def _close(self) -> None: if self._stream is not None: self._stream.close() - def get_chunk(self): + def get_chunk(self) -> Optional[bytes]: if self._stream is None: if self._encryption is None: self._stream = open(self._path, 'rb') # pylint: disable=consider-using-with @@ -389,12 +429,12 @@ def get_chunk(self): self._close() return data - def get_data(self): + def get_data(self) -> bytes: with open(self._path, 'rb') as file: data = file.read() return data - def process_result(self, result): + def process_result(self, result: HTTPUploadData) -> None: self.put_uri = result.put_uri self.get_uri = result.get_uri self._headers = result.headers ===================================== gajim/common/modules/jingle.py ===================================== @@ -28,16 +28,22 @@ # * config: # - codecs +from __future__ import annotations + +from typing import Any from typing import Optional import logging import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq from nbxmpp.structs import StanzaHandler +from nbxmpp.structs import IqProperties from gajim.common import helpers from gajim.common import jingle_xtls +from gajim.common import types from gajim.common.file_props import FileProp from gajim.common.modules.base import BaseModule from gajim.common.jingle_session import JingleSession @@ -51,7 +57,7 @@ class Jingle(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -80,8 +86,8 @@ def __init__(self, con): # dictionary: (jid, iq stanza id) => JingleSession object, # one time callbacks - self.__iq_responses = {} - self.files = [] + self.__iq_responses: dict[tuple[str, str], JingleSession] = {} + self.files: list[dict[str, Any]] = [] def delete_jingle_session(self, sid: str) -> None: """ @@ -94,19 +100,31 @@ def delete_jingle_session(self, sid: str) -> None: self._sessions[sid].callbacks = [] del self._sessions[sid] - def _on_pubkey_request(self, con, stanza, _properties): + def _on_pubkey_request(self, + con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: jid_from = helpers.get_full_jid_from_iq(stanza) self._log.info('Pubkey request from %s', jid_from) sid = stanza.getAttr('id') jingle_xtls.send_cert(con, jid_from, sid) raise nbxmpp.NodeProcessed - def _pubkey_result_received(self, con, stanza, _properties): + def _pubkey_result_received(self, + con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: jid_from = helpers.get_full_jid_from_iq(stanza) self._log.info('Pubkey result from %s', jid_from) jingle_xtls.handle_new_cert(con, stanza, jid_from) - def _on_jingle_iq(self, _con, stanza, _properties): + def _on_jingle_iq(self, + _con: types.xmppClient, + stanza: Iq, + _properties: IqProperties + ) -> None: """ The jingle stanza dispatcher @@ -138,6 +156,7 @@ def _on_jingle_iq(self, _con, stanza, _properties): if id_ in sesn.iq_ids: sesn.on_stanza(stanza) return + # do we need to create a new jingle object if sid not in self._sessions: #TODO: tie-breaking and other things... @@ -148,14 +167,15 @@ def _on_jingle_iq(self, _con, stanza, _properties): self._sessions[sid].collect_iq_id(id_) self._sessions[sid].on_stanza(stanza) # Delete invalid/unneeded sessions - if sid in self._sessions and \ - self._sessions[sid].state == JingleStates.ENDED: + if (sid in self._sessions and + self._sessions[sid].state == JingleStates.ENDED): self.delete_jingle_session(sid) raise nbxmpp.NodeProcessed def start_audio(self, jid: str) -> str: - if self.get_jingle_session(jid, media='audio'): - return self.get_jingle_session(jid, media='audio').sid + audio_session = self.get_jingle_session(jid, media='audio') + if audio_session is not None: + return audio_session.sid jingle = self.get_jingle_session(jid, media='video') if jingle: jingle.add_content('voice', JingleAudio(jingle)) @@ -167,8 +187,9 @@ def start_audio(self, jid: str) -> str: return jingle.sid def start_video(self, jid: str) -> str: - if self.get_jingle_session(jid, media='video'): - return self.get_jingle_session(jid, media='video').sid + video_session = self.get_jingle_session(jid, media='video') + if video_session is not None: + return video_session.sid jingle = self.get_jingle_session(jid, media='audio') if jingle: video = JingleVideo(jingle) @@ -249,7 +270,7 @@ def start_file_transfer(self, return transfer.transport.sid @staticmethod - def __hash_support(contact): + def __hash_support(contact: types.ResourceContact) -> Optional[str]: if contact.supports(Namespace.HASHES_2): if contact.supports(Namespace.HASHES_BLAKE2B_512): return 'blake2b-512' @@ -265,7 +286,11 @@ def __hash_support(contact): return 'sha-256' return None - def get_jingle_sessions(self, jid, sid=None, media=None): + def get_jingle_sessions(self, + jid: Optional[str], + sid: Optional[str] = None, + media: Optional[str] = None + ) -> list[JingleSession]: if sid: return [se for se in self._sessions.values() if se.sid == sid] @@ -276,12 +301,17 @@ def get_jingle_sessions(self, jid, sid=None, media=None): return [se for se in sessions if se.get_content(media)] return sessions - def set_file_info(self, file_): + def set_file_info(self, file_: dict[str, Any]) -> None: # Saves information about the files we have transferred # in case they need to be requested again. self.files.append(file_) - def get_file_info(self, peerjid, hash_=None, name=None, _account=None): + def get_file_info(self, + peerjid: str, + hash_: Optional[str] = None, + name: Optional[str] = None, + _account: Optional[str] = None + ) -> Optional[dict[str, Any]]: if hash_: for file in self.files: # DEBUG #if f['hash'] == '1294809248109223': ===================================== gajim/common/modules/last_activity.py ===================================== @@ -14,8 +14,15 @@ # XEP-0012: Last Activity +from __future__ import annotations + +from typing import cast + +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common import idle +from gajim.common import types from gajim.common.modules.base import BaseModule @@ -28,10 +35,10 @@ class LastActivity(BaseModule): 'disable', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) - def set_enabled(self, enabled): + def set_enabled(self, enabled: bool) -> None: if not enabled or not app.is_installed('IDLE'): self._nbxmpp('LastActivity').disable() return @@ -43,10 +50,11 @@ def set_enabled(self, enabled): self._nbxmpp('LastActivity').set_idle_func(idle.Monitor.get_idle_sec) self._nbxmpp('LastActivity').set_allow_reply_func(self._allow_reply) - def _allow_reply(self, jid): + def _allow_reply(self, jid: JID) -> bool: item = self._con.get_module('Roster').get_item(jid.bare) if item is None: return False - contact = self._get_contact(jid.bare) + contact = cast(types.BareContact, self._get_contact( + JID.from_string(jid.bare))) return contact.is_subscribed ===================================== gajim/common/modules/misc.py ===================================== @@ -14,19 +14,25 @@ # All XEPs that don’t need their own module +from typing import Optional + import logging +from nbxmpp.structs import MessageProperties + +from gajim.common.helpers import AdditionalDataDict from gajim.common.i18n import get_rfc5646_lang log = logging.getLogger('gajim.c.m.misc') - # XEP-0066: Out of Band Data - -def parse_oob(properties, additional_data): +def parse_oob(properties: MessageProperties, + additional_data: AdditionalDataDict + ) -> None: if not properties.is_oob: return + assert properties.oob is not None additional_data.set_value('gajim', 'oob_url', properties.oob.url) if properties.oob.desc is not None: additional_data.set_value('gajim', 'oob_desc', @@ -34,18 +40,20 @@ def parse_oob(properties, additional_data): # XEP-0308: Last Message Correction - -def parse_correction(properties): +def parse_correction(properties: MessageProperties) -> Optional[str]: if not properties.is_correction: return None + assert properties.correction is not None return properties.correction.id # XEP-0071: XHTML-IM - -def parse_xhtml(properties, additional_data): +def parse_xhtml(properties: MessageProperties, + additional_data: AdditionalDataDict + ) -> None: if not properties.has_xhtml: return + assert properties.xhtml is not None body = properties.xhtml.get_body(get_rfc5646_lang()) additional_data.set_value('gajim', 'xhtml', body) ===================================== gajim/common/modules/receipts.py ===================================== @@ -14,18 +14,24 @@ # XEP-0184: Message Delivery Receipts +from __future__ import annotations + import nbxmpp from nbxmpp.structs import StanzaHandler from nbxmpp.namespaces import Namespace from nbxmpp.modules.receipts import build_receipt +from nbxmpp.protocol import JID +from nbxmpp.protocol import Message +from nbxmpp.structs import MessageProperties from gajim.common import app +from gajim.common import types from gajim.common.events import ReceiptReceived from gajim.common.modules.base import BaseModule class Receipts(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -35,10 +41,15 @@ def __init__(self, con): priority=46), ] - def _process_message_receipt(self, _con, stanza, properties): + def _process_message_receipt(self, + _con: types.xmppClient, + stanza: Message, + properties: MessageProperties + ) -> None: if not properties.is_receipt: return + assert properties.receipt is not None if properties.type.is_error: if properties.receipt.is_request: return @@ -94,9 +105,9 @@ def _process_message_receipt(self, _con, stanza, properties): raise nbxmpp.NodeProcessed - def _should_answer(self, properties): + def _should_answer(self, properties: MessageProperties) -> bool: if properties.is_muc_pm: return True - contact = self._get_contact(properties.jid.bare) + contact = self._get_contact(JID.from_string(properties.jid.bare)) return contact.is_subscribed ===================================== gajim/common/modules/register.py ===================================== @@ -14,9 +14,12 @@ # XEP-0077: In-Band Registration +from __future__ import annotations from nbxmpp.namespaces import Namespace +from nbxmpp.structs import DiscoInfo +from gajim.common import types from gajim.common.modules.base import BaseModule @@ -31,10 +34,10 @@ class Register(BaseModule): 'submit_register_form', ] - def __init__(self, con): + def __init__(self, con: types.Client): BaseModule.__init__(self, con) self.supported = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: self.supported = Namespace.REGISTER in info.features ===================================== gajim/common/modules/roster.py ===================================== @@ -23,14 +23,16 @@ import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq from nbxmpp.protocol import JID +from nbxmpp.structs import IqProperties from nbxmpp.structs import RosterData from nbxmpp.structs import RosterItem from nbxmpp.structs import StanzaHandler from nbxmpp.task import Task from gajim.common import app -from gajim.common.client import Client +from gajim.common import types from gajim.common.events import RosterReceived from gajim.common.events import RosterPush from gajim.common.modules.base import BaseModule @@ -45,7 +47,7 @@ class Roster(BaseModule): 'set_item', ] - def __init__(self, client: Client) -> None: + def __init__(self, client: types.Client) -> None: BaseModule.__init__(self, client) self.handlers = [ @@ -131,9 +133,14 @@ def _set_roster_from_data(self, items: list[RosterItem]) -> None: self._store_roster() - def _process_roster_push(self, _con, _stanza, properties): + def _process_roster_push(self, + _con: types.xmppClient, + _stanza: Iq, + properties: IqProperties + ) -> None: self._log.info('Push received') + assert properties.roster is not None item = properties.roster.item if item.subscription == 'remove': self._roster.pop(item.jid) ===================================== gajim/common/modules/roster_item_exchange.py ===================================== @@ -14,19 +14,25 @@ # XEP-0144: Roster Item Exchange +from __future__ import annotations + import nbxmpp from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Iq +from nbxmpp.protocol import JID +from nbxmpp.structs import IqProperties from nbxmpp.structs import StanzaHandler from gajim.common import app from gajim.common import helpers +from gajim.common import types from gajim.common.events import RosterItemExchangeEvent from gajim.common.i18n import _ from gajim.common.modules.base import BaseModule class RosterItemExchange(BaseModule): - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self.handlers = [ @@ -39,7 +45,11 @@ def __init__(self, con): ns=Namespace.ROSTERX), ] - def received_item(self, _con, stanza, properties): + def received_item(self, + _con: types.xmppClient, + stanza: Iq, + properties: IqProperties + ) -> None: # stanza can be a message or a iq self._log.info('Received roster items from %s', stanza.getFrom()) @@ -62,7 +72,7 @@ def received_item(self, _con, stanza, properties): item.getAttr('jid')) continue name = item.getAttr('name') - contact = self._get_contact(jid) + contact = self._get_contact(JID.from_string(jid)) groups = [] same_groups = True for group in item.getTags('group'): @@ -94,18 +104,23 @@ def received_item(self, _con, stanza, properties): raise nbxmpp.NodeProcessed - def send_contacts(self, contacts, fjid, type_='message'): + def send_contacts(self, + contacts: list[types.ChatContactT], + fjid: str, + type_: str = 'message' + ) -> None: if not app.account_is_available(self._account): return if type_ == 'message': if len(contacts) == 1: msg = _('Sent contact: "%(jid)s" (%(name)s)') % { - 'jid': contacts[0].jid, 'name': contacts[0].name} + 'jid': contacts[0].jid, + 'name': contacts[0].name} else: msg = _('Sent contacts:') for contact in contacts: - msg += '\n "%s" (%s)' % (contact.jid, contact.name) + msg += f'\n "{contact.jid}" ({contact.name})' stanza = nbxmpp.Message(to=app.get_jid_without_resource(fjid), body=msg) elif type_ == 'iq': ===================================== gajim/common/modules/security_labels.py ===================================== @@ -14,13 +14,18 @@ # XEP-0258: Security Labels in XMPP +from __future__ import annotations + +from typing import Generator from typing import Optional from nbxmpp.errors import is_error from nbxmpp.namespaces import Namespace from nbxmpp.modules.security_labels import Catalog +from nbxmpp.structs import DiscoInfo from gajim.common import app +from gajim.common import types from gajim.common.events import SecCatalogReceived from gajim.common.modules.base import BaseModule from gajim.common.modules.util import as_task @@ -33,13 +38,13 @@ class SecLabels(BaseModule): 'request_catalog', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self._catalogs: dict[str, Catalog] = {} self.supported = False - def pass_disco(self, info): + def pass_disco(self, info: DiscoInfo) -> None: if Namespace.SECLABEL not in info.features: return @@ -47,7 +52,7 @@ def pass_disco(self, info): self._log.info('Discovered security labels: %s', info.jid) @as_task - def request_catalog(self, jid: str): + def request_catalog(self, jid: str) -> Generator[Catalog, None, None]: _task = yield ===================================== gajim/common/modules/user_nickname.py ===================================== @@ -14,9 +14,15 @@ # XEP-0172: User Nickname +from __future__ import annotations + +from typing import Any + from nbxmpp.namespaces import Namespace +from nbxmpp.structs import MessageProperties from gajim.common import app +from gajim.common import types from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node @@ -29,12 +35,16 @@ class UserNickname(BaseModule): 'set_access_model', ] - def __init__(self, con): + def __init__(self, con: types.Client): BaseModule.__init__(self, con) self._register_pubsub_handler(self._nickname_received) @event_node(Namespace.NICK) - def _nickname_received(self, _con, _stanza, properties): + def _nickname_received(self, + _con: types.xmppClient, + _stanza: Any, + properties: MessageProperties + ) -> None: if properties.pubsub_event.retracted: return ===================================== gajim/common/modules/user_tune.py ===================================== @@ -16,18 +16,23 @@ from __future__ import annotations +from typing import Any from typing import Optional from nbxmpp.namespaces import Namespace from nbxmpp.protocol import JID +from nbxmpp.structs import MessageProperties from nbxmpp.structs import TuneData from gajim.common import app from gajim.common import ged +from gajim.common import types from gajim.common.modules.base import BaseModule from gajim.common.modules.util import event_node from gajim.common.modules.util import store_publish from gajim.common.dbus.music_track import MusicTrackListener +from gajim.common.events import MusicTrackChanged +from gajim.common.events import SignedIn from gajim.common.helpers import event_filter @@ -38,7 +43,7 @@ class UserTune(BaseModule): 'set_tune', ] - def __init__(self, con): + def __init__(self, con: types.Client) -> None: BaseModule.__init__(self, con) self._register_pubsub_handler(self._tune_received) self._current_tune: Optional[TuneData] = None @@ -51,7 +56,11 @@ def get_contact_tune(self, jid: JID) -> Optional[TuneData]: return self._contact_tunes.get(jid) @event_node(Namespace.TUNE) - def _tune_received(self, _con, _stanza, properties): + def _tune_received(self, + _con: types.xmppClient, + _stanza: Any, + properties: MessageProperties + ) -> None: if properties.pubsub_event.retracted: return @@ -65,7 +74,7 @@ def _tune_received(self, _con, _stanza, properties): contact.notify('tune-update', data) @store_publish - def set_tune(self, tune, force=False): + def set_tune(self, tune: Optional[TuneData], force: bool = False) -> None: if not self._con.get_module('PEP').supported: return @@ -81,7 +90,7 @@ def set_tune(self, tune, force=False): self._log.info('Send %s', tune) self._nbxmpp('Tune').set_tune(tune) - def set_enabled(self, enable): + def set_enabled(self, enable: bool) -> None: if enable: self.register_events([ ('music-track-changed', ged.CORE, self._on_music_track_changed), @@ -96,10 +105,10 @@ def _publish_current_tune(self): self.set_tune(MusicTrackListener.get().current_tune) @event_filter(['account']) - def _on_signed_in(self, _event): + def _on_signed_in(self, _event: SignedIn) -> None: self._publish_current_tune() - def _on_music_track_changed(self, event): + def _on_music_track_changed(self, event: MusicTrackChanged) -> None: if self._current_tune == event.info: return ===================================== gajim/common/types.py ===================================== @@ -78,6 +78,7 @@ AnyCallableT = Callable[..., Any] ObservableCbDict = dict[str, list[weakref.WeakMethod[AnyCallableT]]] +BareContactT = Union['BareContact'] ChatContactT = Union['BareContact', 'GroupchatContact', 'GroupchatParticipant'] OneOnOneContactT = Union['BareContact', 'GroupchatParticipant'] GroupchatContactT = Union['GroupchatContact'] ===================================== gajim/gtk/filetransfer.py ===================================== @@ -371,7 +371,7 @@ def _on_yes(): new_file_props.hash_ = file_props.hash_ new_file_props.type_ = 'r' tsid = client.get_module('Jingle').start_file_transfer( - jid, new_file_props, True) + str(jid), new_file_props, True) new_file_props.transport_sid = tsid self.add_transfer(account, contact, new_file_props) ===================================== pyrightconfig.json ===================================== @@ -30,6 +30,7 @@ "gajim/common/idle.py", "gajim/common/logging_helpers.py", "gajim/common/modules/chat_markers.py", + "gajim/common/modules/register.py", "gajim/common/passwords.py", "gajim/common/regex.py", "gajim/common/setting_values.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/51ecba65121fb3aa5291a374f127a12… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/51ecba65121fb3aa5291a374f127a12… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Replace user-visible strings of 'Groupchat' with 'Group Chat'
by Daniel Brötzmann (＠wurstsalat) 26 May '22

26 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 51ecba65 by wurstsalat at 2022-05-26T18:54:06+02:00 fix: Replace user-visible strings of 'Groupchat' with 'Group Chat' - - - - - 2 changed files: - gajim/data/gui/groupchat_manage.ui - gajim/gtk/groupchat_details.py Changes: ===================================== gajim/data/gui/groupchat_manage.ui ===================================== @@ -157,7 +157,7 @@ <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes">Destroy Groupchat…</property> + <property name="tooltip-text" translatable="yes">Destroy Group Chat…</property> <signal name="clicked" handler="_on_destroy_clicked" swapped="no"/> <child> <object class="GtkImage"> ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -51,7 +51,7 @@ def __init__(self, self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_resizable(True) self.set_default_size(-1, 600) - self.set_title(_('Groupchat Details')) + self.set_title(_('Group Chat Details')) self.account = contact.account self._client = app.get_client(contact.account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/51ecba65121fb3aa5291a374f127a120… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/51ecba65121fb3aa5291a374f127a120… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: VCardGrid: Request minimum width
by Daniel Brötzmann (＠wurstsalat) 26 May '22

26 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c177dc36 by wurstsalat at 2022-05-26T15:05:15+02:00 fix: VCardGrid: Request minimum width This keeps the MultiLineProperty from shrinking to near zero width if displayed alone Fixes: #10912 - - - - - 1 changed file: - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -155,6 +155,7 @@ def __init__(self, account: str) -> None: self.set_no_show_all(True) self.set_visible(True) self.set_halign(Gtk.Align.CENTER) + self.set_size_request(300, -1) self._account = account self._row_count: int = 0 View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c177dc36ae3cb2cd1dad7bc9fe855db6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c177dc36ae3cb2cd1dad7bc9fe855db6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Workspaces: Enable emoji picker
by Daniel Brötzmann (＠wurstsalat) 26 May '22

26 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bf485747 by wurstsalat at 2022-05-26T14:49:38+02:00 imprv: Workspaces: Enable emoji picker Fixes: #10812 - - - - - 2 changed files: - gajim/data/gui/workspace_dialog.ui - gajim/gtk/workspace_dialog.py Changes: ===================================== gajim/data/gui/workspace_dialog.ui ===================================== @@ -29,6 +29,8 @@ <property name="halign">center</property> <property name="activates-default">True</property> <property name="xalign">0.5</property> + <property name="show-emoji-icon">True</property> + <property name="enable-emoji-completion">True</property> <signal name="notify::text" handler="_on_text_changed" swapped="no"/> </object> <packing> @@ -88,6 +90,7 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">center</property> + <property name="margin-top">24</property> <property name="spacing">6</property> <child> <object class="GtkSwitch" id="image_switch"> ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -41,7 +41,7 @@ def __init__(self, workspace_id: Optional[str] = None) -> None: self.set_show_menubar(False) self.set_title(_('Workspace Settings')) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_size_request(350, -1) + self.set_size_request(500, 600) self._workspace_id = workspace_id View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf485747817f98265ae0d85d33fa08ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/bf485747817f98265ae0d85d33fa08ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Avatars: Render emojis correctly
by Daniel Brötzmann (＠wurstsalat) 26 May '22

26 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 73d269db by wurstsalat at 2022-05-26T14:33:08+02:00 imprv: Avatars: Render emojis correctly Fixes: #10905 - - - - - 2 changed files: - gajim/gtk/avatar.py - gajim/gtk/emoji_data.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -38,6 +38,8 @@ from gajim.common.const import StyleAttr from .const import DEFAULT_WORKSPACE_COLOR +from .emoji_data import is_emoji +from .emoji_data import get_emoji_font from .util import load_icon_surface from .util import load_pixbuf from .util import text_to_color @@ -79,7 +81,11 @@ def generate_avatar(letters: str, context.fill() # Draw letters - context.select_font_face('sans-serif', + if is_emoji(letters): + font_face = get_emoji_font() + else: + font_face = 'sans-serif' + context.select_font_face(font_face, cairo.FontSlant.NORMAL, cairo.FontWeight.NORMAL) context.set_font_size(font_size) ===================================== gajim/gtk/emoji_data.py ===================================== @@ -17,6 +17,7 @@ from typing import Optional import re +import sys import weakref from enum import IntEnum from collections import OrderedDict @@ -61,6 +62,12 @@ def get_emoji_pixbuf(codepoints: str) -> Optional[GdkPixbuf.Pixbuf]: return pixbuf +def get_emoji_font() -> str: + if sys.platform == 'win32': + return 'Segoe UI Emoji' + return 'Noto Color Emoji' + + class EmojiData(OrderedDict): def __getitem__(self, key): try: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/73d269db1a3a72a5a4b91c9d24b35a3c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/73d269db1a3a72a5a4b91c9d24b35a3c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Update debian files
by Philipp Hörist (＠lovetox) 25 May '22

25 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 82e23391 by lovetox at 2022-05-26T00:03:35+02:00 ci: Update debian files - - - - - 1 changed file: - debian/control Changes: ===================================== debian/control ===================================== @@ -1,4 +1,4 @@ -Source: gajim +Source: gajim-nightly Section: net Priority: optional Maintainer: Gajim Maintainers <ci(a)gajim.org> @@ -12,7 +12,7 @@ Build-Depends: python3-gi, python3-gi-cairo, python3-nbxmpp-nightly (>=20220501), - python3-setuptools + python3-setuptools, gir1.2-gtk-3.0, Rules-Requires-Root: no Standards-Version: 4.1.4 @@ -20,7 +20,7 @@ Homepage: https://gajim.org/ Vcs-Git: https://dev.gajim.org/gajim/gajim.git Vcs-Browser: https://dev.gajim.org/gajim/gajim/tree/master -Package: gajim +Package: gajim-nightly Architecture: all Depends: ${misc:Depends}, @@ -36,9 +36,9 @@ Depends: python3-nbxmpp-nightly (>=20220501), python3-openssl (>= 0.19), python3-precis-i18n, - python3-keyring - python3-packaging - python3-setuptools + python3-keyring, + python3-packaging, + python3-setuptools, python3-css-parser, Recommends: aspell-en | aspell-dictionary, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/82e23391f94e3dd622ebfddffd80ed72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/82e23391f94e3dd622ebfddffd80ed72… 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