Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add NSFW filter for videos in admin

Chocobozzzbba1ade360ba
diff --git a/client/src/app/+admin/overview/videos/video-admin.service.ts b/client/src/app/+admin/overview/videos/video-admin.service.ts
index 63aae2caf0..0414de33c8 100644
--- a/client/src/app/+admin/overview/videos/video-admin.service.ts
+++ b/client/src/app/+admin/overview/videos/video-admin.service.ts
@@ -4,7 +4,7 @@ import { RestExtractor, RestPagination, RestService } from '@app/core'
import { AdvancedInputFilter } from '@app/shared/shared-forms/advanced-input-filter.component'
import { Video } from '@app/shared/shared-main/video/video.model'
import { CommonVideoParams, VideoService } from '@app/shared/shared-main/video/video.service'
-import { getAllPrivacies, omit } from '@peertube/peertube-core-utils'
+import { exists, getAllPrivacies, omit } from '@peertube/peertube-core-utils'
import { ResultList, VideoInclude, VideoPrivacy } from '@peertube/peertube-models'
import { Observable } from 'rxjs'
import { catchError, switchMap } from 'rxjs/operators'
@@ -39,6 +39,16 @@ export class VideoAdminService {
buildAdminInputFilter (): AdvancedInputFilter[] {
return [
+ {
+ title: $localize`Moderation`,
+ children: [
+ {
+ value: 'nsfw:true',
+ label: $localize`Sensitive videos`
+ }
+ ]
+ },
+
{
title: $localize`Video type`,
children: [
@@ -145,6 +155,10 @@ export class VideoAdminService {
autoTagOneOf: {
prefix: 'autoTag:',
multiple: true
+ },
+ nsfw: {
+ prefix: 'nsfw:',
+ isBoolean: true
}
})
diff --git a/client/src/app/+admin/overview/videos/video-list.component.scss b/client/src/app/+admin/overview/videos/video-list.component.scss
index 83f67e9893..d9b832c93f 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.scss
+++ b/client/src/app/+admin/overview/videos/video-list.component.scss
@@ -1,5 +1,5 @@
-@use '_variables' as *;
-@use '_mixins' as *;
+@use "_variables" as *;
+@use "_mixins" as *;
td {
padding-top: 0.25rem;
@@ -13,7 +13,8 @@ my-embed {
}
.pt-badge,
-my-video-privacy-badge {
+my-video-privacy-badge,
+my-video-nsfw-badge {
@include margin-right(5px);
}
diff --git a/client/src/app/core/rest/rest.service.ts b/client/src/app/core/rest/rest.service.ts
index 602f9dfa1a..18511f2f2d 100644
--- a/client/src/app/core/rest/rest.service.ts
+++ b/client/src/app/core/rest/rest.service.ts
@@ -18,18 +18,17 @@ interface QueryStringFilterPrefixes {
}
}
-type ParseQueryStringFilters <K extends keyof any> = Partial<Record<K, ParseQueryHandlerResult | ParseQueryHandlerResult[]>>
-type ParseQueryStringFiltersResult <K extends keyof any> = ParseQueryStringFilters<K> & { search?: string }
+type ParseQueryStringFilters<K extends keyof any> = Partial<Record<K, ParseQueryHandlerResult | ParseQueryHandlerResult[]>>
+type ParseQueryStringFiltersResult<K extends keyof any> = ParseQueryStringFilters<K> & { search?: string }
@Injectable()
export class RestService {
-
addRestGetParams (params: HttpParams, pagination?: RestPagination, sort?: SortMeta | string) {
let newParams = params
if (pagination !== undefined) {
newParams = newParams.set('start', pagination.start.toString())
- .set('count', pagination.count.toString())
+ .set('count', pagination.count.toString())
}
if (sort !== undefined) {
@@ -56,7 +55,7 @@ export class RestService {
return params
}
- addObjectParams (params: HttpParams, object: { [ name: string ]: any }) {
+ addObjectParams (params: HttpParams, object: { [name: string]: any }) {
for (const name of Object.keys(object)) {
const value = object[name]
if (value === undefined || value === null) continue
@@ -64,7 +63,7 @@ export class RestService {
if (Array.isArray(value)) {
params = this.addArrayParams(params, name, value)
} else {
- params = params.append(name, value)
+ params = params.set(name, value)
}
}
@@ -80,16 +79,16 @@ export class RestService {
}
/*
- * Returns an object containing the filters and the remaining search
- */
- parseQueryStringFilter <T extends QueryStringFilterPrefixes> (q: string, prefixes: T): ParseQueryStringFiltersResult<keyof T> {
+ * Returns an object containing the filters and the remaining search
+ */
+ parseQueryStringFilter<T extends QueryStringFilterPrefixes> (q: string, prefixes: T): ParseQueryStringFiltersResult<keyof T> {
if (!q) return {}
const tokens = this.tokenizeString(q)
// Build prefix array
const prefixeStrings = Object.values(prefixes)
- .map(p => p.prefix)
+ .map(p => p.prefix)
debugLogger(`Built tokens "${tokens.join(', ')}" for prefixes "${prefixeStrings.join(', ')}"`)
@@ -105,21 +104,21 @@ export class RestService {
const prefix = prefixObj.prefix
const matchedTokens = tokens.filter(t => t.startsWith(prefix))
- .map(t => t.slice(prefix.length)) // Keep the value filter
- .map(t => t.replace(/^"|"$/g, '')) // Remove ""
- .map(t => {
- if (prefixObj.handler) return prefixObj.handler(t)
+ .map(t => t.slice(prefix.length)) // Keep the value filter
+ .map(t => t.replace(/^"|"$/g, '')) // Remove ""
+ .map(t => {
+ if (prefixObj.handler) return prefixObj.handler(t)
- if (prefixObj.isBoolean) {
- if (t === 'true') return true
- if (t === 'false') return false
+ if (prefixObj.isBoolean) {
+ if (t === 'true') return true
+ if (t === 'false') return false
- return undefined
- }
+ return undefined
+ }
- return t
- })
- .filter(t => t !== null && t !== undefined)
+ return t
+ })
+ .filter(t => t !== null && t !== undefined)
if (matchedTokens.length === 0) continue
@@ -144,6 +143,6 @@ export class RestService {
// Tokenize the strings using spaces that are not in quotes
return q.match(/(?:[^\s"]+|"[^"]*")+/g)
- .filter(token => !!token)
+ .filter(token => !!token)
}
}