slawk0/relay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed some socket not working on production

Browse Source
This commit is contained in:
slawk0
2024-12-17 22:36:24 +01:00
parent 894c6d8f3a
commit 9c98a88027
2 changed files with 51 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
client/src/components/chat/ContactsList.tsx
View File

@@ -44,20 +44,16 @@ function ContactsList({
useEffect(() => {
if (!socket) return;
socket.on(
'added to group',
(msg: {
username: string;
user_id: string;
group_id: string;
isadmin: false;
}) => {
console.log('added to group, fetching contacts');
console.error(msg);
fetchContacts();
},
);
}, []);
const handleAddedToGroup = () => {
fetchContacts();
};
socket.on('added to group', handleAddedToGroup);
return () => {
socket?.off('added to group', handleAddedToGroup);
};
}, [socket]);
const fetchContacts = async () => {
const contacts: ContactsProps[] = await getContactsList();

87
client/src/components/chat/ParticipantsBar.tsx
View File

@@ -71,50 +71,42 @@ function ParticipantsBar({
useEffect(() => {
if (!socket || !contact) return;
socket.on(
'added to group',
(msg: {
username: string;
user_id: string;
group_id: string;
isadmin: false;
}) => {
const { group_id } = msg;
console.log('Added to group: ', msg);
console.log('Current participants: ', participants);
console.log('CURRENTCONTACT: ', currentContact);
if (
msg.group_id == currentContact?.conversation_id &&
msg.user_id == user?.user_id
) {
initializeContact({
read: true,
username: msg.username,
user_id: msg.user_id,
id: currentContact?.id,
type: 'group',
conversation_id: msg.group_id,
last_active: new Date().toString(),
});
}
const handleAddedToGroup = (msg: {
username: string;
user_id: string;
group_id: string;
isadmin: false;
}) => {
const { group_id } = msg;
if (
msg.group_id == currentContact?.conversation_id &&
msg.user_id == user?.user_id
) {
initializeContact({
read: true,
username: msg.username,
user_id: msg.user_id,
id: currentContact?.id,
type: 'group',
conversation_id: msg.group_id,
last_active: new Date().toString(),
});
}
if (group_id === contact.conversation_id) {
setParticipants((prevMembers) => {
const existingMember = prevMembers.some(
(m) => m.user_id === msg.user_id,
);
if (existingMember) {
return prevMembers;
}
return [...prevMembers, msg];
});
}
},
);
if (group_id === contact.conversation_id) {
setParticipants((prevMembers) => {
const existingMember = prevMembers.some(
(m) => m.user_id === msg.user_id,
);
if (existingMember) {
return prevMembers;
}
return [...prevMembers, msg];
});
}
};
socket.on('left group', (msg: { user_id: string; group_id: string }) => {
console.log(`(socket on "left group")`, msg);
// Initialize contact again to clear messages and participants list
const handleLeftGroup = (msg: { user_id: string; group_id: string }) => {
if (
msg.group_id == currentContact?.conversation_id &&
msg.user_id == user?.user_id
@@ -124,13 +116,16 @@ function ParticipantsBar({
setParticipants((prevMembers) =>
prevMembers.filter((member) => member.user_id !== msg.user_id),
);
});
};
socket.on('added to group', handleAddedToGroup);
socket.on('left group', handleLeftGroup);
return () => {
socket?.off('left group');
socket?.off('added to group');
socket?.off('added to group', handleAddedToGroup);
socket?.off('left group', handleLeftGroup);
};
}, [contact, participants]);
}, [socket, contact, currentContact, user?.user_id]);
const handleRemoveUser = async (userId: string) => {
try {