Adding mural comments notifications

Zambom
1 parent 1d8d5041
Showing 3 changed files with 95 additions and 18 deletions Show diff stats
amadeus/static/js/socket.js
mural/models.py
mural/views.py
@@ -16,6 +16,12 @@ socket.onmessage = function(e) {
 			muralNotificationUpdate(content);
 		} else if (content.subtype == "delete") {
 			muralNotificationDelete(content);
+		} else if (content.subtype == "create_comment") {
+			muralNotificationComment(content);
+		} else if (content.subtype == "update_comment") {
+			muralNotificationCommentUpdate(content);
+		} else if (content.subtype == "delete_comment") {
+			muralNotificationCommentDelete(content);
 		}
 	}
 }
@@ -79,4 +85,65 @@ function muralNotificationDelete(content) {
 			post.remove();
 		}
 	}
+}
+
+function muralNotificationComment(content) {
+	if (window.location.pathname == content.pathname) {
+		if ($("#post-" + content.post_id).is(":visible")) {
+			var section = $("#post-" + content.post_id).find('.comment-section');
+
+			section.append(content.complete);
+		}
+	} else {
+		$('.mural_badge').each(function () {
+			var actual = $(this).text();
+
+			if (actual != "+99") {
+				actual = parseInt(actual, 10) + 1;
+
+				if (actual > 99) {
+					actual = "+99";
+				}
+
+				$(this).text(actual);
+			}
+
+			$(this).show();
+		});
+	}
+
+	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);
+	    }
+  	}
+}
+
+function muralNotificationCommentUpdate(content) {
+	if (window.location.pathname == content.pathname) {
+		var comment = $("#comment-" + content.comment_id);
+
+		if (comment.is(":visible")) {
+			comment.before(content.complete);
+
+			comment.remove();
+		}
+	}
+}
+
+function muralNotificationCommentDelete(content) {
+	if (window.location.pathname == content.pathname) {
+		var comment = $("#comment-" + content.comment_id);
+
+		if (comment.is(":visible")) {
+			comment.remove();
+		}
+	}
 }
 \ No newline at end of file
@@ -27,6 +27,10 @@ class Mural(KnowsChild):
 	edited = models.BooleanField(_('Edited'), default = False)
 	@always_as_child
+	def get_id(self):
+		pass	
+
+	@always_as_child
 	def update_link(self):
 		pass
@@ -37,6 +41,9 @@ class Mural(KnowsChild):
 class GeneralPost(Mural):
 	space = models.IntegerField(_('Space'), default = 0, blank = True)
+	def get_id(self):
+		return self.id
+
 	def update_link(self):
 		return "mural:update_general"
@@ -46,6 +53,12 @@ class GeneralPost(Mural):
 class CategoryPost(Mural):
 	space = models.ForeignKey(Category, verbose_name = ('Category'), related_name = 'post_category')
+	def get_id(self):
+		return self.id
+
+	def get_id(self):
+		return self.id
+
 	def update_link(self):
 		return ""
@@ -262,16 +262,19 @@ class CommentCreate(LoginRequiredMixin, generic.edit.CreateView):
 		self.object.save()
 		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))
+		_view = render_to_string("mural/_view_comment.html", {"comment": self.object}, self.request)
+		simple_notify = _("%s has commented in 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))
-		#	Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "create", "user_icon": user_icon, "pathname": pathname, "simple": simple_notify, "complete": _view})})
+		for user in users:
+			entries.append(MuralVisualizations(viewed = False, user = user, comment = self.object))
+			Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "create_comment", "user_icon": user_icon, "pathname": pathname, "simple": simple_notify, "complete": _view, "post_id": post.get_id()})})
+
+		MuralVisualizations.objects.bulk_create(entries)
 		return super(CommentCreate, self).form_valid(form)
@@ -309,20 +312,14 @@ class CommentUpdate(LoginRequiredMixin, generic.UpdateView):
 		self.object.save()
 		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))
+		_view = render_to_string("mural/_view_comment.html", {"comment": self.object}, self.request)
 		pathname = reverse("mural:manage_general")
