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

Support is:blacklisted as video-abuse-list filter

pull/2737/head
Rigel Kent 2020-05-03 16:16:10 +02:00 committed by Rigel Kent
parent 7f979fd8aa
commit 9b1fa49b60
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
View File

@ -24,7 +24,7 @@
<a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:pending' }" class="dropdown-item" i18n>Unsolved reports</a> <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:pending' }" class="dropdown-item" i18n>Unsolved reports</a>
<a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:accepted' }" class="dropdown-item" i18n>Accepted reports</a> <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:accepted' }" class="dropdown-item" i18n>Accepted reports</a>
<a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:rejected' }" class="dropdown-item" i18n>Refused reports</a> <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:rejected' }" class="dropdown-item" i18n>Refused reports</a>
<a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'is:blocked' }" class="dropdown-item" i18n>Reports with blocked videos</a> <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'is:blacklisted' }" class="dropdown-item" i18n>Reports with blacklisted videos</a>
<a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'is:deleted' }" class="dropdown-item" i18n>Reports with deleted videos</a> <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'is:deleted' }" class="dropdown-item" i18n>Reports with deleted videos</a>
</div> </div>
</div> </div>

15
server/models/video/video-abuse.ts
View File

@ -90,10 +90,13 @@ export enum ScopeNames {
}) })
} }
if (options.is) { let onlyBlacklisted = false
if (options.is === "deleted") {
where = Object.assign(where, { where = Object.assign(where, {
...options.is deletedVideo: { [Op.not]: null }
}) })
} else if (options.is === "blacklisted") {
onlyBlacklisted = true
} }
return { return {
@ -184,7 +187,7 @@ export enum ScopeNames {
}, },
{ {
model: VideoModel, model: VideoModel,
required: false, required: onlyBlacklisted,
where: searchAttribute(options.searchVideo, 'name'), where: searchAttribute(options.searchVideo, 'name'),
include: [ include: [
{ {
@ -202,7 +205,8 @@ export enum ScopeNames {
}, },
{ {
attributes: [ 'id', 'reason', 'unfederated' ], attributes: [ 'id', 'reason', 'unfederated' ],
model: VideoBlacklistModel model: VideoBlacklistModel,
required: onlyBlacklisted
} }
] ]
} }
@ -328,7 +332,8 @@ export class VideoAbuseModel extends Model<VideoAbuseModel> {
is: { is: {
prefix: 'is:', prefix: 'is:',
handler: v => { handler: v => {
if (v === "deleted") return { deletedVideo: { [Op.not]: null } } if (v === "deleted") return v
if (v === "blacklisted") return v
return undefined return undefined
} }
}, },