X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Baccounts%2Faccounts.component.ts;h=b06ecfe0e49db6fe0c7a03fc28911c0ad4ad6b72;hb=496b02e38f272622a84ba22db412858d478ae7b0;hp=e19927d6b08b0a83204bb495f4848390f448ce42;hpb=79bd2632d62f2f600d663815fcc00a01ca981aa1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/+accounts/accounts.component.ts b/client/src/app/+accounts/accounts.component.ts index e19927d6b..b06ecfe0e 100644 --- a/client/src/app/+accounts/accounts.component.ts +++ b/client/src/app/+accounts/accounts.component.ts @@ -3,12 +3,13 @@ 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 { NotificationsService } from 'angular2-notifications' +import { catchError, distinctUntilChanged, first, map, switchMap, tap } from 'rxjs/operators' +import { forkJoin, Subscription } from 'rxjs' +import { AuthService, Notifier, RedirectService } from '@app/core' import { User, UserRight } from '../../../../shared' import { I18n } from '@ngx-translate/i18n-polyfill' -import { AuthService, RedirectService } from '@app/core' +import { VideoChannelService } from '@app/shared/video-channel/video-channel.service' +import { VideoChannel } from '@app/shared/video-channel/video-channel.model' @Component({ templateUrl: './accounts.component.html', @@ -16,7 +17,11 @@ import { AuthService, RedirectService } from '@app/core' }) export class AccountsComponent implements OnInit, OnDestroy { account: Account - user: User + accountUser: User + videoChannels: VideoChannel[] = [] + + isAccountManageable = false + accountFollowerTitle = '' private routeSub: Subscription @@ -24,7 +29,8 @@ export class AccountsComponent implements OnInit, OnDestroy { private route: ActivatedRoute, private userService: UserService, private accountService: AccountService, - private notificationsService: NotificationsService, + private videoChannelService: VideoChannelService, + private notifier: Notifier, private restExtractor: RestExtractor, private redirectService: RedirectService, private authService: AuthService, @@ -37,13 +43,25 @@ export class AccountsComponent implements OnInit, OnDestroy { map(params => params[ 'accountId' ]), distinctUntilChanged(), switchMap(accountId => this.accountService.getAccount(accountId)), - tap(account => this.getUserIfNeeded(account)), + tap(account => { + this.account = account + + 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) + }), + switchMap(account => this.videoChannelService.listAccountVideoChannels(account)), catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 404 ])) ) .subscribe( - account => this.account = account, + videoChannels => this.videoChannels = videoChannels.data, - err => this.notificationsService.error(this.i18n('Error'), err.message) + err => this.notifier.error(err.message) ) } @@ -51,6 +69,13 @@ export class AccountsComponent implements OnInit, OnDestroy { if (this.routeSub) this.routeSub.unsubscribe() } + get naiveAggregatedSubscribers () { + return this.videoChannels.reduce( + (acc, val) => acc + val.followersCount, + this.account.followersCount // accumulator starts with the base number of subscribers the account has + ) + } + onUserChanged () { this.getUserIfNeeded(this.account) } @@ -59,18 +84,27 @@ export class AccountsComponent implements OnInit, OnDestroy { this.redirectService.redirectToHomepage() } + activateCopiedMessage () { + this.notifier.success(this.i18n('Username copied')) + } + + subscribersDisplayFor (count: number) { + return this.i18n(`{count, plural, =1 {1 subscriber} other {${count} subscribers}}`, { count }) + } + private getUserIfNeeded (account: Account) { - if (!account.userId) return - if (!this.authService.isLoggedIn()) return + if (!account.userId || !this.authService.isLoggedIn()) return const user = this.authService.getUser() if (user.hasRight(UserRight.MANAGE_USERS)) { - this.userService.getUser(account.userId) - .subscribe( - user => this.user = user, + forkJoin([ + this.userService.getUser(account.userId), + this.authService.userInformationLoaded.pipe(first()) + ]).subscribe( + ([ accountUser ]) => this.accountUser = accountUser, - err => this.notificationsService.error(this.i18n('Error'), err.message) - ) + err => this.notifier.error(err.message) + ) } } }