Adding project 1 refactored code.

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>Instructor %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/src/client/account/settings.js

@@ -72,27 +72,40 @@
 	}
 
 	function saveSettings(settings) {
-		api.put(`/users/${ajaxify.data.uid}/settings`, { settings }).then((newSettings) => {
-			alerts.success('[[success:settings-saved]]');
-			let languageChanged = false;
-			for (const key in newSettings) {
-				if (newSettings.hasOwnProperty(key)) {
-					if (key === 'userLang' && config.userLang !== newSettings.userLang) {
-						languageChanged = true;
-					}
-					if (key === 'bootswatchSkin') {
-						savedSkin = newSettings.bootswatchSkin;
-						config.bootswatchSkin = savedSkin === 'noskin' ? '' : savedSkin;
-					} else if (config.hasOwnProperty(key)) {
-						config[key] = newSettings[key];
-					}
-				}
-			}
+		console.log('Logging Jullia Montejo');
+		api.put(`/users/${ajaxify.data.uid}/settings`, { settings }).then(handleNewSettings);
+	}
+
+	// Alerts the user that the settings have been saved and updates the configuration.
+	function handleNewSettings(newSettings) {
+		alerts.success('[[success:settings-saved]]');
+		processNewSettings(newSettings);
+	}
 
-			if (languageChanged && parseInt(app.user.uid, 10) === parseInt(ajaxify.data.theirid, 10)) {
-				window.location.reload();
+	// Processes the new settings and updates the configuration accordingly.
+	function processNewSettings(newSettings) {
+		for (const key in newSettings) {
+			if (newSettings.hasOwnProperty(key)) {
+				checkAndUpdateConfig(key, newSettings);
 			}
-		});
+		}
+	}
+
+	// Updates the configuration based on the provided key and new settings.
+	function checkAndUpdateConfig(key, newSettings) {
+		if (key === 'userLang' && config.userLang !== newSettings.userLang) {
+			window.location.reload();
+		} else if (key === 'bootswatchSkin') {
+			updateSkin(newSettings.bootswatchSkin);
+		} else if (config.hasOwnProperty(key)) {
+			config[key] = newSettings[key];
+		}
+	}
+
+	// Updates the saved skin with the new skin.
+	function updateSkin(skin) {
+		savedSkin = skin;
+		config.bootswatchSkin = skin === 'noskin' ? '' : skin;
 	}
 
 	function toggleCustomRoute() {
@@ -162,4 +175,4 @@
 	};
 
 	return AccountSettings;
-});
+});

src/topics/create.js

@@ -167,61 +167,73 @@
 		data = await plugins.hooks.fire('filter:topic.reply', data);
 		const { tid } = data;
 		const { uid } = data;
-
+	
 		const [topicData, isAdmin] = await Promise.all([
 			Topics.getTopicData(tid),
 			privileges.users.isAdministrator(uid),
 		]);
-
+	
 		await canReply(data, topicData);
-
+	
 		data.cid = topicData.cid;
-
+	
 		await guestHandleValid(data);
 		data.content = String(data.content || '').trimEnd();
-
+	
 		if (!data.fromQueue && !isAdmin) {
 			await user.isReadyToPost(uid, data.cid);
 			Topics.checkContent(data.content);
 			if (!await posts.canUserPostContentWithLinks(uid, data.content)) {
 				throw new Error(`[[error:not-enough-reputation-to-post-links, ${meta.config['min:rep:post-links']}]]`);
 			}
 		}
-
+	
 		// For replies to scheduled topics, don't have a timestamp older than topic's itself
 		if (topicData.scheduled) {
 			data.timestamp = topicData.lastposttime + 1;
 		}
-
+	
 		data.ip = data.req ? data.req.ip : null;
 		let postData = await posts.create(data);
 		postData = await onNewPost(postData, data);
-
+	
 		const settings = await user.getSettings(uid);
 		if (uid > 0 && settings.followTopicsOnReply) {
 			await Topics.follow(postData.tid, uid);
 		}
-
+	
 		if (parseInt(uid, 10)) {
 			user.setUserField(uid, 'lastonline', Date.now());
 		}
-
+	
 		if (parseInt(uid, 10) || meta.config.allowGuestReplyNotifications) {
 			const { displayname } = postData.user;
 
+			 // Ensure isAdmin is correctly set
+			 const isAdmin = await privileges.users.isAdministrator(uid);
+
+			// Modify notification message based on admin status
+			let notificationMessage = translator.compile('notifications:user-posted-to', displayname, postData.topic.title);
+			console.log('isnotadmin');
+			if (isAdmin) {
+				console.log('isAdmin:', isAdmin);
+				notificationMessage = translator.compile('notifications:admin-posted-to', displayname, postData.topic.title);
+			}
+
 			Topics.notifyFollowers(postData, uid, {
 				type: 'new-reply',
-				bodyShort: translator.compile('notifications:user-posted-to', displayname, postData.topic.title),
+				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 });
-
+	
 		return postData;
 	};
+
 
 	async function onNewPost(postData, data) {
 		const { tid, uid } = postData;