@@ -331,7 +331,7 @@ func (repo *Repository) innerAPIFormat(e Engine, mode AccessMode, isParent bool)
331
331
AllowRebase : allowRebase ,
332
332
AllowRebaseMerge : allowRebaseMerge ,
333
333
AllowSquash : allowSquash ,
334
- AvatarURL : repo .AvatarLink ( ),
334
+ AvatarURL : repo .avatarLink ( e ),
335
335
}
336
336
}
337
337
@@ -2524,11 +2524,7 @@ func (repo *Repository) CustomAvatarPath() string {
2524
2524
return filepath .Join (setting .RepositoryAvatarUploadPath , repo .Avatar )
2525
2525
}
2526
2526
2527
- // GenerateRandomAvatar generates a random avatar for repository.
2528
- func (repo * Repository ) GenerateRandomAvatar () error {
2529
- return repo .generateRandomAvatar (x )
2530
- }
2531
-
2527
+ // generateRandomAvatar generates a random avatar for repository.
2532
2528
func (repo * Repository ) generateRandomAvatar (e Engine ) error {
2533
2529
idToString := fmt .Sprintf ("%d" , repo .ID )
2534
2530
@@ -2581,16 +2577,19 @@ func RemoveRandomAvatars() error {
2581
2577
2582
2578
// RelAvatarLink returns a relative link to the repository's avatar.
2583
2579
func (repo * Repository ) RelAvatarLink () string {
2580
+ return repo .relAvatarLink (x )
2581
+ }
2584
2582
2583
+ func (repo * Repository ) relAvatarLink (e Engine ) string {
2585
2584
// If no avatar - path is empty
2586
2585
avatarPath := repo .CustomAvatarPath ()
2587
2586
if len (avatarPath ) <= 0 || ! com .IsFile (avatarPath ) {
2588
2587
switch mode := setting .RepositoryAvatarFallback ; mode {
2589
2588
case "image" :
2590
2589
return setting .RepositoryAvatarFallbackImage
2591
2590
case "random" :
2592
- if err := repo .GenerateRandomAvatar ( ); err != nil {
2593
- log .Error ("GenerateRandomAvatar : %v" , err )
2591
+ if err := repo .generateRandomAvatar ( e ); err != nil {
2592
+ log .Error ("generateRandomAvatar : %v" , err )
2594
2593
}
2595
2594
default :
2596
2595
// default behaviour: do not display avatar
@@ -2600,9 +2599,9 @@ func (repo *Repository) RelAvatarLink() string {
2600
2599
return setting .AppSubURL + "/repo-avatars/" + repo .Avatar
2601
2600
}
2602
2601
2603
- // AvatarLink returns user avatar absolute link.
2604
- func (repo * Repository ) AvatarLink ( ) string {
2605
- link := repo .RelAvatarLink ( )
2602
+ // avatarLink returns user avatar absolute link.
2603
+ func (repo * Repository ) avatarLink ( e Engine ) string {
2604
+ link := repo .relAvatarLink ( e )
2606
2605
// link may be empty!
2607
2606
if len (link ) > 0 {
2608
2607
if link [0 ] == '/' && link [1 ] != '/' {
0 commit comments