Fix: Duplicate friends in Friend Window

This commit is contained in:
duckietm 2024-04-03 16:45:32 +02:00
parent 2c4491b2b4
commit 0f858212d8

View File

@ -1,8 +1,9 @@
import { AcceptFriendMessageComposer, DeclineFriendMessageComposer, FollowFriendMessageComposer, FriendListFragmentEvent, FriendListUpdateComposer, FriendListUpdateEvent, FriendParser, FriendRequestsEvent, GetFriendRequestsComposer, GetSessionDataManager, MessengerInitComposer, MessengerInitEvent, NewFriendRequestEvent, RequestFriendComposer, SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
import { AcceptFriendMessageComposer, DeclineFriendMessageComposer, FindFriendsProcessResultEvent, FollowFriendMessageComposer, FriendListFragmentEvent, FriendListUpdateComposer, FriendListUpdateEvent, FriendParser, FriendRequestsEvent, GetFriendRequestsComposer, GetSessionDataManager, MessengerInitComposer, MessengerInitEvent, NewFriendRequestEvent, RequestFriendComposer, SetRelationshipStatusComposer } from '@nitrots/nitro-renderer';
import { useEffect, useMemo, useState } from 'react';
import { useBetween } from 'use-between';
import { CloneObject, MessengerFriend, MessengerRequest, MessengerSettings, SendMessageComposer } from '../../api';
import { CloneObject, LocalizeText, MessengerFriend, MessengerRequest, MessengerSettings, SendMessageComposer } from '../../api';
import { useMessageEvent } from '../events';
import { useNotification } from '../notification';
const useFriendsState = () =>
{
@ -11,6 +12,7 @@ const useFriendsState = () =>
const [ sentRequests, setSentRequests ] = useState<number[]>([]);
const [ dismissedRequestIds, setDismissedRequestIds ] = useState<number[]>([]);
const [ settings, setSettings ] = useState<MessengerSettings>(null);
const { simpleAlert } = useNotification();
const onlineFriends = useMemo(() =>
{
@ -193,7 +195,7 @@ const useFriendsState = () =>
{
const index = newValue.findIndex(existing => (existing.requesterUserId === request.requesterUserId));
if(index > 0)
if(index >= 0)
{
newValue[index] = CloneObject(newValue[index]);
newValue[index].populate(request);
@ -210,6 +212,15 @@ const useFriendsState = () =>
return newValue;
});
});
useMessageEvent<FindFriendsProcessResultEvent>(FindFriendsProcessResultEvent, event =>
{
const parser = event.getParser();
if (!parser) return;
simpleAlert(LocalizeText(!parser.success ? 'friendbar.find.error.text' : 'friendbar.find.success.text'), '', '', '', LocalizeText(!parser.success ? 'friendbar.find.error.title' : 'friendbar.find.success.title'));
});
useMessageEvent<NewFriendRequestEvent>(NewFriendRequestEvent, event =>
{
@ -238,7 +249,7 @@ const useFriendsState = () =>
{
SendMessageComposer(new MessengerInitComposer());
const interval = setInterval(() => SendMessageComposer(new FriendListUpdateComposer()), 120000);
const interval = window.setInterval(() => SendMessageComposer(new FriendListUpdateComposer()), 120000);
return () =>
{
@ -249,4 +260,4 @@ const useFriendsState = () =>
return { friends, requests, sentRequests, dismissedRequestIds, setDismissedRequestIds, settings, onlineFriends, offlineFriends, getFriend, canRequestFriend, requestFriend, requestResponse, followFriend, updateRelationship };
}
export const useFriends = () => useBetween(useFriendsState);
export const useFriends = () => useBetween(useFriendsState);