f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-05 03:42:38 +00:00
Code Wiki Activity

Changed uses of the 'raw' brew access type to 'view' and update uses of mergeBrewText as a result

Browse Source 
#1838
This commit is contained in:
Charlie Humphreys
2021-11-25 22:44:59 -06:00
parent ef433bbbe2
commit 5ffdd022c2
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.json
View File

@@ -2,5 +2,6 @@
"host" : "homebrewery.local.naturalcrit.com:8000", "host" : "homebrewery.local.naturalcrit.com:8000",
"naturalcrit_url" : "local.naturalcrit.com:8010", "naturalcrit_url" : "local.naturalcrit.com:8010",
"secret" : "secret", "secret" : "secret",
"web_port" : 8000 "web_port" : 8000,
"enable_v3" : true
} }

11
server.js
View File

@@ -12,7 +12,7 @@ const serveCompressedStaticAssets = require('./server/static-assets.mv.js');
const sanitizeFilename = require('sanitize-filename'); const sanitizeFilename = require('sanitize-filename');
const asyncHandler = require('express-async-handler'); const asyncHandler = require('express-async-handler');
const brewAccessTypes = ['edit', 'share', 'raw']; const brewAccessTypes = ['edit', 'share', 'raw', 'view'];
//Get the brew object from the HB database or Google Drive //Get the brew object from the HB database or Google Drive
const getBrewFromId = asyncHandler(async (id, accessType)=>{ const getBrewFromId = asyncHandler(async (id, accessType)=>{
@@ -167,10 +167,10 @@ app.get('/faq', async (req, res, next)=>{
//Source page //Source page
app.get('/source/:id', asyncHandler(async (req, res)=>{ app.get('/source/:id', asyncHandler(async (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'raw'); const brew = await getBrewFromId(req.params.id, 'view');
const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' }; const replaceStrings = { '&': '&amp;', '<': '&lt;', '>': '&gt;' };
let text = brewUtils.mergeBrewText(brew, { metadata: true, fullMetadata: true }); let text = brewUtils.mergeBrewText(brew, { style: true, metadata: true, fullMetadata: true });
for (const replaceStr in replaceStrings) { for (const replaceStr in replaceStrings) {
text = text.replaceAll(replaceStr, replaceStrings[replaceStr]); text = text.replaceAll(replaceStr, replaceStrings[replaceStr]);
} }
@@ -180,7 +180,7 @@ app.get('/source/:id', asyncHandler(async (req, res)=>{
//Download brew source page //Download brew source page
app.get('/download/:id', asyncHandler(async (req, res)=>{ app.get('/download/:id', asyncHandler(async (req, res)=>{
const brew = await getBrewFromId(req.params.id, 'raw'); const brew = await getBrewFromId(req.params.id, 'view');
const prefix = 'HB - '; const prefix = 'HB - ';
let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', ''); let fileName = sanitizeFilename(`${prefix}${brew.title}`).replaceAll(' ', '');
@@ -190,7 +190,8 @@ app.get('/download/:id', asyncHandler(async (req, res)=>{
'Content-Type' : 'text/plain', 'Content-Type' : 'text/plain',
'Content-Disposition' : `attachment; filename="${fileName}.txt"` 'Content-Disposition' : `attachment; filename="${fileName}.txt"`
}); });
res.status(200).send(brewUtils.mergeBrewText(brew, { metadata: true, fullMetadata: true })); const text = brewUtils.mergeBrewText(brew, { style: true, metadata: true, fullMetadata: true });
res.status(200).send(text);
})); }));
//User Page //User Page