From 5c308176c3e3d02e86f9fecfad8dfa0d1eff3265 Mon Sep 17 00:00:00 2001 From: lolimay Date: Mon, 25 May 2020 23:20:00 +0800 Subject: [PATCH 1/2] fix: double slashes in avatar url --- app/apps/client/RealAppsEngineUIHost.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/apps/client/RealAppsEngineUIHost.js b/app/apps/client/RealAppsEngineUIHost.js index e21a458baff19..94712776a32c0 100644 --- a/app/apps/client/RealAppsEngineUIHost.js +++ b/app/apps/client/RealAppsEngineUIHost.js @@ -15,10 +15,9 @@ export class RealAppsEngineUIHost extends AppsEngineUIHost { } getUserAvatarUrl(username) { - const avatarUrl = getUserAvatarURL(username); - + let avatarUrl = getUserAvatarURL(username); if (!avatarUrl.startsWith('http') && !avatarUrl.startsWith('data')) { - return `${ this._baseURL }${ avatarUrl }`; + avatarUrl = `${ this._baseURL.replace(/\/$/, '') }${ avatarUrl }`; } return avatarUrl; From 952079221aef9cebcde3dd97455ae6a3d3785333 Mon Sep 17 00:00:00 2001 From: lolimay Date: Tue, 26 May 2020 21:49:41 +0800 Subject: [PATCH 2/2] Use replace on this._baseURL and avoid using let --- app/apps/client/RealAppsEngineUIHost.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/apps/client/RealAppsEngineUIHost.js b/app/apps/client/RealAppsEngineUIHost.js index 94712776a32c0..29802587f9b7b 100644 --- a/app/apps/client/RealAppsEngineUIHost.js +++ b/app/apps/client/RealAppsEngineUIHost.js @@ -11,13 +11,14 @@ export class RealAppsEngineUIHost extends AppsEngineUIHost { constructor() { super(); - this._baseURL = baseURI; + this._baseURL = baseURI.replace(/\/$/, ''); } getUserAvatarUrl(username) { - let avatarUrl = getUserAvatarURL(username); + const avatarUrl = getUserAvatarURL(username); + if (!avatarUrl.startsWith('http') && !avatarUrl.startsWith('data')) { - avatarUrl = `${ this._baseURL.replace(/\/$/, '') }${ avatarUrl }`; + return `${ this._baseURL }${ avatarUrl }`; } return avatarUrl;