diff --git a/.changeset/add-room-banner-support.md b/.changeset/add-room-banner-support.md new file mode 100644 index 000000000..57ffeb749 --- /dev/null +++ b/.changeset/add-room-banner-support.md @@ -0,0 +1,5 @@ +--- +default: minor +--- + +Add Space banner support per MSC4221. You can now set it from the space settings. diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx index 9b7f732bb..cb49900ff 100644 --- a/src/app/features/common-settings/general/RoomProfile.tsx +++ b/src/app/features/common-settings/general/RoomProfile.tsx @@ -315,7 +315,7 @@ export type ProfileProps = { function RoomBannerEdit({ bannerURI }: Readonly) { const mx = useMatrixClient(); const [alertRemove, setAlertRemove] = useState(false); - + const space = useRoom(); const [stagedUrl, setStagedUrl] = useState(); const [isRemoving, setIsRemoving] = useState(false); @@ -353,7 +353,7 @@ function RoomBannerEdit({ bannerURI }: Readonly) { const { mxc } = upload; if (imageFileURL) setStagedUrl(imageFileURL); - mx.sendStateEvent(space.roomId, CustomStateEvent.RoomBanner, {url: mxc}, ''); + mx.sendStateEvent(space.roomId, CustomStateEvent.RoomBanner, { url: mxc }, ''); setImageFile(undefined); }, [mx, imageFileURL, space] @@ -364,7 +364,7 @@ function RoomBannerEdit({ bannerURI }: Readonly) { setStagedUrl(undefined); setImageFile(undefined); - mx.sendStateEvent(space.roomId, CustomStateEvent.RoomBanner, {url: ''}, ''); + mx.sendStateEvent(space.roomId, CustomStateEvent.RoomBanner, { url: '' }, ''); setAlertRemove(false); }; @@ -579,14 +579,16 @@ export function RoomProfile({ permissions }: RoomProfileProps) { )} - - - + {room.isSpaceRoom() && ( + + + + )} ); } diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx index cf86aed12..e00e5f425 100644 --- a/src/app/features/settings/cosmetics/Themes.tsx +++ b/src/app/features/settings/cosmetics/Themes.tsx @@ -237,7 +237,7 @@ function ThemeVisualPreferences() { const [linkPreviewMaxHeightInput, setLinkPreviewMaxHeightInput] = useState( linkPreviewImageMaxHeight.toString() ); - const [showRoomBanners,setShowRoomBanners] = useSetting(settingsAtom, 'showRoomBanners'); + const [showRoomBanners, setShowRoomBanners] = useSetting(settingsAtom, 'showRoomBanners'); const handleIncomingDefaultHeightChange: ChangeEventHandler = (evt) => { const val = evt.target.value; @@ -627,10 +627,7 @@ function SidebarWidth({ sidebarSelector }: { sidebarSelector: string }) { settingsAtom, 'widgetSidebarWidth' ); - const [roomBannerHeight, setRoomBannerHeight] = useSetting( - settingsAtom, - 'roomBannerHeight' - ); + const [roomBannerHeight, setRoomBannerHeight] = useSetting(settingsAtom, 'roomBannerHeight'); // Yandere style code but it works and is as straight forward as can be :shrug: const getCurValue = useMemo(() => { @@ -650,7 +647,7 @@ function SidebarWidth({ sidebarSelector }: { sidebarSelector: string }) { threadRootHeight, vcmsgSidebarWidth, widgetSidebarWidth, - roomBannerHeight + roomBannerHeight, ]); const [curValue, setCurValue] = useState(getCurValue); const setValue = (value: number) => { diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index ea653afba..63c5016de 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -281,7 +281,7 @@ function SpaceHeader({ hideText, mx }: { hideText?: boolean; mx: MatrixClient }) const bannerState = useStateEvent(space, CustomStateEvent.RoomBanner); const bannerMXC = bannerState?.getContent()?.url; const bannerURI = mxcUrlToHttp(mx, bannerMXC ?? '', true); - const hasBanner = bannerURI && !hideText && showBanners; + const hasBanner = !!(bannerURI && !hideText && showBanners); return ( <>