socketio changes
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -336,8 +336,11 @@ def send_message(conversation_id):
|
||||
# Emit the message to all users in the conversation room
|
||||
socketio.emit('new_message', message_data, room=f'conversation_{conversation_id}')
|
||||
|
||||
# Return minimal response since the message will be received through WebSocket
|
||||
return jsonify({'success': True})
|
||||
# Return response with message data
|
||||
return jsonify({
|
||||
'success': True,
|
||||
'message': message_data
|
||||
})
|
||||
|
||||
@conversations_bp.route('/messages/<int:message_id>/attachment/<int:attachment_index>')
|
||||
@login_required
|
||||
|
||||
@@ -665,23 +665,19 @@ $(document).ready(function() {
|
||||
response: response,
|
||||
socketId: socket.id
|
||||
});
|
||||
if (response.success && response.message) {
|
||||
if (response.success) {
|
||||
messageInput.val('');
|
||||
fileInput.value = '';
|
||||
$('#selectedFiles').text('');
|
||||
|
||||
// If socket is disconnected, append message directly
|
||||
if (!state.connectionState.isConnected) {
|
||||
try {
|
||||
appendMessage(response.message);
|
||||
} catch (error) {
|
||||
console.error('Error appending message:', error);
|
||||
// Refresh the page to show the new message
|
||||
window.location.reload();
|
||||
}
|
||||
if (!state.connectionState.isConnected && response.message) {
|
||||
console.log('Socket disconnected, appending message directly');
|
||||
appendMessage(response.message);
|
||||
}
|
||||
} else {
|
||||
console.error('Invalid response format:', response);
|
||||
console.error('Message send failed:', response);
|
||||
alert('Failed to send message. Please try again.');
|
||||
}
|
||||
},
|
||||
error: function(xhr, status, error) {
|
||||
|
||||
Reference in New Issue
Block a user