Always display the gravatar for the primary alias

When a user has multiple aliases, previously we always displayed the
gravatar used by the email in that message. This is confusing, as we
represented the same user with different avatars for different messages.

This commit unifies this by always using the avatar for the primary
address.

Author: dutow

app/models/alias.rb

@@ -20,6 +20,10 @@ def gravatar_url(size: 80)
     "https://www.gravatar.com/avatar/#{hash}?s=#{size}&d=identicon"
   end
 
+  def display_gravatar_url(size: 80)
+    (person&.default_alias || self).gravatar_url(size: size)
+  end
+
   def contributor
     person
   end

app/views/people/show.html.slim

@@ -9,7 +9,7 @@
         .alias-list
           - additional_aliases.each do |al|
             .alias-row
-              = image_tag al.gravatar_url(size: 32), class: "alias-row-avatar", alt: al.name
+              = image_tag al.display_gravatar_url(size: 32), class: "alias-row-avatar", alt: al.name
               .alias-row-details
                 span.alias-row-name = al.name
                 span.alias-row-email = al.email

app/views/topics/_avatar_list.slim

@@ -9,6 +9,6 @@
       - css_classes << "is-past-contributor" if participant.past_contributor?
       - badge_text = participant.contributor_badge ? "#{participant.name} (#{participant.contributor_badge})" : participant.name
       = link_to person_path(participant.email), class: "participant-avatar-link" do
-        = image_tag participant.gravatar_url(size: 32), class: css_classes.join(" "), alt: participant.name, title: badge_text
+        = image_tag participant.display_gravatar_url(size: 32), class: css_classes.join(" "), alt: participant.name, title: badge_text
     - if total_participants > participants.count
       span.participants-count +#{total_participants - participants.count}

app/views/topics/_message.html.slim

@@ -22,9 +22,9 @@
         - profile_path = message.sender.person ? person_path(message.sender.email) : nil
         - if profile_path
           = link_to profile_path, class: "author-avatar-link" do
-            = image_tag message.sender.gravatar_url(size: 42), class: "message-avatar", alt: message.sender.name
+            = image_tag message.sender.display_gravatar_url(size: 42), class: "message-avatar", alt: message.sender.name
         - else
-          = image_tag message.sender.gravatar_url(size: 42), class: "message-avatar", alt: message.sender.name
+          = image_tag message.sender.display_gravatar_url(size: 42), class: "message-avatar", alt: message.sender.name
         .author-details
           - if profile_path
             .author-name = link_to message.sender.name, profile_path, class: "author-name-link"

app/views/topics/_participant_row.html.slim

@@ -21,6 +21,6 @@
 - row_classes << "is-past-contributor" if alias_record.past_contributor?
 .participant-row class=row_classes.join(" ") title=tooltip
   = link_to person_path(alias_record.email), class: "participant-avatar-link" do
-    = image_tag alias_record.gravatar_url(size: avatar_size), class: avatar_classes.join(" "), alt: alias_record.name, title: tooltip
+    = image_tag alias_record.display_gravatar_url(size: avatar_size), class: avatar_classes.join(" "), alt: alias_record.name, title: tooltip
   .participant-details
     .participant-name = link_to alias_record.name, person_path(alias_record.email), class: "participant-name-link"

app/views/topics/_topics_page.html.slim

@@ -24,7 +24,7 @@
           - css_classes << "is-past-contributor" if participant.past_contributor?
           - badge_text = participant.contributor_badge ? "#{participant.name} (#{participant.contributor_badge})" : participant.name
           = link_to person_path(participant.email), class: "participant-avatar-link" do
-            = image_tag participant.gravatar_url(size: 32), class: css_classes.join(" "), alt: participant.name, title: badge_text
+            = image_tag participant.display_gravatar_url(size: 32), class: css_classes.join(" "), alt: participant.name, title: badge_text
       - total_participants = topic.messages.select(:sender_id).distinct.count
       - if total_participants > participants.count
         span.participants-count +#{total_participants - participants.count}

app/views/topics/show.html.slim

@@ -63,7 +63,7 @@
                       .outline-avatars
                         - participants.each do |participant|
                           = link_to person_path(participant.email), class: "outline-avatar-link" do
-                            = image_tag participant.gravatar_url(size: 24), class: "outline-avatar", alt: participant.name, title: participant.name
+                            = image_tag participant.display_gravatar_url(size: 24), class: "outline-avatar", alt: participant.name, title: participant.name
                       - if is_reply
                         span.outline-icon ↳
                       span.branch-toggle = "▸"
@@ -80,7 +80,7 @@
                     .outline-content
                       .outline-meta
                         span.outline-number = "##{entry[:message_number]}"
-                        = image_tag msg.sender.gravatar_url(size: 32), class: "outline-avatar", alt: msg.sender.name
+                        = image_tag msg.sender.display_gravatar_url(size: 32), class: "outline-avatar", alt: msg.sender.name
                         - if is_reply
                           span.outline-icon ↳
                         span.outline-author = msg.sender.name
@@ -98,7 +98,7 @@
                   .outline-content
                     .outline-meta
                       span.outline-number = "##{entry[:message_number]}"
-                      = image_tag msg.sender.gravatar_url(size: 32), class: "outline-avatar", alt: msg.sender.name
+                      = image_tag msg.sender.display_gravatar_url(size: 32), class: "outline-avatar", alt: msg.sender.name
                       - if is_reply
                         span.outline-icon ↳
                       span.outline-author = msg.sender.name