github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 20:46:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Use first grapheme cluster for letter avatar

Browse Source
This commit is contained in:
Gerhard Schlager 2019-04-24 23:18:52 +02:00
parent 03f9564804
commit aadb7da7d3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/user.rb
View File

@ -737,17 +737,19 @@ class User < ActiveRecord::Base
end
def self.system_avatar_template(username)
normalized_username = normalize_username(username)
# TODO it may be worth caching this in a distributed cache, should be benched
if SiteSetting.external_system_avatars_enabled
url = SiteSetting.external_system_avatars_url.dup
url = "#{Discourse::base_uri}#{url}" unless url =~ /^https?:\/\//
url.gsub! "{color}", letter_avatar_color(username.downcase)
url.gsub! "{color}", letter_avatar_color(normalized_username)
url.gsub! "{username}", username
url.gsub! "{first_letter}", username[0].downcase
url.gsub! "{first_letter}", normalized_username.grapheme_clusters.first
url.gsub! "{hostname}", Discourse.current_hostname
url
else
"#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png"
"#{Discourse.base_uri}/letter_avatar/#{normalized_username}/{size}/#{LetterAvatar.version}.png"
end
end