nonshy/website
nonshy/website
1
0
Fork 0
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

Fix limited logged-out view profile picture

Browse Source
This commit is contained in:
Noah Petherbridge 2024-01-07 15:32:51 -08:00
parent 7a6b21fee5
commit 19006877a2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/user.go
View File

@ -559,7 +559,7 @@ func (u *User) VisibleAvatarURL(currentUser *User) string {
// //
// If the user has no profile photo, returns (false, PhotoPublic) which should manifest as the blue shy.png placeholder image. // If the user has no profile photo, returns (false, PhotoPublic) which should manifest as the blue shy.png placeholder image.
func (u *User) CanSeeProfilePicture(currentUser *User) (bool, PhotoVisibility) { func (u *User) CanSeeProfilePicture(currentUser *User) (bool, PhotoVisibility) {
if !u.UserRelationship.Computed { if !u.UserRelationship.Computed && currentUser != nil {
SetUserRelationships(currentUser, []*User{u}) SetUserRelationships(currentUser, []*User{u})
} }
@ -570,7 +570,7 @@ func (u *User) CanSeeProfilePicture(currentUser *User) (bool, PhotoVisibility) {
} else if visibility == PhotoFriends && !u.UserRelationship.IsFriend { } else if visibility == PhotoFriends && !u.UserRelationship.IsFriend {
// Friends only // Friends only
return false, visibility return false, visibility
} else if visibility == PhotoInnerCircle && !currentUser.IsInnerCircle() { } else if visibility == PhotoInnerCircle && currentUser != nil && !currentUser.IsInnerCircle() {
// Inner circle only // Inner circle only
return false, visibility return false, visibility
} else if u.ProfilePhoto.CroppedFilename != "" { } else if u.ProfilePhoto.CroppedFilename != "" {

4
web/templates/account/profile.html
View File

@ -8,7 +8,11 @@
<div class="columns"> <div class="columns">
<div class="column is-narrow has-text-centered"> <div class="column is-narrow has-text-centered">
<figure class="profile-photo is-inline-block"> <figure class="profile-photo is-inline-block">
{{if or (not .CurrentUser) .IsExternalView}}
<img src="{{.User.VisibleAvatarURL nil}}" data-photo-id="{{.User.ProfilePhoto.ID}}">
{{else}}
<img src="{{.User.VisibleAvatarURL .CurrentUser}}" data-photo-id="{{.User.ProfilePhoto.ID}}"> <img src="{{.User.VisibleAvatarURL .CurrentUser}}" data-photo-id="{{.User.ProfilePhoto.ID}}">
{{end}}
<!-- CurrentUser can upload a new profile pic --> <!-- CurrentUser can upload a new profile pic -->
{{if and .LoggedIn (eq .CurrentUser.ID .User.ID) (not .IsPrivate)}} {{if and .LoggedIn (eq .CurrentUser.ID .User.ID) (not .IsPrivate)}}