Mercurial > libervia-backend

diff libervia/backend/plugins/plugin_sec_autocrypt.py @ 4379:79d463e3fdeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core (types): Renamed `libervia.backend.core.core_types.MessageData` to `MessageDataLegacy`: There are 2 concurrent models, this one is an historical legacy. The type to use the one from `libervia.backend.models.core`, and it will progressively be used everywhere and fully based on Pydantic.
author Goffi <goffi@goffi.org>
date Fri, 04 Jul 2025 12:28:00 +0200
parents 6a0a081485b8
children
line wrap: on
line diff
--- a/libervia/backend/plugins/plugin_sec_autocrypt.py	Thu Jun 26 17:02:33 2025 +0200
+++ b/libervia/backend/plugins/plugin_sec_autocrypt.py	Fri Jul 04 12:28:00 2025 +0200
@@ -27,7 +27,7 @@
 from twisted.words.xish import domish
 
 from libervia.backend.core.constants import Const as C
-from libervia.backend.core.core_types import MessageData, SatXMPPEntity
+from libervia.backend.core.core_types import MessageDataLegacy, SatXMPPEntity
 from libervia.backend.core.i18n import _
 from libervia.backend.core.log import getLogger
 from libervia.backend.memory import persistent
@@ -159,7 +159,7 @@
         client._autocrypt_gpg_provider = get_gpg_provider(self.host, client)
 
     async def handle_autocrypt_data(
-        self, client: SatXMPPEntity, mess_data: MessageData, autocrypt_data_raw: str
+        self, client: SatXMPPEntity, mess_data: MessageDataLegacy, autocrypt_data_raw: str
     ) -> None:
         """Process Autocrypt header from XMPP email gateway
 
@@ -211,8 +211,8 @@
         client._autocrypt_seen.add(sender_email)
 
     def _check_headers(
-        self, client: SatXMPPEntity, mess_data: MessageData
-    ) -> MessageData:
+        self, client: SatXMPPEntity, mess_data: MessageDataLegacy
+    ) -> MessageDataLegacy:
         try:
             autocrypt_data = mess_data["extra"]["headers"]["autocrypt"]
         except KeyError:
@@ -232,7 +232,7 @@
         post_treat.addCallback(partial(self._check_headers, client))
         return True
 
-    async def add_autocrypt_header(self, client, mess_data: MessageData) -> MessageData:
+    async def add_autocrypt_header(self, client, mess_data: MessageDataLegacy) -> MessageDataLegacy:
         to_jid = mess_data["to"]
         if await self.host.memory.disco.has_identity(
             client, "gateway", "smtp", jid.JID(to_jid.host)
@@ -265,7 +265,7 @@
     ) -> Literal[True]:
         """Process the XEP-0131 related data to be sent"""
 
-        def add_headers(mess_data: MessageData) -> MessageData:
+        def add_headers(mess_data: MessageDataLegacy) -> MessageDataLegacy:
             extra = mess_data["extra"]
             self.move_keywords_to_headers(extra)
             # Now we parse headers, if any.