rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: userAvatar external image issues

Browse source
This commit is contained in:
swve 2025-02-24 18:52:21 +01:00
parent 77bc14d842
commit f8974da088
1 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

48
apps/web/components/Objects/UserAvatar.tsx
View file

@ -18,40 +18,50 @@ function UserAvatar(props: UserAvatarProps) {
const session = useLHSession() as any const session = useLHSession() as any
const params = useParams() as any const params = useParams() as any
const isValidUrl = (url: string): boolean => { const isExternalUrl = (url: string): boolean => {
try { return url.startsWith('http://') || url.startsWith('https://')
new URL(url) }
return true
} catch { const extractExternalUrl = (url: string): string | null => {
return false // Check if the URL contains an embedded external URL
const matches = url.match(/avatars\/(https?:\/\/[^/]+.*$)/)
if (matches && matches[1]) {
return matches[1]
} }
return null
} }
const getAvatarUrl = (): string => { const getAvatarUrl = (): string => {
// If avatar_url prop is provided and is a valid URL, use it directly
if (props.avatar_url && isValidUrl(props.avatar_url)) {
return props.avatar_url
}
// If user has an avatar in session and it's a valid URL, use it directly
if (session?.data?.user?.avatar_image && isValidUrl(session.data.user.avatar_image)) {
return session.data.user.avatar_image
}
// If predefined avatar is specified // If predefined avatar is specified
if (props.predefined_avatar) { if (props.predefined_avatar) {
const avatarType = props.predefined_avatar === 'ai' ? 'ai_avatar.png' : 'empty_avatar.png' const avatarType = props.predefined_avatar === 'ai' ? 'ai_avatar.png' : 'empty_avatar.png'
return getUriWithOrg(params.orgslug, `/${avatarType}`) return getUriWithOrg(params.orgslug, `/${avatarType}`)
} }
// If avatar_url prop is provided but not a URL, process it // If avatar_url prop is provided
if (props.avatar_url) { if (props.avatar_url) {
// Check if it's a malformed URL (external URL processed through getUserAvatarMediaDirectory)
const extractedUrl = extractExternalUrl(props.avatar_url)
if (extractedUrl) {
return extractedUrl
}
// If it's a direct external URL
if (isExternalUrl(props.avatar_url)) {
return props.avatar_url
}
// Otherwise use as is
return props.avatar_url return props.avatar_url
} }
// If user has an avatar in session but not a URL, process it // If user has an avatar in session
if (session?.data?.user?.avatar_image) { if (session?.data?.user?.avatar_image) {
return getUserAvatarMediaDirectory(session.data.user.user_uuid, session.data.user.avatar_image) const avatarUrl = session.data.user.avatar_image
// If it's an external URL (e.g., from Google, Facebook, etc.), use it directly
if (isExternalUrl(avatarUrl)) {
return avatarUrl
}
// Otherwise, get the local avatar URL
return getUserAvatarMediaDirectory(session.data.user.user_uuid, avatarUrl)
} }
// Fallback to empty avatar // Fallback to empty avatar