-import { BytesPipe } from 'ngx-pipes'
import { SortMeta } from 'primeng/api'
import { from, Observable, of } from 'rxjs'
import { catchError, concatMap, filter, first, map, shareReplay, throttleTime, toArray } from 'rxjs/operators'
import { HttpClient, HttpParams } from '@angular/common/http'
import { Injectable } from '@angular/core'
import { AuthService } from '@app/core/auth'
-import { I18n } from '@ngx-translate/i18n-polyfill'
+import { getBytes } from '@root-helpers/bytes'
import { UserLocalStorageKeys } from '@root-helpers/users'
import {
Avatar,
export class UserService {
static BASE_USERS_URL = environment.apiUrl + '/api/v1/users/'
- private bytesPipe = new BytesPipe()
-
private userCache: { [ id: number ]: Observable<UserServerModel> } = {}
constructor (
private restExtractor: RestExtractor,
private restService: RestService,
private localStorageService: LocalStorageService,
- private sessionStorageService: SessionStorageService,
- private i18n: I18n
- ) { }
+ private sessionStorageService: SessionStorageService
+ ) { }
changePassword (currentPassword: string, newPassword: string) {
const url = UserService.BASE_USERS_URL + 'me'
if (user.videoQuota === -1) {
videoQuota = '∞'
} else {
- videoQuota = this.bytesPipe.transform(user.videoQuota, 0)
+ videoQuota = getBytes(user.videoQuota, 0)
}
- const videoQuotaUsed = this.bytesPipe.transform(user.videoQuotaUsed, 0)
+ const videoQuotaUsed = getBytes(user.videoQuotaUsed, 0)
let videoQuotaDaily: string
let videoQuotaUsedDaily: string
if (user.videoQuotaDaily === -1) {
videoQuotaDaily = '∞'
- videoQuotaUsedDaily = this.bytesPipe.transform(0, 0) + ''
+ videoQuotaUsedDaily = getBytes(0, 0) + ''
} else {
- videoQuotaDaily = this.bytesPipe.transform(user.videoQuotaDaily, 0) + ''
- videoQuotaUsedDaily = this.bytesPipe.transform(user.videoQuotaUsedDaily || 0, 0) + ''
+ videoQuotaDaily = getBytes(user.videoQuotaDaily, 0) + ''
+ videoQuotaUsedDaily = getBytes(user.videoQuotaUsedDaily || 0, 0) + ''
}
const roleLabels: { [ id in UserRole ]: string } = {
- [UserRole.USER]: this.i18n('User'),
- [UserRole.ADMINISTRATOR]: this.i18n('Administrator'),
- [UserRole.MODERATOR]: this.i18n('Moderator')
+ [UserRole.USER]: $localize`User`,
+ [UserRole.ADMINISTRATOR]: $localize`Administrator`,
+ [UserRole.MODERATOR]: $localize`Moderator`
}
return Object.assign(user, {