RNS-Things/reticulum-meshchatX
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 8 Wiki Activity

clean up duped logic

Browse Source
This commit is contained in:
liamcottle
2024-05-04 21:41:55 +12:00
parent 4ca4b9a56d
commit 643fc93cd7
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
web.py
View File

@@ -463,31 +463,16 @@ class ReticulumWebChat:
# handle an lxmf delivery from reticulum # handle an lxmf delivery from reticulum
# NOTE: cant be async, as Reticulum doesn't await it # NOTE: cant be async, as Reticulum doesn't await it
def on_lxmf_delivery(self, message): def on_lxmf_delivery(self, lxmf_message):
try: try:
# convert lxmf message to dict # upsert lxmf message to database
lxmf_message_dict = self.convert_lxmf_message_to_dict(message) self.db_upsert_lxmf_message(lxmf_message)
# save to database
lxmf_message_db = database.LxmfMessage(
hash=lxmf_message_dict["hash"],
source_hash=lxmf_message_dict["source_hash"],
destination_hash=lxmf_message_dict["destination_hash"],
is_incoming=lxmf_message_dict["is_incoming"],
state=lxmf_message_dict["state"],
progress=lxmf_message_dict["progress"],
title=lxmf_message_dict["title"],
content=lxmf_message_dict["content"],
fields=json.dumps(lxmf_message_dict["fields"]),
timestamp=lxmf_message_dict["timestamp"],
)
lxmf_message_db.save()
# send received lxmf message data to all websocket clients # send received lxmf message data to all websocket clients
asyncio.run(self.websocket_broadcast(json.dumps({ asyncio.run(self.websocket_broadcast(json.dumps({
"type": "lxmf.delivery", "type": "lxmf.delivery",
"lxmf_message": self.convert_lxmf_message_to_dict(message), "lxmf_message": self.convert_lxmf_message_to_dict(lxmf_message),
}))) })))
except Exception as e: except Exception as e: