Mirror/liamcottle___reticulum-meshchat
1
0
Fork 0
mirror of https://github.com/liamcottle/reticulum-meshchat.git synced 2026-04-28 00:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

more clean up

Browse source
This commit is contained in:
liamcottle 2024-09-17 16:05:58 +12:00
commit ea412a7d95
1 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

29
meshchat.py
View file

@ -185,12 +185,9 @@ class ReticulumMeshChat:
# force close websocket clients
for websocket_client in self.websocket_clients:
print("force closing websocket for shutdown")
await websocket_client.close(code=WSCloseCode.GOING_AWAY)
print("force closed websocket")
# stop reticulum
print("stopping reticulum")
RNS.Transport.detach_interfaces()
self.reticulum.exit_handler()
RNS.exit()
@ -501,7 +498,6 @@ class ReticulumMeshChat:
"message": "Interface has been added",
})
# handle websocket clients
@routes.get("/ws")
async def ws(request):
@ -946,10 +942,13 @@ class ReticulumMeshChat:
try:
# send lxmf message to destination
lxmf_message = await self.send_message(destination_hash, content,
image_field=image_field,
audio_field=audio_field,
file_attachments_field=file_attachments_field)
lxmf_message = await self.send_message(
destination_hash=destination_hash,
content=content,
image_field=image_field,
audio_field=audio_field,
file_attachments_field=file_attachments_field
)
return web.json_response({
"lxmf_message": self.convert_lxmf_message_to_dict(lxmf_message),
@ -1400,20 +1399,6 @@ class ReticulumMeshChat:
"path": path,
}
# convert app data to string, or return none unable to do so
def convert_app_data_to_string(self, app_data):
# attempt to convert to utf-8 string
if app_data is not None:
try:
return app_data.decode("utf-8")
except:
# ignore failure to convert to string
pass
# unable to convert to string
return None
# convert an lxmf message to a dictionary, for sending over websocket
def convert_lxmf_message_to_dict(self, lxmf_message: LXMF.LXMessage):