remove json from chat messages

This commit is contained in:
Tiago Vasconcelos 2023-03-30 16:58:34 +01:00
parent 48554b965a
commit 6c8f405cb8
2 changed files with 40 additions and 13 deletions

View file

@ -41,10 +41,15 @@
:name="message.sender" :name="message.sender"
:text="[message.msg]" :text="[message.msg]"
:sent="message.sender == 'Me'" :sent="message.sender == 'Me'"
:bg-color="message.sender == 'Me' ? 'white' : 'light-green-2'" :bg-color="message.json ? 'yellow-11' : message.sender == 'Me' ? 'white' : 'light-green-2'"
:stamp="message.timestamp" :stamp="message.timestamp"
size="6" size="6"
/> ><template v-slot:avatar v-if="message.json">
<q-icon
name="smart_toy"
class="q-message-avatar q-message-avatar--received"
/> </template
></q-chat-message>
</q-card-section> </q-card-section>
<q-card-actions> <q-card-actions>
<q-form @submit="sendMessage" class="full-width chat-input"> <q-form @submit="sendMessage" class="full-width chat-input">

View file

@ -59,19 +59,41 @@ async function chatDialog(path) {
}, },
computed: { computed: {
sortedMessages() { sortedMessages() {
return this.nostrMessages.sort((a, b) => b.created_at - a.created_at) return this.nostrMessages
.map(m => {
if (!isJson(m.msg)) return m
let msg = JSON.parse(m.msg)
if (msg?.message) {
m.json = m.msg
m.msg = msg.message
return m
}
if (msg?.items) {
m.json = m.msg
m.msg = 'Order placed!'
return m
}
if (msg?.payment_options) {
m.json = m.msg
m.msg = '⚡︎ Invoice sent!'
return m
}
return m
})
.sort((a, b) => b.created_at - a.created_at)
}, },
ordersList() { ordersList() {
let orders = this.nostrMessages return Object.values(
.sort((a, b) => b.created_at - a.created_at) this.nostrMessages
.filter(o => isJson(o.msg)) .sort((a, b) => b.created_at - a.created_at)
.reduce((acc, cur) => { .filter(o => isJson(o.msg))
const obj = JSON.parse(cur.msg) .reduce((acc, cur) => {
const key = obj.id const obj = JSON.parse(cur.msg)
const curGroup = acc[key] ?? {created_at: cur.timestamp} const key = obj.id
return {...acc, [key]: {...curGroup, ...obj}} const curGroup = acc[key] ?? {created_at: cur.timestamp}
}, {}) return {...acc, [key]: {...curGroup, ...obj}}
return Object.values(orders) }, {})
)
} }
}, },
methods: { methods: {