Merge pull request #134 from Sebastian-Webster/history-viewer-fails-t…

…o-load-for-posts-with-users-who-dont-have-profile-pictures fix history viewer failing to load when post creator doesn't have profile picture
Sebastian-Webster · Sep 25, 2022 · ba13ea3 · ba13ea3
2 parents 46cfee9 + b91bf5b
commit ba13ea3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/backend/models/User.js b/backend/models/User.js
@@ -7,7 +7,7 @@ const UserSchema = new Schema({
     password: String,
     followers: Array,
     following: Array,
-    profileImageKey: String,
+    profileImageKey: {type: String, default: ''},
     publicId: String,
     hideFollowing: {type: Boolean, default: false},
     hideFollowers: {type: Boolean, default: false}

diff --git a/frontend/src/routes/HistoryViewer.js b/frontend/src/routes/HistoryViewer.js
@@ -39,7 +39,7 @@ const HistoryViewer = () => {
             const {profileData, editHistory, currentPost} = result;
 
             if (currentPost.imageKey) currentPost.image = ('data:image/jpeg;base64,' + (await axios.get(`${serverUrl}/image/${currentPost.imageKey}`)).data)
-            profileData.profilePicture = profileData.profileImageKey !== '' ? ('data:image/jpeg;base64,' + (await axios.get(`${serverUrl}/image/${profileData.profileImageKey}`)).data) : defaultPfp
+            profileData.profilePicture = profileData?.profileImageKey && profileData?.profileImageKey !== '' ? ('data:image/jpeg;base64,' + (await axios.get(`${serverUrl}/image/${profileData.profileImageKey}`)).data) : defaultPfp
             setCurrentPost(currentPost)
             setEditHistory(editHistory.sort((a,b) => b.dateMade - a.dateMade))
             setProfileData(profileData)