mirrors/cinny
1
0
Fork 0
mirror of https://github.com/cinnyapp/cinny.git synced 2025-11-15 11:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move space shortcut from roomlist to accountdata

Browse source 
Signed-off-by: Ajay Bura <ajbura@gmail.com>
This commit is contained in:
Ajay Bura 2022-02-27 17:02:03 +05:30
parent 7db674b65d
commit a62df536dd
10 changed files with 131 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/app/hooks/useSpaceShortcut.js
View file

@ -5,16 +5,19 @@ import initMatrix from '../../client/initMatrix';
import cons from '../../client/state/cons';
export function useSpaceShortcut() {
const { roomList } = initMatrix;
const [spaceShortcut, setSpaceShortcut] = useState([...roomList.spaceShortcut]);
const { accountData } = initMatrix;
const [spaceShortcut, setSpaceShortcut] = useState([...accountData.spaceShortcut]);
useEffect(() => {
const onSpaceShortcutUpdated = () => {
setSpaceShortcut([...roomList.spaceShortcut]);
setSpaceShortcut([...accountData.spaceShortcut]);
};
roomList.on(cons.events.roomList.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
accountData.on(cons.events.accountData.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
return () => {
roomList.removeListener(cons.events.roomList.SPACE_SHORTCUT_UPDATED, onSpaceShortcutUpdated);
accountData.removeListener(
cons.events.accountData.SPACE_SHORTCUT_UPDATED,
onSpaceShortcutUpdated,
);
};
}, []);

18
src/app/molecules/space-options/SpaceOptions.jsx
View file

@ -5,10 +5,13 @@ import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
import { openSpaceSettings, openSpaceManage, openInviteUser } from '../../../client/action/navigation';
import { leave, createSpaceShortcut, deleteSpaceShortcut } from '../../../client/action/room';
import { leave } from '../../../client/action/room';
import { createSpaceShortcut, deleteSpaceShortcut } from '../../../client/action/accountData';
import { MenuHeader, MenuItem } from '../../atoms/context-menu/ContextMenu';
import CategoryIC from '../../../../public/res/ic/outlined/category.svg';
import CategoryFilledIC from '../../../../public/res/ic/filled/category.svg';
import AddUserIC from '../../../../public/res/ic/outlined/add-user.svg';
import SettingsIC from '../../../../public/res/ic/outlined/settings.svg';
import HashSearchIC from '../../../../public/res/ic/outlined/hash-search.svg';
@ -20,7 +23,7 @@ function SpaceOptions({ roomId, afterOptionSelect }) {
const mx = initMatrix.matrixClient;
const room = mx.getRoom(roomId);
const canInvite = room?.canInvite(mx.getUserId());
const isPinned = initMatrix.roomList.spaceShortcut.has(roomId);
const isPinned = initMatrix.accountData.spaceShortcut.has(roomId);
const handleInviteClick = () => {
openInviteUser(roomId);
@ -31,7 +34,10 @@ function SpaceOptions({ roomId, afterOptionSelect }) {
else createSpaceShortcut(roomId);
afterOptionSelect();
};
const handleCategorizeClick = () => {
alert('categorize');
afterOptionSelect();
};
const handleSettingsClick = () => {
openSpaceSettings(roomId);
afterOptionSelect();
@ -51,6 +57,12 @@ function SpaceOptions({ roomId, afterOptionSelect }) {
return (
<div style={{ maxWidth: 'calc(var(--navigation-drawer-width) - var(--sp-normal))' }}>
<MenuHeader>{twemojify(`Options for ${initMatrix.matrixClient.getRoom(roomId)?.name}`)}</MenuHeader>
<MenuItem
onClick={handleCategorizeClick}
iconSrc={CategoryIC}
>
Categorize subspaces
</MenuItem>
<MenuItem
onClick={handlePinClick}
iconSrc={isPinned ? PinFilledIC : PinIC}

4
src/app/organisms/navigation/SideBar.jsx
View file

@ -79,7 +79,7 @@ function useTotalInvites() {
}
function SideBar() {
const { roomList, notifications } = initMatrix;
const { roomList, accountData, notifications } = initMatrix;
const mx = initMatrix.matrixClient;
const [selectedTab] = useSelectedTab();
@ -112,7 +112,7 @@ function SideBar() {
let noti = null;
orphans.forEach((roomId) => {
if (roomList.spaceShortcut.has(roomId)) return;
if (accountData.spaceShortcut.has(roomId)) return;
if (!notifications.hasNoti(roomId)) return;
if (noti === null) noti = { total: 0, highlight: 0 };
const childNoti = notifications.getNoti(roomId);

5
src/app/organisms/space-settings/SpaceSettings.jsx
View file

@ -7,7 +7,8 @@ import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import navigation from '../../../client/state/navigation';
import { leave, createSpaceShortcut, deleteSpaceShortcut } from '../../../client/action/room';
import { leave } from '../../../client/action/room';
import { createSpaceShortcut, deleteSpaceShortcut } from '../../../client/action/accountData';
import Text from '../../atoms/text/Text';
import IconButton from '../../atoms/button/IconButton';
@ -51,7 +52,7 @@ const tabItems = [{
}];
function GeneralSettings({ roomId }) {
const isPinned = initMatrix.roomList.spaceShortcut.has(roomId);
const isPinned = initMatrix.accountData.spaceShortcut.has(roomId);
const [, forceUpdate] = useForceUpdate();
return (