Merge pull request #12 from CMU-313/melody/proj1

Merge individual changes made in Project 1
CMU-313 · Sep 20, 2024 · b859768 · b859768
2 parents 68a7fd8 + 9e5cbfb
commit b859768
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js
@@ -44,28 +44,27 @@ module.exports = function (Messaging) {
 
 	function modifyRoomData(rooms, fields) {
 		rooms.forEach((data) => {
-			if (data) {
-				db.parseIntFields(data, intFields, fields);
-				data.roomName = validator.escape(String(data.roomName || ''));
-				data.public = parseInt(data.public, 10) === 1;
-				data.groupChat = data.userCount > 2;
-
-				if (!fields.length || fields.includes('notificationSetting')) {
-					data.notificationSetting = data.notificationSetting ||
-						(
-							data.public ?
-								Messaging.notificationSettings.ATMENTION :
-								Messaging.notificationSettings.ALLMESSAGES
-						);
-				}
+			if (!data) { return; }
+			db.parseIntFields(data, intFields, fields);
+			data.roomName = validator.escape(String(data.roomName || ''));
+			data.public = parseInt(data.public, 10) === 1;
+			data.groupChat = data.userCount > 2;
+
+			if (!fields.length || fields.includes('notificationSetting')) {
+				data.notificationSetting = data.notificationSetting ||
+					(
+						data.public ?
+							Messaging.notificationSettings.ATMENTION :
+							Messaging.notificationSettings.ALLMESSAGES
+					);
+			}
 
-				if (data.hasOwnProperty('groups') || !fields.length || fields.includes('groups')) {
-					try {
-						data.groups = JSON.parse(data.groups || '[]');
-					} catch (err) {
-						winston.error(err.stack);
-						data.groups = [];
-					}
+			if (data.hasOwnProperty('groups') || !fields.length || fields.includes('groups')) {
+				try {
+					data.groups = JSON.parse(data.groups || '[]');
+				} catch (err) {
+					winston.error(err.stack);
+					data.groups = [];
 				}
 			}
 		});