Revert "Merge pull request #26 from CMU-313/anonymous-feature"

This reverts commit 1ba80bc, reversing changes made to aef0de0.
CMU-313 · Oct 9, 2024 · 6e2c4bd · 6e2c4bd
1 parent 0f3ba1f
commit 6e2c4bd
Show file tree

Hide file tree

Showing 5 changed files with 204 additions and 0 deletions.
diff --git a/node_modules/nodebb-plugin-composer-default/package.json b/node_modules/nodebb-plugin-composer-default/package.json
diff --git a/...les/nodebb-plugin-composer-default/static/templates/partials/composer-title-container.tpl b/...les/nodebb-plugin-composer-default/static/templates/partials/composer-title-container.tpl
diff --git a/...odebb-plugin-composer-default/static/templates/partials/composer-title-container.tpl.save b/...odebb-plugin-composer-default/static/templates/partials/composer-title-container.tpl.save
diff --git a/src/posts/create.js b/src/posts/create.js
@@ -35,7 +35,10 @@ module.exports = function (Posts) {
 			tid: tid,
 			content: content,
 			timestamp: timestamp,
+<<<<<<< HEAD
 			anonymous: data.anonymous ? 1 : 0, // Added anonymous status
+=======
+>>>>>>> parent of 1ba80bc2 (Merge pull request #26 from CMU-313/anonymous-feature)
 		};
 
 		if (data.toPid) {

diff --git a/src/posts/data.js b/src/posts/data.js
@@ -22,17 +22,22 @@ module.exports = function (Posts) {
 			posts: postData,
 			fields: fields,
 		});
+<<<<<<< HEAD
 		result.posts.forEach((post) => {
 			modifyPost(post, fields);
 			if (post.anonymous === 1) {
 				post.uid = null;
 			}
 		});
+=======
+		result.posts.forEach(post => modifyPost(post, fields));
+>>>>>>> parent of 1ba80bc2 (Merge pull request #26 from CMU-313/anonymous-feature)
 		return result.posts;
 	};
 
 	Posts.getPostData = async function (pid) {
 		const posts = await Posts.getPostsFields([pid], []);
+<<<<<<< HEAD
 		if (posts && posts.length) {
 			const post = posts[0];
 			if (post.anonymous === 1) {
@@ -41,6 +46,9 @@ module.exports = function (Posts) {
 			return post;
 		}
 		return null;
+=======
+		return posts && posts.length ? posts[0] : null;
+>>>>>>> parent of 1ba80bc2 (Merge pull request #26 from CMU-313/anonymous-feature)
 	};
 
 	Posts.getPostsData = async function (pids) {