diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-02 20:50:42 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-10 21:12:05 +0200 |
commit | 5baee5fca418487e72ddcd6419d31bca8659b668 (patch) | |
tree | 6604cc16d42152f4929d888565d2d435e2480d47 /client/src/app/shared/video-blacklist/video-blacklist.service.ts | |
parent | d840487fed32b4604b02030c0d7464afa925904f (diff) | |
download | PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.gz PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.zst PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.zip |
rename blacklist to block/blocklist, merge block and auto-block views
- also replace whitelist with allowlist
- add advanced filters for video-block-list view
- move icons in video-block-list and video-abuse-list to left side
for visibility
- add robot icon to depict automated nature of a block in
video-block-list
resolves #2790
Diffstat (limited to 'client/src/app/shared/video-blacklist/video-blacklist.service.ts')
-rw-r--r-- | client/src/app/shared/video-blacklist/video-blacklist.service.ts | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts deleted file mode 100644 index c0e13a651..000000000 --- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | import { catchError, map, concatMap, toArray } from 'rxjs/operators' | ||
2 | import { HttpClient, HttpParams } from '@angular/common/http' | ||
3 | import { Injectable } from '@angular/core' | ||
4 | import { SortMeta } from 'primeng/api' | ||
5 | import { from as observableFrom, Observable } from 'rxjs' | ||
6 | import { VideoBlacklist, VideoBlacklistType, ResultList } from '../../../../../shared' | ||
7 | import { Video } from '../video/video.model' | ||
8 | import { environment } from '../../../environments/environment' | ||
9 | import { RestExtractor, RestPagination, RestService } from '../rest' | ||
10 | import { ComponentPaginationLight } from '../rest/component-pagination.model' | ||
11 | |||
12 | @Injectable() | ||
13 | export class VideoBlacklistService { | ||
14 | private static BASE_VIDEOS_URL = environment.apiUrl + '/api/v1/videos/' | ||
15 | |||
16 | constructor ( | ||
17 | private authHttp: HttpClient, | ||
18 | private restService: RestService, | ||
19 | private restExtractor: RestExtractor | ||
20 | ) {} | ||
21 | |||
22 | listBlacklist (options: { | ||
23 | pagination: RestPagination, | ||
24 | sort: SortMeta, | ||
25 | search?: string | ||
26 | type?: VideoBlacklistType | ||
27 | }): Observable<ResultList<VideoBlacklist>> { | ||
28 | const { pagination, sort, search, type } = options | ||
29 | |||
30 | let params = new HttpParams() | ||
31 | params = this.restService.addRestGetParams(params, pagination, sort) | ||
32 | |||
33 | if (search) params = params.append('search', search) | ||
34 | if (type) params = params.append('type', type.toString()) | ||
35 | |||
36 | return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params }) | ||
37 | .pipe( | ||
38 | map(res => this.restExtractor.convertResultListDateToHuman(res)), | ||
39 | catchError(res => this.restExtractor.handleError(res)) | ||
40 | ) | ||
41 | } | ||
42 | |||
43 | getAutoBlacklistedAsVideoList (videoPagination: ComponentPaginationLight): Observable<ResultList<Video>> { | ||
44 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | ||
45 | |||
46 | // prioritize first created since waiting longest | ||
47 | const AUTO_BLACKLIST_SORT = 'createdAt' | ||
48 | |||
49 | let params = new HttpParams() | ||
50 | params = this.restService.addRestGetParams(params, pagination, AUTO_BLACKLIST_SORT) | ||
51 | |||
52 | params = params.set('type', VideoBlacklistType.AUTO_BEFORE_PUBLISHED.toString()) | ||
53 | |||
54 | return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params }) | ||
55 | .pipe( | ||
56 | map(res => { | ||
57 | return { | ||
58 | total: res.total, | ||
59 | data: res.data.map(videoBlacklist => new Video(videoBlacklist.video)) | ||
60 | } | ||
61 | }), | ||
62 | catchError(res => this.restExtractor.handleError(res)) | ||
63 | ) | ||
64 | } | ||
65 | |||
66 | removeVideoFromBlacklist (videoIdArgs: number | number[]) { | ||
67 | const videoIds = Array.isArray(videoIdArgs) ? videoIdArgs : [ videoIdArgs ] | ||
68 | |||
69 | return observableFrom(videoIds) | ||
70 | .pipe( | ||
71 | concatMap(id => this.authHttp.delete(VideoBlacklistService.BASE_VIDEOS_URL + id + '/blacklist')), | ||
72 | toArray(), | ||
73 | catchError(err => this.restExtractor.handleError(err)) | ||
74 | ) | ||
75 | } | ||
76 | |||
77 | blacklistVideo (videoId: number, reason: string, unfederate: boolean) { | ||
78 | const body = { | ||
79 | unfederate, | ||
80 | reason | ||
81 | } | ||
82 | |||
83 | return this.authHttp.post(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist', body) | ||
84 | .pipe( | ||
85 | map(this.restExtractor.extractDataBool), | ||
86 | catchError(res => this.restExtractor.handleError(res)) | ||
87 | ) | ||
88 | } | ||
89 | } | ||