Merge pull request #25 from CMU-313/jullia/instructor-notif-ft

updated src/topics/create.js and notifications.json to handle course faculty notifications.

public/language/ar/notifications.json

@@ -46,6 +46,7 @@
     "user-flagged-user-dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
     "user-flagged-user-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> flagged a user profile (%4)",
     "user-flagged-user-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others flagged a user profile (%4)",
+    "admin-posted-to": "<strong>[COURSE FACULTY] %1</strong> أضاف ردًا إلى: <strong>%2</strong>",
     "user-posted-to": "<strong>%1</strong> أضاف ردا إلى: <strong>%2</strong>",
     "user-posted-to-dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user-posted-to-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have posted replies to: <strong>%4</strong>",

public/language/en-GB/notifications.json

@@ -50,6 +50,7 @@
 	"user-flagged-user-dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
 	"user-flagged-user-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> flagged a user profile (%4)",
 	"user-flagged-user-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others flagged a user profile (%4)",
+	"admin-posted-to" : "<strong>[COURSE FACULTY] %1</strong> has posted a reply to: <strong>%2</strong>",
 	"user-posted-to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
 	"user-posted-to-dual" : "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
 	"user-posted-to-triple" : "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have posted replies to: <strong>%4</strong>",

public/language/en-US/notifications.json

@@ -46,6 +46,7 @@
     "user-flagged-user-dual": "<strong>%1</strong> and <strong>%2</strong> flagged a user profile (%3)",
     "user-flagged-user-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> flagged a user profile (%4)",
     "user-flagged-user-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others flagged a user profile (%4)",
+    "admin-posted-to" : "<strong>[COURSE FACULTY] %1</strong> has posted a reply to: <strong>%2</strong>",
     "user-posted-to": "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
     "user-posted-to-dual": "<strong>%1</strong> and <strong>%2</strong> have posted replies to: <strong>%3</strong>",
     "user-posted-to-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have posted replies to: <strong>%4</strong>",

public/language/es/notifications.json

@@ -46,6 +46,7 @@
     "user-flagged-user-dual": "<strong>%1</strong> y <strong>%2</strong> reportaron el perfil (%3)",
     "user-flagged-user-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> flagged a user profile (%4)",
     "user-flagged-user-multiple": "<strong>%1</strong>, <strong>%2</strong> and %3 others flagged a user profile (%4)",
+    "admin-posted-to" : "<strong>[COURSE FACULTY] %1</strong> ha respondido a: <strong>%2</strong>",
     "user-posted-to": "<strong>%1</strong> ha respondido a: <strong>%2</strong>",
     "user-posted-to-dual": "<strong>%1</strong> y <strong>%2</strong> han respondido a <strong>%3</strong>",
     "user-posted-to-triple": "<strong>%1</strong>, <strong>%2</strong> and <strong>%3</strong> have posted replies to: <strong>%4</strong>",

public/language/fr/notifications.json

@@ -46,6 +46,7 @@
     "user-flagged-user-dual": "<strong>%1</strong> et <strong>%2</strong> ont signalé un profil utilisateur (%3)",
     "user-flagged-user-triple": "<strong>%1</strong>, <strong>%2</strong> et <strong>%3</strong> ont signalé un profil utilisateur (%4)",
     "user-flagged-user-multiple": "<strong>%1</strong>, <strong>%2</strong> et %3 autres ont signalé un profil utilisateur (%4)",
+    "admin-posted-to": "<strong>[COURSE FACULTY] %1</strong> a répondu à : <strong>%2</strong>",
     "user-posted-to": "<strong>%1</strong> a répondu à : <strong>%2</strong>",
     "user-posted-to-dual": "<strong>%1</strong> et <strong>%2</strong> ont posté une réponse à : <strong>%3</strong>",
     "user-posted-to-triple": "<strong>%1</strong>, <strong>%2</strong> et <strong>%3</strong> ont publié des réponses à : <strong>%4</strong>",

src/topics/create.js

@@ -209,18 +209,38 @@ module.exports = function (Topics) {
 		if (parseInt(uid, 10) || meta.config.allowGuestReplyNotifications) {
 			const { displayname } = postData.user;
 
-			Topics.notifyFollowers(postData, uid, {
-				type: 'new-reply',
-				bodyShort: translator.compile('notifications:user-posted-to', displayname, postData.topic.title),
-				nid: `new_post:tid:${postData.topic.tid}:pid:${postData.pid}:uid:${uid}`,
-				mergeId: `notifications:user-posted-to|${postData.topic.tid}`,
-			});
-		}
+			// Checks if the user is an admin
+			const isAdmin = await privileges.users.isAdministrator(uid);
+			let notificationMessage;
+
+			if (isAdmin) {
+				// Handles admin/instructor notification separately so it doesn't get bundled with
+				// notifications of non-admin replies.
+				// It does this by using a different notification ID and merge ID for admin replies.
+				notificationMessage = translator.compile('notifications:admin-posted-to', displayname, postData.topic.title);
+				Topics.notifyFollowers(postData, uid, {
+					type: 'new-reply',
+					bodyShort: notificationMessage,
+					nid: `admin_post:tid:${postData.topic.tid}:pid:${postData.pid}:uid:${uid}`,
+					mergeId: `notifications:admin-posted-to|${postData.topic.tid}`,
+				});
+			} else {
+				// This code handles non-admin replies, allowing bundling.
+				notificationMessage = translator.compile('notifications:user-posted-to', displayname, postData.topic.title);
+
+				Topics.notifyFollowers(postData, uid, {
+					type: 'new-reply',
+					bodyShort: notificationMessage,
+					nid: `new_post:tid:${postData.topic.tid}:pid:${postData.pid}:uid:${uid}`,
+					mergeId: `notifications:user-posted-to|${postData.topic.tid}`,
+				});
+			}
 
-		analytics.increment(['posts', `posts:byCid:${data.cid}`]);
-		plugins.hooks.fire('action:topic.reply', { post: _.clone(postData), data: data });
+			analytics.increment(['posts', `posts:byCid:${data.cid}`]);
+			plugins.hooks.fire('action:topic.reply', { post: _.clone(postData), data: data });
 
-		return postData;
+			return postData;
+		}
 	};
 
 	async function onNewPost(postData, data) {