nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2025-01-31 10:22:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Messenger improvements

Browse Source
This commit is contained in:
Bill 2022-07-27 10:03:44 -04:00
parent bf99cb3e1b
commit f9c3b967de
3 changed files with 56 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/friends/MessengerThread.ts
View File

@ -1,4 +1,3 @@
import { LocalizeText } from '../utils';
import { GetGroupChatData } from './GetGroupChatData'; import { GetGroupChatData } from './GetGroupChatData';
import { MessengerFriend } from './MessengerFriend'; import { MessengerFriend } from './MessengerFriend';
import { MessengerGroupType } from './MessengerGroupType'; import { MessengerGroupType } from './MessengerGroupType';
@ -16,20 +15,13 @@ export class MessengerThread
private _lastUpdated: Date; private _lastUpdated: Date;
private _unreadCount: number; private _unreadCount: number;
constructor(participant: MessengerFriend, isNew: boolean = true) constructor(participant: MessengerFriend)
{ {
this._threadId = ++MessengerThread.THREAD_ID; this._threadId = ++MessengerThread.THREAD_ID;
this._participant = participant; this._participant = participant;
this._groups = []; this._groups = [];
this._lastUpdated = new Date(); this._lastUpdated = new Date();
this._unreadCount = 0; this._unreadCount = 0;
if(isNew)
{
this.addMessage(null, LocalizeText('messenger.moderationinfo'), 0, null, MessengerThreadChat.SECURITY_NOTIFICATION);
this._unreadCount = 0;
}
} }
public addMessage(senderId: number, message: string, secondsSinceSent: number = 0, extraData: string = null, type: number = 0): MessengerThreadChat public addMessage(senderId: number, message: string, secondsSinceSent: number = 0, extraData: string = null, type: number = 0): MessengerThreadChat

4
src/components/friends/views/messenger/FriendsMessengerView.tsx
View File

