{
@@ -182,6 +249,11 @@ function RoomPermissions({ roomId }) {
content={
{permInfo.description}}
options={(
@@ -31,6 +33,7 @@ function RoomSelectorWrapper({
}
RoomSelectorWrapper.defaultProps = {
options: null,
+ onContextMenu: null,
};
RoomSelectorWrapper.propTypes = {
isSelected: PropTypes.bool.isRequired,
@@ -38,12 +41,13 @@ RoomSelectorWrapper.propTypes = {
onClick: PropTypes.func.isRequired,
content: PropTypes.node.isRequired,
options: PropTypes.node,
+ onContextMenu: PropTypes.func,
};
function RoomSelector({
name, parentName, roomId, imageSrc, iconSrc,
isSelected, isUnread, notificationCount, isAlert,
- options, onClick,
+ options, onClick, onContextMenu,
}) {
return (
);
}
@@ -87,6 +92,7 @@ RoomSelector.defaultProps = {
imageSrc: null,
iconSrc: null,
options: null,
+ onContextMenu: null,
};
RoomSelector.propTypes = {
name: PropTypes.string.isRequired,
@@ -103,6 +109,7 @@ RoomSelector.propTypes = {
isAlert: PropTypes.bool.isRequired,
options: PropTypes.node,
onClick: PropTypes.func.isRequired,
+ onContextMenu: PropTypes.func,
};
export default RoomSelector;
diff --git a/src/app/organisms/navigation/Selector.jsx b/src/app/organisms/navigation/Selector.jsx
index 80a03574..e321db82 100644
--- a/src/app/organisms/navigation/Selector.jsx
+++ b/src/app/organisms/navigation/Selector.jsx
@@ -4,12 +4,13 @@ import PropTypes from 'prop-types';
import initMatrix from '../../../client/initMatrix';
import navigation from '../../../client/state/navigation';
-import { openRoomOptions } from '../../../client/action/navigation';
+import { openReusableContextMenu } from '../../../client/action/navigation';
import { createSpaceShortcut, deleteSpaceShortcut } from '../../../client/action/room';
import { getEventCords, abbreviateNumber } from '../../../util/common';
import IconButton from '../../atoms/button/IconButton';
import RoomSelector from '../../molecules/room-selector/RoomSelector';
+import RoomOptions from '../../molecules/room-optons/RoomOptions';
import HashIC from '../../../../public/res/ic/outlined/hash.svg';
import HashGlobeIC from '../../../../public/res/ic/outlined/hash-globe.svg';
@@ -49,6 +50,15 @@ function Selector({
};
}, []);
+ const openRoomOptions = (e) => {
+ e.preventDefault();
+ openReusableContextMenu(
+ 'right',
+ getEventCords(e, '.room-selector'),
+ (closeMenu) =>
,
+ );
+ };
+
const joinRuleToIconSrc = (joinRule) => ({
restricted: () => (room.isSpaceRoom() ? SpaceIC : HashIC),
invite: () => (room.isSpaceRoom() ? SpaceLockIC : HashLockIC),
@@ -96,13 +106,14 @@ function Selector({
notificationCount={abbreviateNumber(noti.getTotalNoti(roomId))}
isAlert={noti.getHighlightNoti(roomId) !== 0}
onClick={onClick}
+ onContextMenu={openRoomOptions}
options={(
openRoomOptions(getEventCords(e), roomId)}
+ onClick={openRoomOptions}
/>
)}
/>
diff --git a/src/app/organisms/profile-viewer/ProfileViewer.jsx b/src/app/organisms/profile-viewer/ProfileViewer.jsx
index 73b722e5..23890125 100644
--- a/src/app/organisms/profile-viewer/ProfileViewer.jsx
+++ b/src/app/organisms/profile-viewer/ProfileViewer.jsx
@@ -7,26 +7,87 @@ import { twemojify } from '../../../util/twemojify';
import initMatrix from '../../../client/initMatrix';
import cons from '../../../client/state/cons';
import navigation from '../../../client/state/navigation';
-import { selectRoom } from '../../../client/action/navigation';
+import { selectRoom, openReusableContextMenu } from '../../../client/action/navigation';
import * as roomActions from '../../../client/action/room';
import { getUsername, getUsernameOfRoomMember, getPowerLabel } from '../../../util/matrixUtil';
+import { getEventCords } from '../../../util/common';
import colorMXID from '../../../util/colorMXID';
import Text from '../../atoms/text/Text';
import Chip from '../../atoms/chip/Chip';
import IconButton from '../../atoms/button/IconButton';
+import Input from '../../atoms/input/Input';
import Avatar from '../../atoms/avatar/Avatar';
import Button from '../../atoms/button/Button';
+import { MenuItem } from '../../atoms/context-menu/ContextMenu';
+import PowerLevelSelector from '../../molecules/power-level-selector/PowerLevelSelector';
import Dialog from '../../molecules/dialog/Dialog';
-import SettingTile from '../../molecules/setting-tile/SettingTile';
import ShieldEmptyIC from '../../../../public/res/ic/outlined/shield-empty.svg';
+import ChevronRightIC from '../../../../public/res/ic/outlined/chevron-right.svg';
import ChevronBottomIC from '../../../../public/res/ic/outlined/chevron-bottom.svg';
import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
+import { useForceUpdate } from '../../hooks/useForceUpdate';
+
+function ModerationTools({
+ roomId, userId,
+}) {
+ const mx = initMatrix.matrixClient;
+ const room = mx.getRoom(roomId);
+ const roomMember = room.getMember(userId);
+
+ const myPowerLevel = room.getMember(mx.getUserId()).powerLevel;
+ const powerLevel = roomMember?.powerLevel || 0;
+ const canIKick = (
+ roomMember?.membership === 'join'
+ && room.currentState.hasSufficientPowerLevelFor('kick', myPowerLevel)
+ && powerLevel < myPowerLevel
+ );
+ const canIBan = (
+ ['join', 'leave'].includes(roomMember?.membership)
+ && room.currentState.hasSufficientPowerLevelFor('ban', myPowerLevel)
+ && powerLevel < myPowerLevel
+ );
+
+ const handleKick = (e) => {
+ e.preventDefault();
+ const kickReason = e.target.elements['kick-reason']?.value.trim();
+ roomActions.kick(roomId, userId, kickReason !== '' ? kickReason : undefined);
+ };
+
+ const handleBan = (e) => {
+ e.preventDefault();
+ const banReason = e.target.elements['ban-reason']?.value.trim();
+ roomActions.ban(roomId, userId, banReason !== '' ? banReason : undefined);
+ };
+
+ return (
+
+ {canIKick && (
+
+ )}
+ {canIBan && (
+
+ )}
+
+ );
+}
+ModerationTools.propTypes = {
+ roomId: PropTypes.string.isRequired,
+ userId: PropTypes.string.isRequired,
+};
+
function SessionInfo({ userId }) {
const [devices, setDevices] = useState(null);
+ const [isVisible, setIsVisible] = useState(false);
const mx = initMatrix.matrixClient;
useEffect(() => {
@@ -51,10 +112,11 @@ function SessionInfo({ userId }) {
}, [userId]);
function renderSessionChips() {
+ if (!isVisible) return null;
return (
- {devices === null &&
Loading sessions...}
- {devices?.length === 0 &&
No session found.}
+ {devices === null &&
Loading sessions...}
+ {devices?.length === 0 &&
No session found.}
{devices !== null && (devices.map((device) => (
-
+
+ {renderSessionChips()}
@@ -193,7 +260,14 @@ function ProfileFooter({ roomId, userId, onRequestClose }) {
>
{isCreatingDM ? 'Creating room...' : 'Message'}
- { member?.membership === 'join' &&
}
+ { isBanned && canIKick && (
+
+ )}
{ (isInvited ? canIKick : room.canInvite(mx.getUserId())) && isInvitable && (