Merge pull request #1337 from ZogStriP/avatar-work

Avatar work

app/models/user.rb

@@ -297,13 +297,6 @@ class User < ActiveRecord::Base
     end
   end
 
-  def self.avatar_template(email)
-    user = User.select([:email, :use_uploaded_avatar, :uploaded_avatar_template, :uploaded_avatar_id])
-               .where(email: Email.downcase(email))
-               .first
-    user.avatar_template if user.present?
-  end
-
   def self.gravatar_template(email)
     email_hash = self.email_hash(email)
     "//www.gravatar.com/avatar/#{email_hash}.png?s={size}&r=pg&d=identicon"
@@ -314,7 +307,7 @@ class User < ActiveRecord::Base
   #   - self oneboxes in open graph data
   #   - emails
   def small_avatar_url
-    template = User.avatar_template(email)
+    template = avatar_template
     template.gsub("{size}", "60")
   end
 

lib/oneboxer/discourse_local_onebox.rb

@@ -57,10 +57,12 @@ module Oneboxer
           post = topic.posts.first
 
           posters = topic.posters_summary.map do |p|
-            {username: p[:user][:username],
-             avatar: PrettyText.avatar_img(p[:user][:avatar_template], 'tiny'),
-             description: p[:description],
-             extras: p[:extras]}
+            {
+              username: p[:user].username,
+              avatar: PrettyText.avatar_img(p[:user].avatar_template, 'tiny'),
+              description: p[:description],
+              extras: p[:extras]
+            }
           end
 
           category = topic.category
@@ -70,7 +72,7 @@ module Oneboxer
 
           quote = post.excerpt(SiteSetting.post_onebox_maxlength)
           args.merge! title: topic.title,
-                      avatar: PrettyText.avatar_img(topic.user.username, 'tiny'),
+                      avatar: PrettyText.avatar_img(topic.user.avatar_template, 'tiny'),
                       posts_count: topic.posts_count,
                       last_post: FreedomPatches::Rails4.time_ago_in_words(topic.last_posted_at, false, scope: :'datetime.distance_in_words_verbose'),
                       age: FreedomPatches::Rails4.time_ago_in_words(topic.created_at, false, scope: :'datetime.distance_in_words_verbose'),

lib/oneboxer/templates/discourse_topic_onebox.hbrs

@@ -1,23 +1,20 @@
 <aside class='quote' data-post="1" data-topic="{{topic}}">
   <div class='title'>
     <div class='quote-controls'></div>
-  {{{avatar}}}
-    <a href="{{original_url}}">{{title}}</a> {{{category}}} </div>
-  <blockquote>{{{quote}}}
-  <div class='topic-info'>
-  <div class='info-line'>
-  {{posts_count}} posts, last post {{last_post}}, created {{age}}, {{views}} views
-  </div>
-  <div class='posters'>
-  {{#posters}}
     {{{avatar}}}
-  {{/posters}}
-  </div>
-  <div class='clearfix'>
-  </div>
+    <a href="{{original_url}}">{{title}}</a> {{{category}}}
   </div>
+  <blockquote>{{{quote}}}
+    <div class='topic-info'>
+      <div class='info-line'>
+        {{posts_count}} posts, last post {{last_post}}, created {{age}}, {{views}} views
+      </div>
+      <div class='posters'>
+        {{#posters}}
+          {{{avatar}}}
+        {{/posters}}
+      </div>
+      <div class='clearfix'></div>
+    </div>
   </blockquote>
 </aside>
-
-    
-

lib/search/search_result.rb

@@ -32,7 +32,7 @@ class Search
 
     def self.from_user(u)
       SearchResult.new(type: :user, id: u.username_lower, title: u.username, url: "/users/#{u.username_lower}").tap do |r|
-        r.avatar_template = User.avatar_template(u.email)
+        r.avatar_template = u.avatar_template
       end
     end
 
@@ -43,7 +43,7 @@ class Search
     def self.from_post(p)
       if p.post_number == 1
         # we want the topic link when it's the OP
-        SearchResult.from_topic(p.topic) 
+        SearchResult.from_topic(p.topic)
       else
         SearchResult.new(type: :topic, id: p.topic.id, title: p.topic.title, url: p.url)
       end