Move showNote to note controller

Signed-off-by: David Mehren <dmehren1@gmail.com>

lib/response.js

@@ -14,7 +14,6 @@ const errors = require('./errors')
 
 // public
 var response = {
-  showNote: showNote,
   showPublishNote: showPublishNote,
   showIndex: showIndex,
   publishNoteActions: publishNoteActions,
@@ -52,33 +51,6 @@ function showIndex (req, res, next) {
   }
 }
 
-function responseCodiMD (res, note) {
-  var body = note.content
-  var extracted = models.Note.extractMeta(body)
-  var meta = models.Note.parseMeta(extracted.meta)
-  var title = models.Note.decodeTitle(note.title)
-  title = models.Note.generateWebTitle(meta.title || title)
-  var opengraph = models.Note.parseOpengraph(meta, title)
-  res.set({
-    'Cache-Control': 'private', // only cache by client
-    'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
-  })
-  res.render('codimd.ejs', {
-    title: title,
-    opengraph: opengraph
-  })
-}
-
-function showNote (req, res, next) {
-  noteUtil.findNote(req, res, function (note) {
-    // force to use note id
-    var noteId = req.params.noteId
-    var id = models.Note.encodeNoteId(note.id)
-    if ((note.alias && noteId !== note.alias) || (!note.alias && noteId !== id)) { return res.redirect(config.serverURL + '/' + (note.alias || id)) }
-    return responseCodiMD(res, note)
-  })
-}
-
 function showPublishNote (req, res, next) {
   var include = [{
     model: models.User,

lib/web/note/controller.js

@@ -8,7 +8,17 @@ const errors = require('../../errors')
 const noteUtil = require('./util')
 const noteActions = require('./actions')
 
-
+exports.showNote = function (req, res, next) {
+  noteUtil.findNote(req, res, function (note) {
+    // force to use note id
+    const noteId = req.params.noteId
+    const id = models.Note.encodeNoteId(note.id)
+    if ((note.alias && noteId !== note.alias) || (!note.alias && noteId !== id)) {
+      return res.redirect(config.serverURL + '/' + (note.alias || id))
+    }
+    return responseCodiMD(res, note)
+  })
+}
 
 exports.createFromPOST = function (req, res, next) {
   let body = ''
@@ -83,115 +93,19 @@ exports.downloadMarkdown = function (req, res, note) {
   res.send(body)
 }
 
-function getInfo (req, res, note) {
+function responseCodiMD (res, note) {
   const body = note.content
   const extracted = models.Note.extractMeta(body)
-  const markdown = extracted.markdown
   const meta = models.Note.parseMeta(extracted.meta)
-  const createtime = note.createdAt
+  let title = models.Note.decodeTitle(note.title)
-  const updatetime = note.lastchangeAt
+  title = models.Note.generateWebTitle(meta.title || title)
-  const title = models.Note.decodeTitle(note.title)
+  const opengraph = models.Note.parseOpengraph(meta, title)
-  const data = {
-    title: meta.title || title,
-    description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
-    viewcount: note.viewcount,
-    createtime: createtime,
-    updatetime: updatetime
-  }
   res.set({
-    'Access-Control-Allow-Origin': '*', // allow CORS as API
-    'Access-Control-Allow-Headers': 'Range',
-    'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
     'Cache-Control': 'private', // only cache by client
     'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
   })
-  res.send(data)
+  res.render('codimd.ejs', {
-}
+    title: title,
-
+    opengraph: opengraph
-function createPDF (req, res, note) {
-  const url = config.serverURL || 'http://' + req.get('host')
-  const body = note.content
-  const extracted = models.Note.extractMeta(body)
-  let content = extracted.markdown
-  const title = models.Note.decodeTitle(note.title)
-
-  if (!fs.existsSync(config.tmpPath)) {
-    fs.mkdirSync(config.tmpPath)
-  }
-  const path = config.tmpPath + '/' + Date.now() + '.pdf'
-  content = content.replace(/\]\(\//g, '](' + url + '/')
-  markdownpdf().from.string(content).to(path, function () {
-    if (!fs.existsSync(path)) {
-      logger.error('PDF seems to not be generated as expected. File doesn\'t exist: ' + path)
-      return errors.errorInternalError(res)
-    }
-    const stream = fs.createReadStream(path)
-    let filename = title
-    // Be careful of special characters
-    filename = encodeURIComponent(filename)
-    // Ideally this should strip them
-    res.setHeader('Content-disposition', 'attachment; filename="' + filename + '.pdf"')
-    res.setHeader('Cache-Control', 'private')
-    res.setHeader('Content-Type', 'application/pdf; charset=UTF-8')
-    res.setHeader('X-Robots-Tag', 'noindex, nofollow') // prevent crawling
-    stream.pipe(res)
-    fs.unlinkSync(path)
   })
 }
-
-function createGist (req, res, note) {
-  const data = {
-    client_id: config.github.clientID,
-    redirect_uri: config.serverURL + '/auth/github/callback/' + models.Note.encodeNoteId(note.id) + '/gist',
-    scope: 'gist',
-    state: shortId.generate()
-  }
-  const query = querystring.stringify(data)
-  res.redirect('https://github.com/login/oauth/authorize?' + query)
-}
-
-function getRevision (req, res, note) {
-  const actionId = req.params.actionId
-  if (actionId) {
-    const time = moment(parseInt(actionId))
-    if (time.isValid()) {
-      models.Revision.getPatchedNoteRevisionByTime(note, time, function (err, content) {
-        if (err) {
-          logger.error(err)
-          return errors.errorInternalError(res)
-        }
-        if (!content) {
-          return errors.errorNotFound(res)
-        }
-        res.set({
-          'Access-Control-Allow-Origin': '*', // allow CORS as API
-          'Access-Control-Allow-Headers': 'Range',
-          'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
-          'Cache-Control': 'private', // only cache by client
-          'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
-        })
-        res.send(content)
-      })
-    } else {
-      return errors.errorNotFound(res)
-    }
-  } else {
-    models.Revision.getNoteRevisions(note, function (err, data) {
-      if (err) {
-        logger.error(err)
-        return errors.errorInternalError(res)
-      }
-      const out = {
-        revision: data
-      }
-      res.set({
-        'Access-Control-Allow-Origin': '*', // allow CORS as API
-        'Access-Control-Allow-Headers': 'Range',
-        'Access-Control-Expose-Headers': 'Cache-Control, Content-Encoding, Content-Range',
-        'Cache-Control': 'private', // only cache by client
-        'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
-      })
-      res.send(out)
-    })
-  }
-}

lib/web/note/router.js

@@ -26,7 +26,7 @@ router.get('/p/:shortid', slide.showPublishSlide)
 // publish slide actions
 router.get('/p/:shortid/:action', slide.publishSlideActions)
 // get note by id
-router.get('/:noteId', response.showNote)
+router.get('/:noteId', noteController.showNote)
 // note actions
 router.get('/:noteId/:action', noteController.doAction)
 // note actions with action id