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

Merge branch 'dev' of https://github.com/billsonnn/nitro-react into dev

Browse Source
This commit is contained in:
Bill 2021-09-15 23:36:33 -04:00
commit 02d54d770f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/friends/views/friend-bar-item/FriendBarItemView.tsx
View File

@ -1,4 +1,4 @@
import { FollowFriendComposer, MouseEventType, UserProfileComposer } from '@nitrots/nitro-renderer'; import { FollowFriendMessageComposer, MouseEventType, UserProfileComposer } from '@nitrots/nitro-renderer';
import { FC, useCallback, useEffect, useRef, useState } from 'react'; import { FC, useCallback, useEffect, useRef, useState } from 'react';
import { LocalizeText } from '../../../../api'; import { LocalizeText } from '../../../../api';
import { SendMessageHook } from '../../../../hooks/messages'; import { SendMessageHook } from '../../../../hooks/messages';
@ -13,7 +13,7 @@ export const FriendBarItemView: FC<FriendBarItemViewProps> = props =>
const followFriend = useCallback(() => const followFriend = useCallback(() =>
{ {
SendMessageHook(new FollowFriendComposer(friend.id)); SendMessageHook(new FollowFriendMessageComposer(friend.id));
}, [ friend ]); }, [ friend ]);
const openProfile = useCallback(() => const openProfile = useCallback(() =>

4
src/views/friends/views/friend-item/FriendsListItemView.tsx
View File

@ -1,4 +1,4 @@
import { FollowFriendComposer, SetRelationshipStatusComposer } from '@nitrots/nitro-renderer'; import { FollowFriendMessageComposer, SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
import { FC, useCallback, useState } from 'react'; import { FC, useCallback, useState } from 'react';
import { LocalizeText } from '../../../../api'; import { LocalizeText } from '../../../../api';
import { SendMessageHook } from '../../../../hooks'; import { SendMessageHook } from '../../../../hooks';
@ -16,7 +16,7 @@ export const FriendsListItemView: FC<FriendsListItemViewProps> = props =>
{ {
if(!friend) return; if(!friend) return;
SendMessageHook(new FollowFriendComposer(friend.id)); SendMessageHook(new FollowFriendMessageComposer(friend.id));
}, [ friend ]); }, [ friend ]);
const getCurrentRelationshipName = useCallback(() => const getCurrentRelationshipName = useCallback(() =>

6
src/views/friends/views/request-item/FriendsRequestItemView.tsx
View File

@ -1,4 +1,4 @@
import { AcceptFriendComposer, DeclineFriendComposer } from '@nitrots/nitro-renderer'; import { AcceptFriendMessageComposer, DeclineFriendMessageComposer } from '@nitrots/nitro-renderer';
import { FC, useCallback } from 'react'; import { FC, useCallback } from 'react';
import { SendMessageHook } from '../../../../hooks/messages/message-event'; import { SendMessageHook } from '../../../../hooks/messages/message-event';
import { UserProfileIconView } from '../../../shared/user-profile-icon/UserProfileIconView'; import { UserProfileIconView } from '../../../shared/user-profile-icon/UserProfileIconView';
@ -12,14 +12,14 @@ export const FriendsRequestItemView: FC<FriendsRequestItemViewProps> = props =>
{ {
if(!request) return; if(!request) return;
SendMessageHook(new AcceptFriendComposer(request.id)); SendMessageHook(new AcceptFriendMessageComposer(request.id));
}, [ request ]); }, [ request ]);
const decline = useCallback(() => const decline = useCallback(() =>
{ {
if(!request) return; if(!request) return;
SendMessageHook(new DeclineFriendComposer(false, request.id)); SendMessageHook(new DeclineFriendMessageComposer(false, request.id));
}, [ request ]); }, [ request ]);
if(!request) return null; if(!request) return null;

6
src/views/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx
View File

@ -1,4 +1,4 @@
import { LoveLockFurniFinishedEvent, LoveLockFurniFriendConfirmedEvent, LoveLockFurniStartEvent, LoveLockStartConfirmComposer, NitroEvent, RoomEngineTriggerWidgetEvent, RoomObjectVariable } from '@nitrots/nitro-renderer'; import { FriendFurniConfirmLockMessageComposer, LoveLockFurniFinishedEvent, LoveLockFurniFriendConfirmedEvent, LoveLockFurniStartEvent, NitroEvent, RoomEngineTriggerWidgetEvent, RoomObjectVariable } from '@nitrots/nitro-renderer';
import { FC, useCallback, useState } from 'react'; import { FC, useCallback, useState } from 'react';
import { GetRoomEngine, GetRoomSession, LocalizeText, RoomWidgetRoomObjectUpdateEvent } from '../../../../../api'; import { GetRoomEngine, GetRoomSession, LocalizeText, RoomWidgetRoomObjectUpdateEvent } from '../../../../../api';
import { CreateEventDispatcherHook } from '../../../../../hooks/events/event-dispatcher.base'; import { CreateEventDispatcherHook } from '../../../../../hooks/events/event-dispatcher.base';
@ -77,10 +77,10 @@ export const FurnitureFriendFurniView: FC<{}> = props =>
setEngravingLockData(null); setEngravingLockData(null);
return; return;
case 'accept_request': case 'accept_request':
GetRoomSession().connection.send(new LoveLockStartConfirmComposer(engravingLockData.objectId, true)); GetRoomSession().connection.send(new FriendFurniConfirmLockMessageComposer(engravingLockData.objectId, true));
return; return;
case 'reject_request': case 'reject_request':
GetRoomSession().connection.send(new LoveLockStartConfirmComposer(engravingLockData.objectId, false)); GetRoomSession().connection.send(new FriendFurniConfirmLockMessageComposer(engravingLockData.objectId, false));
processAction('close_request'); processAction('close_request');
return; return;
case 'close_request': case 'close_request':