https://github.com/syuilo/misskey/pull/7129#discussion_r599518698, https://github.com/syuilo/misskey/pull/7129#discussion_r599504827
This commit is contained in:
parent
ba315b7765
commit
745eecae56
|
@ -94,12 +94,18 @@ export default defineComponent({
|
||||||
getNoteSummary: (text: string) => getNoteSummary(text, i18n.locale),
|
getNoteSummary: (text: string) => getNoteSummary(text, i18n.locale),
|
||||||
followRequestDone: false,
|
followRequestDone: false,
|
||||||
groupInviteDone: false,
|
groupInviteDone: false,
|
||||||
connection: null,
|
readObserver: null as IntersectionObserver | null,
|
||||||
readObserver: null,
|
|
||||||
faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faClock, faCheck, faPollH
|
faIdCardAlt, faPlus, faQuoteLeft, faQuoteRight, faRetweet, faReply, faAt, faClock, faCheck, faPollH
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
'notification.isRead'() {
|
||||||
|
this.readObserver?.unobserve(this.$el);
|
||||||
|
this.readObserver = null;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
if (!this.notification.isRead) {
|
if (!this.notification.isRead) {
|
||||||
this.readObserver = new IntersectionObserver((entries, observer) => {
|
this.readObserver = new IntersectionObserver((entries, observer) => {
|
||||||
|
@ -107,30 +113,19 @@ export default defineComponent({
|
||||||
os.stream.send('readNotification', {
|
os.stream.send('readNotification', {
|
||||||
id: this.notification.id
|
id: this.notification.id
|
||||||
});
|
});
|
||||||
entries.map(({ target }) => observer.unobserve(target));
|
for (const { target } of entries) {
|
||||||
|
observer.unobserve(target);
|
||||||
|
}
|
||||||
|
this.readObserver = null;
|
||||||
});
|
});
|
||||||
|
|
||||||
this.readObserver.observe(this.$el);
|
this.readObserver.observe(this.$el);
|
||||||
|
|
||||||
this.connection = os.stream.useSharedConnection('main');
|
|
||||||
|
|
||||||
// 既読処理
|
|
||||||
// notification.isReadは更新しないので注意
|
|
||||||
this.connection.on('readAllNotifications', () => {
|
|
||||||
this.readObserver.unobserve(this.$el);
|
|
||||||
});
|
|
||||||
this.connection.on('readNotifications', notificationIds => {
|
|
||||||
if (notificationIds.includes(this.notification.id)) {
|
|
||||||
this.readObserver.unobserve(this.$el);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
beforeUnmount() {
|
beforeUnmount() {
|
||||||
if (!this.notification.isRead) {
|
if (!this.notification.isRead) {
|
||||||
this.readObserver.unobserve(this.$el);
|
this.readObserver?.unobserve(this.$el);
|
||||||
this.connection.dispose();
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -87,9 +87,11 @@ export default defineComponent({
|
||||||
this.connection = os.stream.useSharedConnection('main');
|
this.connection = os.stream.useSharedConnection('main');
|
||||||
this.connection.on('notification', this.onNotification);
|
this.connection.on('notification', this.onNotification);
|
||||||
|
|
||||||
// queueに対してのみ既読処理を行う
|
|
||||||
this.connection.on('readAllNotifications', () => {
|
this.connection.on('readAllNotifications', () => {
|
||||||
this.queue = this.queue.map(x => markNotificationRead(x));
|
this.queue = this.queue.map(x => markNotificationRead(x));
|
||||||
|
for (const item of this.items) {
|
||||||
|
item.isRead = true;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
this.connection.on('readNotifications', notificationIds => {
|
this.connection.on('readNotifications', notificationIds => {
|
||||||
if (this.queue.length === 0) return;
|
if (this.queue.length === 0) return;
|
||||||
|
@ -98,6 +100,9 @@ export default defineComponent({
|
||||||
if (notificationIds.includes(this.queue[i].id)) {
|
if (notificationIds.includes(this.queue[i].id)) {
|
||||||
this.queue[i] = markNotificationRead(this.queue[i]);
|
this.queue[i] = markNotificationRead(this.queue[i]);
|
||||||
}
|
}
|
||||||
|
if (notificationIds.includes(this.items[i].id)) {
|
||||||
|
this.items[i].isRead = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
|
@ -51,11 +51,11 @@ export default defineComponent({
|
||||||
const connection = stream.useSharedConnection('main', 'UI');
|
const connection = stream.useSharedConnection('main', 'UI');
|
||||||
connection.on('notification', onNotification);
|
connection.on('notification', onNotification);
|
||||||
|
|
||||||
const navHook = inject('navHook', null);
|
|
||||||
const sideViewHook = inject('sideViewHook', null);
|
|
||||||
|
|
||||||
//#region Listen message from SW
|
//#region Listen message from SW
|
||||||
if ('serviceWorker' in navigator) {
|
if ('serviceWorker' in navigator) {
|
||||||
|
const navHook = inject('navHook', null);
|
||||||
|
const sideViewHook = inject('sideViewHook', null);
|
||||||
|
|
||||||
navigator.serviceWorker.addEventListener('message', ev => {
|
navigator.serviceWorker.addEventListener('message', ev => {
|
||||||
if (_DEV_) {
|
if (_DEV_) {
|
||||||
console.log('sw msg', ev.data);
|
console.log('sw msg', ev.data);
|
||||||
|
|
Loading…
Reference in New Issue