f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 11:52:44 +00:00
Code Wiki Activity

fix deletion, update urls

Browse Source
This commit is contained in:
Charlie Humphreys
2022-05-25 03:03:43 +00:00
parent 7691e4d24e
commit 55c91217ab
5 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/app.js
View File

@@ -190,7 +190,7 @@ app.get('/user/:username', async (req, res, next)=>{
});
for (const brew of brews) {
const match = googleBrews.findIndex((b)=>b.editId === brew.editId);
const match = googleBrews?.findIndex((b)=>b.editId === brew.editId) ?? -1;
if(match !== -1) {
brew.googleId = googleBrews[match].googleId;
brew.stubbed = true;

23
server/homebrew.api.js
View File

@@ -48,7 +48,7 @@ const getBrew = (accessType)=>{
// If we can't find the google brew and there is a google id for the brew, throw an error.
if(!googleBrew) throw googleError;
// Combine the Homebrewery stub with the google brew, or if the stub doesn't exist just use the google brew
stub = stub ? _.assign(excludeStubProps(stub), excludeGoogleProps(googleBrew)) : googleBrew;
stub = stub ? _.assign({ ...excludeStubProps(stub), stubbed: true }, excludeGoogleProps(googleBrew)) : googleBrew;
}
// If after all of that we still don't have a brew, throw an exception
@@ -257,17 +257,22 @@ const deleteGoogleBrew = async (account, id, editId, res)=>{
};
const deleteBrew = async (req, res)=>{
const { brew, account } = req;
if(brew.googleId) {
const googleDeleted = await deleteGoogleBrew(account, brew.googleId, brew.editId, res)
let brew = req.brew;
const { googleId, editId } = brew;
const account = req.account;
const isOwner = account && (brew.authors.length === 0 || brew.authors[0] === account.username);
console.log(brew.authors, googleId, account.username);
let afterSave = async ()=>true;
if(googleId && isOwner) {
afterSave = async ()=>await deleteGoogleBrew(account, googleId, editId, res)
.catch((err)=>{
console.error(err);
res.status(500).send(err);
});
if(!googleDeleted) return;
}
if(brew._id) {
brew = _.assign(await HomebrewModel.findOne({ _id: brew._id }), brew);
if(account) {
// Remove current user as author
brew.authors = _.pull(brew.authors, account.username);
@@ -282,6 +287,12 @@ const deleteBrew = async (req, res)=>{
throw { status: 500, message: 'Error while removing' };
});
} else {
if(googleId && isOwner) {
brew.googleId = undefined;
brew.textBin = zlib.deflateRawSync(brew.text);
brew.text = undefined;
}
// Otherwise, save the brew with updated author list
await brew.save()
.catch((err)=>{
@@ -289,6 +300,8 @@ const deleteBrew = async (req, res)=>{
});
}
}
const after = await afterSave();
if(!after) return;
res.status(204).send();
};