|
|
@ -103,12 +103,12 @@ def get_messages(): |
|
|
|
'text': msg.textContent, |
|
|
|
'text': msg.textContent, |
|
|
|
'userId': str(msg.userID), |
|
|
|
'userId': str(msg.userID), |
|
|
|
'username': msg.user.username, |
|
|
|
'username': msg.user.username, |
|
|
|
'timestamp': msg.chatDate.isoformat() |
|
|
|
'timestamp': msg.chatDate.isoformat(), |
|
|
|
|
|
|
|
'isSelf': int(msg.userID == g.current_user.id) |
|
|
|
} for msg in messages] |
|
|
|
} for msg in messages] |
|
|
|
return jsonify({ |
|
|
|
return jsonify({ |
|
|
|
'messages': chat_messages, |
|
|
|
'messages': chat_messages, |
|
|
|
'count': len(chat_messages), |
|
|
|
'count': len(chat_messages), |
|
|
|
}), 200 |
|
|
|
}), 200 |
|
|
|
except Exception as e: |
|
|
|
except Exception as e: |
|
|
|
raise e |
|
|
|
return jsonify({'message': f'An error occurred: {str(e)}'}), 500 |
|
|
|
# return jsonify({'message': f'An error occurred: {str(e)}'}), 500 |
|
|
|
|