|
@@ -5,6 +5,7 @@ from django.contrib.auth.models import User
|
|
|
from django.contrib.auth.decorators import login_required
|
|
|
import json
|
|
|
from friends.models import Friends
|
|
|
+from infrastructure.consumers import knock_knock
|
|
|
|
|
|
from .form import StoreDataForm
|
|
|
from .models import Message
|
|
@@ -48,6 +49,7 @@ def send_message(request):
|
|
|
toUser=user.get(),
|
|
|
plaintext=data['plaintext'],
|
|
|
)
|
|
|
+ knock_knock(user.get().username, 'request_message')
|
|
|
return HttpResponse(status=200)
|
|
|
else:
|
|
|
return HttpResponse(status=423)
|
|
@@ -85,9 +87,9 @@ def filter_messages(request):
|
|
|
user = User.objects.filter(username=data['username'])
|
|
|
if user:
|
|
|
temp_friends_1 = Friends.objects.filter(
|
|
|
- user=User.objects.filter(username=data["toUsername"]).get(), friend=request.user)
|
|
|
+ user=user, friend=request.user)
|
|
|
temp_friends_2 = Friends.objects.filter(
|
|
|
- friend=User.objects.filter(username=data["toUsername"]).get(), user=request.user)
|
|
|
+ friend=user, user=request.user)
|
|
|
if temp_friends_1 or temp_friends_2:
|
|
|
# to_user = User.objects.filter(username=data['username'])
|
|
|
# messages = Message.objects.filter(
|