Changing chat push notification function

Zambom
1 parent 4624161e
Showing 2 changed files with 13 additions and 6 deletions Show diff stats
api/utils.py
api/views.py
@@ -32,11 +32,11 @@ def  sendChatPushNotification(user, message):
 		response = json.dumps(info)
-		title = str(user).join(_(" sent a message"))
+		title = str(message.user).join(_(" sent a message"))
 		simple_notify = textwrap.shorten(strip_tags(message.text), width = 30, placeholder = "...")
 		if message.image:
 			simple_notify += " ".join(_("[Photo]"))
-		device.send_message(title = title, body = simple_notify, data = {"response": response})
 \ No newline at end of file
+		device.send_message(data = {"response": response, "title": title, "body": simple_notify, "user_from": message.user.email, "user_name": str(message.user), "user_img": message.user.image_url})
 \ No newline at end of file
@@ -305,7 +305,14 @@ class ChatViewset(viewsets.ModelViewSet):
 				talk.save()
-			subject = Subject.objects.get(slug = subject)
+			if subject != "":
+				subject = Subject.objects.get(slug = subject)
+				space = subject.slug
+				space_type = "subject"
+			else: 
+				subject = None
+				space = 0
+				space_type = "general"
 			message = TalkMessages()
 			message.text = "<p>" + msg_text + "</p>"
@@ -320,11 +327,11 @@ class ChatViewset(viewsets.ModelViewSet):
 			if not message.pk is None:
 				simple_notify = textwrap.shorten(strip_tags(message.text), width = 30, placeholder = "...")
-				
+
 				notification = {
 					"type": "chat",
-					"subtype": "subject",
-					"space": subject.slug,
+					"subtype": space_type,
+					"space": space,
 					"user_icon": message.user.image_url,
 					"notify_title": str(message.user),
 					"simple_notify": simple_notify,