core, memory (sqla), plugins XEP-0277, XEP-0346: various fixes:

- `is_local`: now use `server_jid`.
- `aio_func`: pass the missing `self` argument (`aio_fund` is unbound).
- Declare `pubsub_service` in `core_types.SatXMPPEntity`
- plugin XEP-0277: fix handling of `MbData.from_element` when node is not specified (so we
  use default node).
- plugin XEP-0346: `IdentityData`: fix field access, following move to Pydantic model.
This commit is contained in:
Goffi 2026-10-26 12:13:42 +01:00
commit 50ffc8c3b4
6 changed files with 26 additions and 25 deletions

View file

@ -110,6 +110,8 @@ class SatXMPPEntity(ABC):
conn_deferred: defer.Deferred
xmlstream: mod_xmlstream.XmlStream
tor: "Tor | None" = None
# Default pubsub service (set by XEP-0060)
pubsub_service: "t_jid.JID | None" = None
def __init__(self) -> None:
self.plugin_data: dict[str, Any] = {}
@ -374,5 +376,5 @@ class SatXMPPClient(SatXMPPEntity):
class SatXMPPComponent(SatXMPPEntity):
def is_local(self, jid_: t_jid.JID) -> bool:
"""Returns True if jid_ use a domain or subdomain of component's host"""
"""Returns True if jid_ is an account on the local server"""
raise NotImplementedError

View file

@ -1322,10 +1322,8 @@ class SatXMPPComponent(SatXMPPEntity, core_types.SatXMPPComponent, component.Com
return False
def is_local(self, jid_: jid.JID) -> bool:
"""Returns True if jid_ use a domain or subdomain of component's host"""
local_host = self.host.split(".")
assert local_host
return jid_.host.split(".")[-len(local_host) :] == local_host
"""Return True if jid_ is an account on the local server."""
return jid_.host == self.server_jid.host
def _create_sub_protocols(self):
self.messageProt = SatMessageProtocol()

View file

@ -164,7 +164,7 @@ class Storage:
This method is called on shutdown.
"""
if self.engine.dialect.name == "sqlite":
await self.wal_checkpoint.aio_func()
await self.wal_checkpoint.aio_func(self)
await self.engine.dispose()
async def migrate_apply(self, *args: str, log_output: bool = False) -> None:
@ -1464,7 +1464,7 @@ class Storage:
create_kwargs = {}
try:
return await self.set_pubsub_node.aio_func(
client, service, name, **create_kwargs
self, client, service, name, **create_kwargs
)
except IntegrityError as e:
if "unique" in str(e.orig).lower():
@ -1472,6 +1472,7 @@ class Storage:
# get_pubsub_node above
log.debug("ignoring UNIQUE constraint error")
return await self.get_pubsub_node.aio_func(
self,
client,
service,
name=name,
@ -2266,7 +2267,7 @@ class Storage:
If affiliation is None, the entity's affiliation is removed.
@raise exceptions.NotFound: Node doesn't exist.
"""
node = await self.get_pubsub_node.aio_func(client, service, node_name)
node = await self.get_pubsub_node.aio_func(self, client, service, node_name)
if node is None:
raise exceptions.NotFound(f"Node {node_name!r} not found")

View file

@ -214,8 +214,9 @@ class MbData(BaseModel):
data = {
"id": id_,
"service": service,
"node": node,
}
if node is not None:
data["node"] = node
# Set URI if node is provided
# FIXME: node should alway be set in the future, check FIXME in method signature.

View file

@ -810,7 +810,7 @@ class PubsubSchema(object):
if fill_author:
if not values.get("author"):
id_data = await self._i.get_identity(client, None, ["nicknames"])
values["author"] = id_data["nicknames"][0]
values["author"] = id_data.nicknames[0]
if not values.get("author_jid"):
values["author_jid"] = client.jid.full()
item_id = await self.send_data_form_item(