From c8bc9bd5db92d3efc106a7ad848407f835065fa5 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Wed, 29 Jan 2014 12:17:58 -0500
Subject: [PATCH] Show discourse logo as system user avatar
---
app/models/user.rb | 2 +-
app/serializers/user_action_serializer.rb | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index fad8ffd587d..1be31a90c15 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -340,7 +340,7 @@ class User < ActiveRecord::Base
end
def avatar_template
- uploaded_avatar_path || User.gravatar_template(email)
+ uploaded_avatar_path || User.gravatar_template(id != -1 ? email : "team@discourse.org")
end
# The following count methods are somewhat slow - definitely don't use them in a loop.
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index e2a1d9be473..4e7629e4a82 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -30,6 +30,7 @@ class UserActionSerializer < ApplicationSerializer
def avatar_template
avatar_for(
+ object.user_id,
object.email,
object.use_uploaded_avatar,
object.uploaded_avatar_template,
@@ -39,6 +40,7 @@ class UserActionSerializer < ApplicationSerializer
def acting_avatar_template
avatar_for(
+ object.acting_user_id,
object.acting_email,
object.acting_use_uploaded_avatar,
object.acting_uploaded_avatar_template,
@@ -72,9 +74,10 @@ class UserActionSerializer < ApplicationSerializer
private
- def avatar_for(email, use_uploaded_avatar, uploaded_avatar_template, uploaded_avatar_id)
+ def avatar_for(user_id, email, use_uploaded_avatar, uploaded_avatar_template, uploaded_avatar_id)
# NOTE: id is required for cases where the template is blank (during initial population)
User.new(
+ id: user_id,
email: email,
use_uploaded_avatar: use_uploaded_avatar,
uploaded_avatar_template: uploaded_avatar_template,