X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccounts.component.ts;h=1458ea59c40acc24fcc379bf9abfe0dec380af84;hb=6939cbac48e0a9823b34577836480ae3c28186be;hp=bf71179f32b629c33a68d5b368e38f61d6e32013;hpb=610d0be13b3d01f653ef269271dd667a57c85ef2;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index bf71179f3..1458ea59c 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -1,23 +1,22 @@ -import { Component, OnDestroy, OnInit } from '@angular/core' -import { ActivatedRoute } from '@angular/router' -import { AccountService } from '@app/shared/account/account.service' -import { Account } from '@app/shared/account/account.model' -import { RestExtractor, UserService } from '@app/shared' -import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators' import { Subscription } from 'rxjs' -import { AuthService, Notifier, RedirectService } from '@app/core' -import { User, UserRight } from '../../../../shared' -import { I18n } from '@ngx-translate/i18n-polyfill' -import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' -import { VideoChannel } from '@app/shared/video-channel/video-channel.model' -import { ListOverflowItem } from '@app/shared/misc/list-overflow.component' -import { ScreenService } from '@app/shared/misc/screen.service' +import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators' +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, DropdownAction, ListOverflowItem, VideoChannel, VideoChannelService } from '@app/shared/shared-main' +import { AccountReportComponent } from '@app/shared/shared-moderation' +import { User, UserRight } from '@shared/models' +import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes' +import { AccountSearchComponent } from './account-search/account-search.component' @Component({ templateUrl: './accounts.component.html', styleUrls: [ './accounts.component.scss' ] }) export class AccountsComponent implements OnInit, OnDestroy { + @ViewChild('accountReportModal') accountReportModal: AccountReportComponent + accountSearch: AccountSearchComponent + account: Account accountUser: User videoChannels: VideoChannel[] = [] @@ -26,6 +25,8 @@ export class AccountsComponent implements OnInit, OnDestroy { isAccountManageable = false accountFollowerTitle = '' + prependModerationActions: DropdownAction[] + private routeSub: Subscription constructor ( @@ -37,8 +38,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 ) { } @@ -48,26 +48,12 @@ 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 ])) + catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ + HttpStatusCode.BAD_REQUEST_400, + HttpStatusCode.NOT_FOUND_404 + ])) ) .subscribe( videoChannels => this.videoChannels = videoChannels.data, @@ -76,9 +62,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' } ] } @@ -106,11 +92,58 @@ 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` + } + + onOutletLoaded (component: Component) { + if (component instanceof AccountSearchComponent) { + this.accountSearch = component + } else { + this.accountSearch = undefined + } + } + + searchChanged (search: string) { + if (this.accountSearch) this.accountSearch.updateSearch(search) + } + + 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 this account`, + handler: () => this.showReportModal() + } + ] + } + } + ) + } + + this.getUserIfNeeded(account) + } + + private showReportModal () { + this.accountReportModal.show() } private getUserIfNeeded (account: Account) {