Adding mural notifications

Zambom
1 parent 6c50648e
Showing 6 changed files with 61 additions and 11 deletions Show diff stats
amadeus/routing.py
amadeus/settings.py
amadeus/static/js/socket.js
amadeus/templates/base.html
mural/consumers.py
mural/views.py
 from channels.routing import route
-from mural.consumers import ws_message
+from mural.consumers import ws_add, ws_message
  
 channel_routing = [
+	route("websocket.connect", ws_add),
     route("websocket.receive", ws_message),
 ]
 \ No newline at end of file
@@ -54,7 +54,7 @@ INSTALLED_APPS = [
     'session_security',
     'django_crontab',
     'django_cron',
-    #'channels',
+    'channels',
  
     'amadeus',
     'users',
@@ -0,0 +1,37 @@
+socket = new WebSocket("ws://" + window.location.host + "/");
+
+socket.onmessage = function(e) {
+	content = JSON.parse(e.data);
+
+	if (content.type == "mural") {
+		if (window.location.pathname == content.pathname) {
+			$('.posts').prepend(content.complete);
+
+	        $('.no-subjects').attr('style', 'display:none');
+		}
+
+		if (("Notification" in window)) {
+			var options = {
+				icon: content.user_icon,
+				body: content.simple
+			}
+
+		    if (Notification.permission === "granted") {
+		    	var notification = new Notification("", options);
+
+		    	setTimeout(notification.close.bind(notification), 3000);
+		    } else if (Notification.permission !== 'denied') {
+		    	Notification.requestPermission(function (permission) {
+		      		// If the user accepts, let's create a notification
+		      		if (permission === "granted") {
+		        		var notification = new Notification("", options);
+
+		        		setTimeout(notification.close.bind(notification), 3000);
+		      		}
+		    	});
+		  	}
+	  	}
+	}
+}
+// Call onopen directly if socket is already open
+if (socket.readyState == WebSocket.OPEN) socket.onopen();
 \ No newline at end of file
@@ -260,6 +260,7 @@
     <!-- Init material Bootstrap -->
     <script type="text/javascript">$.material.init()</script>
     <script src="{% static 'js/main.js' %}"></script>
+    <script src="{% static 'js/socket.js' %}"></script>
 </body>
  
 </html>
 \ No newline at end of file
 from channels import Group
 from channels.sessions import channel_session
-from django.http import HttpResponse
-from channels.handler import AsgiHandler
+from channels.auth import channel_session_user, channel_session_user_from_http
+
+# Connected to websocket.connect
+@channel_session_user_from_http
+def ws_add(message):
+    # Accept connection
+    message.reply_channel.send({"accept": True})
+    # Add them to the right group
+    Group("user-%s" % message.user.id).add(message.reply_channel)
  
-def http_consumer(message):
-    # Make standard HTTP response - access ASGI path attribute directly
-    response = HttpResponse("Hello world! You asked for %s" % message.content['path'])
-    # Encode that response into message format (ASGI)
-    for chunk in AsgiHandler.encode_response(response):
-        message.reply_channel.send(chunk)
  
 def ws_message(message):
     # ASGI WebSocket packet-received and send-packet message types
@@ -8,6 +8,9 @@ from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.db.models import Q, Count
  
+from channels import Group
+import json
+
 from users.models import User
  
 from .models import GeneralPost, CategoryPost, SubjectPost, MuralVisualizations
@@ -67,8 +70,15 @@ class GeneralCreate(LoginRequiredMixin, generic.edit.CreateView):
 		users = User.objects.all().exclude(id = self.request.user.id)
 		entries = []
  
+		notify_type = "mural"
+		user_icon = self.object.user.image_url
+		_view = render_to_string("mural/_view.html", {"post": self.object}, self.request)
+		simple_notify = _("%s has made a post in General")%(str(self.object.user))
+		pathname = reverse("mural:manage_general")
+
 		for user in users:
-			entries.append(MuralVisualizations(viewed = False, user = user, post = self.object)) 
+			entries.append(MuralVisualizations(viewed = False, user = user, post = self.object))
+			Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "user_icon": user_icon, "pathname": pathname, "simple": simple_notify, "complete": _view})})
  
 		MuralVisualizations.objects.bulk_create(entries)
1	1	from channels.routing import route
2		-from mural.consumers import ws_message
	2	+from mural.consumers import ws_add, ws_message
