@@ -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
@@ -2528,11 +2528,7 @@ func (repo *Repository) CustomAvatarPath() string {
2528
2528
return filepath .Join (setting .RepositoryAvatarUploadPath , repo .Avatar )
2529
2529
}
2530
2530
2531
- // GenerateRandomAvatar generates a random avatar for repository.
2532
- func (repo * Repository ) GenerateRandomAvatar () error {
2533
- return repo .generateRandomAvatar (x )
2534
- }
2535
-
2531
+ // generateRandomAvatar generates a random avatar for repository.
2536
2532
func (repo * Repository ) generateRandomAvatar (e Engine ) error {
2537
2533
idToString := fmt .Sprintf ("%d" , repo .ID )
2538
2534
@@ -2585,16 +2581,19 @@ func RemoveRandomAvatars() error {
2585
2581
2586
2582
// RelAvatarLink returns a relative link to the repository's avatar.
2587
2583
func (repo * Repository ) RelAvatarLink () string {
2584
+ return repo .relAvatarLink (x )
2585
+ }
2588
2586
2587
+ func (repo * Repository ) relAvatarLink (e Engine ) string {
2589
2588
// If no avatar - path is empty
2590
2589
avatarPath := repo .CustomAvatarPath ()
2591
2590
if len (avatarPath ) <= 0 || ! com .IsFile (avatarPath ) {
2592
2591
switch mode := setting .RepositoryAvatarFallback ; mode {
2593
2592
case "image" :
2594
2593
return setting .RepositoryAvatarFallbackImage
2595
2594
case "random" :
2596
- if err := repo .GenerateRandomAvatar ( ); err != nil {
2597
- log .Error ("GenerateRandomAvatar : %v" , err )
2595
+ if err := repo .generateRandomAvatar ( e ); err != nil {
2596
+ log .Error ("generateRandomAvatar : %v" , err )
2598
2597
}
2599
2598
default :
2600
2599
// default behaviour: do not display avatar
@@ -2604,9 +2603,9 @@ func (repo *Repository) RelAvatarLink() string {
2604
2603
return setting .AppSubURL + "/repo-avatars/" + repo .Avatar
2605
2604
}
2606
2605
2607
- // AvatarLink returns user avatar absolute link.
2608
- func (repo * Repository ) AvatarLink ( ) string {
2609
- link := repo .RelAvatarLink ( )
2606
+ // avatarLink returns user avatar absolute link.
2607
+ func (repo * Repository ) avatarLink ( e Engine ) string {
2608
+ link := repo .relAvatarLink ( e )
2610
2609
// link may be empty!
2611
2610
if len (link ) > 0 {
2612
2611
if link [0 ] == '/' && link [1 ] != '/' {
0 commit comments