f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2025-12-27 18:02:42 +00:00
Code Wiki Activity

Merge branch 'master' into migration-guide

Browse Source 
# Conflicts:
#	shared/naturalcrit/markdown.js
This commit is contained in:
Charlie Humphreys
2021-12-15 23:59:10 -06:00
parent 889d307372 0555427805
commit e2b4151ab4
20 changed files with 1361 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server.js
View File

@@ -2,6 +2,7 @@
const _ = require('lodash');
const jwt = require('jwt-simple');
const express = require('express');
const yaml = require('js-yaml');
const app = express();
const homebrewApi = require('./server/homebrew.api.js');
@@ -32,7 +33,7 @@ const getBrewFromId = asyncHandler(async (id, accessType)=>{
if(accessType == 'raw') {
return brew;
}
splitTextAndStyle(brew);
splitTextStyleAndMetadata(brew);
return brew;
});
@@ -45,8 +46,15 @@ const sanitizeBrew = (brew, full=false)=>{
return brew;
};
const splitTextAndStyle = (brew)=>{
const splitTextStyleAndMetadata = (brew)=>{
brew.text = brew.text.replaceAll('\r\n', '\n');
if(brew.text.startsWith('```metadata')) {
const index = brew.text.indexOf('```\n\n');
const metadataSection = brew.text.slice(12, index - 1);
const metadata = yaml.load(metadataSection);
Object.assign(brew, _.pick(metadata, ['title', 'description', 'tags', 'systems', 'renderer']));
brew.text = brew.text.slice(index + 5);
}
if(brew.text.startsWith('```css')) {
const index = brew.text.indexOf('```\n\n');
brew.style = brew.text.slice(7, index - 1);
@@ -129,7 +137,7 @@ app.get('/v3_preview', async (req, res, next)=>{
text : welcomeTextV3,
renderer : 'V3'
};
splitTextAndStyle(brew);
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next();
});
@@ -152,7 +160,7 @@ app.get('/changelog', async (req, res, next)=>{
text : changelogText,
renderer : 'V3'
};
splitTextAndStyle(brew);
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next();
});
@@ -164,7 +172,7 @@ app.get('/faq', async (req, res, next)=>{
text : faqText,
renderer : 'V3'
};
splitTextAndStyle(brew);
splitTextStyleAndMetadata(brew);
req.brew = brew;
return next();
});