diff --git a/src/api/nitro/session/ProcessFurniAction.ts b/src/api/nitro/session/ProcessFurniAction.ts deleted file mode 100644 index 4e70daab..00000000 --- a/src/api/nitro/session/ProcessFurniAction.ts +++ /dev/null @@ -1,70 +0,0 @@ -import { RoomAdsUpdateComposer, RoomObjectOperationType, SecurityLevel } from 'nitro-renderer'; -import { GetConnection } from '../GetConnection'; -import { GetRoomEngine } from '../room'; -import { GetSessionDataManager } from './GetSessionDataManager'; - -export class FurniAction -{ - public static ROTATE: string = 'FA_ROTATE'; - public static MOVE: string = 'FA_MOVE'; - public static PICKUP: string = 'FA_PICKUP'; - public static EJECT: string = 'FA_EJECT'; - public static USE: string = 'FA_USE'; - public static OPEN_WELCOME_GIFT: string = 'FA_OPEN_WELCOME_GIFT'; - public static SAVE_STUFF_DATA: string = 'FA_SAVE_STUFF_DATA'; -} - -export function ProcessFurniAction(type: string, objectId: number, category: number, offerId = -1, objectData: string = null): void -{ - switch(type) - { - case FurniAction.ROTATE: - GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_ROTATE_POSITIVE); - return; - case FurniAction.MOVE: - GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_MOVE); - return; - case FurniAction.PICKUP: - GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_PICKUP); - return; - case FurniAction.EJECT: - GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_EJECT); - return; - case FurniAction.USE: - GetRoomEngine().useRoomObject(objectId, category); - return; - case FurniAction.SAVE_STUFF_DATA: { - if(objectData) - { - const mapData = new Map(); - const dataParts = objectData.split('\t'); - - if(dataParts) - { - for(const part of dataParts) - { - const partPieces = part.split('=', 2); - - if(partPieces && partPieces.length === 2) - { - const piece1 = partPieces[0]; - const piece2 = partPieces[1]; - - mapData.set(piece1, piece2); - } - } - } - - GetRoomEngine().processRoomObjectWallOperation(objectId, category, RoomObjectOperationType.OBJECT_SAVE_STUFF_DATA, mapData); - - if(GetSessionDataManager().hasSecurity(SecurityLevel.MODERATOR)) - { - GetConnection().send(new RoomAdsUpdateComposer(this._widget.furniData.id, mapData)); - } - - mapData.clear(); - } - return; - } - } -} diff --git a/src/api/nitro/session/ProcessUserAction.ts b/src/api/nitro/session/ProcessUserAction.ts deleted file mode 100644 index 05ada760..00000000 --- a/src/api/nitro/session/ProcessUserAction.ts +++ /dev/null @@ -1,194 +0,0 @@ -import { RoomUnitDropHandItemComposer, RoomUnitGiveHandItemComposer, RoomUserData } from 'nitro-renderer'; -import { GetConnection } from '../GetConnection'; -import { GetRoomSession } from './GetRoomSession'; -import { GetSessionDataManager } from './GetSessionDataManager'; - -export class UserAction -{ - public static WHISPER_USER: string = 'UA_WHISPER_USER'; - public static IGNORE_USER: string = 'UA_IGNORE_USER'; - public static IGNORE_USER_BUBBLE: string = 'UA_IGNORE_USER_BUBBLE'; - public static UNIGNORE_USER: string = 'UA_UNIGNORE_USER'; - public static KICK_USER: string = 'UA_KICK_USER'; - public static BAN_USER_HOUR: string = 'UA_BAN_USER_HOUR'; - public static BAN_USER_DAY: string = 'UA_BAN_USER_DAY'; - public static BAN_USER_PERM: string = 'UA_BAN_USER_PERM'; - public static MUTE_USER_2MIN: string = 'UA_MUTE_USER_2MIN'; - public static MUTE_USER_5MIN: string = 'UA_MUTE_USER_5MIN'; - public static MUTE_USER_10MIN: string = 'UA_MUTE_USER_10MIN'; - public static SEND_FRIEND_REQUEST: string = 'UA_SEND_FRIEND_REQUEST'; - public static RESPECT_USER: string = 'UA_RESPECT_USER'; - public static GIVE_RIGHTS: string = 'UA_GIVE_RIGHTS'; - public static TAKE_RIGHTS: string = 'UA_TAKE_RIGHTS'; - public static START_TRADING: string = 'UA_START_TRADING'; - public static OPEN_HOME_PAGE: string = 'UA_OPEN_HOME_PAGE'; - public static REPORT: string = 'UA_REPORT'; - public static PICKUP_PET: string = 'UA_PICKUP_PET'; - public static MOUNT_PET: string = 'UA_MOUNT_PET'; - public static TOGGLE_PET_RIDING_PERMISSION: string = 'UA_TOGGLE_PET_RIDING_PERMISSION'; - public static TOGGLE_PET_BREEDING_PERMISSION: string = 'UA_TOGGLE_PET_BREEDING_PERMISSION'; - public static DISMOUNT_PET: string = 'UA_DISMOUNT_PET'; - public static SADDLE_OFF: string = 'UA_SADDLE_OFF'; - public static TRAIN_PET: string = 'UA_TRAIN_PET'; - public static RESPECT_PET: string = 'UA_ RESPECT_PET'; - public static TREAT_PET: string = 'UA_TREAT_PET'; - public static REQUEST_PET_UPDATE: string = 'UA_REQUEST_PET_UPDATE'; - public static START_NAME_CHANGE: string = 'UA_START_NAME_CHANGE'; - public static PASS_CARRY_ITEM: string = 'UA_PASS_CARRY_ITEM'; - public static DROP_CARRY_ITEM: string = 'UA_DROP_CARRY_ITEM'; - public static GIVE_CARRY_ITEM_TO_PET: string = 'UA_GIVE_CARRY_ITEM_TO_PET'; - public static GIVE_WATER_TO_PET: string = 'UA_GIVE_WATER_TO_PET'; - public static GIVE_LIGHT_TO_PET: string = 'UA_GIVE_LIGHT_TO_PET'; - public static REQUEST_BREED_PET: string = 'UA_REQUEST_BREED_PET'; - public static HARVEST_PET: string = 'UA_HARVEST_PET'; - public static REVIVE_PET: string = 'UA_REVIVE_PET'; - public static COMPOST_PLANT: string = 'UA_COMPOST_PLANT'; - public static GET_BOT_INFO: string = 'UA_GET_BOT_INFO'; - public static REPORT_CFH_OTHER: string = 'UA_REPORT_CFH_OTHER'; - public static AMBASSADOR_ALERT_USER: string = 'UA_AMBASSADOR_ALERT_USER'; - public static AMBASSADOR_KICK_USER: string = 'UA_AMBASSADOR_KICK_USER'; - public static AMBASSADOR_MUTE_USER_2MIN: string = 'UA_AMBASSADOR_MUTE_2MIN'; - public static AMBASSADOR_MUTE_USER_10MIN: string = 'UA_AMBASSADOR_MUTE_10MIN'; - public static AMBASSADOR_MUTE_USER_60MIN: string = 'UA_AMBASSADOR_MUTE_60MIN'; - public static AMBASSADOR_MUTE_USER_18HOUR: string = 'UA_AMBASSADOR_MUTE_18HOUR'; -} - -export function ProcessUserAction(userId: number, type: string): void -{ - let userData: RoomUserData = null; - - const petMessages = [ - UserAction.REQUEST_PET_UPDATE, - UserAction.RESPECT_PET, - UserAction.PICKUP_PET, - UserAction.MOUNT_PET, - UserAction.TOGGLE_PET_RIDING_PERMISSION, - UserAction.TOGGLE_PET_BREEDING_PERMISSION, - UserAction.DISMOUNT_PET, - UserAction.SADDLE_OFF, - UserAction.GIVE_CARRY_ITEM_TO_PET, - UserAction.GIVE_WATER_TO_PET, - UserAction.GIVE_LIGHT_TO_PET, - UserAction.TREAT_PET - ]; - - if(petMessages.indexOf(type) >= 0) - { - userData = GetRoomSession().userDataManager.getPetData(userId); - } - else - { - userData = GetRoomSession().userDataManager.getUserData(userId); - } - - if(!userData) return - - switch(type) - { - case UserAction.RESPECT_USER: - GetSessionDataManager().giveRespect(userId); - return; - case UserAction.RESPECT_PET: - GetSessionDataManager().givePetRespect(userId); - return; - // case UserAction.WHISPER_USER: - // this._container.events.dispatchEvent(new RoomWidgetChatInputContentUpdateEvent(RoomWidgetChatInputContentUpdateEvent.WHISPER, userData.name)); - // return; - case UserAction.IGNORE_USER: - GetSessionDataManager().ignoreUser(userData.name); - return; - case UserAction.UNIGNORE_USER: - GetSessionDataManager().unignoreUser(userData.name); - return; - case UserAction.KICK_USER: - GetRoomSession().sendKickMessage(userId); - return; - case UserAction.BAN_USER_DAY: - case UserAction.BAN_USER_HOUR: - case UserAction.BAN_USER_PERM: - GetRoomSession().sendBanMessage(userId, type); - return; - case UserAction.MUTE_USER_2MIN: - GetRoomSession().sendMuteMessage(userId, 2); - return; - case UserAction.MUTE_USER_5MIN: - GetRoomSession().sendMuteMessage(userId, 5); - return; - case UserAction.MUTE_USER_10MIN: - GetRoomSession().sendMuteMessage(userId, 10); - return; - case UserAction.GIVE_RIGHTS: - GetRoomSession().sendGiveRightsMessage(userId); - return; - case UserAction.TAKE_RIGHTS: - GetRoomSession().sendTakeRightsMessage(userId); - return; - // case UserAction.START_TRADING: - // if(userData) this._widget.inventoryTrading.startTrade(userData.roomIndex, userData.name); - // return; - // case UserAction.OPEN_HOME_PAGE: - // GetSessionDataManager()._Str_21275(userId, _local_3.name); - // return; - // case UserAction.PICKUP_PET: - // GetRoomSession()._Str_13781(_local_2); - // return; - // case UserAction.MOUNT_PET: - // GetRoomSession()._Str_21066(_local_2); - // return; - // case UserAction.TOGGLE_PET_RIDING_PERMISSION: - // GetRoomSession()._Str_21025(_local_2); - // return; - // case UserAction.TOGGLE_PET_BREEDING_PERMISSION: - // GetRoomSession()._Str_21562(_local_2); - // return; - // case UserAction.DISMOUNT_PET: - // GetRoomSession()._Str_19075(_local_2); - // return; - // case UserAction.SADDLE_OFF: - // GetRoomSession()._Str_21635(_local_2); - // return; - case UserAction.PASS_CARRY_ITEM: - GetConnection().send(new RoomUnitGiveHandItemComposer(userId)); - return; - // case UserAction.GIVE_CARRY_ITEM_TO_PET: - // GetConnection().send(new RoomUnitGiveHandItemPetComposer(userId)); - // return; - // case UserAction.GIVE_WATER_TO_PET: - // GetConnection().send(new _Str_7251(_local_2, PetSupplementEnum._Str_9473)); - // return; - // case UserAction.GIVE_LIGHT_TO_PET: - // GetConnection().send(new _Str_7251(_local_2, PetSupplementEnum._Str_8421)); - // return; - // case UserAction.TREAT_PET: - // GetConnection().send(new _Str_8184(_local_2)); - // return; - case UserAction.DROP_CARRY_ITEM: - GetConnection().send(new RoomUnitDropHandItemComposer()); - return; - case UserAction.REQUEST_PET_UPDATE: - GetRoomSession().userDataManager.requestPetInfo(userId); - return; - case UserAction.REPORT: - return; - case UserAction.REPORT_CFH_OTHER: - return; - case UserAction.AMBASSADOR_ALERT_USER: - GetRoomSession().sendAmbassadorAlertMessage(userId); - return; - case UserAction.AMBASSADOR_KICK_USER: - GetRoomSession().sendKickMessage(userId); - return; - case UserAction.AMBASSADOR_MUTE_USER_2MIN: - GetRoomSession().sendMuteMessage(userId, 2); - return; - case UserAction.AMBASSADOR_MUTE_USER_10MIN: - GetRoomSession().sendMuteMessage(userId, 10); - return; - case UserAction.AMBASSADOR_MUTE_USER_60MIN: - GetRoomSession().sendMuteMessage(userId, 60); - return; - case UserAction.AMBASSADOR_MUTE_USER_18HOUR: - GetRoomSession().sendMuteMessage(userId, 1080); - return; - } -} diff --git a/src/api/nitro/session/index.ts b/src/api/nitro/session/index.ts index cb94de8b..2c35db50 100644 --- a/src/api/nitro/session/index.ts +++ b/src/api/nitro/session/index.ts @@ -5,7 +5,5 @@ export * from './GetRoomSession'; export * from './GetRoomSessionManager'; export * from './GetSessionDataManager'; export * from './IsOwnerOfFurniture'; -export * from './ProcessFurniAction'; -export * from './ProcessUserAction'; export * from './SendChatTypingMessage'; export * from './StartRoomSession'; diff --git a/src/assets/images/icons/user-profile-hover.png b/src/assets/images/icons/user-profile-hover.png new file mode 100644 index 00000000..f8f42f2b Binary files /dev/null and b/src/assets/images/icons/user-profile-hover.png differ diff --git a/src/assets/images/icons/user-profile.png b/src/assets/images/icons/user-profile.png new file mode 100644 index 00000000..60107e1e Binary files /dev/null and b/src/assets/images/icons/user-profile.png differ diff --git a/src/assets/styles/bootstrap/_variables.scss b/src/assets/styles/bootstrap/_variables.scss index 01276306..fa6d432e 100644 --- a/src/assets/styles/bootstrap/_variables.scss +++ b/src/assets/styles/bootstrap/_variables.scss @@ -526,9 +526,9 @@ $blockquote-footer-color: $gray-600 !default; $blockquote-footer-font-size: $small-font-size !default; $hr-margin-y: $spacer !default; -$hr-color: inherit !default; +$hr-color: rgba($white, 0.1) !default; $hr-height: $border-width !default; -$hr-opacity: .25 !default; +$hr-opacity: 0.5 !default; $legend-margin-bottom: .5rem !default; $legend-font-size: 1.5rem !default; diff --git a/src/assets/styles/icons.scss b/src/assets/styles/icons.scss index dc97caba..fb508cdf 100644 --- a/src/assets/styles/icons.scss +++ b/src/assets/styles/icons.scss @@ -458,6 +458,16 @@ i { height: 14px; } + &.icon-user-profile { + background: url('../images/icons/user-profile.png'); + width: 13px; + height: 11px; + + &:hover { + background: url('../images/icons/user-profile-hover.png'); + } + } + &.spin { animation: rotating 1s linear infinite; } diff --git a/src/layout/card/header/NitroCardHeaderView.tsx b/src/layout/card/header/NitroCardHeaderView.tsx index c850c4d2..4f4fd4d1 100644 --- a/src/layout/card/header/NitroCardHeaderView.tsx +++ b/src/layout/card/header/NitroCardHeaderView.tsx @@ -14,7 +14,7 @@ export const NitroCardHeaderView: FC = props =>
{ headerText }
-
+
event.stopPropagation() } onClick={ onCloseClick }>
diff --git a/src/views/room/handlers/RoomWidgetInfostandHandler.ts b/src/views/room/handlers/RoomWidgetInfostandHandler.ts index 5e523843..d1e509f0 100644 --- a/src/views/room/handlers/RoomWidgetInfostandHandler.ts +++ b/src/views/room/handlers/RoomWidgetInfostandHandler.ts @@ -1,5 +1,5 @@ -import { IFurnitureData, Nitro, NitroEvent, ObjectDataFactory, PetType, RoomControllerLevel, RoomModerationParser, RoomObjectCategory, RoomObjectType, RoomObjectVariable, RoomSessionPetInfoUpdateEvent, RoomTradingLevelEnum, RoomUserData, RoomWidgetEnumItemExtradataParameter, Vector3d } from 'nitro-renderer'; -import { GetRoomEngine, GetSessionDataManager, IsOwnerOfFurniture } from '../../../api'; +import { IFurnitureData, Nitro, NitroEvent, ObjectDataFactory, PetType, RoomAdsUpdateComposer, RoomControllerLevel, RoomModerationParser, RoomObjectCategory, RoomObjectOperationType, RoomObjectType, RoomObjectVariable, RoomSessionPetInfoUpdateEvent, RoomSessionUserBadgesEvent, RoomTradingLevelEnum, RoomUnitDropHandItemComposer, RoomUnitGiveHandItemComposer, RoomUnitGiveHandItemPetComposer, RoomUserData, RoomWidgetEnumItemExtradataParameter, SecurityLevel, Vector3d } from 'nitro-renderer'; +import { GetConnection, GetRoomEngine, GetSessionDataManager, IsOwnerOfFurniture } from '../../../api'; import { LocalizeText } from '../../../utils/LocalizeText'; import { RoomWidgetObjectNameEvent, RoomWidgetUpdateEvent, RoomWidgetUpdateInfostandFurniEvent, RoomWidgetUpdateInfostandPetEvent, RoomWidgetUpdateInfostandRentableBotEvent, RoomWidgetUpdateInfostandUserEvent } from '../events'; import { RoomWidgetChangeMottoMessage, RoomWidgetFurniActionMessage, RoomWidgetMessage, RoomWidgetRoomObjectMessage, RoomWidgetUserActionMessage } from '../messages'; @@ -14,7 +14,9 @@ export class RoomWidgetInfostandHandler extends RoomWidgetHandler case RoomSessionPetInfoUpdateEvent.PET_INFO: this.processPetInfoEvent((event as RoomSessionPetInfoUpdateEvent)); return; - + case RoomSessionUserBadgesEvent.RSUBE_BADGES: + this.eventDispatcher.dispatchEvent(event); + return; } } @@ -68,6 +70,162 @@ export class RoomWidgetInfostandHandler extends RoomWidgetHandler return this.processObjectNameMessage((message as RoomWidgetRoomObjectMessage)); case RoomWidgetRoomObjectMessage.GET_OBJECT_INFO: return this.processObjectInfoMessage((message as RoomWidgetRoomObjectMessage)); + case RoomWidgetUserActionMessage.SEND_FRIEND_REQUEST: + //this._container.friendService.sendFriendRequest(userId, userData.name); + break; + case RoomWidgetUserActionMessage.RESPECT_USER: + GetSessionDataManager().giveRespect(userId); + break; + case RoomWidgetUserActionMessage.RESPECT_PET: + GetSessionDataManager().givePetRespect(userId); + break; + case RoomWidgetUserActionMessage.WHISPER_USER: + //this.eventDispatcher.dispatchEvent(new RoomWidgetChatInputContentUpdateEvent(RoomWidgetChatInputContentUpdateEvent.WHISPER, userData.name)); + break; + case RoomWidgetUserActionMessage.IGNORE_USER: + GetSessionDataManager().ignoreUser(userData.name); + break; + case RoomWidgetUserActionMessage.UNIGNORE_USER: + GetSessionDataManager().unignoreUser(userData.name); + break; + case RoomWidgetUserActionMessage.KICK_USER: + this.roomSession.sendKickMessage((message as RoomWidgetUserActionMessage).userId); + break; + case RoomWidgetUserActionMessage.BAN_USER_DAY: + case RoomWidgetUserActionMessage.BAN_USER_HOUR: + case RoomWidgetUserActionMessage.BAN_USER_PERM: + this.roomSession.sendBanMessage((message as RoomWidgetUserActionMessage).userId, message.type); + break; + case RoomWidgetUserActionMessage.MUTE_USER_2MIN: + this.roomSession.sendMuteMessage((message as RoomWidgetUserActionMessage).userId, 2); + break; + case RoomWidgetUserActionMessage.MUTE_USER_5MIN: + this.roomSession.sendMuteMessage((message as RoomWidgetUserActionMessage).userId, 5); + break; + case RoomWidgetUserActionMessage.MUTE_USER_10MIN: + this.roomSession.sendMuteMessage((message as RoomWidgetUserActionMessage).userId, 10); + break; + case RoomWidgetUserActionMessage.GIVE_RIGHTS: + this.roomSession.sendGiveRightsMessage((message as RoomWidgetUserActionMessage).userId); + break; + case RoomWidgetUserActionMessage.TAKE_RIGHTS: + this.roomSession.sendTakeRightsMessage((message as RoomWidgetUserActionMessage).userId); + break; + case RoomWidgetUserActionMessage.START_TRADING: + //if(userData) this._widget.inventoryTrading.startTrade(userData.roomIndex, userData.name); + break; + // case RoomWidgetUserActionMessage.RWUAM_OPEN_HOME_PAGE: + // this._container.sessionDataManager._Str_21275((message as RoomWidgetUserActionMessage).userId, _local_3.name); + // break; + // case RoomWidgetUserActionMessage.RWUAM_PICKUP_PET: + // this._container.roomSession._Str_13781(_local_2); + // break; + // case RoomWidgetUserActionMessage.RWUAM_MOUNT_PET: + // this._container.roomSession._Str_21066(_local_2); + // break; + // case RoomWidgetUserActionMessage.RWUAM_TOGGLE_PET_RIDING_PERMISSION: + // this._container.roomSession._Str_21025(_local_2); + // break; + // case RoomWidgetUserActionMessage.RWUAM_TOGGLE_PET_BREEDING_PERMISSION: + // this._container.roomSession._Str_21562(_local_2); + // break; + // case RoomWidgetUserActionMessage.RWUAM_DISMOUNT_PET: + // this._container.roomSession._Str_19075(_local_2); + // break; + // case RoomWidgetUserActionMessage.RWUAM_SADDLE_OFF: + // this._container.roomSession._Str_21635(_local_2); + // break; + case RoomWidgetUserActionMessage.PASS_CARRY_ITEM: + GetConnection().send(new RoomUnitGiveHandItemComposer(userId)); + break; + case RoomWidgetUserActionMessage.GIVE_CARRY_ITEM_TO_PET: + GetConnection().send(new RoomUnitGiveHandItemPetComposer(userId)); + break; + case RoomWidgetUserActionMessage.GIVE_WATER_TO_PET: + //this._container.connection.send(new _Str_7251(_local_2, PetSupplementEnum._Str_9473)); + break; + case RoomWidgetUserActionMessage.GIVE_LIGHT_TO_PET: + //this._container.connection.send(new _Str_7251(_local_2, PetSupplementEnum._Str_8421)); + break; + case RoomWidgetUserActionMessage.TREAT_PET: + //this._container.connection.send(new _Str_8184(_local_2)); + break; + case RoomWidgetUserActionMessage.DROP_CARRY_ITEM: + GetConnection().send(new RoomUnitDropHandItemComposer()); + break; + case RoomWidgetUserActionMessage.REQUEST_PET_UPDATE: + this.roomSession.userDataManager.requestPetInfo(userId); + return; + case RoomWidgetUserActionMessage.REPORT: + return; + case RoomWidgetUserActionMessage.REPORT_CFH_OTHER: + return; + case RoomWidgetUserActionMessage.AMBASSADOR_ALERT_USER: + this.roomSession.sendAmbassadorAlertMessage(userId); + return; + case RoomWidgetUserActionMessage.AMBASSADOR_KICK_USER: + this.roomSession.sendKickMessage(userId); + return; + case RoomWidgetUserActionMessage.AMBASSADOR_MUTE_USER_2MIN: + this.roomSession.sendMuteMessage(userId, 2); + return; + case RoomWidgetUserActionMessage.AMBASSADOR_MUTE_USER_10MIN: + this.roomSession.sendMuteMessage(userId, 10); + return; + case RoomWidgetUserActionMessage.AMBASSADOR_MUTE_USER_60MIN: + this.roomSession.sendMuteMessage(userId, 60); + return; + case RoomWidgetUserActionMessage.AMBASSADOR_MUTE_USER_18HOUR: + this.roomSession.sendMuteMessage(userId, 1080); + return; + case RoomWidgetFurniActionMessage.ROTATE: + GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_ROTATE_POSITIVE); + return; + case RoomWidgetFurniActionMessage.MOVE: + GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_MOVE); + return; + case RoomWidgetFurniActionMessage.PICKUP: + GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_PICKUP); + return; + case RoomWidgetFurniActionMessage.EJECT: + GetRoomEngine().processRoomObjectOperation(objectId, category, RoomObjectOperationType.OBJECT_EJECT); + return; + case RoomWidgetFurniActionMessage.USE: + GetRoomEngine().useRoomObject(objectId, category); + return; + case RoomWidgetFurniActionMessage.SAVE_STUFF_DATA: { + const furniMessage = (message as RoomWidgetFurniActionMessage); + + if(!furniMessage.objectData) return; + + const mapData = new Map(); + const dataParts = furniMessage.objectData.split('\t'); + + if(dataParts) + { + for(const part of dataParts) + { + const partPieces = part.split('=', 2); + + if(partPieces && partPieces.length === 2) + { + const piece1 = partPieces[0]; + const piece2 = partPieces[1]; + + mapData.set(piece1, piece2); + } + } + } + + GetRoomEngine().processRoomObjectWallOperation(objectId, category, RoomObjectOperationType.OBJECT_SAVE_STUFF_DATA, mapData); + + if(GetSessionDataManager().hasSecurity(SecurityLevel.MODERATOR)) GetConnection().send(new RoomAdsUpdateComposer(objectId, mapData)); + + return; + } + case RoomWidgetChangeMottoMessage.CHANGE_MOTTO: + this.roomSession.sendMottoMessage((message as RoomWidgetChangeMottoMessage).motto); + return; } return null; @@ -604,7 +762,8 @@ export class RoomWidgetInfostandHandler extends RoomWidgetHandler public get eventTypes(): string[] { return [ - RoomSessionPetInfoUpdateEvent.PET_INFO + RoomSessionPetInfoUpdateEvent.PET_INFO, + RoomSessionUserBadgesEvent.RSUBE_BADGES ]; } diff --git a/src/views/room/messages/RoomWidgetChangeMottoMessage.ts b/src/views/room/messages/RoomWidgetChangeMottoMessage.ts index 2905ea30..2342da2a 100644 --- a/src/views/room/messages/RoomWidgetChangeMottoMessage.ts +++ b/src/views/room/messages/RoomWidgetChangeMottoMessage.ts @@ -6,9 +6,9 @@ export class RoomWidgetChangeMottoMessage extends RoomWidgetMessage private _motto: string; - constructor(type: string, motto: string) + constructor(motto: string) { - super(type); + super(RoomWidgetChangeMottoMessage.CHANGE_MOTTO); this._motto = motto; } diff --git a/src/views/room/widgets/avatar-info/AvatarInfoWidgetView.tsx b/src/views/room/widgets/avatar-info/AvatarInfoWidgetView.tsx index 21c33678..221c6c63 100644 --- a/src/views/room/widgets/avatar-info/AvatarInfoWidgetView.tsx +++ b/src/views/room/widgets/avatar-info/AvatarInfoWidgetView.tsx @@ -61,12 +61,12 @@ export const AvatarInfoWidgetView: FC = props => case RoomWidgetRoomObjectUpdateEvent.USER_REMOVED: if(prevValue instanceof RoomWidgetUpdateInfostandUserEvent || prevValue instanceof RoomWidgetUpdateInfostandRentableBotEvent) { - if(prevValue.webID === roomObjectEvent.id) return null; + if(prevValue.roomIndex === roomObjectEvent.id) return null; } else if(prevValue instanceof RoomWidgetUpdateInfostandPetEvent) { - // room index + if(prevValue.roomIndex === roomObjectEvent.id) return null; } break; } @@ -102,9 +102,7 @@ export const AvatarInfoWidgetView: FC = props => case RoomWidgetUpdateInfostandUserEvent.PEER: case RoomWidgetUpdateInfostandUserEvent.BOT: case RoomWidgetUpdateInfostandRentableBotEvent.RENTABLE_BOT: { - const infostandEvent = (event as RoomWidgetUpdateInfostandFurniEvent); - - setInfoStandEvent(infostandEvent); + setInfoStandEvent((event as RoomWidgetUpdateInfostandFurniEvent)); return; } default: diff --git a/src/views/room/widgets/avatar-info/utils/BotSkillsEnum.ts b/src/views/room/widgets/avatar-info/utils/BotSkillsEnum.ts new file mode 100644 index 00000000..cd006fa1 --- /dev/null +++ b/src/views/room/widgets/avatar-info/utils/BotSkillsEnum.ts @@ -0,0 +1,18 @@ +export class BotSkillsEnum +{ + public static _Str_19584: number = 0; + public static DRESS_UP: number = 1; + public static SETUP_CHAT: number = 2; + public static RANDOM_WALK: number = 3; + public static DANCE: number = 4; + public static CHANGE_BOT_NAME: number = 5; + public static _Str_20280: number = 6; + public static _Str_18934: number = 7; + public static _Str_14917: number = 8; + public static CHANGE_BOT_MOTTO: number = 9; + public static NUX_TAKE_TOUR: number = 10; + public static NO_PICK_UP: number = 12; + public static NAVIGATOR_SEARCH: number = 14; + public static DONATE_TO_USER: number = 24; + public static DONATE_TO_ALL: number = 25; +} diff --git a/src/views/room/widgets/infostand/InfoStandWidgetView.scss b/src/views/room/widgets/infostand/InfoStandWidgetView.scss index cfa6c11a..b5219a9c 100644 --- a/src/views/room/widgets/infostand/InfoStandWidgetView.scss +++ b/src/views/room/widgets/infostand/InfoStandWidgetView.scss @@ -7,14 +7,16 @@ .nitro-infostand { position: relative; - min-width: 170px; - max-width: 170px; + min-width: 190px; + max-width: 190px; z-index: $infostand-zindex; pointer-events: auto; box-shadow: inset 0 2px 0 rgba($white, .15), 0 1px 1px rgba($black, .1); - &.nitro-infostand-user { - max-width: 180px; + .form-control-sm { + height: 25px; + min-height: 25px; + padding: 0.1rem 0.25rem; } .pet-image { diff --git a/src/views/room/widgets/infostand/InfoStandWidgetView.tsx b/src/views/room/widgets/infostand/InfoStandWidgetView.tsx index 945c52ab..2f6b332a 100644 --- a/src/views/room/widgets/infostand/InfoStandWidgetView.tsx +++ b/src/views/room/widgets/infostand/InfoStandWidgetView.tsx @@ -53,12 +53,12 @@ export const InfoStandWidgetView: FC = props => case RoomWidgetRoomObjectUpdateEvent.USER_REMOVED: if(prevValue instanceof RoomWidgetUpdateInfostandUserEvent || prevValue instanceof RoomWidgetUpdateInfostandRentableBotEvent) { - if(prevValue.webID === roomObjectEvent.id) return null; + if(prevValue.roomIndex === roomObjectEvent.id) return null; } else if(prevValue instanceof RoomWidgetUpdateInfostandPetEvent) { - // room index + if(prevValue.roomIndex === roomObjectEvent.id) return null; } break; } @@ -73,11 +73,7 @@ export const InfoStandWidgetView: FC = props => case RoomWidgetUpdateInfostandUserEvent.BOT: case RoomWidgetUpdateInfostandRentableBotEvent.RENTABLE_BOT: case RoomWidgetUpdateInfostandPetEvent.PET_INFO: { - const infostandEvent = (event as RoomWidgetUpdateInfostandEvent); - - console.log(infostandEvent); - - setInfoStandEvent(infostandEvent); + setInfoStandEvent((event as RoomWidgetUpdateInfostandEvent)); return; } default: diff --git a/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx b/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx index 25e5e61c..a2021565 100644 --- a/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx +++ b/src/views/room/widgets/infostand/views/bot/InfoStandWidgetBotView.tsx @@ -1,5 +1,4 @@ -import { RoomControllerLevel } from 'nitro-renderer'; -import { FC, useCallback, useEffect, useState } from 'react'; +import { FC, useCallback } from 'react'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; import { AvatarImageView } from '../../../../../avatar-image/AvatarImageView'; import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; @@ -9,17 +8,6 @@ export const InfoStandWidgetBotView: FC = props => { const { botData = null, close = null } = props; - const [ canPickup, setCanPickup ] = useState(false); - - useEffect(() => - { - setCanPickup(false); - - if(botData.amIOwner || botData.amIAnyRoomController || botData.roomControllerLevel >= RoomControllerLevel.MODERATOR) - setCanPickup(true); - - }, [ botData ]); - const processButtonAction = useCallback((action: string) => { if(!action || (action === '')) return; @@ -29,34 +17,34 @@ export const InfoStandWidgetBotView: FC = props => if(!botData) return null; return ( - <> -
-
-
-
{ botData.name }
- +
+
+
+
{ botData.name }
+ +
+
+
+
+
-
-
-
- -
-
- -
-
-
-
-
{ botData.motto }
+
+ { (botData.badges.length > 0) && botData.badges.map((result, index) => + { + return ; + }) }
+
+
{ botData.motto }
+ { (botData.carryItem > 0) && + <> +
+
+ { LocalizeText('infostand.text.handitem', [ 'item' ], [ LocalizeText('handitem' + botData.carryItem) ]) } +
+ }
- { canPickup &&
- -
} - +
); } diff --git a/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx b/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx index a5e6b147..7c23f4b3 100644 --- a/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx +++ b/src/views/room/widgets/infostand/views/furni/InfoStandWidgetFurniView.tsx @@ -1,9 +1,10 @@ import { CrackableDataType, RoomControllerLevel, RoomWidgetEnumItemExtradataParameter, RoomWidgetFurniInfoUsagePolicyEnum, StringDataType } from 'nitro-renderer'; import { FC, useCallback, useEffect, useState } from 'react'; -import { FurniAction, ProcessFurniAction } from '../../../../../../api'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; import { LimitedEditionCompactPlateView } from '../../../../../limited-edition/compact-plate/LimitedEditionCompactPlateView'; +import { useRoomContext } from '../../../../context/RoomContext'; +import { RoomWidgetFurniActionMessage } from '../../../../messages'; import { InfoStandWidgetFurniViewProps } from './InfoStandWidgetFurniView.types'; const PICKUP_MODE_NONE: number = 0; @@ -13,6 +14,7 @@ const PICKUP_MODE_FULL: number = 2; export const InfoStandWidgetFurniView: FC = props => { const { furniData = null, close = null } = props; + const { eventDispatcher = null, widgetHandler = null } = useRoomContext(); const [ pickupMode, setPickupMode ] = useState(0); const [ canMove, setCanMove ] = useState(false); @@ -27,29 +29,28 @@ export const InfoStandWidgetFurniView: FC = props useEffect(() => { - setPickupMode(0); - setCanMove(false); - setCanRotate(false); - setCanUse(false); - setFurniSettingsKeys([]); - setFurniSettingsValues([]); - setIsCrackable(false); - setCrackableHits(0); - setCrackableTarget(0); - setGodMode(false); + let pickupMode = PICKUP_MODE_NONE; + let canMove = false; + let canRotate = false; + let canUse = false; + let furniSettings: string[] = []; + let furniValues: string[] = []; + let isCrackable = false; + let crackableHits = 0; + let crackableTarget = 0; + let godMode = false; const isValidController = (furniData.roomControllerLevel >= RoomControllerLevel.GUEST); if(isValidController || furniData.isOwner || furniData.isRoomOwner || furniData.isAnyRoomController) { - setCanMove(true); - setCanRotate(!furniData.isWallItem); + canMove = true; + canRotate = !furniData.isWallItem; - if(furniData.roomControllerLevel >= RoomControllerLevel.MODERATOR) setGodMode(true); + if(furniData.roomControllerLevel >= RoomControllerLevel.MODERATOR) godMode = true; } - else - - if((((furniData.usagePolicy === RoomWidgetFurniInfoUsagePolicyEnum.EVERYBODY) || ((furniData.usagePolicy === RoomWidgetFurniInfoUsagePolicyEnum.CONTROLLER) && isValidController)) || ((furniData.extraParam === RoomWidgetEnumItemExtradataParameter.JUKEBOX) && isValidController)) || ((furniData.extraParam === RoomWidgetEnumItemExtradataParameter.USABLE_PRODUCT) && isValidController)) setCanUse(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) { @@ -57,10 +58,10 @@ export const InfoStandWidgetFurniView: FC = props { const stuffData = (furniData.stuffData as CrackableDataType); - setCanUse(true); - setIsCrackable(true); - setCrackableHits(stuffData.hits); - setCrackableTarget(stuffData.target); + canUse = true; + isCrackable = true; + crackableHits = stuffData.hits; + crackableTarget = stuffData.target; } if(godMode) @@ -71,39 +72,36 @@ export const InfoStandWidgetFurniView: FC = props { const parts = extraParam.split('\t'); - let keys: string[] = []; - let values: string[] = []; - for(const part of parts) { const value = part.split('='); if(value && (value.length === 2)) { - keys.push(value[0]); - values.push(value[1]); + furniSettings.push(value[0]); + furniValues.push(value[1]); } } - - setFurniSettingsKeys(keys); - setFurniSettingsValues(values); } } } - setPickupMode(PICKUP_MODE_NONE); + if(furniData.isOwner || furniData.isAnyRoomController) pickupMode = PICKUP_MODE_FULL; - if(furniData.isOwner || furniData.isAnyRoomController) - { - setPickupMode(PICKUP_MODE_FULL); - } + else if(furniData.isRoomOwner || (furniData.roomControllerLevel >= RoomControllerLevel.GUILD_ADMIN)) pickupMode = PICKUP_MODE_EJECT; - else if(furniData.isRoomOwner || (furniData.roomControllerLevel >= RoomControllerLevel.GUILD_ADMIN)) - { - setPickupMode(PICKUP_MODE_EJECT); - } + if(furniData.isStickie) pickupMode = PICKUP_MODE_NONE; - else if(furniData.isStickie) setPickupMode(PICKUP_MODE_NONE); + setPickupMode(pickupMode); + setCanMove(canMove); + setCanRotate(canRotate); + setCanUse(canUse); + setFurniSettingsKeys(furniSettings); + setFurniSettingsValues(furniValues); + setIsCrackable(isCrackable); + setCrackableHits(crackableHits); + setCrackableTarget(crackableTarget); + setGodMode(godMode); }, [ furniData ]); const openFurniGroupInfo = useCallback(() => @@ -151,28 +149,28 @@ export const InfoStandWidgetFurniView: FC = props switch(action) { case 'move': - messageType = FurniAction.MOVE; + messageType = RoomWidgetFurniActionMessage.MOVE; break; case 'rotate': - messageType = FurniAction.ROTATE; + messageType = RoomWidgetFurniActionMessage.ROTATE; break; case 'pickup': - if(pickupMode === PICKUP_MODE_FULL) messageType = FurniAction.PICKUP; - else messageType = FurniAction.EJECT; + if(pickupMode === PICKUP_MODE_FULL) messageType = RoomWidgetFurniActionMessage.PICKUP; + else messageType = RoomWidgetFurniActionMessage.EJECT; break; case 'use': - messageType = FurniAction.USE; + messageType = RoomWidgetFurniActionMessage.USE; break; case 'save_branding_configuration': - messageType = FurniAction.SAVE_STUFF_DATA; + messageType = RoomWidgetFurniActionMessage.SAVE_STUFF_DATA; objectData = getFurniSettingsAsString(); break; } if(!messageType) return; - ProcessFurniAction(messageType, furniData.id, furniData.category, furniData.purchaseOfferId, objectData); - }, [ furniData, pickupMode ]); + widgetHandler.processWidgetMessage(new RoomWidgetFurniActionMessage(messageType, furniData.id, furniData.category, furniData.purchaseOfferId, objectData)); + }, [ furniData, pickupMode, widgetHandler, getFurniSettingsAsString ]); if(!furniData) return null; @@ -181,44 +179,54 @@ export const InfoStandWidgetFurniView: FC = props
-
{ furniData.name }
+
{ furniData.name }
-
-
+
+
{ furniData.stuffData.isUnique && - } +
+ +
} { furniData.image.src.length && }
-
-
-
{furniData.description}
-
-
{ LocalizeText('furni.owner', [ 'name' ], [ furniData.ownerName ]) }
- {isCrackable &&
-
-

{LocalizeText('infostand.crackable_furni.hits_remaining', ['hits', 'target'], [crackableHits.toString(), crackableTarget.toString()])}

-
} - { (furniData.groupId > 0) && +
+
{ furniData.description }
+
+
+ +
{ LocalizeText('furni.owner', [ 'name' ], [ furniData.ownerName ]) }
+
+ { isCrackable && + <> +
+
{ LocalizeText('infostand.crackable_furni.hits_remaining', [ 'hits', 'target' ], [ crackableHits.toString(), crackableTarget.toString() ]) }
+ } + { (furniData.groupId > 0) && + <> +
-
} -
- { godMode && <> -
-
ID: { furniData.id }
- {furniSettingsKeys.length > 0 && <> -
- { furniSettingsKeys.map((key, index) => - { - return
-
{ key }
- onFurniSettingChange(index, event.target.value) }/> -
; - }) } +
+ } + { godMode && + <> +
+
ID: { furniData.id }
+ { (furniSettingsKeys.length > 0) && + <> +
+ { furniSettingsKeys.map((key, index) => + { + return ( +
+
{ key }
+ onFurniSettingChange(index, event.target.value) }/> +
); + }) } + } } - }
diff --git a/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx b/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx index cb17a3e5..9e10e706 100644 --- a/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx +++ b/src/views/room/widgets/infostand/views/rentable-bot/InfoStandWidgetRentableBotView.tsx @@ -1,62 +1,75 @@ -import { RoomControllerLevel } from 'nitro-renderer'; -import { FC, useCallback, useEffect, useState } from 'react'; +import { BotRemoveComposer } from 'nitro-renderer'; +import { FC, useCallback, useMemo } from 'react'; +import { GetConnection } from '../../../../../../api'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; import { AvatarImageView } from '../../../../../avatar-image/AvatarImageView'; import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; +import { BotSkillsEnum } from '../../../avatar-info/utils/BotSkillsEnum'; import { InfoStandWidgetRentableBotViewProps } from './InfoStandWidgetRentableBotView.types'; export const InfoStandWidgetRentableBotView: FC = props => { const { rentableBotData = null, close = null } = props; - const [ canPickup, setCanPickup ] = useState(false); - - useEffect(() => + const canPickup = useMemo(() => { - setCanPickup(false); + if(rentableBotData.botSkills.indexOf(BotSkillsEnum.NO_PICK_UP) >= 0) return false; - if(rentableBotData.amIOwner || rentableBotData.amIAnyRoomController || rentableBotData.roomControllerLevel >= RoomControllerLevel.MODERATOR) - setCanPickup(true); - + if(!rentableBotData.amIOwner && !rentableBotData.amIAnyRoomController) return false; + + return true; }, [ rentableBotData ]); - const processButtonAction = useCallback((action: string) => + const pickupBot = useCallback(() => { - if(!action || (action === '')) return; - - }, []); + GetConnection().send(new BotRemoveComposer(rentableBotData.webID)); + }, [ rentableBotData ]); if(!rentableBotData) return; return ( <> -
+
-
{ rentableBotData.name }
+
{ rentableBotData.name }
-
+
- + { (rentableBotData.badges.length > 0) && rentableBotData.badges.map((result, index) => + { + return ; + }) }
-
-
{ rentableBotData.motto }
-
-
{ LocalizeText('infostand.text.botowner', ['name'], [ rentableBotData.ownerName ]) }
+
+
{ rentableBotData.motto }
+
+
+ +
{ LocalizeText('infostand.text.botowner', [ 'name' ], [ rentableBotData.ownerName ]) }
+
+ { (rentableBotData.carryItem > 0) && + <> +
+
+ { LocalizeText('infostand.text.handitem', [ 'item' ], [ LocalizeText('handitem' + rentableBotData.carryItem) ]) } +
+ }
- { canPickup &&
- -
} +
} ); } diff --git a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx index d93ba5ec..52c90be5 100644 --- a/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx +++ b/src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx @@ -1,120 +1,128 @@ -import classNames from 'classnames'; -import { FC, KeyboardEvent, useCallback, useEffect, useRef, useState } from 'react'; +import { RoomSessionUserBadgesEvent } from 'nitro-renderer'; +import { FC, FocusEvent, KeyboardEvent, useCallback, useEffect, useState } from 'react'; +import { CreateEventDispatcherHook } from '../../../../../../hooks/events'; import { LocalizeText } from '../../../../../../utils/LocalizeText'; import { AvatarImageView } from '../../../../../avatar-image/AvatarImageView'; import { BadgeImageView } from '../../../../../badge-image/BadgeImageView'; +import { useRoomContext } from '../../../../context/RoomContext'; import { RoomWidgetUpdateInfostandUserEvent } from '../../../../events/RoomWidgetUpdateInfostandUserEvent'; +import { RoomWidgetChangeMottoMessage } from '../../../../messages'; import { InfoStandWidgetUserViewProps } from './InfoStandWidgetUserView.types'; export const InfoStandWidgetUserView: FC = props => { const { userData = null, close = null } = props; + const { eventDispatcher = null, widgetHandler = null } = useRoomContext(); + const [ badges, setBadges ] = useState([]); + const [ motto, setMotto ] = useState(null); + const [ isEditingMotto, setIsEditingMotto ] = useState(false); - const [ motto, setMotto ] = useState(null); - const [ isEditingMotto, setIsEditingMotto ] = useState(false); - - const inputRef = useRef(); - - useEffect(() => + const saveMotto = useCallback((motto: string) => { + if(motto.length > 38) return; + + widgetHandler.processWidgetMessage(new RoomWidgetChangeMottoMessage(motto)); + setIsEditingMotto(false); - setMotto(null); - - if(!motto) setMotto(userData.motto); - }, [ userData ]); + }, [ widgetHandler ]); - const saveMotto = useCallback(() => + const onMottoBlur = useCallback((event: FocusEvent) => { - setIsEditingMotto(false); - }, [ motto ]); + saveMotto(event.target.value); + }, [ saveMotto ]); - const editMotto = useCallback(() => - { - setIsEditingMotto(true); - setTimeout(() => - { - if(inputRef.current) inputRef.current.focus(); - }, 100); - }, [ inputRef ]); - - const onKeyDownEvent = useCallback((event: KeyboardEvent) => + const onMottoKeyDown = useCallback((event: KeyboardEvent) => { switch(event.key) { case 'Enter': - saveMotto(); - - const target = (event.target as HTMLInputElement); - target.blur(); + saveMotto((event.target as HTMLInputElement).value); return; } - - }, []); + }, [ saveMotto ]); + + const onRoomSessionUserBadgesEvent = useCallback((event: RoomSessionUserBadgesEvent) => + { + if(!userData || (userData.webID !== event.userId)) return; + + setBadges(event.badges); + }, [ userData ]); + + CreateEventDispatcherHook(RoomSessionUserBadgesEvent.RSUBE_BADGES, eventDispatcher, onRoomSessionUserBadgesEvent); + + useEffect(() => + { + setBadges(userData.badges); + setIsEditingMotto(false); + setMotto(userData.motto); + }, [ userData ]); if(!userData) return null; return ( - <> -
-
-
-
{ userData.name }
- +
+
+
+
{ userData.name }
+ +
+
+
+
+
-
-
-
- +
+
+
+ { badges[0] && } +
+
+ { userData.groupId > 0 && } +
-
-
-
- { userData.badges[0] && } -
-
- { userData.groupId > 0 && } -
+
+
+ { badges[1] && }
-
-
- { userData.badges[1] && } -
-
- { userData.badges[2] && } -
+
+ { badges[2] && }
-
-
- { userData.badges[3] && } -
-
- { userData.badges[4] && } -
+
+
+
+ { badges[3] && } +
+
+ { badges[4] && }
-
-
- { userData.type !== RoomWidgetUpdateInfostandUserEvent.OWN_USER &&
{ motto }
} - { userData.type === RoomWidgetUpdateInfostandUserEvent.OWN_USER &&
-
- -
+
+
+
+ { userData.type !== RoomWidgetUpdateInfostandUserEvent.OWN_USER &&
{ motto }
} + { userData.type === RoomWidgetUpdateInfostandUserEvent.OWN_USER && +
+
- { !isEditingMotto &&
editMotto() }>{ motto }
} - setMotto(event.target.value) } onBlur={ () => saveMotto() } onKeyDown={ event => onKeyDownEvent(event) }/> + { !isEditingMotto && +
setIsEditingMotto(true) }>{ motto }
} + { isEditingMotto && + setMotto(event.target.value) } onBlur={ onMottoBlur } onKeyDown={ onMottoKeyDown } autoFocus={ true } /> }
} -
-
-
- { LocalizeText('infostand.text.achievement_score') + ' ' + userData.achievementScore } -
- { userData.carryItem > 0 && <> -
- { LocalizeText('infostand.text.handitem', ['item'], [LocalizeText('handitem' + userData.carryItem)]) } - }
+
+
+ { LocalizeText('infostand.text.achievement_score') + ' ' + userData.achievementScore } +
+ { (userData.carryItem > 0) && + <> +
+
+ { LocalizeText('infostand.text.handitem', [ 'item' ], [ LocalizeText('handitem' + userData.carryItem) ]) } +
+ }
- ); +
); }