From c655eddddec63a60b29e68165959fb7055f85204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javi=20Mart=C3=ADn?= <javim@elretirao.net>
Date: Thu, 11 Apr 2024 17:15:41 +0200
Subject: [PATCH] Extract method to render special avatars in comments

---
 app/components/comments/avatar_component.html.erb | 6 +++---
 app/components/comments/avatar_component.rb       | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/components/comments/avatar_component.html.erb b/app/components/comments/avatar_component.html.erb
index 432e3a33e..dc59e90b4 100644
--- a/app/components/comments/avatar_component.html.erb
+++ b/app/components/comments/avatar_component.html.erb
@@ -1,12 +1,12 @@
 <span class="comment-avatar">
   <% if comment.as_administrator? %>
-    <%= image_tag("avatar_admin.png", size: 32, class: "admin-avatar", alt: "") %>
+    <%= special_avatar("avatar_admin.png", class: "admin-avatar") %>
   <% elsif comment.as_moderator? %>
-    <%= image_tag("avatar_moderator.png", size: 32, class: "moderator-avatar", alt: "") %>
+    <%= special_avatar("avatar_moderator.png", class: "moderator-avatar") %>
   <% elsif comment.user.hidden? || comment.user.erased? %>
     <span class="icon-deleted user-deleted"></span>
   <% elsif comment.user.organization? %>
-    <%= image_tag("avatar_collective.png", size: 32, class: "avatar", alt: "") %>
+    <%= special_avatar("avatar_collective.png", class: "avatar") %>
   <% else %>
     <%= render Shared::AvatarComponent.new(comment.user, size: 32) %>
   <% end %>
diff --git a/app/components/comments/avatar_component.rb b/app/components/comments/avatar_component.rb
index d39fd9f2b..2fd691bf7 100644
--- a/app/components/comments/avatar_component.rb
+++ b/app/components/comments/avatar_component.rb
@@ -4,4 +4,10 @@ class Comments::AvatarComponent < ApplicationComponent
   def initialize(comment)
     @comment = comment
   end
+
+  private
+
+    def special_avatar(image_name, options = {})
+      image_tag(image_name, { size: 32, alt: "" }.merge(options))
+    end
 end