foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-24 13:09:23 -05:00
Code Issues Wiki Activity

Merge pull request #866 from vitalvas/dev

Browse source 
Fix in url if cache avatar is enabled
This commit is contained in:
无闻 2015-01-20 13:38:17 +08:00
commit 830bc75107
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/avatar/avatar.go
View file

@ -38,10 +38,12 @@ import (
var gravatarSource string var gravatarSource string
func init() { func UpdateGravatarSource() {
gravatarSource = setting.GravatarSource gravatarSource = setting.GravatarSource
log.Debug("avatar.UpdateGravatarSource(gavatar source): %s", gravatarSource)
if !strings.HasPrefix(gravatarSource, "http:") { if !strings.HasPrefix(gravatarSource, "http:") {
gravatarSource = "http:" + gravatarSource gravatarSource = "http:" + gravatarSource
log.Debug("avatar.UpdateGravatarSource(update gavatar source): %s", gravatarSource)
} }
} }
@ -131,11 +133,13 @@ func (this *Avatar) Encode(wr io.Writer, size int) (err error) {
// get image from gravatar.com // get image from gravatar.com
func (this *Avatar) Update() { func (this *Avatar) Update() {
UpdateGravatarSource()
thunder.Fetch(gravatarSource+this.Hash+"?"+this.reqParams, thunder.Fetch(gravatarSource+this.Hash+"?"+this.reqParams,
this.imagePath) this.imagePath)
} }
func (this *Avatar) UpdateTimeout(timeout time.Duration) (err error) { func (this *Avatar) UpdateTimeout(timeout time.Duration) (err error) {
UpdateGravatarSource()
select { select {
case <-time.After(timeout): case <-time.After(timeout):
err = fmt.Errorf("get gravatar image %s timeout", this.Hash) err = fmt.Errorf("get gravatar image %s timeout", this.Hash)