1
0
mirror of https://gitlab.com/comunic/comunicapiv2 synced 2024-12-28 14:38:52 +00:00

Can display user account image in all cases

This commit is contained in:
Pierre HUBERT 2020-01-03 17:37:47 +01:00
parent 1ac9a927f1
commit 2453deeec3

View File

@ -76,7 +76,7 @@ export class UserController {
"publicPage": user.pageStatus == UserPageStatus.PUBLIC,
"openPage": user.pageStatus == UserPageStatus.OPEN,
"virtualDirectory": user.hasVirtualDirectory ? user.virtualDirectory : "",
"accountImage": this.GetAccountImageURL(user.accountImage, h)
"accountImage": await this.GetAccountImageURL(user.accountImage, h)
};
if(advanced) {
@ -98,22 +98,20 @@ export class UserController {
return info;
}
private static GetAccountImageURL(image : AccountImage, handler: RequestHandler) {
private static async GetAccountImageURL(image : AccountImage, handler: RequestHandler) {
if(image.level == AccountImageVisibilityLevel.EVERYONE
|| (handler.signedIn && handler.getUserId() == image.userID))
return image.url;
if(image.level == AccountImageVisibilityLevel.COMUNIC_USERS) {
if(handler.signedIn)
return image.url;
else
return AccountImage.errorURL;
if(!handler.signedIn)
return AccountImage.errorURL;
if(image.level == AccountImageVisibilityLevel.COMUNIC_USERS
|| await FriendsHelper.AreFriend(image.userID, handler.getUserId())) {
return image.url;
}
// TODO : implement frienship support
console.error("ERR: Can not check friends for now (for account image)!");
return AccountImage.errorURL;
}
}