mirror of
https://github.com/billsonnn/nitro-react.git
synced 2024-11-23 14:40:50 +01:00
Updates
This commit is contained in:
parent
749aed141d
commit
b5850c1995
7
src/api/friends/OpenMessengerChat.ts
Normal file
7
src/api/friends/OpenMessengerChat.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
import { CreateLinkEvent } from '..';
|
||||||
|
|
||||||
|
export function OpenMessengerChat(friendId: number): void
|
||||||
|
{
|
||||||
|
console.log(`friends/messenger/${friendId}`);
|
||||||
|
CreateLinkEvent(`friends/messenger/${friendId}`);
|
||||||
|
}
|
1
src/api/friends/index.ts
Normal file
1
src/api/friends/index.ts
Normal file
@ -0,0 +1 @@
|
|||||||
|
export * from './OpenMessengerChat';
|
@ -1,4 +1,5 @@
|
|||||||
export * from './core';
|
export * from './core';
|
||||||
|
export * from './friends';
|
||||||
export * from './groups';
|
export * from './groups';
|
||||||
export * from './navigator';
|
export * from './navigator';
|
||||||
export * from './nitro';
|
export * from './nitro';
|
||||||
|
@ -21,7 +21,6 @@ export const FriendsView: FC<{}> = props =>
|
|||||||
|
|
||||||
const [ isReady, setIsReady ] = useState(false);
|
const [ isReady, setIsReady ] = useState(false);
|
||||||
const [ isListVisible, setIsListVisible ] = useState(false);
|
const [ isListVisible, setIsListVisible ] = useState(false);
|
||||||
const [ isMessengerVisible, setIsMessengerVisible ] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() =>
|
useEffect(() =>
|
||||||
{
|
{
|
||||||
@ -45,12 +44,6 @@ export const FriendsView: FC<{}> = props =>
|
|||||||
case FriendsEvent.TOGGLE_FRIEND_LIST:
|
case FriendsEvent.TOGGLE_FRIEND_LIST:
|
||||||
setIsListVisible(value => !value);
|
setIsListVisible(value => !value);
|
||||||
return;
|
return;
|
||||||
case FriendsEvent.SHOW_FRIEND_MESSENGER:
|
|
||||||
setIsMessengerVisible(true);
|
|
||||||
return;
|
|
||||||
case FriendsEvent.TOGGLE_FRIEND_MESSENGER:
|
|
||||||
setIsMessengerVisible(value => !value);
|
|
||||||
return;
|
|
||||||
case FriendsSendFriendRequestEvent.SEND_FRIEND_REQUEST:
|
case FriendsSendFriendRequestEvent.SEND_FRIEND_REQUEST:
|
||||||
const requestEvent = (event as FriendsSendFriendRequestEvent);
|
const requestEvent = (event as FriendsSendFriendRequestEvent);
|
||||||
return;
|
return;
|
||||||
@ -104,7 +97,7 @@ export const FriendsView: FC<{}> = props =>
|
|||||||
<FriendsMessageHandler />
|
<FriendsMessageHandler />
|
||||||
{ isReady && createPortal(<FriendBarView />, document.getElementById('toolbar-friend-bar-container')) }
|
{ isReady && createPortal(<FriendBarView />, document.getElementById('toolbar-friend-bar-container')) }
|
||||||
{ isListVisible && <FriendsListView onlineFriends={ onlineFriends } offlineFriends={ offlineFriends } friendRequests={ requests } onCloseClick={ () => setIsListVisible(false) } /> }
|
{ isListVisible && <FriendsListView onlineFriends={ onlineFriends } offlineFriends={ offlineFriends } friendRequests={ requests } onCloseClick={ () => setIsListVisible(false) } /> }
|
||||||
{ isMessengerVisible && <FriendsMessengerView /> }
|
<FriendsMessengerView />
|
||||||
</FriendsContextProvider>
|
</FriendsContextProvider>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -12,9 +12,9 @@ export class MessengerChat
|
|||||||
this._messages = [];
|
this._messages = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
public addMessage(): void
|
public addMessage(type: number, senderId: number, message: string, sentAt: number, extraData?: string): void
|
||||||
{
|
{
|
||||||
this._messages.push();
|
this._messages.push(new MessengerChatMessage(type, senderId, message, sentAt, extraData));
|
||||||
}
|
}
|
||||||
|
|
||||||
public get friendId(): number
|
public get friendId(): number
|
||||||
|
@ -3,11 +3,40 @@ export class MessengerChatMessage
|
|||||||
private _type: number;
|
private _type: number;
|
||||||
private _senderId: number;
|
private _senderId: number;
|
||||||
private _message: string;
|
private _message: string;
|
||||||
private _extraData: string;
|
|
||||||
private _sentAt: number;
|
private _sentAt: number;
|
||||||
|
private _extraData: string;
|
||||||
|
|
||||||
constructor(type: number, senderId: number, message: string, extraData: string, sentAt: number)
|
constructor(type: number, senderId: number, message: string, sentAt: number, extraData?: string)
|
||||||
{
|
{
|
||||||
|
this._type = type;
|
||||||
|
this._senderId = senderId;
|
||||||
|
this._message = message;
|
||||||
|
this._sentAt = sentAt;
|
||||||
|
this._extraData = extraData;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get type(): number
|
||||||
|
{
|
||||||
|
return this._type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get senderId(): number
|
||||||
|
{
|
||||||
|
return this._senderId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get message(): string
|
||||||
|
{
|
||||||
|
return this._message;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get sentAt(): number
|
||||||
|
{
|
||||||
|
return this._sentAt;
|
||||||
|
}
|
||||||
|
|
||||||
|
public get extraData(): string
|
||||||
|
{
|
||||||
|
return this._extraData;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
|
import { SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
|
||||||
import { FollowFriendMessageComposer } from '@nitrots/nitro-renderer/src/nitro/communication/messages/outgoing/friendlist/FollowFriendMessageComposer';
|
import { FollowFriendMessageComposer } from '@nitrots/nitro-renderer/src/nitro/communication/messages/outgoing/friendlist/FollowFriendMessageComposer';
|
||||||
import { FC, useCallback, useState } from 'react';
|
import { FC, useCallback, useState } from 'react';
|
||||||
import { LocalizeText } from '../../../../api';
|
import { LocalizeText, OpenMessengerChat } from '../../../../api';
|
||||||
import { SendMessageHook } from '../../../../hooks';
|
import { SendMessageHook } from '../../../../hooks';
|
||||||
import { UserProfileIconView } from '../../../shared/user-profile-icon/UserProfileIconView';
|
import { UserProfileIconView } from '../../../shared/user-profile-icon/UserProfileIconView';
|
||||||
import { MessengerFriend } from '../../common/MessengerFriend';
|
import { MessengerFriend } from '../../common/MessengerFriend';
|
||||||
@ -20,6 +20,13 @@ export const FriendsListItemView: FC<FriendsListItemViewProps> = props =>
|
|||||||
SendMessageHook(new FollowFriendMessageComposer(friend.id));
|
SendMessageHook(new FollowFriendMessageComposer(friend.id));
|
||||||
}, [ friend ]);
|
}, [ friend ]);
|
||||||
|
|
||||||
|
const openMessengerChat = useCallback(() =>
|
||||||
|
{
|
||||||
|
if(!friend) return;
|
||||||
|
|
||||||
|
OpenMessengerChat(friend.id);
|
||||||
|
}, [ friend ]);
|
||||||
|
|
||||||
const getCurrentRelationshipName = useCallback(() =>
|
const getCurrentRelationshipName = useCallback(() =>
|
||||||
{
|
{
|
||||||
if(!friend) return 'none';
|
if(!friend) return 'none';
|
||||||
@ -48,8 +55,8 @@ export const FriendsListItemView: FC<FriendsListItemViewProps> = props =>
|
|||||||
<div>{ friend.name }</div>
|
<div>{ friend.name }</div>
|
||||||
<div className="ms-auto d-flex align-items-center gap-1">
|
<div className="ms-auto d-flex align-items-center gap-1">
|
||||||
{ !isExpanded && <>
|
{ !isExpanded && <>
|
||||||
{ friend.followingAllowed && <i onClick={ followFriend } className="icon icon-friendlist-follow cursor-pointer" title={ LocalizeText('friendlist.tip.follow') } /> }
|
{ friend.followingAllowed && <i className="icon icon-friendlist-follow cursor-pointer" onClick={ followFriend } title={ LocalizeText('friendlist.tip.follow') } /> }
|
||||||
{ friend.online && <i className="icon icon-friendlist-chat cursor-pointer" title={ LocalizeText('friendlist.tip.im') } /> }
|
{ friend.online && <i className="icon icon-friendlist-chat cursor-pointer" onClick={ openMessengerChat } title={ LocalizeText('friendlist.tip.im') } /> }
|
||||||
<i className={ 'icon cursor-pointer icon-relationship-' + getCurrentRelationshipName() } onClick={ () => setIsExpanded(true) } title={ LocalizeText('infostand.link.relationship') } />
|
<i className={ 'icon cursor-pointer icon-relationship-' + getCurrentRelationshipName() } onClick={ () => setIsExpanded(true) } title={ LocalizeText('infostand.link.relationship') } />
|
||||||
</> }
|
</> }
|
||||||
{ isExpanded && <>
|
{ isExpanded && <>
|
||||||
|
@ -1,9 +1,80 @@
|
|||||||
import { FC } from 'react';
|
import { ILinkEventTracker, NitroEvent } from '@nitrots/nitro-renderer';
|
||||||
import { LocalizeText } from '../../../../api';
|
import { FC, useCallback, useEffect, useState } from 'react';
|
||||||
|
import { AddEventLinkTracker, LocalizeText, RemoveLinkEventTracker } from '../../../../api';
|
||||||
|
import { FriendsEvent } from '../../../../events/friends/FriendsEvent';
|
||||||
|
import { useUiEvent } from '../../../../hooks';
|
||||||
import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../layout';
|
import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../layout';
|
||||||
|
import { MessengerChat } from '../../common/MessengerChat';
|
||||||
|
import { useFriendsContext } from '../../context/FriendsContext';
|
||||||
|
import { FriendsActions } from '../../reducers/FriendsReducer';
|
||||||
|
|
||||||
export const FriendsMessengerView: FC<{}> = props =>
|
export const FriendsMessengerView: FC<{}> = props =>
|
||||||
{
|
{
|
||||||
|
const { friendsState = null, dispatchFriendsState = null } = useFriendsContext();
|
||||||
|
const { activeChats = [] } = friendsState;
|
||||||
|
|
||||||
|
const [ isVisible, setIsVisible ] = useState(false);
|
||||||
|
const [ activeChatIndex, setActiveChatIndex ] = useState(0);
|
||||||
|
|
||||||
|
const onNitroEvent = useCallback((event: NitroEvent) =>
|
||||||
|
{
|
||||||
|
switch(event.type)
|
||||||
|
{
|
||||||
|
case FriendsEvent.SHOW_FRIEND_MESSENGER:
|
||||||
|
setIsVisible(true);
|
||||||
|
return;
|
||||||
|
case FriendsEvent.TOGGLE_FRIEND_MESSENGER:
|
||||||
|
setIsVisible(value => !value);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useUiEvent(FriendsEvent.SHOW_FRIEND_MESSENGER, onNitroEvent);
|
||||||
|
useUiEvent(FriendsEvent.TOGGLE_FRIEND_MESSENGER, onNitroEvent);
|
||||||
|
|
||||||
|
const linkReceived = useCallback((url: string) =>
|
||||||
|
{
|
||||||
|
const parts = url.split('/');
|
||||||
|
console.log(parts);
|
||||||
|
if(parts.length < 3) return;
|
||||||
|
|
||||||
|
const friendId = parseInt(parts[2]);
|
||||||
|
console.log(friendId);
|
||||||
|
let existingChatIndex = activeChats.findIndex(c => c.friendId === friendId);
|
||||||
|
|
||||||
|
if(existingChatIndex === -1)
|
||||||
|
{
|
||||||
|
const clonedActiveChats = Array.from(activeChats);
|
||||||
|
clonedActiveChats.push(new MessengerChat(friendId, true));
|
||||||
|
|
||||||
|
dispatchFriendsState({
|
||||||
|
type: FriendsActions.SET_ACTIVE_CHATS,
|
||||||
|
payload: {
|
||||||
|
chats: clonedActiveChats
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
existingChatIndex = clonedActiveChats.length - 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
setActiveChatIndex(existingChatIndex);
|
||||||
|
setIsVisible(true);
|
||||||
|
}, [ activeChats, dispatchFriendsState ]);
|
||||||
|
|
||||||
|
useEffect(() =>
|
||||||
|
{
|
||||||
|
const linkTracker: ILinkEventTracker = {
|
||||||
|
linkReceived,
|
||||||
|
eventUrlPrefix: 'friends/messenger/'
|
||||||
|
};
|
||||||
|
|
||||||
|
AddEventLinkTracker(linkTracker);
|
||||||
|
|
||||||
|
return () => RemoveLinkEventTracker(linkTracker);
|
||||||
|
}, [ linkReceived ]);
|
||||||
|
|
||||||
|
if(!isVisible) return null;
|
||||||
|
|
||||||
return (<NitroCardView className="nitro-friends-messenger" simple={ true }>
|
return (<NitroCardView className="nitro-friends-messenger" simple={ true }>
|
||||||
<NitroCardHeaderView headerText={ LocalizeText('friendlist.friends') } onCloseClick={ () => {} } />
|
<NitroCardHeaderView headerText={ LocalizeText('friendlist.friends') } onCloseClick={ () => {} } />
|
||||||
<NitroCardContentView className="p-0">
|
<NitroCardContentView className="p-0">
|
||||||
|
Loading…
Reference in New Issue
Block a user