mirrors/lnbits-legend
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits-legend.git synced 2025-02-24 22:58:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

message notification

Browse source
This commit is contained in:
Tiago Vasconcelos 2022-12-22 10:44:10 +00:00
parent 10a1a28d04
commit b179b48edc
1 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lnbits/extensions/shop/templates/shop/index.html
View file

@ -630,7 +630,6 @@
if (!this.keys && !this.diagonAlley) { if (!this.keys && !this.diagonAlley) {
this.generateKeys() this.generateKeys()
} }
console.log(this.stallDialog.data)
}, },
openStallUpdateDialog: function (linkId) { openStallUpdateDialog: function (linkId) {
var self = this var self = this
@ -653,7 +652,7 @@
let data = { let data = {
name: this.stallDialog.data.name, name: this.stallDialog.data.name,
wallet: this.stallDialog.data.wallet, wallet: this.stallDialog.data.wallet,
publickey: this.stallDialog.data.publickey, publickey: this.stallDialog.data.publickey || this.keys.pubkey,
relays: this.stallDialog.data.relays, relays: this.stallDialog.data.relays,
shippingzones: this.stallDialog.data.shippingzones shippingzones: this.stallDialog.data.shippingzones
.map(z => z.split('-')[0].trim()) .map(z => z.split('-')[0].trim())
@ -1109,7 +1108,6 @@
if (response.data) { if (response.data) {
this.orders = response.data.map(mapOrders) this.orders = response.data.map(mapOrders)
} }
console.log(this.orders)
}) })
.catch(function (error) { .catch(function (error) {
LNbits.utils.notifyApiError(error) LNbits.utils.notifyApiError(error)
@ -1195,7 +1193,6 @@
this.g.user.wallets[0].adminkey this.g.user.wallets[0].adminkey
) )
.then(res => { .then(res => {
console.log(res)
if (!res.data.length) return if (!res.data.length) return
this.messages = _.groupBy(res.data, 'id_conversation') this.messages = _.groupBy(res.data, 'id_conversation')
this.checkUnreadMessages() this.checkUnreadMessages()
@ -1219,15 +1216,15 @@
this.checkUnreadMessages() this.checkUnreadMessages()
}, },
checkUnreadMessages() { checkUnreadMessages() {
let lastMsgs = this.$q.localStorage.getItem(`lnbits.shop.chat`) let lastMsgs = this.$q.localStorage.getItem(`lnbits.shop.chat`) || {}
if (!lastMsgs) return
for (let key in this.messages) { for (let key in this.messages) {
let idx = this.orders.findIndex(f => f.invoiceid == key) let idx = this.orders.findIndex(f => f.invoiceid == key)
if (!lastMsgs[key]) { if (!lastMsgs[key]) {
this.updateLastSeenMsg(key) this.updateLastSeenMsg(key)
this.$set(this.orders[idx], 'unread', true)
return return
} }
if ( if (
lastMsgs[key].timestamp < lastMsgs[key].timestamp <
Math.max(...this.messages[key].map(c => c.timestamp)) Math.max(...this.messages[key].map(c => c.timestamp))
@ -1242,24 +1239,22 @@
this.newMessage = '' this.newMessage = ''
this.$refs.newMessage.focus() this.$refs.newMessage.focus()
}, },
sendMessage() { async sendMessage() {
// we need Buffer to make this play nice // this is way more tricky...
// need to figure out how to better display our messages in plain text, and incoming with encryption
/*let orderPublicKey = this.orders.find( // also, as we're saving messages to the DB, the full Nostr event format will be much more heavy in size
/*
let orderPublicKey = this.orders.find(
o => o.invoiceid == this.customerKey o => o.invoiceid == this.customerKey
).pubkey*/ ).pubkey
/*let ciphertext = nostr.nip04.encrypt( let ciphertext = await nostr.nip04.encrypt(
this.keys.privkey, this.keys.privkey,
orderPublicKey, orderPublicKey,
this.newMessage this.newMessage
)*/ )
let message = {
msg: this.newMessage,
pubkey: this.keys.pubkey
}
*/
// if diagon alley mode is active create a propper event // if diagon alley mode is active create a propper event
/* /*
if (this.diagonAlley) { if (this.diagonAlley) {
@ -1276,6 +1271,11 @@
} }
*/ */
let message = {
msg: this.newMessage,
pubkey: this.keys.pubkey
}
this.ws.send(JSON.stringify(message)) this.ws.send(JSON.stringify(message))
this.clearMessage() this.clearMessage()
@ -1289,6 +1289,7 @@
pubkey: m.pubkey pubkey: m.pubkey
}) })
}) })
this.customerKey = id
this.$refs.chatCard.scrollIntoView({ this.$refs.chatCard.scrollIntoView({
behavior: 'smooth', behavior: 'smooth',
inline: 'nearest' inline: 'nearest'
@ -1317,7 +1318,7 @@
} }
} }
ws.onmessage = event => { ws.onmessage = async event => {
let event_data = JSON.parse(event.data) let event_data = JSON.parse(event.data)
this.$set(this.orderMessages, Date.now(), event_data) this.$set(this.orderMessages, Date.now(), event_data)