3	3
4	4	channel_routing = [
	5	+ route("websocket.connect", ws_add),
5	6	route("websocket.receive", ws_message),
6	7	]
7	8	\ No newline at end of file
...	...
...	...	@@ -54,7 +54,7 @@ INSTALLED_APPS = [
54	54	'session_security',
55	55	'django_crontab',
56	56	'django_cron',
57		- #'channels',
	57	+ 'channels',
58	58
59	59	'amadeus',
60	60	'users',
...	...
...	...	@@ -0,0 +1,37 @@
	1	+socket = new WebSocket("ws://" + window.location.host + "/");
	2	+
	3	+socket.onmessage = function(e) {
	4	+ content = JSON.parse(e.data);
	5	+
	6	+ if (content.type == "mural") {
	7	+ if (window.location.pathname == content.pathname) {
	8	+ $('.posts').prepend(content.complete);
	9	+
	10	+ $('.no-subjects').attr('style', 'display:none');
	11	+ }
	12	+
	13	+ if (("Notification" in window)) {
	14	+ var options = {
	15	+ icon: content.user_icon,
	16	+ body: content.simple
	17	+ }
	18	+
	19	+ if (Notification.permission === "granted") {
	20	+ var notification = new Notification("", options);
	21	+
	22	+ setTimeout(notification.close.bind(notification), 3000);
	23	+ } else if (Notification.permission !== 'denied') {
	24	+ Notification.requestPermission(function (permission) {
	25	+ // If the user accepts, let's create a notification
	26	+ if (permission === "granted") {
	27	+ var notification = new Notification("", options);
	28	+
	29	+ setTimeout(notification.close.bind(notification), 3000);
	30	+ }
	31	+ });
	32	+ }
	33	+ }
	34	+ }
	35	+}
	36	+// Call onopen directly if socket is already open
	37	+if (socket.readyState == WebSocket.OPEN) socket.onopen();
0	38	\ No newline at end of file
...	...
...	...	@@ -260,6 +260,7 @@
260	260	<!-- Init material Bootstrap -->
261	261	<script type="text/javascript">$.material.init()</script>
262	262	<script src="{% static 'js/main.js' %}"></script>
	263	+ <script src="{% static 'js/socket.js' %}"></script>
263	264	</body>
264	265
265	266	</html>
266	267	\ No newline at end of file
...	...
1	1	from channels import Group
2	2	from channels.sessions import channel_session
3		-from django.http import HttpResponse
4		-from channels.handler import AsgiHandler
	3	+from channels.auth import channel_session_user, channel_session_user_from_http
	4	+
	5	+# Connected to websocket.connect
	6	+@channel_session_user_from_http
	7	+def ws_add(message):
	8	+ # Accept connection
	9	+ message.reply_channel.send({"accept": True})
	10	+ # Add them to the right group
	11	+ Group("user-%s" % message.user.id).add(message.reply_channel)
5	12
6		-def http_consumer(message):
7		- # Make standard HTTP response - access ASGI path attribute directly
8		- response = HttpResponse("Hello world! You asked for %s" % message.content['path'])
9		- # Encode that response into message format (ASGI)
10		- for chunk in AsgiHandler.encode_response(response):
11		- message.reply_channel.send(chunk)
12	13
13	14	def ws_message(message):
14	15	# ASGI WebSocket packet-received and send-packet message types
...	...
...	...	@@ -8,6 +8,9 @@ from django.utils.translation import ugettext_lazy as _
8	8	from django.contrib.auth.mixins import LoginRequiredMixin
9	9	from django.db.models import Q, Count
10	10
	11	+from channels import Group
	12	+import json
	13	+
11	14	from users.models import User
12	15
13	16	from .models import GeneralPost, CategoryPost, SubjectPost, MuralVisualizations
...	...	@@ -67,8 +70,15 @@ class GeneralCreate(LoginRequiredMixin, generic.edit.CreateView):
67	70	users = User.objects.all().exclude(id = self.request.user.id)
68	71	entries = []
69	72
	73	+ notify_type = "mural"
	74	+ user_icon = self.object.user.image_url
	75	+ _view = render_to_string("mural/_view.html", {"post": self.object}, self.request)
	76	+ simple_notify = _("%s has made a post in General")%(str(self.object.user))
	77	+ pathname = reverse("mural:manage_general")
	78	+
70	79	for user in users:
71		- entries.append(MuralVisualizations(viewed = False, user = user, post = self.object))
	80	+ entries.append(MuralVisualizations(viewed = False, user = user, post = self.object))
	81	+ Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "user_icon": user_icon, "pathname": pathname, "simple": simple_notify, "complete": _view})})
72	82
73	83	MuralVisualizations.objects.bulk_create(entries)
74	84
...	...