From 8c0ca988ae9d897ea2cb72bf08735480c5a344ca Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Sat, 17 Jun 2023 19:50:05 +1200
Subject: [PATCH 1/5] Trim brew.title on UserPage

---
 client/homebrew/pages/userPage/userPage.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index 1e051987b..57fc5f457 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -28,6 +28,7 @@ const UserPage = createClass({
 		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
 
 		const brews = _.groupBy(this.props.brews, (brew)=>{
+			brew.title = brew.title.trim();
 			return (brew.published ? 'published' : 'private');
 		});
 

From 4ded080a582eb39642f1efa6cf9fb59bf82e2338 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 29 Jun 2023 16:30:06 +1200
Subject: [PATCH 2/5] Trim titles before alphabetical ListPage sorting

---
 client/homebrew/pages/basePages/listPage/listPage.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/homebrew/pages/basePages/listPage/listPage.jsx b/client/homebrew/pages/basePages/listPage/listPage.jsx
index 86570ec46..2696d4e7a 100644
--- a/client/homebrew/pages/basePages/listPage/listPage.jsx
+++ b/client/homebrew/pages/basePages/listPage/listPage.jsx
@@ -89,7 +89,7 @@ const ListPage = createClass({
 	sortBrewOrder : function(brew){
 		if(!brew.title){brew.title = 'No Title';}
 		const mapping = {
-			'alpha'   : _.deburr(brew.title.toLowerCase()),
+			'alpha'   : _.deburr(brew.title.trim().toLowerCase()),
 			'created' : moment(brew.createdAt).format(),
 			'updated' : moment(brew.updatedAt).format(),
 			'views'   : brew.views,

From 636f2f93729203fc1104aa73a80d18a8185e2b99 Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 29 Jun 2023 16:35:26 +1200
Subject: [PATCH 3/5] Add title trim before new saves and updates

---
 server/homebrew.api.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 60c86b6d4..434447ec9 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -143,6 +143,7 @@ const api = {
 		if(!brew.title) {
 			brew.title = api.getGoodBrewTitle(brew.text);
 		}
+		brew.title = brew.title.trim();
 
 		brew.authors = (account) ? [account.username] : [];
 		brew.text = api.mergeBrewText(brew);
@@ -212,6 +213,7 @@ const api = {
 		const { saveToGoogle, removeFromGoogle } = req.query;
 		let afterSave = async ()=>true;
 
+		brew.title = brew.title.trim();
 		brew.text = api.mergeBrewText(brew);
 
 		if(brew.googleId && removeFromGoogle) {

From a41553637ac1335f260f7ed3a32dedf8664722ed Mon Sep 17 00:00:00 2001
From: "G.Ambatte" <sean@robertson-family.nz>
Date: Thu, 29 Jun 2023 16:43:30 +1200
Subject: [PATCH 4/5] Add trim to brew description

---
 server/homebrew.api.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/homebrew.api.js b/server/homebrew.api.js
index 434447ec9..1e754a5ea 100644
--- a/server/homebrew.api.js
+++ b/server/homebrew.api.js
@@ -143,12 +143,14 @@ const api = {
 		if(!brew.title) {
 			brew.title = api.getGoodBrewTitle(brew.text);
 		}
-		brew.title = brew.title.trim();
 
 		brew.authors = (account) ? [account.username] : [];
 		brew.text = api.mergeBrewText(brew);
 
 		_.defaults(brew, DEFAULT_BREW);
+
+		brew.title = brew.title.trim();
+		brew.description = brew.description.trim();
 	},
 	newGoogleBrew : async (account, brew, res)=>{
 		const oAuth2Client = GoogleActions.authCheck(account, res);
@@ -214,6 +216,7 @@ const api = {
 		let afterSave = async ()=>true;
 
 		brew.title = brew.title.trim();
+		brew.description = brew.description.trim() || '';
 		brew.text = api.mergeBrewText(brew);
 
 		if(brew.googleId && removeFromGoogle) {

From 3e43b058a5bd2f60b18501c1ffd99064a6250be4 Mon Sep 17 00:00:00 2001
From: Sean Robertson <sean@robertson-family.nz>
Date: Wed, 6 Sep 2023 11:52:28 +1200
Subject: [PATCH 5/5] Move userpage brew data clean up to app.js

---
 client/homebrew/pages/userPage/userPage.jsx | 1 -
 server/app.js                               | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/homebrew/pages/userPage/userPage.jsx b/client/homebrew/pages/userPage/userPage.jsx
index 57fc5f457..1e051987b 100644
--- a/client/homebrew/pages/userPage/userPage.jsx
+++ b/client/homebrew/pages/userPage/userPage.jsx
@@ -28,7 +28,6 @@ const UserPage = createClass({
 		const usernameWithS = this.props.username + (this.props.username.endsWith('s') ? `’` : `’s`);
 
 		const brews = _.groupBy(this.props.brews, (brew)=>{
-			brew.title = brew.title.trim();
 			return (brew.published ? 'published' : 'private');
 		});
 
diff --git a/server/app.js b/server/app.js
index 520dd154e..f10b6ff5e 100644
--- a/server/app.js
+++ b/server/app.js
@@ -268,6 +268,9 @@ app.get('/user/:username', async (req, res, next)=>{
 	}
 
 	req.brews = _.map(brews, (brew)=>{
+		// Clean up brew data
+		brew.title = brew.title?.trim();
+		brew.description = brew.description?.trim();
 		return sanitizeBrew(brew, ownAccount ? 'edit' : 'share');
 	});