@ -1,7 +1,7 @@
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { FollowFriendMessageComposer, ILinkEventTracker } from '@nitrots/nitro-renderer'; import { FollowFriendMessageComposer, ILinkEventTracker } from '@nitrots/nitro-renderer';
import { FC, KeyboardEvent, useEffect, useRef, useState } from 'react'; import { FC, KeyboardEvent, useEffect, useRef, useState } from 'react';
import { AddEventLinkTracker, GetUserProfile, LocalizeText, RemoveLinkEventTracker, ReportType, SendMessageComposer } from '../../../../api'; import { AddEventLinkTracker, GetSessionDataManager, GetUserProfile, LocalizeText, RemoveLinkEventTracker, ReportType, SendMessageComposer } from '../../../../api';
import { Base, Button, ButtonGroup, Column, Flex, Grid, LayoutAvatarImageView, LayoutBadgeImageView, LayoutGridItem, LayoutItemCountView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common'; import { Base, Button, ButtonGroup, Column, Flex, Grid, LayoutAvatarImageView, LayoutBadgeImageView, LayoutGridItem, LayoutItemCountView, NitroCardContentView, NitroCardHeaderView, NitroCardView, Text } from '../../../../common';
import { useHelp, useMessenger } from '../../../../hooks'; import { useHelp, useMessenger } from '../../../../hooks';
import { FriendsMessengerThreadView } from './messenger-thread/FriendsMessengerThreadView'; import { FriendsMessengerThreadView } from './messenger-thread/FriendsMessengerThreadView';
@ -22,7 +22,7 @@ export const FriendsMessengerView: FC<{}> = props =>
{ {
if(!activeThread || !messageText.length) return; if(!activeThread || !messageText.length) return;
sendMessage(activeThread, messageText); sendMessage(activeThread, GetSessionDataManager().userId, messageText);
setMessageText(''); setMessageText('');
} }

164
src/hooks/friends/useMessenger.ts
View File

@ -1,5 +1,5 @@
import { NewConsoleMessageEvent, RoomInviteErrorEvent, RoomInviteEvent, SendMessageComposer as SendMessageComposerPacket } from '@nitrots/nitro-renderer'; import { NewConsoleMessageEvent, RoomInviteErrorEvent, RoomInviteEvent, SendMessageComposer as SendMessageComposerPacket } from '@nitrots/nitro-renderer';
import { useCallback, useEffect, useMemo, useState } from 'react'; import { useEffect, useMemo, useState } from 'react';
import { useBetween } from 'use-between'; import { useBetween } from 'use-between';
import { CloneObject, GetSessionDataManager, LocalizeText, MessengerIconState, MessengerThread, MessengerThreadChat, NotificationAlertType, PlaySound, SendMessageComposer, SoundNames } from '../../api'; import { CloneObject, GetSessionDataManager, LocalizeText, MessengerIconState, MessengerThread, MessengerThreadChat, NotificationAlertType, PlaySound, SendMessageComposer, SoundNames } from '../../api';
import { useMessageEvent } from '../events'; import { useMessageEvent } from '../events';
@ -18,11 +18,32 @@ const useMessengerState = () =>
const visibleThreads = useMemo(() => messageThreads.filter(thread => (hiddenThreadIds.indexOf(thread.threadId) === -1)), [ messageThreads, hiddenThreadIds ]); const visibleThreads = useMemo(() => messageThreads.filter(thread => (hiddenThreadIds.indexOf(thread.threadId) === -1)), [ messageThreads, hiddenThreadIds ]);
const activeThread = useMemo(() => ((activeThreadId > 0) && visibleThreads.find(thread => (thread.threadId === activeThreadId) || null)), [ activeThreadId, visibleThreads ]); const activeThread = useMemo(() => ((activeThreadId > 0) && visibleThreads.find(thread => (thread.threadId === activeThreadId) || null)), [ activeThreadId, visibleThreads ]);
const getMessageThread = useCallback((userId: number) => const getMessageThread = (userId: number) =>
{ {
let thread = messageThreads.find(thread => (thread.participant && (thread.participant.id === userId))); let thread = messageThreads.find(thread => (thread.participant && (thread.participant.id === userId)));
if(thread) if(!thread)
{
const friend = getFriend(userId);
if(!friend) return null;
thread = new MessengerThread(friend);
thread.addMessage(null, LocalizeText('messenger.moderationinfo'), 0, null, MessengerThreadChat.SECURITY_NOTIFICATION);
thread.setRead();
setMessageThreads(prevValue =>
{
const newValue = [ ...prevValue ];
newValue.push(thread);
return newValue;
});
}
else
{ {
const hiddenIndex = hiddenThreadIds.indexOf(thread.threadId); const hiddenIndex = hiddenThreadIds.indexOf(thread.threadId);
@ -35,43 +56,13 @@ const useMessengerState = () =>
newValue.splice(hiddenIndex, 1); newValue.splice(hiddenIndex, 1);
return newValue; return newValue;
}); })
}
} }
return thread; return thread;
} }
const friend = getFriend(userId);
if(!friend) return null;
thread = new MessengerThread(friend);
setMessageThreads(prevValue =>
{
const newValue = [ ...prevValue ];
newValue.push(thread);
return newValue;
});
setHiddenThreadIds(prevValue =>
{
const index = prevValue.indexOf(thread.threadId);
if(index === -1) return prevValue;
const newValue = [ ...prevValue ];
newValue.splice(index, 1);
return newValue;
});
return thread;
}, [ messageThreads, hiddenThreadIds, getFriend ]);
const closeThread = (threadId: number) => const closeThread = (threadId: number) =>
{ {
setHiddenThreadIds(prevValue => setHiddenThreadIds(prevValue =>
@ -88,13 +79,13 @@ const useMessengerState = () =>
if(activeThreadId === threadId) setActiveThreadId(-1); if(activeThreadId === threadId) setActiveThreadId(-1);
} }
const sendMessage = (thread: MessengerThread, text: string) => const sendMessage = (thread: MessengerThread, senderId: number, messageText: string, secondsSinceSent: number = 0, extraData: string = null, messageType: number = MessengerThreadChat.CHAT) =>
{ {
if(!thread || !text || !text.length) return; if(!thread || !messageText || !messageText.length) return;
SendMessageComposer(new SendMessageComposerPacket(thread.participant.id, text)); const ownMessage = (senderId === GetSessionDataManager().userId);
if((messageThreads.length === 1) && (thread.groups.length === 1)) PlaySound(SoundNames.MESSENGER_NEW_THREAD); if(ownMessage) SendMessageComposer(new SendMessageComposerPacket(thread.participant.id, messageText));
setMessageThreads(prevValue => setMessageThreads(prevValue =>
{ {
@ -103,14 +94,18 @@ const useMessengerState = () =>
if(index === -1) return prevValue; if(index === -1) return prevValue;
newValue[index] = CloneObject(newValue[index]); thread = CloneObject(newValue[index]);
thread = newValue[index]; if(ownMessage && (thread.groups.length === 1)) PlaySound(SoundNames.MESSENGER_NEW_THREAD);
thread.addMessage(GetSessionDataManager().userId, text, 0, null, MessengerThreadChat.CHAT); thread.addMessage(((messageType === MessengerThreadChat.ROOM_INVITE) ? null : senderId), messageText, secondsSinceSent, extraData, messageType);
if(activeThreadId === thread.threadId) thread.setRead(); if(activeThreadId === thread.threadId) thread.setRead();
newValue[index] = thread;
if(!ownMessage && thread.unread) PlaySound(SoundNames.MESSENGER_MESSAGE_RECEIVED);
return newValue; return newValue;
}); });
} }
@ -118,87 +113,28 @@ const useMessengerState = () =>
useMessageEvent<NewConsoleMessageEvent>(NewConsoleMessageEvent, event => useMessageEvent<NewConsoleMessageEvent>(NewConsoleMessageEvent, event =>
{ {
const parser = event.getParser(); const parser = event.getParser();
const thread = getMessageThread(parser.senderId);
setMessageThreads(prevValue => if(!thread) return;
{
const newValue = [ ...prevValue ];
let existingIndex = newValue.findIndex(newThread => (newThread.participant && (newThread.participant.id === parser.senderId))); sendMessage(thread, parser.senderId, parser.messageText, parser.secondsSinceSent, parser.extraData);
let thread: MessengerThread = null;
if(existingIndex === -1)
{
const friend = getFriend(parser.senderId);
if(friend)
{
thread = new MessengerThread(friend);
newValue.push(thread);
}
}
else
{
newValue[existingIndex] = CloneObject(newValue[existingIndex]);
thread = newValue[existingIndex];
}
thread.addMessage(parser.senderId, parser.messageText, parser.secondsSinceSent, parser.extraData);
if(activeThreadId === thread.threadId) thread.setRead();
if(thread.unreadCount > 0) PlaySound(SoundNames.MESSENGER_MESSAGE_RECEIVED);
return newValue;
});
}); });
useMessageEvent<RoomInviteEvent>(RoomInviteEvent, event => useMessageEvent<RoomInviteEvent>(RoomInviteEvent, event =>
{ {
const parser = event.getParser(); const parser = event.getParser();
const thread = getMessageThread(parser.senderId);
setMessageThreads(prevValue => if(!thread) return;
{
const newValue = [ ...prevValue ];
let existingIndex = newValue.findIndex(newThread => (newThread.participant && (newThread.participant.id === parser.senderId))); sendMessage(thread, parser.senderId, parser.messageText, 0, null, MessengerThreadChat.ROOM_INVITE);
let thread: MessengerThread = null;
if(existingIndex === -1)
{
const friend = getFriend(parser.senderId);
if(friend)
{
thread = new MessengerThread(friend);
newValue.push(thread);
}
}
else
{
newValue[existingIndex] = CloneObject(newValue[existingIndex]);
thread = newValue[existingIndex];
}
thread.addMessage(null, parser.messageText, 0, null, MessengerThreadChat.ROOM_INVITE);
if(activeThreadId === thread.threadId) thread.setRead();
if(thread.unreadCount > 0) PlaySound(SoundNames.MESSENGER_MESSAGE_RECEIVED);
return newValue;
});
}); });
useMessageEvent<RoomInviteErrorEvent>(RoomInviteErrorEvent, event => useMessageEvent<RoomInviteErrorEvent>(RoomInviteErrorEvent, event =>
{ {
const parser = event.getParser(); const parser = event.getParser();
const message = ((('Received room invite error: errorCode: ' + parser.errorCode) + ', recipients: ') + parser.failedRecipients);
simpleAlert(message, NotificationAlertType.DEFAULT, null, null, LocalizeText('friendlist.alert.title')); simpleAlert(`Received room invite error: ${ parser.errorCode },recipients: ${ parser.failedRecipients }`, NotificationAlertType.DEFAULT, null, null, LocalizeText('friendlist.alert.title'));
}); });
useEffect(() => useEffect(() =>
@ -208,14 +144,14 @@ const useMessengerState = () =>
setMessageThreads(prevValue => setMessageThreads(prevValue =>
{ {
const newValue = [ ...prevValue ]; const newValue = [ ...prevValue ];
const index = newValue.findIndex(newThread => (newThread.threadId === activeThreadId));
let existingIndex = newValue.findIndex(newThread => (newThread.threadId === activeThreadId)); if(index >= 0)
{
newValue[index] = CloneObject(newValue[index]);
if(existingIndex === -1) return; newValue[index].setRead();
}
newValue[existingIndex] = CloneObject(newValue[existingIndex]);
newValue[existingIndex].setRead();
return newValue; return newValue;
}); });