@@ -26,6 +26,7 @@ import {
2626 UnreadInfo ,
2727} from '../../types/matrix/room' ;
2828import { mdiPound , mdiStarFourPoints } from '@mdi/js' ;
29+ import { mxcUrlToHttp } from './matrix' ;
2930
3031export const getStateEvent = (
3132 room : Room ,
@@ -262,15 +263,21 @@ export const getRoomAvatarUrl = (
262263 mx : MatrixClient ,
263264 room : Room ,
264265 size : 32 | 96 = 32
265- ) : string | undefined => room . getAvatarUrl ( mx . baseUrl , size , size , 'crop' ) ?? undefined ;
266+ ) : string | undefined => {
267+ const mxc = room . getMxcAvatarUrl ( ) ;
268+ return mxc ? mxcUrlToHttp ( mx , mxc , size , size , 'scale' ) ?? undefined :
269+ undefined ;
270+ }
266271
267272export const getDirectRoomAvatarUrl = (
268273 mx : MatrixClient ,
269274 room : Room ,
270275 size : 32 | 96 = 32
271- ) : string | undefined =>
272- room . getAvatarFallbackMember ( ) ?. getAvatarUrl ( mx . baseUrl , size , size , 'crop' , undefined , false ) ??
273- undefined ;
276+ ) : string | undefined => {
277+ const mxc = room . getAvatarFallbackMember ( ) ?. getMxcAvatarUrl ( ) ;
278+ return mxc ? mxcUrlToHttp ( mx , mxc , size , size , 'scale' ) ?? undefined :
279+ undefined ;
280+ }
274281
275282export const trimReplyFromBody = ( body : string ) : string => {
276283 const match = body . match ( / ^ > < .+ ?> .+ \n ( > .* \n ) * ?\n / m) ;
0 commit comments