User Summary improvements

Added "Top Links" list
Added "Most Liked By" list

Added "Bookmark count" stat

UX: Use fa heart icon instead of "like" text in stats

Change the order of the user stats

app/assets/javascripts/discourse/controllers/user-summary.js.es6

@@ -1,7 +1,7 @@
 import computed from 'ember-addons/ember-computed-decorators';
 
-// should be kept in sync with 'UserSummary::MAX_TOPICS'
-const MAX_TOPICS = 6;
+// should be kept in sync with 'UserSummary::MAX_SUMMARY_RESULTS'
+const MAX_SUMMARY_RESULTS = 6;
 // should be kept in sync with 'UserSummary::MAX_BADGES'
 const MAX_BADGES = 6;
 
@@ -10,10 +10,10 @@ export default Ember.Controller.extend({
   user: Ember.computed.alias('controllers.user.model'),
 
   @computed("model.topics.length")
-  moreTopics(topicsLength) { return topicsLength >= MAX_TOPICS; },
+  moreTopics(topicsLength) { return topicsLength >= MAX_SUMMARY_RESULTS; },
 
   @computed("model.replies.length")
-  moreReplies(repliesLength) { return repliesLength >= MAX_TOPICS; },
+  moreReplies(repliesLength) { return repliesLength >= MAX_SUMMARY_RESULTS; },
 
   @computed("model.badges.length")
   moreBadges(badgesLength) { return badgesLength >= MAX_BADGES; },

app/assets/javascripts/discourse/templates/user/summary.hbs

@@ -1,21 +1,22 @@
 <div class='top-section stats-section'>
   <h3 class='stats-title'>{{i18n "user.summary.stats"}}</h3>
   <ul>
+    <li>{{user-stat value=model.days_visited label="user.summary.days_visited"}}</li>
     <li>
       <span class='value'>{{model.time_read}}</span>
       <span class='label'>{{{i18n "user.summary.time_read"}}}</span>
     </li>
+    <li>{{user-stat value=model.posts_read_count label="user.summary.posts_read"}}</li>
+    <li>{{user-stat value=model.likes_given label="user.summary.likes_given"}}</li>
+    <li>{{user-stat value=model.bookmark_count label="user.summary.bookmark_count"}}</li>
     <li>{{user-stat value=model.topic_count label="user.summary.topic_count"}}</li>
     <li>{{user-stat value=model.post_count label="user.summary.post_count"}}</li>
     <li>{{user-stat value=model.likes_received label="user.summary.likes_received"}}</li>
-    <li>{{user-stat value=model.likes_given label="user.summary.likes_given"}}</li>
-    <li>{{user-stat value=model.days_visited label="user.summary.days_visited"}}</li>
-    <li>{{user-stat value=model.posts_read_count label="user.summary.posts_read"}}</li>
   </ul>
 </div>
 
 <div class='top-section'>
-  <div class='replies-section'>
+  <div class='replies-section pull-left'>
     <h3 class='stats-title'>{{i18n "user.summary.top_replies"}}</h3>
     {{#if model.replies.length}}
       <ul>
@@ -42,7 +43,7 @@
       <p>{{i18n "user.summary.no_replies"}}</p>
     {{/if}}
   </div>
-  <div class='topics-section'>
+  <div class='topics-section pull-right'>
     <h3 class='stats-title'>{{i18n "user.summary.top_topics"}}</h3>
     {{#if model.topics.length}}
       <ul>
@@ -71,6 +72,51 @@
   </div>
 </div>
 
+<div class='top-section'>
+  <div class='links-section pull-left'>
+    <h3 class='stats-title'>{{i18n "user.summary.top_links"}}</h3>
+    {{#if model.links.length}}
+      <ul>
+        {{#each link in model.links}}
+          <li>
+            <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=link.clicks}}'>{{link.clicks}}</span>
+            <span class='domain'>{{unbound link.domain}}</span>
+            <br>
+            <a href="{{unbound link.url}}" target="_blank" title="{{unbound link.url}}">
+              {{#if link.title}}
+                {{link.title}}
+              {{else}}
+                {{shorten-url link.url}}
+              {{/if}}
+            </a>
+          </li>
+        {{/each}}
+      </ul>
+    {{else}}
+      <p>{{i18n "user.summary.no_links"}}</p>
+    {{/if}}
+  </div>
+  <div class='likes-section pull-right'>
+    <h3 class='stats-title'>{{i18n "user.summary.most_liked_by"}}</h3>
+    {{#if model.most_liked_by_users.length}}
+      <ul>
+        {{#each user in model.most_liked_by_users}}
+          <li>
+            <span>
+              {{#user-info user=user}}
+                {{fa-icon "heart"}}
+                <span class='likes'>{{user.likes}}</span>
+              {{/user-info}}
+            </span>
+          </li>
+        {{/each}}
+      </ul>
+    {{else}}
+      <p>{{i18n "user.summary.no_likes"}}</p>
+    {{/if}}
+  </div>
+</div>
+
 <div class='top-section badges-section'>
   <h3 class='stats-title'>{{i18n "user.summary.top_badges"}}</h3>
   {{#each badge in model.badges}}

app/assets/stylesheets/common/base/user.scss

@@ -199,7 +199,9 @@
 
 .top-section,
 .replies-section,
-.topics-section {
+.topics-section,
+.links-section,
+.likes-section {
   margin-bottom: 20px;
 }
 
@@ -235,7 +237,9 @@
 }
 
 .replies-section,
-.topics-section {
+.topics-section,
+.links-section,
+.likes-section {
   width: 50%;
 
   ul {
@@ -253,12 +257,17 @@
   }
 }
 
-.replies-section {
-  float: left;
+.links-section {
+  .domain {
+    font-size: 0.714em;
+    color: dark-light-choose(scale-color($primary, $lightness: 40%), scale-color($secondary, $lightness: 40%));
+  }
 }
 
-.topics-section {
-  float: right;
+.likes-section {
+  li {
+    height: 40px;
+  }
 }
 
 @media all

app/models/user_summary.rb

@@ -2,8 +2,8 @@
 
 class UserSummary
 
+  MAX_SUMMARY_RESULTS = 6
   MAX_BADGES = 6
-  MAX_TOPICS = 6
 
   alias :read_attribute_for_serialization :send
 
@@ -20,7 +20,7 @@ class UserSummary
       .where(user: @user)
       .order('like_count DESC, created_at ASC')
       .includes(:user, :category)
-      .limit(MAX_TOPICS)
+      .limit(MAX_SUMMARY_RESULTS)
   end
 
   def replies
@@ -33,7 +33,47 @@ class UserSummary
       .where('post_number > 1')
       .where('topics.archetype <> ?', Archetype.private_message)
       .order('posts.like_count DESC, posts.created_at ASC')
-      .limit(MAX_TOPICS)
+      .limit(MAX_SUMMARY_RESULTS)
+  end
+
+  def links
+    TopicLink
+      .where(user: @user)
+      .where(internal: false)
+      .where(reflection: false)
+      .order('clicks DESC, created_at ASC')
+      .limit(MAX_SUMMARY_RESULTS)
+  end
+
+  class LikedByUser < OpenStruct
+    include ActiveModel::SerializerSupport
+  end
+
+  def most_liked_by_users
+    likers_ids = []
+    counts = []
+    UserAction.where(user: @user)
+              .where(action_type: UserAction::WAS_LIKED)
+              .group(:acting_user_id)
+              .order("COUNT(*) DESC")
+              .limit(MAX_SUMMARY_RESULTS)
+              .pluck("acting_user_id, COUNT(*)")
+              .each do |i|
+                likers_ids << i[0]
+                counts << i[1]
+              end
+
+    User.where(id: likers_ids)
+        .pluck(:id, :username, :name, :uploaded_avatar_id)
+        .map.with_index do |u, i|
+      LikedByUser.new(
+        id: u[0],
+        username: u[1],
+        name: u[2],
+        avatar_template: User.avatar_template(u[1], u[3]),
+        likes: counts[i]
+      )
+    end
   end
 
   def badges
@@ -44,6 +84,13 @@ class UserSummary
     @user.user_stat
   end
 
+  def bookmark_count
+    UserAction
+      .where(user: @user)
+      .where(action_type: UserAction::BOOKMARK)
+      .count
+  end
+
   delegate :likes_given,
            :likes_received,
            :days_visited,

app/serializers/user_summary_serializer.rb

@@ -8,9 +8,19 @@ class UserSummarySerializer < ApplicationSerializer
     has_one :topic, serializer: TopicSerializer
   end
 
+  class LinkSerializer < ApplicationSerializer
+    attributes :url, :title, :clicks, :domain
+  end
+
+  class MostLikedByUserSerializer < BasicUserSerializer
+    attributes :likes, :name
+  end
+
   has_many :topics, serializer: TopicSerializer
   has_many :replies, serializer: ReplySerializer, embed: :object
   has_many :badges, serializer: UserBadgeSerializer, embed: :object
+  has_many :links, serializer: LinkSerializer, embed: :object
+  has_many :most_liked_by_users, serializer: MostLikedByUserSerializer, embed: :object
 
   attributes :likes_given,
              :likes_received,
@@ -18,7 +28,8 @@ class UserSummarySerializer < ApplicationSerializer
              :days_visited,
              :topic_count,
              :post_count,
-             :time_read
+             :time_read,
+             :bookmark_count
 
   def include_badges?
     SiteSetting.enable_badges

config/locales/client.en.yml

@@ -742,17 +742,20 @@ en:
           one: "post created"
           other: "posts created"
         likes_given:
-          one: "like given"
-          other: "likes given"
+          one: "<i class='fa fa-heart'></i> given"
+          other: "<i class='fa fa-heart'></i> given"
         likes_received:
-          one: "like received"
-          other: "likes received"
+          one: "<i class='fa fa-heart'></i> received"
+          other: "<i class='fa fa-heart'></i> received"
         days_visited:
           one: "day visited"
           other: "days visited"
         posts_read:
           one: "post read"
           other: "posts read"
+        bookmark_count:
+          one: "bookmark"
+          other: "bookmarks"
         top_replies: "Top Replies"
         no_replies: "No replies yet."
         more_replies: "More Replies"
@@ -762,6 +765,10 @@ en:
         top_badges: "Top Badges"
         no_badges: "No badges yet."
         more_badges: "More Badges"
+        top_links: "Top Links"
+        no_links: "No links yet."
+        most_liked_by: "Most Liked By"
+        no_likes: "No likes yet."
 
 
       associated_accounts: "Logins"