From 7cb0a7629aba70445de4d477b604d699ba1b068e Mon Sep 17 00:00:00 2001 From: Gurkengewuerz Date: Mon, 30 Oct 2023 15:56:07 +0100 Subject: [PATCH] fix: load userdata of photos better --- .../camera/views/CameraWidgetShowPhotoView.tsx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/frontend/src/components/camera/views/CameraWidgetShowPhotoView.tsx b/apps/frontend/src/components/camera/views/CameraWidgetShowPhotoView.tsx index 6406ae4..788614c 100644 --- a/apps/frontend/src/components/camera/views/CameraWidgetShowPhotoView.tsx +++ b/apps/frontend/src/components/camera/views/CameraWidgetShowPhotoView.tsx @@ -1,7 +1,8 @@ +import {RoomObjectCategory, RoomObjectVariable} from "@nitro/renderer"; import {FC, useEffect, useState} from "react"; import {FaArrowLeft, FaArrowRight} from "react-icons/fa"; -import {GetUserProfile, IPhotoData, LocalizeText} from "../../../api"; +import {GetRoomEngine, GetUserProfile, IPhotoData, LocalizeText} from "../../../api"; import {Flex, Grid, Text} from "../../../common"; export interface CameraWidgetShowPhotoViewProps { @@ -35,6 +36,16 @@ export const CameraWidgetShowPhotoView: FC = pro }); }; + const getUserData = (roomId: number, objectId: number, type: string): number | string => { + const roomObject = GetRoomEngine().getRoomObject(roomId, objectId, RoomObjectCategory.WALL); + + if (!roomObject) return; + + return type == "username" + ? roomObject.model.getValue(RoomObjectVariable.FURNITURE_OWNER_NAME) + : roomObject.model.getValue(RoomObjectVariable.FURNITURE_OWNER_ID); + }; + useEffect(() => { setImageIndex(currentIndex); }, [currentIndex]); @@ -54,8 +65,8 @@ export const CameraWidgetShowPhotoView: FC = pro {currentPhotos.length > 1 && ( - GetUserProfile(currentImage.oi)}> - {currentImage.o} + GetUserProfile(Number(getUserData(currentImage.s, Number(currentImage.u), "id")))}> + {getUserData(currentImage.s, Number(currentImage.u), "username")}