diff --git a/src/chat.js b/src/chat.js index 9b167a6..a0adcf7 100644 --- a/src/chat.js +++ b/src/chat.js @@ -136,7 +136,7 @@ export default class Chat { } async 通知栏消息(data) { console.log('通知栏消息', data) - const { name, text, time, type } = data + const { name, text, avatar } = data const icon = 'https://webrtc.satori.love/favicon.ico' // 如果页面可见或且浏览器不在前台运行, 则发送通知 if (document.visibilityState === 'visible') return console.log('页面可见') @@ -147,7 +147,7 @@ export default class Chat { await Notification.requestPermission() } if (Notification.permission === 'granted') { - const notification = new Notification(name, { body: text, icon }) + const notification = new Notification(name, { body: text, icon:avatar }) notification.onclick = () => { window.focus() notification.close() @@ -368,9 +368,9 @@ export default class Chat { this.send(data) } 收到消息(data) { - console.log('收到消息', data) + const { avatar, ...save } = data this.添加元素(data) - this.存储消息(data) + this.存储消息(save) this.通知栏消息(data) } } \ No newline at end of file diff --git a/src/main.js b/src/main.js index 70f7cfe..6dbe9b7 100644 --- a/src/main.js +++ b/src/main.js @@ -200,7 +200,7 @@ clientList.setChannel('chat', { const data = JSON.parse(event.data) if (data.type === 'message') { console.log(client.name, '发来消息:', data) - chat.收到消息({ name: client.name, ...data.text }) + chat.收到消息({ name: client.name, ...data.text, avatar: client.avatar }) return } if (data.type === 'answer') {