diff options
Diffstat (limited to 'client/src/app/shared/shared-moderation/report-modals')
3 files changed, 9 insertions, 9 deletions
diff --git a/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts index 8ab2fe940..cc8875f77 100644 --- a/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts +++ b/client/src/app/shared/shared-moderation/report-modals/account-report.component.ts | |||
@@ -1,7 +1,8 @@ | |||
1 | import { mapValues, pickBy } from 'lodash-es' | 1 | import { mapValues, pickBy } from 'lodash-es' |
2 | import { Component, Input, OnInit, ViewChild } from '@angular/core' | 2 | import { Component, Input, OnInit, ViewChild } from '@angular/core' |
3 | import { Notifier } from '@app/core' | 3 | import { Notifier } from '@app/core' |
4 | import { AbuseValidatorsService, FormReactive, FormValidatorService } from '@app/shared/shared-forms' | 4 | import { ABUSE_REASON_VALIDATOR } from '@app/shared/form-validators/abuse-validators' |
5 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' | ||
5 | import { Account } from '@app/shared/shared-main' | 6 | import { Account } from '@app/shared/shared-main' |
6 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' | 7 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' |
7 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' | 8 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' |
@@ -28,7 +29,6 @@ export class AccountReportComponent extends FormReactive implements OnInit { | |||
28 | constructor ( | 29 | constructor ( |
29 | protected formValidatorService: FormValidatorService, | 30 | protected formValidatorService: FormValidatorService, |
30 | private modalService: NgbModal, | 31 | private modalService: NgbModal, |
31 | private abuseValidatorsService: AbuseValidatorsService, | ||
32 | private abuseService: AbuseService, | 32 | private abuseService: AbuseService, |
33 | private notifier: Notifier | 33 | private notifier: Notifier |
34 | ) { | 34 | ) { |
@@ -51,7 +51,7 @@ export class AccountReportComponent extends FormReactive implements OnInit { | |||
51 | this.modalTitle = $localize`Report ${this.account.displayName}` | 51 | this.modalTitle = $localize`Report ${this.account.displayName}` |
52 | 52 | ||
53 | this.buildForm({ | 53 | this.buildForm({ |
54 | reason: this.abuseValidatorsService.ABUSE_REASON, | 54 | reason: ABUSE_REASON_VALIDATOR, |
55 | predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null) | 55 | predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null) |
56 | }) | 56 | }) |
57 | 57 | ||
diff --git a/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts index d75f4d717..c7395c7b7 100644 --- a/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts +++ b/client/src/app/shared/shared-moderation/report-modals/comment-report.component.ts | |||
@@ -1,7 +1,8 @@ | |||
1 | import { mapValues, pickBy } from 'lodash-es' | 1 | import { mapValues, pickBy } from 'lodash-es' |
2 | import { Component, Input, OnInit, ViewChild } from '@angular/core' | 2 | import { Component, Input, OnInit, ViewChild } from '@angular/core' |
3 | import { Notifier } from '@app/core' | 3 | import { Notifier } from '@app/core' |
4 | import { AbuseValidatorsService, FormReactive, FormValidatorService } from '@app/shared/shared-forms' | 4 | import { ABUSE_REASON_VALIDATOR } from '@app/shared/form-validators/abuse-validators' |
5 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' | ||
5 | import { VideoComment } from '@app/shared/shared-video-comment' | 6 | import { VideoComment } from '@app/shared/shared-video-comment' |
6 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' | 7 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' |
7 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' | 8 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' |
@@ -28,7 +29,6 @@ export class CommentReportComponent extends FormReactive implements OnInit { | |||
28 | constructor ( | 29 | constructor ( |
29 | protected formValidatorService: FormValidatorService, | 30 | protected formValidatorService: FormValidatorService, |
30 | private modalService: NgbModal, | 31 | private modalService: NgbModal, |
31 | private abuseValidatorsService: AbuseValidatorsService, | ||
32 | private abuseService: AbuseService, | 32 | private abuseService: AbuseService, |
33 | private notifier: Notifier | 33 | private notifier: Notifier |
34 | ) { | 34 | ) { |
@@ -51,7 +51,7 @@ export class CommentReportComponent extends FormReactive implements OnInit { | |||
51 | this.modalTitle = $localize`Report comment` | 51 | this.modalTitle = $localize`Report comment` |
52 | 52 | ||
53 | this.buildForm({ | 53 | this.buildForm({ |
54 | reason: this.abuseValidatorsService.ABUSE_REASON, | 54 | reason: ABUSE_REASON_VALIDATOR, |
55 | predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null) | 55 | predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null) |
56 | }) | 56 | }) |
57 | 57 | ||
diff --git a/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts b/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts index edff6d325..5b06c0bc7 100644 --- a/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts +++ b/client/src/app/shared/shared-moderation/report-modals/video-report.component.ts | |||
@@ -3,7 +3,8 @@ import { buildVideoLink, buildVideoOrPlaylistEmbed } from 'src/assets/player/uti | |||
3 | import { Component, Input, OnInit, ViewChild } from '@angular/core' | 3 | import { Component, Input, OnInit, ViewChild } from '@angular/core' |
4 | import { DomSanitizer, SafeHtml } from '@angular/platform-browser' | 4 | import { DomSanitizer, SafeHtml } from '@angular/platform-browser' |
5 | import { Notifier } from '@app/core' | 5 | import { Notifier } from '@app/core' |
6 | import { AbuseValidatorsService, FormReactive, FormValidatorService } from '@app/shared/shared-forms' | 6 | import { ABUSE_REASON_VALIDATOR } from '@app/shared/form-validators/abuse-validators' |
7 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' | ||
7 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' | 8 | import { NgbModal } from '@ng-bootstrap/ng-bootstrap' |
8 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' | 9 | import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' |
9 | import { abusePredefinedReasonsMap } from '@shared/core-utils/abuse' | 10 | import { abusePredefinedReasonsMap } from '@shared/core-utils/abuse' |
@@ -30,7 +31,6 @@ export class VideoReportComponent extends FormReactive implements OnInit { | |||
30 | constructor ( | 31 | constructor ( |
31 | protected formValidatorService: FormValidatorService, | 32 | protected formValidatorService: FormValidatorService, |
32 | private modalService: NgbModal, | 33 | private modalService: NgbModal, |
33 | private abuseValidatorsService: AbuseValidatorsService, | ||
34 | private abuseService: AbuseService, | 34 | private abuseService: AbuseService, |
35 | private notifier: Notifier, | 35 | private notifier: Notifier, |
36 | private sanitizer: DomSanitizer | 36 | private sanitizer: DomSanitizer |
@@ -68,7 +68,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { | |||
68 | 68 | ||
69 | ngOnInit () { | 69 | ngOnInit () { |
70 | this.buildForm({ | 70 | this.buildForm({ |
71 | reason: this.abuseValidatorsService.ABUSE_REASON, | 71 | reason: ABUSE_REASON_VALIDATOR, |
72 | predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null), | 72 | predefinedReasons: mapValues(abusePredefinedReasonsMap, r => null), |
73 | timestamp: { | 73 | timestamp: { |
74 | hasStart: null, | 74 | hasStart: null, |