mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-18 17:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use import syntax for logger and config

Browse source 
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-12 13:11:06 +02:00
parent dd11483f44
commit 9f284b752b
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
14 changed files with 98 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/web/note/actions.ts
View file

@ -1,8 +1,8 @@
import { Response } from 'express'
import { Note, Revision } from '../../models'
import logger from '../../logger'
import config from '../../config'
import { logger } from '../../logger'
import { config } from '../../config'
import errors from '../../errors'
import shortId from 'shortid'
import moment from 'moment'

6
lib/web/note/controller.ts
View file

@ -1,9 +1,9 @@
import { NextFunction, Response } from 'express'
import { NextFunction, Request, Response } from 'express'
import { NoteUtils } from './util'
import * as ActionController from './actions'
import errors from '../../errors'
import config from '../../config'
import logger from '../../logger'
import { config } from '../../config'
import { logger } from '../../logger'
import { User, Note } from '../../models'
export module NoteController {

4
lib/web/note/slide.ts
View file

@ -1,8 +1,8 @@
import { NextFunction, Response } from "express";
import { NoteUtils } from "./util";
import errors from '../../errors';
import logger from '../../logger';
import config from '../../config';
import { logger } from '../../logger'
import { config } from '../../config'
import { User } from "../../models/user";
import { Note } from "../../models/note";

58
lib/web/note/util.ts
View file

@ -1,20 +1,19 @@
import { Includeable } from "sequelize";
import { Response } from "express";
import { Includeable } from 'sequelize'
import { Response } from 'express'
import path from "path";
import fs from "fs";
import errors from "../../errors";
import config from "../../config";
import logger from "../../logger";
import { Note } from "../../models/note";
import { User } from "../../models/user";
import path from 'path'
import fs from 'fs'
import errors from '../../errors'
import { config } from '../../config'
import { logger } from '../../logger'
import { Note , User } from '../../models'
export module NoteUtils {
export function findNoteOrCreate(req, res, callback: (note: any) => void, include?: Includeable[]) {
const id = req.params.noteId || req.params.shortid;
const id = req.params.noteId || req.params.shortid
Note.parseNoteId(id, function (err, _id) {
if (err) {
logger.error(err);
logger.error(err)
return errors.errorInternalError(res)
}
Note.findOne({
@ -31,13 +30,13 @@ export module NoteUtils {
return callback(note)
}
}).catch(function (err) {
logger.error(err);
logger.error(err)
return errors.errorInternalError(res)
})
})
}
export function checkViewPermission(req: any, note: any) {
export function checkViewPermission (req: any, note: any) {
if (note.permission === 'private') {
return req.isAuthenticated() && note.ownerId === req.user.id
} else if (note.permission === 'limited' || note.permission === 'protected') {
@ -47,9 +46,9 @@ export module NoteUtils {
}
}
export function newNote(req: any, res: Response, body: string | null) {
let owner = null;
const noteId = req.params.noteId ? req.params.noteId : null;
export function newNote (req: any, res: Response, body: string | null) {
let owner = null
const noteId = req.params.noteId ? req.params.noteId : null
if (req.isAuthenticated()) {
owner = req.user.id
} else if (!config.allowAnonymous) {
@ -67,21 +66,21 @@ export module NoteUtils {
}).then(function (note) {
return res.redirect(config.serverURL + '/' + (note.alias ? note.alias : Note.encodeNoteId(note.id)))
}).catch(function (err) {
logger.error(err);
logger.error(err)
return errors.errorInternalError(res)
})
}
export function getPublishData(req: any, res: Response, note: any, callback: (data: any) => void) {
const body = note.content;
const extracted = Note.extractMeta(body);
const markdown = extracted.markdown;
const meta = Note.parseMeta(extracted.meta);
const createtime = note.createdAt;
const updatetime = note.lastchangeAt;
let title = Note.decodeTitle(note.title);
title = Note.generateWebTitle(meta.title || title);
const ogdata = Note.parseOpengraph(meta, title);
export function getPublishData (req: any, res: Response, note: any, callback: (data: any) => void) {
const body = note.content
const extracted = Note.extractMeta(body)
const markdown = extracted.markdown
const meta = Note.parseMeta(extracted.meta)
const createtime = note.createdAt
const updatetime = note.lastchangeAt
let title = Note.decodeTitle(note.title)
title = Note.generateWebTitle(meta.title || title)
const ogdata = Note.parseOpengraph(meta, title)
const data = {
title: title,
description: meta.description || (markdown ? Note.generateDescription(markdown) : null),
@ -101,15 +100,14 @@ export module NoteUtils {
cspNonce: res.locals.nonce,
dnt: req.headers.dnt,
opengraph: ogdata
};
}
callback(data)
}
function isRevealTheme(theme: string) {
function isRevealTheme (theme: string) {
if (fs.existsSync(path.join(__dirname, '..', '..', '..', 'public', 'build', 'reveal.js', 'css', 'theme', theme + '.css'))) {
return theme
}
return undefined
}
}