Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/app/components/room-avatar/RoomAvatar.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { JoinRule } from '$types/matrix-sdk';
import { AvatarFallback, Icon, Icons, color } from 'folds';
import { ComponentProps, ReactNode, forwardRef, useState } from 'react';
import { ComponentProps, ReactNode, forwardRef, useEffect, useState } from 'react';
import { getRoomIconSrc } from '$utils/room';
import colorMXID from '$utils/colorMXID';
import * as css from './RoomAvatar.css';
Expand All @@ -17,6 +17,10 @@ type RoomAvatarProps = {
export function RoomAvatar({ roomId, src, alt, renderFallback, uniformIcons }: RoomAvatarProps) {
const [error, setError] = useState(false);

useEffect(() => {
setError(false);
}, [src]);

if (!src || error) {
return (
<AvatarFallback
Expand Down
6 changes: 5 additions & 1 deletion src/app/components/user-avatar/UserAvatar.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AvatarFallback, AvatarImage, color } from 'folds';
import { ReactEventHandler, ReactNode, useState } from 'react';
import { ReactEventHandler, ReactNode, useEffect, useState } from 'react';
import classNames from 'classnames';
import colorMXID from '$utils/colorMXID';
import * as css from './UserAvatar.css';
Expand All @@ -14,6 +14,10 @@ type UserAvatarProps = {
export function UserAvatar({ className, userId, src, alt, renderFallback }: UserAvatarProps) {
const [error, setError] = useState(false);

useEffect(() => {
setError(false);
}, [src]);

const handleLoad: ReactEventHandler<HTMLImageElement> = (evt) => {
evt.currentTarget.setAttribute('data-image-loaded', 'true');
};
Expand Down
8 changes: 6 additions & 2 deletions src/app/hooks/useUserProfile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export type UserProfile = {
};

const normalizeInfo = (info: any): UserProfile => {
const msc4440Bio = info['gay.fomx.biography'] as MSC4440Bio | undefined;
const knownKeys = new Set([
'avatar_url',
'displayname',
Expand Down Expand Up @@ -61,7 +62,7 @@ const normalizeInfo = (info: any): UserProfile => {
pronouns: info['io.fsky.nyx.pronouns'],
timezone: info['us.cloke.msc4175.tz'] || info['m.tz'],
bio:
(info['gay.fomx.biography'] satisfies MSC4440Bio)['m.text'][0].body ||
msc4440Bio?.['m.text']?.[0]?.body ||
info['moe.sable.app.bio'] ||
info['chat.commet.profile_bio'],
status: info['chat.commet.profile_status'],
Expand Down Expand Up @@ -103,7 +104,10 @@ export const useUserProfile = (
const cached = useAtomValue(userSelector);
const setGlobalProfiles = useSetAtom(profilesCacheAtom);

const needsFetch = !!userId && userId !== 'undefined' && !cached?._fetched;
const hasOnlyFetchedMarker =
cached?._fetched === true && Object.keys(cached ?? {}).every((key) => key === '_fetched');
const needsFetch =
!!userId && userId !== 'undefined' && (!cached?._fetched || hasOnlyFetchedMarker);

useEffect(() => {
if (!needsFetch) return undefined;
Expand Down
Loading