github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-06 04:34:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correct paths used for external service

Browse Source
This commit is contained in:
Sam 2015-09-11 13:18:07 +10:00
parent f6380c66ef
commit 90d49d1497
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/lib/avatar-template.js.es6
View File

@ -17,7 +17,7 @@ function defaultAvatar(username, letterAvatarColor) {
if (Discourse.SiteSettings.external_letter_avatars_enabled) { if (Discourse.SiteSettings.external_letter_avatars_enabled) {
const url = Discourse.SiteSettings.external_letter_avatars_url; const url = Discourse.SiteSettings.external_letter_avatars_url;
return `${url}/letter/${username[0]}?color=${letterAvatarColor}&size={size}`; return `${url}/letter/${username[0]}/${letterAvatarColor}/{size}.png`;
} else { } else {
return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${version}.png`); return Discourse.getURLWithCDN(`/letter_avatar/${username.toLowerCase()}/{size}/${version}.png`);
} }

4
app/models/user.rb
View File

@ -454,7 +454,7 @@ class User < ActiveRecord::Base
[((result << 5) - result) + char.ord].pack('L').unpack('l').first [((result << 5) - result) + char.ord].pack('L').unpack('l').first
end end
avatar_template = split_avatars[hash.abs % split_avatars.size] split_avatars[hash.abs % split_avatars.size]
end end
else else
letter_avatar_template(username) letter_avatar_template(username)
@ -471,7 +471,7 @@ class User < ActiveRecord::Base
def self.letter_avatar_template(username) def self.letter_avatar_template(username)
if SiteSetting.external_letter_avatars_enabled if SiteSetting.external_letter_avatars_enabled
color = letter_avatar_color(username) color = letter_avatar_color(username)
"#{SiteSetting.external_letter_avatars_url}/letter/#{username[0]}?color=#{color}&size={size}" "#{SiteSetting.external_letter_avatars_url}/letter/#{username[0]}/#{color}/{size}.png"
else else
"#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png"
end end