nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-23 14:40:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-see-furni-id-permission' into 'dev'

Browse Source 
Fix issue: room owner can see furni ids

See merge request nitro/nitro-react!9
This commit is contained in:
Bill 2022-03-16 18:39:27 +00:00
commit b881241071
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx
View File

@ -33,6 +33,7 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
const [ crackableHits, setCrackableHits ] = useState(0); const [ crackableHits, setCrackableHits ] = useState(0);
const [ crackableTarget, setCrackableTarget ] = useState(0); const [ crackableTarget, setCrackableTarget ] = useState(0);
const [ godMode, setGodMode ] = useState(false); const [ godMode, setGodMode ] = useState(false);
const [ canSeeFurniId, setCanSeeFurniId ] = useState(false);
const [ groupName, setGroupName ] = useState<string>(null); const [ groupName, setGroupName ] = useState<string>(null);
useEffect(() => useEffect(() =>
@ -49,6 +50,7 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
let crackableHits = 0; let crackableHits = 0;
let crackableTarget = 0; let crackableTarget = 0;
let godMode = false; let godMode = false;
let canSeeFurniId = false;
const isValidController = (furniData.roomControllerLevel >= RoomControllerLevel.GUEST); const isValidController = (furniData.roomControllerLevel >= RoomControllerLevel.GUEST);
@ -60,6 +62,11 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
if(furniData.roomControllerLevel >= RoomControllerLevel.MODERATOR) godMode = true; if(furniData.roomControllerLevel >= RoomControllerLevel.MODERATOR) godMode = true;
} }
if(furniData.isAnyRoomController)
{
canSeeFurniId = true;
}
if((((furniData.usagePolicy === RoomWidgetFurniInfoUsagePolicyEnum.EVERYBODY) || ((furniData.usagePolicy === RoomWidgetFurniInfoUsagePolicyEnum.CONTROLLER) && isValidController)) || ((furniData.extraParam === RoomWidgetEnumItemExtradataParameter.JUKEBOX) && isValidController)) || ((furniData.extraParam === RoomWidgetEnumItemExtradataParameter.USABLE_PRODUCT) && isValidController)) canUse = true; if((((furniData.usagePolicy === RoomWidgetFurniInfoUsagePolicyEnum.EVERYBODY) || ((furniData.usagePolicy === RoomWidgetFurniInfoUsagePolicyEnum.CONTROLLER) && isValidController)) || ((furniData.extraParam === RoomWidgetEnumItemExtradataParameter.JUKEBOX) && isValidController)) || ((furniData.extraParam === RoomWidgetEnumItemExtradataParameter.USABLE_PRODUCT) && isValidController)) canUse = true;
if(furniData.extraParam) if(furniData.extraParam)
@ -133,6 +140,7 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
setCrackableHits(crackableHits); setCrackableHits(crackableHits);
setCrackableTarget(crackableTarget); setCrackableTarget(crackableTarget);
setGodMode(godMode); setGodMode(godMode);
setCanSeeFurniId(canSeeFurniId);
setGroupName(null); setGroupName(null);
}); });
@ -312,7 +320,7 @@ export const InfoStandWidgetFurniView: FC<InfoStandWidgetFurniViewProps> = props
{ godMode && { godMode &&
<> <>
<hr className="m-0" /> <hr className="m-0" />
<Text small wrap variant="white">ID: { furniData.id }</Text> { canSeeFurniId && <Text small wrap variant="white">ID: { furniData.id }</Text> }
{ (furniKeys.length > 0) && { (furniKeys.length > 0) &&
<> <>
<hr className="m-0"/> <hr className="m-0"/>