-		#for user in users:
-		#	entries.append(MuralVisualizations(viewed = False, user = user, post = self.object))
-		#	Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "create", "user_icon": user_icon, "pathname": pathname, "simple": simple_notify, "complete": _view})})
-
-		#MuralVisualizations.objects.bulk_create(entries)
-
+		for user in users:
+			Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "update_comment", "pathname": pathname, "complete": _view, "comment_id": self.object.id})})
+		
 		return super(CommentUpdate, self).form_valid(form)
 	def get_context_data(self, *args, **kwargs):
@@ -356,8 +353,8 @@ class CommentDelete(LoginRequiredMixin, generic.DeleteView):
 		notify_type = "mural"
 		pathname = reverse("mural:manage_general")
-		#for user in users:
-		#	Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "delete", "pathname": pathname, "post_id": self.object.id})})
+		for user in users:
+			Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "delete_comment", "pathname": pathname, "comment_id": self.object.id})})
 		return reverse_lazy('mural:deleted_comment')
	@@ -16,6 +16,12 @@ socket.onmessage = function(e) {		@@ -16,6 +16,12 @@ socket.onmessage = function(e) {
16	muralNotificationUpdate(content);	16	muralNotificationUpdate(content);
17	} else if (content.subtype == "delete") {	17	} else if (content.subtype == "delete") {
18	muralNotificationDelete(content);	18	muralNotificationDelete(content);
		19	+ } else if (content.subtype == "create_comment") {
		20	+ muralNotificationComment(content);
		21	+ } else if (content.subtype == "update_comment") {
		22	+ muralNotificationCommentUpdate(content);
		23	+ } else if (content.subtype == "delete_comment") {
		24	+ muralNotificationCommentDelete(content);
19	}	25	}
20	}	26	}
21	}	27	}
	@@ -79,4 +85,65 @@ function muralNotificationDelete(content) {		@@ -79,4 +85,65 @@ function muralNotificationDelete(content) {
79	post.remove();	85	post.remove();
80	}	86	}
81	}	87	}
		88	+}
		89	+
		90	+function muralNotificationComment(content) {
		91	+ if (window.location.pathname == content.pathname) {
		92	+ if ($("#post-" + content.post_id).is(":visible")) {
		93	+ var section = $("#post-" + content.post_id).find('.comment-section');
		94	+
		95	+ section.append(content.complete);
		96	+ }
		97	+ } else {
		98	+ $('.mural_badge').each(function () {
		99	+ var actual = $(this).text();
		100	+
		101	+ if (actual != "+99") {
		102	+ actual = parseInt(actual, 10) + 1;
		103	+
		104	+ if (actual > 99) {
		105	+ actual = "+99";
		106	+ }
		107	+
		108	+ $(this).text(actual);
		109	+ }
		110	+
		111	+ $(this).show();
		112	+ });
		113	+ }
		114	+
		115	+ if (("Notification" in window)) {
		116	+ var options = {
		117	+ icon: content.user_icon,
		118	+ body: content.simple
		119	+ }
		120	+
		121	+ if (Notification.permission === "granted") {
		122	+ var notification = new Notification("", options);
		123	+
		124	+ setTimeout(notification.close.bind(notification), 3000);
		125	+ }
		126	+ }
		127	+}
		128	+
		129	+function muralNotificationCommentUpdate(content) {
		130	+ if (window.location.pathname == content.pathname) {
		131	+ var comment = $("#comment-" + content.comment_id);
		132	+
		133	+ if (comment.is(":visible")) {
		134	+ comment.before(content.complete);
		135	+
		136	+ comment.remove();
		137	+ }
		138	+ }
		139	+}
		140	+
		141	+function muralNotificationCommentDelete(content) {
		142	+ if (window.location.pathname == content.pathname) {
		143	+ var comment = $("#comment-" + content.comment_id);
		144	+
		145	+ if (comment.is(":visible")) {
		146	+ comment.remove();
		147	+ }
		148	+ }
82	}	149	}
83	\ No newline at end of file	150	\ No newline at end of file