mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
update all pages to show the right room image
This commit is contained in:
1 parent
31fec891f7
commit
e582e429ab
4 files changed
+11
-3
No files matched your search
@@ -5,6 +5,7 @@ export const RoomAvatar = style({
|
||||
backgroundColor: color.Secondary.Container,
|
||||
color: color.Secondary.OnContainer,
|
||||
textTransform: 'capitalize',
|
||||
|
||||
selectors: {
|
||||
'&[data-image-loaded="true"]': {
|
||||
backgroundColor: 'transparent',
|
||||
|
||||
@@ -35,6 +35,8 @@ import { useFilePicker } from '$hooks/useFilePicker';
|
||||
import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback';
|
||||
import { useAlive } from '$hooks/useAlive';
|
||||
import { RoomPermissionsAPI } from '$hooks/useRoomPermissions';
|
||||
import { useSetting } from '$state/hooks/settings';
|
||||
import { settingsAtom } from '$state/settings';
|
||||
|
||||
type RoomProfileEditProps = {
|
||||
canEditAvatar: boolean;
|
||||
@@ -294,8 +296,9 @@ export function RoomProfile({ permissions }: RoomProfileProps) {
|
||||
const room = useRoom();
|
||||
const directs = useAtomValue(mDirectAtom);
|
||||
const isDm = directs.has(room.roomId);
|
||||
const [customDMCards] = useSetting(settingsAtom, 'customDMCards');
|
||||
|
||||
const avatar = useRoomAvatar(room, directs.has(room.roomId));
|
||||
const avatar = useRoomAvatar(room, directs.has(room.roomId) && !customDMCards);
|
||||
const name = useRoomName(room);
|
||||
const topic = useRoomTopic(room);
|
||||
const joinRule = useRoomJoinRule(room);
|
||||
|
||||
@@ -17,6 +17,8 @@ import { Members } from '$features/common-settings/members';
|
||||
import { EmojisStickers } from '$features/common-settings/emojis-stickers';
|
||||
import { DeveloperTools } from '$features/common-settings/developer-tools';
|
||||
import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics';
|
||||
import { settingsAtom } from '$state/settings';
|
||||
import { useSetting } from '$state/hooks/settings';
|
||||
import { Permissions } from './permissions';
|
||||
import { General } from './general';
|
||||
import { RoomAbbreviations } from './abbreviations/RoomAbbreviations';
|
||||
@@ -81,8 +83,9 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) {
|
||||
const mx = useMatrixClient();
|
||||
const useAuthentication = useMediaAuthentication();
|
||||
const mDirects = useAtomValue(mDirectAtom);
|
||||
const [customDMCards] = useSetting(settingsAtom, 'customDMCards');
|
||||
|
||||
const roomAvatar = useRoomAvatar(room, mDirects.has(room.roomId));
|
||||
const roomAvatar = useRoomAvatar(room, mDirects.has(room.roomId) && !customDMCards);
|
||||
const roomName = useRoomName(room);
|
||||
const joinRuleContent = useRoomJoinRule(room);
|
||||
|
||||
|
||||
@@ -350,6 +350,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
|
||||
const [menuAnchor, setMenuAnchor] = useState<RectCords>();
|
||||
const [pinMenuAnchor, setPinMenuAnchor] = useState<RectCords>();
|
||||
const direct = useIsDirectRoom();
|
||||
const [customDMCards] = useSetting(settingsAtom, 'customDMCards');
|
||||
|
||||
const [chat, setChat] = useAtom(callChatAtom);
|
||||
const [threadBrowserOpen, setThreadBrowserOpen] = useAtom(
|
||||
@@ -366,7 +367,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) {
|
||||
|
||||
const encryptionEvent = useStateEvent(room, StateEvent.RoomEncryption);
|
||||
const encryptedRoom = !!encryptionEvent;
|
||||
const avatarMxc = useRoomAvatar(room, direct);
|
||||
const avatarMxc = useRoomAvatar(room, direct && !customDMCards);
|
||||
const name = useRoomName(room);
|
||||
const topic = useRoomTopic(room);
|
||||
const avatarUrl = avatarMxc
|
||||
|
||||
Reference in new issue
Block a user