f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-31 17:22:45 +00:00
Code Wiki Activity

Merge pull request #3796 from naturalcrit/FixGoogleLinksinUserPage

Browse Source
This commit is contained in:
Trevor Buckner
2024-10-06 15:52:29 -04:00
committed by GitHub
parent 487a574f50 2a523c4955
commit 10d4cd4ab3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/app.js
View File

@@ -242,6 +242,8 @@ app.get('/user/:username', async (req, res, next)=>{
console.log(err); console.log(err);
}); });
brews.forEach(brew => brew.stubbed = true); //All brews from MongoDB are "stubbed"
if(ownAccount && req?.account?.googleId){ if(ownAccount && req?.account?.googleId){
const auth = await GoogleActions.authCheck(req.account, res); const auth = await GoogleActions.authCheck(req.account, res);
let googleBrews = await GoogleActions.listGoogleBrews(auth) let googleBrews = await GoogleActions.listGoogleBrews(auth)
@@ -249,12 +251,12 @@ app.get('/user/:username', async (req, res, next)=>{
console.error(err); console.error(err);
}); });
// If stub matches file from Google, use Google metadata over stub metadata
if(googleBrews && googleBrews.length > 0) { if(googleBrews && googleBrews.length > 0) {
for (const brew of brews.filter((brew)=>brew.googleId)) { for (const brew of brews.filter((brew)=>brew.googleId)) {
const match = googleBrews.findIndex((b)=>b.editId === brew.editId); const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
if(match !== -1) { if(match !== -1) {
brew.googleId = googleBrews[match].googleId; brew.googleId = googleBrews[match].googleId;
brew.stubbed = true;
brew.pageCount = googleBrews[match].pageCount; brew.pageCount = googleBrews[match].pageCount;
brew.renderer = googleBrews[match].renderer; brew.renderer = googleBrews[match].renderer;
brew.version = googleBrews[match].version; brew.version = googleBrews[match].version;
@@ -263,6 +265,7 @@ app.get('/user/:username', async (req, res, next)=>{
} }
} }
//Remaining unstubbed google brews display current user as author
googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] })); googleBrews = googleBrews.map((brew)=>({ ...brew, authors: [req.account.username] }));
brews = _.concat(brews, googleBrews); brews = _.concat(brews, googleBrews);
} }