From c0d54860239311a1fb7be01f99a2e4f21f429f44 Mon Sep 17 00:00:00 2001
From: Ben Halpern <bendhalpern@gmail.com>
Date: Mon, 5 Oct 2020 10:52:12 -0400
Subject: [PATCH] [deploy] Fix current_user cache issue in comments (#10609)

---
 .../javascripts/initializers/initializeBaseUserData.js     | 7 +++++++
 app/views/comments/_form.html.erb                          | 6 +-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/initializers/initializeBaseUserData.js b/app/assets/javascripts/initializers/initializeBaseUserData.js
index bdf943fcb..b322c9f89 100644
--- a/app/assets/javascripts/initializers/initializeBaseUserData.js
+++ b/app/assets/javascripts/initializers/initializeBaseUserData.js
@@ -13,6 +13,12 @@ function initializeUserProfileContent(user) {
   document.getElementById('sidebar-profile').href = '/' + user.username;
 }
 
+function initializeProfileImage(user) {
+  if (!document.getElementById('comment-primary-user-profile--avatar')) return;
+  document.getElementById('comment-primary-user-profile--avatar').src =
+  user.profile_image_90;
+}
+
 function initializeUserSidebar(user) {
   if (!document.getElementById('sidebar-nav')) return;
   initializeUserProfileContent(user);
@@ -116,6 +122,7 @@ function initializeBaseUserData() {
 
   setCurrentUserToNavBar(user);
   initializeUserSidebar(user);
+  initializeProfileImage(user);
   addRelevantButtonsToArticle(user);
   addRelevantButtonsToComments(user);
 }
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 7753efcdc..73636a729 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -29,11 +29,7 @@
   <% end %>
 
   <span class="crayons-avatar crayons-avatar--l mr-2 shrink-0">
-    <% if user_signed_in? %>
-      <img src="<%= Images::Profile.call(current_user.profile_image_url, length: 50) %>" width="32" height="32" alt="pic" class="crayons-avatar__image">
-    <% else %>
-      <img src="<%= image_path("android-icon-128x128.png") %>" width="32" height="32" alt="pic" class="crayons-avatar__image">
-    <% end %>
+    <img src="<%= SiteConfig.logo_png %>" width="32" height="32" alt="pic" class="crayons-avatar__image" id="comment-primary-user-profile--avatar">
   </span>
   <div class="comment-form__inner">
     <div class="comment-form__field">