Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

fix notification duplicates in account panel

This commit is contained in:
Nicolas Constant 2020-04-23 22:42:09 -04:00
parent d036a5cd9a
commit 2e8c9b5e9f
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/floating-column/manage-account/mentions/mentions.component.ts
View File

@ -74,11 +74,11 @@ export class MentionsComponent implements OnInit, OnDestroy {
this.userNotificationServiceSub = this.userNotificationService.userNotifications.subscribe((userNotifications: UserNotification[]) => {
this.processNewMentions(userNotifications);
if(this.statuses.length < 20) this.scrolledToBottom();
if (this.statuses.length < 20) this.scrolledToBottom();
});
}
private processNewMentions(userNotifications: UserNotification[]) {
private processNewMentions(userNotifications: UserNotification[]) {
const userNotification = userNotifications.find(x => x.account.id === this.account.info.id);
if (userNotification && userNotification.mentions) {
let orderedMentions = [...userNotification.mentions.map(x => x.status)].reverse();
@ -120,7 +120,9 @@ export class MentionsComponent implements OnInit, OnDestroy {
for (const s of statuses) {
let cwPolicy = this.toolsService.checkContentWarning(s);
const wrapper = new StatusWrapper(cwPolicy.status, this.account.info, cwPolicy.applyCw, cwPolicy.hide);
this.statuses.push(wrapper);
if (!this.statuses.find(x => x.status.id === s.id)) {
this.statuses.push(wrapper);
}
}
this.lastId = result[result.length - 1].id;

40
src/app/components/floating-column/manage-account/notifications/notifications.component.ts
View File

@ -31,7 +31,7 @@ export class NotificationsComponent implements OnInit, OnDestroy {
get account(): AccountWrapper {
return this._account;
}
@ViewChild('statusstream') public statustream: ElementRef;
private maxReached = false;
@ -39,7 +39,7 @@ export class NotificationsComponent implements OnInit, OnDestroy {
private userNotificationServiceSub: Subscription;
private lastId: string;
constructor(
constructor(
private readonly toolsService: ToolsService,
private readonly notificationService: NotificationService,
private readonly userNotificationService: UserNotificationService,
@ -49,22 +49,22 @@ export class NotificationsComponent implements OnInit, OnDestroy {
}
ngOnDestroy(): void {
if(this.userNotificationServiceSub){
if (this.userNotificationServiceSub) {
this.userNotificationServiceSub.unsubscribe();
}
}
private loadNotifications(){
if(this.userNotificationServiceSub){
private loadNotifications() {
if (this.userNotificationServiceSub) {
this.userNotificationServiceSub.unsubscribe();
}
this.notifications.length = 0;
this.userNotificationService.markNotificationAsRead(this.account.info);
this.userNotificationService.markNotificationAsRead(this.account.info);
this.userNotificationServiceSub = this.userNotificationService.userNotifications.subscribe((userNotifications: UserNotification[]) => {
this.processNewNotifications(userNotifications);
if(this.notifications.length < 20) this.scrolledToBottom();
if (this.notifications.length < 20) this.scrolledToBottom();
});
}
@ -75,7 +75,7 @@ export class NotificationsComponent implements OnInit, OnDestroy {
for (let n of orderedNotifications) {
let cwPolicy = this.toolsService.checkContentWarning(n.status);
const notificationWrapper = new NotificationWrapper(n, this.account.info, cwPolicy.applyCw, cwPolicy.hide);
if (!this.notifications.find(x => x.wrapperId === notificationWrapper.wrapperId)) {
if (!this.notifications.find(x => x.wrapperId === notificationWrapper.wrapperId)) {
this.notifications.unshift(notificationWrapper);
}
}
@ -84,7 +84,7 @@ export class NotificationsComponent implements OnInit, OnDestroy {
this.userNotificationService.markNotificationAsRead(this.account.info);
}
onScroll() {
var element = this.statustream.nativeElement as HTMLElement;
const atBottom = element.scrollHeight <= element.clientHeight + element.scrollTop + 1000;
@ -105,11 +105,13 @@ export class NotificationsComponent implements OnInit, OnDestroy {
this.maxReached = true;
return;
}
for (const s of notifications) {
let cwPolicy = this.toolsService.checkContentWarning(s.status);
const wrapper = new NotificationWrapper(s, this.account.info, cwPolicy.applyCw, cwPolicy.hide);
this.notifications.push(wrapper);
if (!this.notifications.find(x => x.wrapperId === wrapper.wrapperId)) {
this.notifications.push(wrapper);
}
}
this.lastId = notifications[notifications.length - 1].id;
@ -136,16 +138,16 @@ export class NotificationsComponent implements OnInit, OnDestroy {
}
export class NotificationWrapper {
constructor(notification: Notification, provider: AccountInfo, applyCw: boolean, hideStatus: boolean) {
constructor(notification: Notification, provider: AccountInfo, applyCw: boolean, hideStatus: boolean) {
this.type = notification.type;
switch(this.type){
case 'mention':
case 'reblog':
switch (this.type) {
case 'mention':
case 'reblog':
case 'favourite':
case 'poll':
this.status= new StatusWrapper(notification.status, provider, applyCw, hideStatus);
break;
}
case 'poll':
this.status = new StatusWrapper(notification.status, provider, applyCw, hideStatus);
break;
}
this.account = notification.account;
this.wrapperId = `${this.type}-${notification.id}`;
this.notification = notification;