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

Various refactors to use the new models

Browse source 
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
David Mehren 2020-04-11 00:05:18 +02:00
parent 4e02f46cee
commit 77e336dfda
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
3 changed files with 51 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,26 +1,26 @@
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 models from "../../models";
import { Note } from "../../models/note";
import { User } from "../../models/user";
export module NoteUtils {
export function findNote(req, res, callback: (note: any) => void, include?: Includeable[]) {
export function findNoteOrCreate(req, res, callback: (note: any) => void, include?: Includeable[]) {
const id = req.params.noteId || req.params.shortid;
models.Note.parseNoteId(id, function (err, _id) {
Note.parseNoteId(id, function (err, _id) {
if (err) {
logger.error(err);
return errors.errorInternalError(res)
}
models.Note.findOne({
Note.findOne({
where: {
id: _id
},
include: include || null
}
}).then(function (note) {
if (!note) {
return newNote(req, res, null)
@ -39,7 +39,7 @@ export module NoteUtils {
export function checkViewPermission(req: any, note: any) {
if (note.permission === 'private') {
return !(!req.isAuthenticated() || note.ownerId !== req.user.id)
return req.isAuthenticated() && note.ownerId === req.user.id
} else if (note.permission === 'limited' || note.permission === 'protected') {
return req.isAuthenticated()
} else {
@ -60,12 +60,12 @@ export module NoteUtils {
} else if (noteId) {
return req.method === 'POST' ? errors.errorForbidden(res) : errors.errorNotFound(res)
}
models.Note.create({
Note.create({
ownerId: owner,
alias: req.alias ? req.alias : null,
content: body
}).then(function (note) {
return res.redirect(config.serverURL + '/' + (note.alias ? note.alias : models.Note.encodeNoteId(note.id)))
return res.redirect(config.serverURL + '/' + (note.alias ? note.alias : Note.encodeNoteId(note.id)))
}).catch(function (err) {
logger.error(err);
return errors.errorInternalError(res)
@ -74,17 +74,17 @@ export module NoteUtils {
export function getPublishData(req: any, res: Response, note: any, callback: (data: any) => void) {
const body = note.content;
const extracted = models.Note.extractMeta(body);
const extracted = Note.extractMeta(body);
const markdown = extracted.markdown;
const meta = models.Note.parseMeta(extracted.meta);
const meta = Note.parseMeta(extracted.meta);
const createtime = note.createdAt;
const updatetime = note.lastchangeAt;
let title = models.Note.decodeTitle(note.title);
title = models.Note.generateWebTitle(meta.title || title);
const ogdata = models.Note.parseOpengraph(meta, title);
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 ? models.Note.generateDescription(markdown) : null),
description: meta.description || (markdown ? Note.generateDescription(markdown) : null),
viewcount: note.viewcount,
createtime: createtime,
updatetime: updatetime,
@ -92,9 +92,9 @@ export module NoteUtils {
theme: meta.slideOptions && isRevealTheme(meta.slideOptions.theme),
meta: JSON.stringify(extracted.meta),
owner: note.owner ? note.owner.id : null,
ownerprofile: note.owner ? models.User.getProfile(note.owner) : null,
ownerprofile: note.owner ? User.getProfile(note.owner) : null,
lastchangeuser: note.lastchangeuser ? note.lastchangeuser.id : null,
lastchangeuserprofile: note.lastchangeuser ? models.User.getProfile(note.lastchangeuser) : null,
lastchangeuserprofile: note.lastchangeuser ? User.getProfile(note.lastchangeuser) : null,
robots: meta.robots || false, // default allow robots
GA: meta.GA,
disqus: meta.disqus,