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

Merge branch 'master' into experimentalSplitHashAndVersionChecks

Browse Source
This commit is contained in:
Trevor Buckner
2025-07-10 11:06:29 -04:00
committed by GitHub
parent 7f3a818558 68460447dc
commit b2c4bb7082
5 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/homebrew.api.js
View File

@@ -362,15 +362,20 @@ const api = {
let brew = _.assign(brewFromServer, brewFromClient);
brew.title = brew.title.trim();
brew.description = brew.description.trim() || '';
try {
const patches = parsePatch(brewFromClient.patches);
brew.text = applyPatches(patches, brewFromServer.text)[0];
// Patch to a throwaway variable while parallelizing - we're more concerned with error/no error.
const patchedResult = applyPatches(patches, brewFromServer.text)[0];
// brew.text = applyPatches(patches, brewFromServer.text)[0];
} catch (err) {
console.error('Failed to apply patches:', {
patches: brewFromClient.patches,
brewId: brew.editId || 'unknown'
patches : brewFromClient.patches,
brewId : brew.editId || 'unknown',
error : err
});
throw err; // rethrow to preserve the 500 behavior
// While running in parallel, don't throw the error upstream.
// throw err; // rethrow to preserve the 500 behavior
}
brew.text = api.mergeBrewText(brew);