Merge pull request #29 from CMU-17313Q/developingCode

merge changes from project 1 in file "groups.data.js"
CMU-17313Q · Sep 19, 2024 · fe805df · fe805df
2 parents 8baa8a3 + a72ede9
commit fe805df
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 23 deletions.
diff --git a/dump.rdb b/dump.rdb
diff --git a/src/groups/data.js b/src/groups/data.js
@@ -7,6 +7,7 @@ const db = require('../database');
 const plugins = require('../plugins');
 const utils = require('../utils');
 const translator = require('../translator');
+const coverPhoto = require('../coverPhoto');
 
 const intFields = [
 	'createtime', 'memberCount', 'hidden', 'system', 'private',
@@ -68,35 +69,47 @@ module.exports = function (Groups) {
 function modifyGroup(group, fields) {
 	if (group) {
 		db.parseIntFields(group, intFields, fields);
-
 		escapeGroupData(group);
-		group.userTitleEnabled = ([null, undefined].includes(group.userTitleEnabled)) ? 1 : group.userTitleEnabled;
-		group.labelColor = validator.escape(String(group.labelColor || '#000000'));
-		group.textColor = validator.escape(String(group.textColor || '#ffffff'));
-		group.icon = validator.escape(String(group.icon || ''));
-		group.createtimeISO = utils.toISOString(group.createtime);
-		group.private = ([null, undefined].includes(group.private)) ? 1 : group.private;
-		group.memberPostCids = group.memberPostCids || '';
-		group.memberPostCidsArray = group.memberPostCids.split(',').map(cid => parseInt(cid, 10)).filter(Boolean);
-
-		group['cover:thumb:url'] = group['cover:thumb:url'] || group['cover:url'];
-
-		if (group['cover:url']) {
-			group['cover:url'] = group['cover:url'].startsWith('http') ? group['cover:url'] : (nconf.get('relative_path') + group['cover:url']);
-		} else {
-			group['cover:url'] = require('../coverPhoto').getDefaultGroupCover(group.name);
-		}
+		setDefaultValues(group);
+		formatGroupFields(group);
+		setCoverUrls(group);
+	}
+}
 
-		if (group['cover:thumb:url']) {
-			group['cover:thumb:url'] = group['cover:thumb:url'].startsWith('http') ? group['cover:thumb:url'] : (nconf.get('relative_path') + group['cover:thumb:url']);
-		} else {
-			group['cover:thumb:url'] = require('../coverPhoto').getDefaultGroupCover(group.name);
-		}
+function setDefaultValues(group) {
+	group.userTitleEnabled = ([null, undefined].includes(group.userTitleEnabled)) ? 1 : group.userTitleEnabled;
+	group.private = ([null, undefined].includes(group.private)) ? 1 : group.private;
+	group.labelColor = validator.escape(String(group.labelColor || '#000000'));
+	group.textColor = validator.escape(String(group.textColor || '#ffffff'));
+	group.icon = validator.escape(String(group.icon || ''));
+}
 
-		group['cover:position'] = validator.escape(String(group['cover:position'] || '50% 50%'));
+function formatGroupFields(group) {
+	group.createtimeISO = utils.toISOString(group.createtime);
+	group.memberPostCids = group.memberPostCids || '';
+	group.memberPostCidsArray = group.memberPostCids.split(',').map(cid => parseInt(cid, 10)).filter(Boolean);
+	group['cover:position'] = validator.escape(String(group['cover:position'] || '50% 50%'));
+}
+
+function setCoverUrls(group) {
+	group['cover:thumb:url'] = group['cover:thumb:url'] || group['cover:url'];
+	if (group['cover:url']) {
+		group['cover:url'] = formatUrl(group['cover:url']);
+	} else {
+		group['cover:url'] = coverPhoto.getDefaultGroupCover(group.name);
+	}
+
+	if (group['cover:thumb:url']) {
+		group['cover:thumb:url'] = formatUrl(group['cover:thumb:url']);
+	} else {
+		group['cover:thumb:url'] = coverPhoto.getDefaultGroupCover(group.name);
 	}
 }
 
+function formatUrl(url) {
+	return url.startsWith('http') ? url : (nconf.get('relative_path') + url);
+}
+
 function escapeGroupData(group) {
 	if (group) {
 		group.nameEncoded = encodeURIComponent(group.name);