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

refactor fields to be an object instead of array

Browse Source
This commit is contained in:
liamcottle
2024-04-29 04:04:54 +12:00
parent e58f39bc07
commit b74fd5e143
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
index.html
View File

@@ -91,13 +91,11 @@
<span v-else>@<{{ chatItem.source_hash }}></span> <span v-else>@<{{ chatItem.source_hash }}></span>
</div> </div>
<div v-if="chatItem.message.content" style="white-space:pre-wrap;word-wrap:break-word;font-family:inherit;">{{ chatItem.message.content }}</div> <div v-if="chatItem.message.content" style="white-space:pre-wrap;word-wrap:break-word;font-family:inherit;">{{ chatItem.message.content }}</div>
<div v-if="chatItem.message.fields && chatItem.message.fields.map((field) => field.type).includes('image')" class="grid grid-cols-3 gap-2"> <div v-if="chatItem.message.fields?.image" class="grid grid-cols-3 gap-2">
<div v-for="field of chatItem.message.fields.filter((f) => f.type === 'image')"> <img @click="openImage(`data:image/${chatItem.message.fields.image.image_type};base64,${chatItem.message.fields.image.image_bytes}`)" :src="`data:image/${chatItem.message.fields.image.image_type};base64,${chatItem.message.fields.image.image_bytes}`" class="w-full rounded-md shadow-md cursor-pointer"/>
<img @click="openImage(`data:image/${field.image_type};base64,${field.image_bytes}`)" :src="`data:image/${field.image_type};base64,${field.image_bytes}`" class="w-full rounded-md shadow-md cursor-pointer"/>
</div>
</div> </div>
<div v-for="field of chatItem.message.fields?.filter((f) => f.type === 'file_attachments') ?? []"> <div v-if="chatItem.message.fields?.file_attachments">
<a target="_blank" :download="file_attachment.file_name" :href="`data:application/octet-stream;base64,${file_attachment.file_bytes}`" v-for="file_attachment of field.file_attachments" class="flex border border-gray-200 hover:bg-gray-100 rounded px-2 py-1 text-sm text-gray-700 font-semibold cursor-pointer"> <a target="_blank" :download="file_attachment.file_name" :href="`data:application/octet-stream;base64,${file_attachment.file_bytes}`" v-for="file_attachment of chatItem.message.fields?.file_attachments ?? []" class="flex border border-gray-200 hover:bg-gray-100 rounded px-2 py-1 text-sm text-gray-700 font-semibold cursor-pointer">
<div class="mr-2 my-auto"> <div class="mr-2 my-auto">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"> <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
<path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13"></path> <path stroke-linecap="round" stroke-linejoin="round" d="m18.375 12.739-7.693 7.693a4.5 4.5 0 0 1-6.364-6.364l10.94-10.94A3 3 0 1 1 19.5 7.372L8.552 18.32m.009-.01-.01.01m5.699-9.941-7.81 7.81a1.5 1.5 0 0 0 2.112 2.13"></path>

17
web.py
View File

@@ -101,7 +101,7 @@ def lxmf_delivery(message):
message_content = message.content.decode('utf-8') message_content = message.content.decode('utf-8')
source_hash_text = RNS.hexrep(message.source_hash, delimit=False) source_hash_text = RNS.hexrep(message.source_hash, delimit=False)
fields = [] fields = {}
message_fields = message.get_fields() message_fields = message.get_fields()
for field_type in message_fields: for field_type in message_fields:
@@ -121,20 +121,16 @@ def lxmf_delivery(message):
}) })
# add to fields # add to fields
fields.append({ fields["file_attachments"] = file_attachments
"type": "file_attachments",
"file_attachments": file_attachments,
})
# handle image field # handle image field
if field_type == LXMF.FIELD_IMAGE: if field_type == LXMF.FIELD_IMAGE:
image_type = value[0] image_type = value[0]
image_bytes = base64.b64encode(value[1]).decode("utf-8") image_bytes = base64.b64encode(value[1]).decode("utf-8")
fields.append({ fields["image"] = {
"type": "image",
"image_type": image_type, "image_type": image_type,
"image_bytes": image_bytes, "image_bytes": image_bytes,
}) }
# handle commands field # handle commands field
if field_type == LXMF.FIELD_COMMANDS: if field_type == LXMF.FIELD_COMMANDS:
@@ -148,10 +144,7 @@ def lxmf_delivery(message):
}) })
# add to fields # add to fields
fields.append({ fields["commands"] = commands
"type": "commands",
"commands": commands,
})
# send received lxmf message data to all websocket clients # send received lxmf message data to all websocket clients
websocket_broadcast(json.dumps({ websocket_broadcast(json.dumps({