X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccounts.component.ts;h=bbce62c35389442c0e23aa65c4fd17d6eee1697d;hb=66357162f8e1227495f09bd4f68446aad7071c6d;hp=01911cac286892648079c6dc1a38d6f5820a5bd7;hpb=67ed6552b831df66713bac9e672738796128d33f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index 01911cac2..bbce62c35 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -1,10 +1,10 @@ import { Subscription } from 'rxjs' import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators' -import { Component, OnDestroy, OnInit } from '@angular/core' +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core' import { ActivatedRoute } from '@angular/router' import { AuthService, Notifier, RedirectService, RestExtractor, ScreenService, UserService } from '@app/core' -import { Account, AccountService, ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main' -import { I18n } from '@ngx-translate/i18n-polyfill' +import { Account, AccountService, DropdownAction, ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main' +import { AccountReportComponent } from '@app/shared/shared-moderation' import { User, UserRight } from '@shared/models' @Component({ @@ -12,6 +12,8 @@ import { User, UserRight } from '@shared/models' styleUrls: [ './accounts.component.scss' ] }) export class AccountsComponent implements OnInit, OnDestroy { + @ViewChild('accountReportModal') accountReportModal: AccountReportComponent + account: Account accountUser: User videoChannels: VideoChannel[] = [] @@ -20,6 +22,8 @@ export class AccountsComponent implements OnInit, OnDestroy { isAccountManageable = false accountFollowerTitle = '' + prependModerationActions: DropdownAction[] + private routeSub: Subscription constructor ( @@ -31,8 +35,7 @@ export class AccountsComponent implements OnInit, OnDestroy { private restExtractor: RestExtractor, private redirectService: RedirectService, private authService: AuthService, - private screenService: ScreenService, - private i18n: I18n + private screenService: ScreenService ) { } @@ -42,24 +45,7 @@ export class AccountsComponent implements OnInit, OnDestroy { map(params => params[ 'accountId' ]), distinctUntilChanged(), switchMap(accountId => this.accountService.getAccount(accountId)), - tap(account => { - this.account = account - - if (this.authService.isLoggedIn()) { - this.authService.userInformationLoaded.subscribe( - () => { - this.isAccountManageable = this.account.userId && this.account.userId === this.authService.getUser().id - - this.accountFollowerTitle = this.i18n( - '{{followers}} direct account followers', - { followers: this.subscribersDisplayFor(account.followersCount) } - ) - } - ) - } - - this.getUserIfNeeded(account) - }), + tap(account => this.onAccount(account)), switchMap(account => this.videoChannelService.listAccountVideoChannels(account)), catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])) ) @@ -70,9 +56,9 @@ export class AccountsComponent implements OnInit, OnDestroy { ) this.links = [ - { label: this.i18n('VIDEO CHANNELS'), routerLink: 'video-channels' }, - { label: this.i18n('VIDEOS'), routerLink: 'videos' }, - { label: this.i18n('ABOUT'), routerLink: 'about' } + { label: $localize`VIDEO CHANNELS`, routerLink: 'video-channels' }, + { label: $localize`VIDEOS`, routerLink: 'videos' }, + { label: $localize`ABOUT`, routerLink: 'about' } ] } @@ -100,11 +86,46 @@ export class AccountsComponent implements OnInit, OnDestroy { } activateCopiedMessage () { - this.notifier.success(this.i18n('Username copied')) + this.notifier.success($localize`Username copied`) } subscribersDisplayFor (count: number) { - return this.i18n('{count, plural, =1 {1 subscriber} other {{{count}} subscribers}}', { count }) + if (count === 1) return $localize`1 subscriber` + + return $localize`${count} subscribers` + } + + private onAccount (account: Account) { + this.prependModerationActions = undefined + + this.account = account + + if (this.authService.isLoggedIn()) { + this.authService.userInformationLoaded.subscribe( + () => { + this.isAccountManageable = this.account.userId && this.account.userId === this.authService.getUser().id + + const followers = this.subscribersDisplayFor(account.followersCount) + this.accountFollowerTitle = $localize`${followers} direct account followers` + + // It's not our account, we can report it + if (!this.isAccountManageable) { + this.prependModerationActions = [ + { + label: $localize`Report account`, + handler: () => this.showReportModal() + } + ] + } + } + ) + } + + this.getUserIfNeeded(account) + } + + private showReportModal () { + this.accountReportModal.show() } private getUserIfNeeded (account: Account) {