diff options
Diffstat (limited to 'client/src/app/core/users')
-rw-r--r-- | client/src/app/core/users/user.model.ts | 4 | ||||
-rw-r--r-- | client/src/app/core/users/user.service.ts | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/client/src/app/core/users/user.model.ts b/client/src/app/core/users/user.model.ts index 15a4f7f82..8aaaa238d 100644 --- a/client/src/app/core/users/user.model.ts +++ b/client/src/app/core/users/user.model.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { Account } from '@app/shared/shared-main/account/account.model' | 1 | import { Account } from '@app/shared/shared-main/account/account.model' |
2 | import { hasUserRight } from '@shared/core-utils/users' | 2 | import { hasUserRight } from '@shared/core-utils/users' |
3 | import { | 3 | import { |
4 | Avatar, | 4 | ActorImage, |
5 | NSFWPolicyType, | 5 | NSFWPolicyType, |
6 | User as UserServerModel, | 6 | User as UserServerModel, |
7 | UserAdminFlag, | 7 | UserAdminFlag, |
@@ -131,7 +131,7 @@ export class User implements UserServerModel { | |||
131 | } | 131 | } |
132 | } | 132 | } |
133 | 133 | ||
134 | updateAccountAvatar (newAccountAvatar?: Avatar) { | 134 | updateAccountAvatar (newAccountAvatar?: ActorImage) { |
135 | if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar) | 135 | if (newAccountAvatar) this.account.updateAvatar(newAccountAvatar) |
136 | else this.account.resetAvatar() | 136 | else this.account.resetAvatar() |
137 | } | 137 | } |
diff --git a/client/src/app/core/users/user.service.ts b/client/src/app/core/users/user.service.ts index 33cc1f668..3de83152c 100644 --- a/client/src/app/core/users/user.service.ts +++ b/client/src/app/core/users/user.service.ts | |||
@@ -7,8 +7,7 @@ import { AuthService } from '@app/core/auth' | |||
7 | import { getBytes } from '@root-helpers/bytes' | 7 | import { getBytes } from '@root-helpers/bytes' |
8 | import { UserLocalStorageKeys } from '@root-helpers/users' | 8 | import { UserLocalStorageKeys } from '@root-helpers/users' |
9 | import { | 9 | import { |
10 | Avatar, | 10 | ActorImage, |
11 | NSFWPolicyType, | ||
12 | ResultList, | 11 | ResultList, |
13 | User as UserServerModel, | 12 | User as UserServerModel, |
14 | UserCreate, | 13 | UserCreate, |
@@ -136,7 +135,7 @@ export class UserService { | |||
136 | changeAvatar (avatarForm: FormData) { | 135 | changeAvatar (avatarForm: FormData) { |
137 | const url = UserService.BASE_USERS_URL + 'me/avatar/pick' | 136 | const url = UserService.BASE_USERS_URL + 'me/avatar/pick' |
138 | 137 | ||
139 | return this.authHttp.post<{ avatar: Avatar }>(url, avatarForm) | 138 | return this.authHttp.post<{ avatar: ActorImage }>(url, avatarForm) |
140 | .pipe(catchError(err => this.restExtractor.handleError(err))) | 139 | .pipe(catchError(err => this.restExtractor.handleError(err))) |
141 | } | 140 | } |
142 | 141 | ||