OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix abuse crash on deleted reporter account

pull/4736/head
Chocobozzz 2022-01-20 10:52:50 +01:00
parent efd4ff5fbc
commit 82b9a1005c
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
View File

@ -171,6 +171,7 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
isLocalAbuse (abuse: AdminAbuse) { isLocalAbuse (abuse: AdminAbuse) {
if (this.viewType === 'user') return true if (this.viewType === 'user') return true
if (!abuse.reporterAccount) return false
return Actor.IS_LOCAL(abuse.reporterAccount.host) return Actor.IS_LOCAL(abuse.reporterAccount.host)
} }

5
server/models/abuse/abuse-query-builder.ts
View File

@ -48,7 +48,10 @@ function buildAbuseListQuery (options: BuildAbusesQueryOptions, type: 'count' |
] ]
if (options.serverAccountId || options.userAccountId) { if (options.serverAccountId || options.userAccountId) {
whereAnd.push('"abuse"."reporterAccountId" NOT IN (' + buildBlockedAccountSQL([ options.serverAccountId, options.userAccountId ]) + ')') whereAnd.push(
'"abuse"."reporterAccountId" IS NULL OR ' +
'"abuse"."reporterAccountId" NOT IN (' + buildBlockedAccountSQL([ options.serverAccountId, options.userAccountId ]) + ')'
)
} }
if (options.reporterAccountId) { if (options.reporterAccountId) {