code rewrite, historical messages are displayed
This commit is contained in:
@@ -105,8 +105,9 @@ function initializeSocket(server) {
|
||||
// );
|
||||
|
||||
if (result.rows.length > 0) {
|
||||
const { username: sender, recipient: receiver, content } = result.rows;
|
||||
socket.emit('messages history', sender, receiver, content);
|
||||
//const { username: sender, recipient: receiver, content: content, id: id } = result.rows;
|
||||
console.log('Sending messages:', result.rows);
|
||||
socket.emit('messages history', result.rows);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error retrieving messages:', e);
|
||||
|
||||
@@ -52,12 +52,13 @@ async function initializeSocket() {
|
||||
|
||||
socket.on('chat message', (msg, serverOffset) => {
|
||||
console.log('Received message:', msg);
|
||||
const [sender, content, recipient] = msg;
|
||||
console.log(
|
||||
'Sender:', sender,
|
||||
'Content:', content,
|
||||
'Recipient:', recipient
|
||||
)
|
||||
|
||||
const [sender, content, recipient] = msg;
|
||||
console.log('Current recipient:', currentRecipient + ' Recipient:', recipient + ' Sender:', sender);
|
||||
if (recipient === currentRecipient){
|
||||
const item = document.createElement('li');
|
||||
@@ -90,11 +91,17 @@ async function initializeSocket() {
|
||||
|
||||
socket.on('messages history', (messagesHistory) => {
|
||||
console.log('Received messages history:', messagesHistory);
|
||||
//messages.innerHTML = ''; // Clear previous messages
|
||||
messages.innerHTML = ''; // Clear previous messages
|
||||
for (const message of messagesHistory) {
|
||||
const item = document.createElement('li');
|
||||
item.textContent = messagesHistory;
|
||||
item.textContent = `${message.username}: ${message.content}`;
|
||||
if (message.username !== 'admin') {
|
||||
item.classList.add('user-message');
|
||||
} else {
|
||||
item.classList.add('admin-message');
|
||||
}
|
||||
messages.appendChild(item);
|
||||
|
||||
}
|
||||
window.scrollTo(0, document.body.scrollHeight);
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user