|
|
@@ -6,6 +6,7 @@ from django.contrib.auth.decorators import login_required
|
|
|
import json
|
|
|
from friends.models import Friends
|
|
|
from infrastructure.consumers import knock_knock
|
|
|
+import time
|
|
|
|
|
|
from .form import StoreDataForm
|
|
|
from .models import Message
|
|
|
@@ -86,6 +87,7 @@ def filter_messages(request):
|
|
|
data = request.POST
|
|
|
user = User.objects.filter(username=data['username'])
|
|
|
if user:
|
|
|
+ user = user.get()
|
|
|
temp_friends_1 = Friends.objects.filter(
|
|
|
user=user, friend=request.user)
|
|
|
temp_friends_2 = Friends.objects.filter(
|
|
|
@@ -101,13 +103,15 @@ def filter_messages(request):
|
|
|
toUser__username=request.user.username)
|
|
|
for message in messages:
|
|
|
message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
- 'to_user_name': request.user.username}
|
|
|
+ 'to_user_name': request.user.username,
|
|
|
+ 'date': time.mktime(message.date.timetuple())}
|
|
|
response.append(message_dict)
|
|
|
messages = Message.objects.filter(toUser__username=data['username'],
|
|
|
fromUser__username=request.user.username)
|
|
|
for message in messages:
|
|
|
message_dict = {'from_user_name': message.fromUser.username, 'plaintext': message.plaintext,
|
|
|
- 'to_user_name': request.user.username}
|
|
|
+ 'to_user_name': request.user.username,
|
|
|
+ 'date': time.mktime(message.date.timetuple())}
|
|
|
response.append(message_dict)
|
|
|
return HttpResponse(json.dumps(response), status=200)
|
|
|
else:
|
|
|
@@ -140,7 +144,8 @@ def request_for_message(request):
|
|
|
response = []
|
|
|
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}
|
|
|
+ 'to_user_name': request.user.username, 'message_id': message.message_id,
|
|
|
+ 'date': time.mktime(message.date.timetuple())}
|
|
|
response.append(message_dict)
|
|
|
return HttpResponse(json.dumps(response), status=200)
|
|
|
|