style: make linting changes

This commit is contained in:
William Oldham
2025-01-20 12:13:47 +00:00
parent e63adcd63f
commit 1c1e453213
19 changed files with 141 additions and 145 deletions

View File

@@ -1,5 +1,5 @@
const express = require('express');
const crypto = require('crypto');
const express = require('express');
const DiscordOauth2 = require('discord-oauth2');
const Stripe = require('stripe');
const { REST: DiscordRest } = require('@discordjs/rest');
@@ -11,7 +11,7 @@ const util = require('../util');
const { handleStripeEvent } = require('../stripe');
const logger = require('../logger');
const config = require('../../config.json');
const editorJSON = require('../json/miieditor.json');
const editorJSON = require('../json/miieditor.json');
const { Router } = express;
@@ -60,7 +60,7 @@ router.get('/', requireLoginMiddleware, async (request, response) => {
// If no Discord account linked, generate an auth URL
const discordAuthURL = discordOAuth.generateAuthUrl({
scope: ['identify', 'guilds'],
state: crypto.randomBytes(16).toString('hex'),
state: crypto.randomBytes(16).toString('hex')
});
renderData.discordAuthURL = discordAuthURL;
@@ -155,8 +155,8 @@ router.get('/forgot-password', async (request, response) => {
const renderData = {
input: request.cookies.input,
success_message: request.cookies.success_message,
error_message: request.cookies.error_message,
}
error_message: request.cookies.error_message
};
response.clearCookie('input', { domain: '.pretendo.network' });
@@ -172,7 +172,7 @@ router.post('/forgot-password', async (request, response) => {
await util.forgotPassword({
input,
hCaptchaResponse
})
});
response.clearCookie('input', { domain: '.pretendo.network' });
@@ -201,9 +201,9 @@ router.get('/connect/discord', requireLoginMiddleware, async (request, response)
tokens = await discordOAuth.tokenRequest({
code: request.query.code,
scope: 'identify guilds',
grantType: 'authorization_code',
grantType: 'authorization_code'
});
} catch (error) {
} catch (ignored) {
response.cookie('error_message', 'Invalid Discord authorization code. Please try again', { domain: '.pretendo.network' });
return response.redirect('/account');
}
@@ -291,7 +291,7 @@ router.get('/upgrade', requireLoginMiddleware, async (request, response) => {
renderData.tiers = products
.filter(product => product.active)
.sort((a, b) => +a.metadata.tier_level - +b.metadata.tier_level)
.map(product => {
.map((product) => {
const price = prices.find(price => price.id === product.default_price);
const perks = [];
@@ -309,7 +309,7 @@ router.get('/upgrade', requireLoginMiddleware, async (request, response) => {
name: product.name,
description: product.description,
perks,
price: (price.unit_amount / 100).toLocaleString('en-US', { style: 'currency', currency: 'USD' }),
price: (price.unit_amount / 100).toLocaleString('en-US', { style: 'currency', currency: 'USD' })
};
});
@@ -358,8 +358,8 @@ router.post('/stripe/checkout/:priceId', requireLoginMiddleware, async (request,
line_items: [
{
price: priceId,
quantity: 1,
},
quantity: 1
}
],
customer: customer.id,
mode: 'subscription',
@@ -391,9 +391,9 @@ router.post('/stripe/unsubscribe', requireLoginMiddleware, async (request, respo
const updateData = {
'connections.stripe.subscription_id': null,
'connections.stripe.price_id': null,
'connections.stripe.price_id': null,
'connections.stripe.tier_level': 0,
'connections.stripe.tier_name': null,
'connections.stripe.tier_name': null
};
if (pnid.get('access_level') < 2) {

View File

@@ -1,11 +1,11 @@
const { Router } = require('express');
const logger = require('../logger');
const router = new Router();
const fs = require('fs');
const path = require('path');
const { Router } = require('express');
const { marked } = require('marked');
const matter = require('gray-matter');
const logger = require('../logger');
const router = new Router();
const postList = () => {
const files = fs.readdirSync('blogposts');
@@ -23,7 +23,7 @@ const postList = () => {
const { data: postInfo } = matter(rawPost);
return {
slug,
postInfo,
postInfo
};
});
@@ -35,7 +35,7 @@ const postList = () => {
};
router.get('/', async (request, response) => {
const renderData = {
const renderData = {
postList
};
@@ -44,7 +44,6 @@ router.get('/', async (request, response) => {
// RSS feed
router.get('/feed.xml', async (request, response) => {
// Adds the pubDate and the cover_extension to the post array
const posts = postList().map((post) => {
post.postInfo.pubDate = new Date(post.postInfo.date).toUTCString();
@@ -60,10 +59,9 @@ router.get('/feed.xml', async (request, response) => {
});
router.get('/:slug', async (request, response, next) => {
const renderData = {
const renderData = {
layout: 'blog-opengraph',
postList,
postList
};
// Get the name of the post from the URL
@@ -73,13 +71,13 @@ router.get('/:slug', async (request, response, next) => {
let rawPost;
try {
rawPost = fs.readFileSync(path.join('blogposts', `${postName}.md`), 'utf-8');
} catch(err) {
} catch (err) {
logger.error(err);
next();
return;
}
// Convert the post info into JSON and separate it and the content
// eslint-disable-next-line prefer-const
let { data: postInfo, content } = matter(rawPost);
renderData.postInfo = postInfo;

View File

@@ -13,7 +13,7 @@ router.get('/', async (request, response) => {
router.get('/welcome', async (request, response) => {
const renderData = {
currentPage: 'welcome',
currentPage: 'welcome'
};
response.render('docs/welcome', renderData);
@@ -21,7 +21,7 @@ router.get('/welcome', async (request, response) => {
router.get('/install', async (request, response) => {
const renderData = {
currentPage: 'install',
currentPage: 'install'
};
response.render('docs/install', renderData);
@@ -29,11 +29,11 @@ router.get('/install', async (request, response) => {
router.get([
'/search', // TODO - Deprecate search page
'/errors',
'/errors'
], async (_request, response) => {
const renderData = {
errorList: JSON.stringify(errorList),
currentPage: 'errors',
currentPage: 'errors'
};
response.render('docs/search', renderData);
@@ -44,7 +44,7 @@ router.get('/error', async (_request, response) => {
});
router.get('/:page', async (request, response, next) => {
const renderData = {};
const renderData = {};
const locale = response.locals.localeString;
const pageName = request.params.page;
@@ -63,12 +63,12 @@ router.get('/:page', async (request, response, next) => {
router.get([
'/errors/:errorCode', // TODO - Deprecate "errors" route
'/error/:errorCode',
'/error/:errorCode'
], async (request, response, next) => {
const locale = response.locals.localeString;
const error = request.params.errorCode;
const [ sysmodule, errorCode ] = error.split('-');
const [sysmodule, errorCode] = error.split('-');
if (!errorCode) {
return next();

View File

@@ -1,10 +1,10 @@
const { Router } = require('express');
const router = new Router();
const { getGithubProjectsCache } = require('../cache');
const router = new Router();
router.get('/', async (request, response) => {
const renderData = {};
const renderData = {};
const githubProjectsCache = await getGithubProjectsCache();
@@ -48,7 +48,7 @@ router.get('/', async (request, response) => {
};
// Calculates individual completion percentages and progress states
githubProjectsCache.sections.forEach(section => {
githubProjectsCache.sections.forEach((section) => {
const { todo, in_progress, done } = section.cards;
// Calculates the completion percentage of the project, and sums it to the total
@@ -57,7 +57,7 @@ router.get('/', async (request, response) => {
const sectionTitle = `${section.title} [${Math.floor(sectionCompletionPercentage * 100)}%]`;
switch(sectionCompletionPercentage) {
switch (sectionCompletionPercentage) {
case 0:
totalProgress.cards.todo.push(sectionTitle);
break;

View File

@@ -1,10 +1,10 @@
const { Router } = require('express');
const router = new Router();
const { getGithubProjectsCache, getStripeDonationCache } = require('../cache');
const router = new Router();
router.get('/', async (request, response) => {
const renderData = {
const renderData = {
progressLists: await getGithubProjectsCache(),
donationCache: await getStripeDonationCache()
};