Implement two factor in client

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-moderation / abuse.service.ts

diff --git a/client/src/app/shared/shared-moderation/abuse.service.ts b/client/src/app/shared/shared-moderation/abuse.service.ts
index 06b236d1e6a542c3de1e6d8957ec1eebdf41efbc..5d1539f69dfbd5b3223609e8c7e7017956d0e001 100644 (file)
--- a/client/src/app/shared/shared-moderation/abuse.service.ts
+++ b/client/src/app/shared/shared-moderation/abuse.service.ts
@@ -1,11 +1,10 @@
 import { omit } from 'lodash-es'
 import { SortMeta } from 'primeng/api'
 import { Observable } from 'rxjs'
-import { catchError, map } from 'rxjs/operators'
+import { catchError } from 'rxjs/operators'
 import { HttpClient, HttpParams } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { RestExtractor, RestPagination, RestService } from '@app/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
 import {
   AbuseCreate,
   AbuseFilter,
@@ -25,15 +24,14 @@ export class AbuseService {
   private static BASE_MY_ABUSE_URL = environment.apiUrl + '/api/v1/users/me/abuses'
 
   constructor (
-    private i18n: I18n,
     private authHttp: HttpClient,
     private restService: RestService,
     private restExtractor: RestExtractor
   ) { }
 
   getAdminAbuses (options: {
-    pagination: RestPagination,
-    sort: SortMeta,
+    pagination: RestPagination
+    sort: SortMeta
     search?: string
   }): Observable<ResultList<AdminAbuse>> {
     const { pagination, sort, search } = options
@@ -53,8 +51,8 @@ export class AbuseService {
   }
 
   getUserAbuses (options: {
-    pagination: RestPagination,
-    sort: SortMeta,
+    pagination: RestPagination
+    sort: SortMeta
     search?: string
   }): Observable<ResultList<UserAbuse>> {
     const { pagination, sort, search } = options
@@ -76,43 +74,31 @@ export class AbuseService {
   reportVideo (parameters: AbuseCreate) {
     const url = AbuseService.BASE_ABUSE_URL
 
-    const body = omit(parameters, ['id'])
+    const body = omit(parameters, [ 'id' ])
 
     return this.authHttp.post(url, body)
-      .pipe(
-        map(this.restExtractor.extractDataBool),
-        catchError(res => this.restExtractor.handleError(res))
-      )
+      .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
   updateAbuse (abuse: AdminAbuse, abuseUpdate: AbuseUpdate) {
     const url = AbuseService.BASE_ABUSE_URL + '/' + abuse.id
 
     return this.authHttp.put(url, abuseUpdate)
-      .pipe(
-        map(this.restExtractor.extractDataBool),
-        catchError(res => this.restExtractor.handleError(res))
-      )
+      .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
   removeAbuse (abuse: AdminAbuse) {
     const url = AbuseService.BASE_ABUSE_URL + '/' + abuse.id
 
     return this.authHttp.delete(url)
-      .pipe(
-        map(this.restExtractor.extractDataBool),
-        catchError(res => this.restExtractor.handleError(res))
-      )
+      .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
   addAbuseMessage (abuse: UserAbuse, message: string) {
     const url = AbuseService.BASE_ABUSE_URL + '/' + abuse.id + '/messages'
 
     return this.authHttp.post(url, { message })
-    .pipe(
-      map(this.restExtractor.extractDataBool),
-      catchError(res => this.restExtractor.handleError(res))
-    )
+    .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
   listAbuseMessages (abuse: UserAbuse) {
@@ -128,43 +114,43 @@ export class AbuseService {
     const url = AbuseService.BASE_ABUSE_URL + '/' + abuse.id + '/messages/' + abuseMessage.id
 
     return this.authHttp.delete(url)
-    .pipe(
-      map(this.restExtractor.extractDataBool),
-      catchError(res => this.restExtractor.handleError(res))
-    )
+    .pipe(catchError(res => this.restExtractor.handleError(res)))
   }
 
   getPrefefinedReasons (type: AbuseFilter) {
     let reasons: { id: AbusePredefinedReasonsString, label: string, description?: string, help?: string }[] = [
       {
         id: 'violentOrRepulsive',
-        label: this.i18n('Violent or repulsive'),
-        help: this.i18n('Contains offensive, violent, or coarse language or iconography.')
+        label: $localize`Violent or repulsive`,
+        help: $localize`Contains offensive, violent, or coarse language or iconography.`
       },
       {
         id: 'hatefulOrAbusive',
-        label: this.i18n('Hateful or abusive'),
-        help: this.i18n('Contains abusive, racist or sexist language or iconography.')
+        label: $localize`Hateful or abusive`,
+        help: $localize`Contains abusive, racist or sexist language or iconography.`
       },
       {
         id: 'spamOrMisleading',
-        label: this.i18n('Spam, ad or false news'),
-        help: this.i18n('Contains marketing, spam, purposefully deceitful news, or otherwise misleading thumbnail/text/tags. Please provide reputable sources to report hoaxes.')
+        label: $localize`Spam, ad or false news`,
+        // eslint-disable-next-line max-len
+        help: $localize`Contains marketing, spam, purposefully deceitful news, or otherwise misleading thumbnail/text/tags. Please provide reputable sources to report hoaxes.`
       },
       {
         id: 'privacy',
-        label: this.i18n('Privacy breach or doxxing'),
-        help: this.i18n('Contains personal information that could be used to track, identify, contact or impersonate someone (e.g. name, address, phone number, email, or credit card details).')
+        label: $localize`Privacy breach or doxxing`,
+        // eslint-disable-next-line max-len
+        help: $localize`Contains personal information that could be used to track, identify, contact or impersonate someone (e.g. name, address, phone number, email, or credit card details).`
       },
       {
         id: 'rights',
-        label: this.i18n('Copyright'),
-        help: this.i18n('Infringes your copyright wrt. the regional laws with which the server must comply.')
+        label: $localize`Copyright`,
+        help: $localize`Infringes your copyright wrt. the regional laws with which the server must comply.`
       },
       {
         id: 'serverRules',
-        label: this.i18n('Breaks server rules'),
-        description: this.i18n('Anything not included in the above that breaks the terms of service, code of conduct, or general rules in place on the server.')
+        label: $localize`Breaks server rules`,
+        // eslint-disable-next-line max-len
+        description: $localize`Anything not included in the above that breaks the terms of service, code of conduct, or general rules in place on the server.`
       }
     ]
 
@@ -172,13 +158,13 @@ export class AbuseService {
       reasons = reasons.concat([
         {
           id: 'thumbnails',
-          label: this.i18n('Thumbnails'),
-          help: this.i18n('The above can only be seen in thumbnails.')
+          label: $localize`Thumbnails`,
+          help: $localize`The above can only be seen in thumbnails.`
         },
         {
           id: 'captions',
-          label: this.i18n('Captions'),
-          help: this.i18n('The above can only be seen in captions (please describe which).')
+          label: $localize`Captions`,
+          help: $localize`The above can only be seen in captions (please describe which).`
         }
       ])
     }