aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-03-22 09:49:23 +0100
committerChocobozzz <me@florianbigard.com>2021-03-22 09:49:23 +0100
commit61fd98341f76b2b7a2a3814408e38af35bd028ee (patch)
treeac0ab8e6bdda4bdbba256f9c8ed9e6c97adecc24
parent42ec411bf879ef9505b93f74610d787320643193 (diff)
downloadPeerTube-61fd98341f76b2b7a2a3814408e38af35bd028ee.tar.gz
PeerTube-61fd98341f76b2b7a2a3814408e38af35bd028ee.tar.zst
PeerTube-61fd98341f76b2b7a2a3814408e38af35bd028ee.zip
Fix mention notification with deleted comment
-rw-r--r--client/src/app/shared/shared-main/users/user-notifications.component.html32
-rw-r--r--server/tests/api/moderation/blocklist.ts2
2 files changed, 21 insertions, 13 deletions
diff --git a/client/src/app/shared/shared-main/users/user-notifications.component.html b/client/src/app/shared/shared-main/users/user-notifications.component.html
index 91a4c8dc3..265af8d55 100644
--- a/client/src/app/shared/shared-main/users/user-notifications.component.html
+++ b/client/src/app/shared/shared-main/users/user-notifications.component.html
@@ -90,9 +90,7 @@
90 </ng-container> 90 </ng-container>
91 91
92 <ng-container *ngSwitchCase="UserNotificationType.NEW_COMMENT_ON_MY_VIDEO"> 92 <ng-container *ngSwitchCase="UserNotificationType.NEW_COMMENT_ON_MY_VIDEO">
93 <ng-container *ngIf="notification.comment; then hasComment; else noComment"></ng-container> 93 <ng-container *ngIf="notification.comment">
94
95 <ng-template #hasComment>
96 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl"> 94 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">
97 <img alt="" aria-labelledby="avatar" class="avatar" [src]="notification.comment.account.avatarUrl" /> 95 <img alt="" aria-labelledby="avatar" class="avatar" [src]="notification.comment.account.avatarUrl" />
98 </a> 96 </a>
@@ -100,15 +98,15 @@
100 <div class="message" i18n> 98 <div class="message" i18n>
101 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.comment.account.displayName }}</a> commented your video <a (click)="markAsRead(notification)" [routerLink]="notification.commentUrl">{{ notification.comment.video.name }}</a> 99 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.comment.account.displayName }}</a> commented your video <a (click)="markAsRead(notification)" [routerLink]="notification.commentUrl">{{ notification.comment.video.name }}</a>
102 </div> 100 </div>
103 </ng-template> 101 </ng-container>
104 102
105 <ng-template #noComment> 103 <ng-container *ngIf="!notification.comment">
106 <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon> 104 <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>
107 105
108 <div class="message" i18n> 106 <div class="message" i18n>
109 The notification concerns a comment now unavailable 107 The notification concerns a comment now unavailable
110 </div> 108 </div>
111 </ng-template> 109 </ng-container>
112 </ng-container> 110 </ng-container>
113 111
114 <ng-container *ngSwitchCase="UserNotificationType.MY_VIDEO_PUBLISHED"> 112 <ng-container *ngSwitchCase="UserNotificationType.MY_VIDEO_PUBLISHED">
@@ -157,13 +155,23 @@
157 </ng-container> 155 </ng-container>
158 156
159 <ng-container *ngSwitchCase="UserNotificationType.COMMENT_MENTION"> 157 <ng-container *ngSwitchCase="UserNotificationType.COMMENT_MENTION">
160 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl"> 158 <ng-container *ngIf="notification.comment">
161 <img alt="" aria-labelledby="avatar" class="avatar" [src]="notification.comment.account.avatarUrl" /> 159 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">
162 </a> 160 <img alt="" aria-labelledby="avatar" class="avatar" [src]="notification.comment.account.avatarUrl" />
161 </a>
163 162
164 <div class="message" i18n> 163 <div class="message" i18n>
165 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.comment.account.displayName }}</a> mentioned you on <a (click)="markAsRead(notification)" [routerLink]="notification.commentUrl">video {{ notification.comment.video.name }}</a> 164 <a (click)="markAsRead(notification)" [routerLink]="notification.accountUrl">{{ notification.comment.account.displayName }}</a> mentioned you on <a (click)="markAsRead(notification)" [routerLink]="notification.commentUrl">video {{ notification.comment.video.name }}</a>
166 </div> 165 </div>
166 </ng-container>
167
168 <ng-container *ngIf="!notification.comment">
169 <my-global-icon iconName="alert" aria-hidden="true"></my-global-icon>
170
171 <div class="message" i18n>
172 The notification concerns a comment now unavailable
173 </div>
174 </ng-container>
167 </ng-container> 175 </ng-container>
168 176
169 <ng-container *ngSwitchCase="UserNotificationType.NEW_INSTANCE_FOLLOWER"> 177 <ng-container *ngSwitchCase="UserNotificationType.NEW_INSTANCE_FOLLOWER">
diff --git a/server/tests/api/moderation/blocklist.ts b/server/tests/api/moderation/blocklist.ts
index 8c9107a50..e8202aff1 100644
--- a/server/tests/api/moderation/blocklist.ts
+++ b/server/tests/api/moderation/blocklist.ts
@@ -107,7 +107,7 @@ describe('Test blocklist', function () {
107 let userToken2: string 107 let userToken2: string
108 108
109 before(async function () { 109 before(async function () {
110 this.timeout(60000) 110 this.timeout(120000)
111 111
112 servers = await flushAndRunMultipleServers(3) 112 servers = await flushAndRunMultipleServers(3)
113 await setAccessTokensToServers(servers) 113 await setAccessTokensToServers(servers)