|
@@ -102,17 +102,17 @@ def filter_messages(request):
|
|
|
messages = Message.objects.filter(fromUser__username=data['username'],
|
|
messages = Message.objects.filter(fromUser__username=data['username'],
|
|
|
toUser__username=request.user.username)
|
|
toUser__username=request.user.username)
|
|
|
for message in messages:
|
|
for message in messages:
|
|
|
- message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
|
|
- 'to_user_name': request.user.username,
|
|
|
|
|
- 'date': time.mktime(message.date.timetuple())}
|
|
|
|
|
- response.append(message_dict)
|
|
|
|
|
|
|
+ # message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
|
|
+ # 'to_user_name': request.user.username,
|
|
|
|
|
+ # 'date': time.mktime(message.date.timetuple())}
|
|
|
|
|
+ response.append(message.plaintext)
|
|
|
messages = Message.objects.filter(toUser__username=data['username'],
|
|
messages = Message.objects.filter(toUser__username=data['username'],
|
|
|
fromUser__username=request.user.username)
|
|
fromUser__username=request.user.username)
|
|
|
for message in messages:
|
|
for message in messages:
|
|
|
- message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
|
|
- 'to_user_name': request.user.username,
|
|
|
|
|
- 'date': time.mktime(message.date.timetuple())}
|
|
|
|
|
- response.append(message_dict)
|
|
|
|
|
|
|
+ # message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
|
|
+ # 'to_user_name': request.user.username,
|
|
|
|
|
+ # 'date': time.mktime(message.date.timetuple())}
|
|
|
|
|
+ response.append(message.plaintext)
|
|
|
return HttpResponse(json.dumps(response), status=200)
|
|
return HttpResponse(json.dumps(response), status=200)
|
|
|
else:
|
|
else:
|
|
|
return HttpResponse(status=423)
|
|
return HttpResponse(status=423)
|
|
@@ -143,10 +143,10 @@ def request_for_message(request):
|
|
|
messages = Message.objects.filter(toUser__username=request.user.username, is_received=False)
|
|
messages = Message.objects.filter(toUser__username=request.user.username, is_received=False)
|
|
|
response = []
|
|
response = []
|
|
|
for message in messages:
|
|
for message in messages:
|
|
|
- message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
|
|
- 'to_user_name': request.user.username, 'message_id': message.message_id,
|
|
|
|
|
- 'date': time.mktime(message.date.timetuple())}
|
|
|
|
|
- response.append(message_dict)
|
|
|
|
|
|
|
+ # message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
|
|
+ # 'to_user_name': request.user.username, 'message_id': message.message_id,
|
|
|
|
|
+ # 'date': time.mktime(message.date.timetuple())}
|
|
|
|
|
+ response.append(message.plaintext)
|
|
|
return HttpResponse(json.dumps(response), status=200)
|
|
return HttpResponse(json.dumps(response), status=200)
|
|
|
|
|
|
|
|
|
|
|