duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-20 15:36:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

🆙 Fix Room Settings / HC now hidden when not HC and small fixes

Browse Source
This commit is contained in:
duckietm
2026-03-03 09:12:12 +01:00
parent 312edc3bf0
commit 7c01337984
7 changed files with 221 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navigator/views/room-settings/NavigatorRoomSettingsRightsTabView.tsx
+93 -16
View File
@@ -1,8 +1,8 @@
import { FlatControllerAddedEvent, FlatControllerRemovedEvent, FlatControllersEvent, RemoveAllRightsMessageComposer, RoomTakeRightsComposer, RoomUsersWithRightsComposer } from '@nitrots/nitro-renderer';
import { FlatControllerAddedEvent, FlatControllerRemovedEvent, FlatControllersEvent, RemoveAllRightsMessageComposer, RoomGiveRightsComposer, RoomTakeRightsComposer, RoomUsersWithRightsComposer } from '@nitrots/nitro-renderer';
import { FC, useEffect, useState } from 'react';
import { IRoomData, LocalizeText, SendMessageComposer } from '../../../../api';
import { Button, Column, Flex, Grid, Text, UserProfileIconView } from '../../../../common';
import { useMessageEvent } from '../../../../hooks';
import { useFriends, useMessageEvent } from '../../../../hooks';
interface NavigatorRoomSettingsTabViewProps
{
@@ -10,10 +10,38 @@ interface NavigatorRoomSettingsTabViewProps
handleChange: (field: string, value: string | number | boolean) => void;
}
const STAFF_CHAT_ID = -1;
const STAFF_CHAT_NAME = 'Staff Chat';
export const NavigatorRoomSettingsRightsTabView: FC<NavigatorRoomSettingsTabViewProps> = props =>
{
const { roomData = null } = props;
const [ usersWithRights, setUsersWithRights ] = useState<Map<number, string>>(new Map());
const { onlineFriends = [], offlineFriends = [] } = useFriends();
const allFriendsRaw = [ ...onlineFriends, ...offlineFriends ];
const allFriends = allFriendsRaw.filter(friend =>
{
if(friend.id === STAFF_CHAT_ID) return false;
if(friend.name === STAFF_CHAT_NAME) return false;
if(friend.id <= 0) return false;
return true;
});
const filteredUsersWithRights = new Map(
Array.from(usersWithRights.entries()).filter(([ id, name ]) =>
{
if(id === STAFF_CHAT_ID) return false;
if(name === STAFF_CHAT_NAME) return false;
if(id <= 0) return false;
return true;
})
);
const friendsWithoutRights = allFriends.filter(friend => !filteredUsersWithRights.has(friend.id));
useMessageEvent<FlatControllersEvent>(FlatControllersEvent, event =>
{
@@ -58,34 +86,83 @@ export const NavigatorRoomSettingsRightsTabView: FC<NavigatorRoomSettingsTabView
useEffect(() =>
{
if(!roomData) return;
SendMessageComposer(new RoomUsersWithRightsComposer(roomData.roomId));
}, [ roomData.roomId ]);
}, [ roomData?.roomId ]);
return (
<Grid>
<Column size={ 6 }>
<Text small bold>
{ LocalizeText('navigator.flatctrls.userswithrights', [ 'displayed', 'total' ], [ usersWithRights.size.toString(), usersWithRights.size.toString() ]) }
<Text bold>
{ LocalizeText(
'navigator.flatctrls.userswithrights',
[ 'displayed', 'total' ],
[
filteredUsersWithRights.size.toString(),
filteredUsersWithRights.size.toString()
]
) }
</Text>
<Flex className="bg-white rounded list-container p-2" overflow="hidden">
<Column fullWidth gap={ 1 } overflow="auto">
{ Array.from(usersWithRights.entries()).map(([ id, name ], index) =>
<Flex overflow="hidden" className="p-2 bg-white rounded list-container">
<Column fullWidth overflow="auto" gap={ 1 }>
{ Array.from(filteredUsersWithRights.entries()).map(([ id, name ], index) =>
{
return (
<Flex key={ index } shrink alignItems="center" gap={ 1 } overflow="hidden">
<UserProfileIconView userName={ name } />
<Text small grow pointer onClick={ event => SendMessageComposer(new RoomTakeRightsComposer(id)) }> { name }</Text>
<Flex key={ `${id}-${index}` } shrink alignItems="center" gap={ 1 } overflow="hidden">
<UserProfileIconView userId={ id } />
<Text
pointer
grow
onClick={ () => SendMessageComposer(new RoomTakeRightsComposer(id)) }>
{ name }
</Text>
</Flex>
);
}) }
</Column>
</Flex>
<Button
variant="danger"
disabled={ !filteredUsersWithRights.size }
onClick={ () => roomData && SendMessageComposer(new RemoveAllRightsMessageComposer(roomData.roomId)) }>
{ LocalizeText('navigator.flatctrls.clear') }
</Button>
</Column>
<Column size={ 6 }>
<Text bold>
{ LocalizeText(
'navigator.flatctrls.friends',
[ 'displayed', 'total' ],
[
friendsWithoutRights.length.toString(),
allFriends.length.toString()
]
) }
</Text>
<Flex overflow="hidden" className="p-2 bg-white rounded list-container">
<Column fullWidth overflow="auto" gap={ 1 }>
{ friendsWithoutRights.map((friend, index) =>
{
return (
<Flex key={ `${friend.id}-${index}` } shrink alignItems="center" gap={ 1 } overflow="hidden">
<UserProfileIconView userId={ friend.id } />
<Text
pointer
grow
onClick={ () => SendMessageComposer(new RoomGiveRightsComposer(friend.id)) }>
{ friend.name }
</Text>
</Flex>
);
}) }
</Column>
</Flex>
</Column>
<Column justifyContent="end" size={ 6 }>
<Button disabled={ !usersWithRights.size } variant="danger" onClick={ event => SendMessageComposer(new RemoveAllRightsMessageComposer(roomData.roomId)) } >
{ LocalizeText('navigator.flatctrls.clear') }
</Button>
</Column>
</Grid>
);
};