erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core (xmpp): Remove host from SatMessageProtocol:

Browse source 
It is not needed anymore to pass `host` to most classes, as it is now available as a
global variable with `G`.
This commit is contained in:
Goffi 2026-04-21 12:42:45 +02:00
commit e41d2cf26f
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libervia/backend/core/xmpp.py
View file

@ -1121,7 +1121,7 @@ class SatXMPPClient(SatXMPPEntity, core_types.SatXMPPClient, tx_xmpp_client.XMPP
yield p
def _create_sub_protocols(self):
self.messageProt = SatMessageProtocol(self.host_app)
self.messageProt = SatMessageProtocol()
self.messageProt.setHandlerParent(self)
self.roster = LiberviaRosterProtocol(self.host_app)
@ -1269,7 +1269,7 @@ class SatXMPPComponent(SatXMPPEntity, core_types.SatXMPPComponent, component.Com
return jid_.host.split(".")[-len(local_host) :] == local_host
def _create_sub_protocols(self):
self.messageProt = SatMessageProtocol(self.host_app)
self.messageProt = SatMessageProtocol()
self.messageProt.setHandlerParent(self)
def _build_dependencies(self, current, plugins, required=True):
@ -1399,9 +1399,8 @@ class SatXMPPComponent(SatXMPPEntity, core_types.SatXMPPComponent, component.Com
class SatMessageProtocol(xmppim.MessageProtocol):
def __init__(self, host):
def __init__(self):
xmppim.MessageProtocol.__init__(self)
self.host = host
self.messages_queue = defer.DeferredQueue()
def setHandlerParent(self, parent):
@ -1482,9 +1481,9 @@ class SatMessageProtocol(xmppim.MessageProtocol):
# origin
if not from_jid_bare in (client.jid.userhostJID(), client.server_jid):
disco_infos = await self.host.memory.disco.get_infos(client, from_jid_bare)
disco_infos = await G.host.memory.disco.get_infos(client, from_jid_bare)
if from_jid_bare.user:
domain_disco_infos = await self.host.memory.disco.get_infos(
domain_disco_infos = await G.host.memory.disco.get_infos(
client, jid.JID(from_jid_bare.host)
)
else:
@ -1541,7 +1540,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
if parsed_delay.sender:
data["delay_sender"] = parsed_delay.sender.full()
self.host.trigger.point("message_parse", client, message_elt, data)
G.host.trigger.point("message_parse", client, message_elt, data)
return data
def onMessage(self, message_elt: domish.Element) -> None:
@ -1577,7 +1576,6 @@ class SatMessageProtocol(xmppim.MessageProtocol):
async def process_message(
self, client: SatXMPPEntity, message_elt: domish.Element
) -> None:
# TODO: handle threads
if not "from" in message_elt.attributes:
message_elt["from"] = client.jid.host
log.debug(_("got message from: {from_}").format(from_=message_elt["from"]))
@ -1588,7 +1586,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
# plugin can add their treatments to this deferred
post_treat = defer.Deferred()
async_point_d = defer.ensureDeferred(
self.host.trigger.async_point(
G.host.trigger.async_point(
"message_received", client, message_elt, post_treat
)
)
@ -1645,7 +1643,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
else:
# we need a message to store
if self.parent.is_message_printable(data):
return await self.host.memory.add_to_history(self.parent, data)
return await G.host.memory.add_to_history(self.parent, data)
else:
log.debug(
"not storing empty message to history: {data}".format(data=data)
@ -1663,7 +1661,7 @@ class SatMessageProtocol(xmppim.MessageProtocol):
data["extra"]["encrypted"] = True
if data is not None:
if self.parent.is_message_printable(data):
self.host.bridge.message_new(
G.host.bridge.message_new(
data["uid"],
data["timestamp"],
data["from"].full(),

2
libervia/backend/test/test_core_xmpp.py
View file

@ -45,7 +45,7 @@ class SatMessageProtocolTest(unittest.TestCase):
def setUp(self):
self.host = helpers.FakeSAT()
self.message = xmpp.SatMessageProtocol(self.host)
self.message = xmpp.SatMessageProtocol()
self.message.parent = helpers.FakeClient(self.host)
def test_on_message(self):