Skip to content

Commit a338346

Browse files
a60814billya60814billy
authored
Merge branch 'develop' into feature/slides-timer
2 parents e315127 + a4fdb4f commit a338346

File tree

14 files changed

+81
-55
lines changed

14 files changed

+81
-55
lines changed

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ To stay up to date with your installation it's recommended to subscribe the [rel
7676

7777
**License under AGPL.**
7878

79+
[gitter-image]: https://img.shields.io/badge/gitter-hackmdio/codimd-blue.svg
80+
[gitter-url]: https://gitter.im/hackmdio/hackmd
7981
[travis-image]: https://travis-ci.org/hackmdio/codimd.svg?branch=master
8082
[travis-url]: https://travis-ci.org/hackmdio/codimd
8183
[github-version-badge]: https://img.shields.io/github/release/hackmdio/codimd.svg

‎lib/config/default.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ module.exports = {
6666
s3: {
6767
accessKeyId: undefined,
6868
secretAccessKey: undefined,
69-
region: undefined
69+
region: undefined,
70+
endpoint: undefined
7071
},
7172
minio: {
7273
accessKey: undefined,

‎lib/config/environment.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ module.exports = {
4040
s3: {
4141
accessKeyId: process.env.CMD_S3_ACCESS_KEY_ID,
4242
secretAccessKey: process.env.CMD_S3_SECRET_ACCESS_KEY,
43-
region: process.env.CMD_S3_REGION
43+
region: process.env.CMD_S3_REGION,
44+
endpoint: process.env.CMD_S3_ENDPOINT
4445
},
4546
minio: {
4647
accessKey: process.env.CMD_MINIO_ACCESS_KEY,

‎lib/migrations/20171009121200-longtext-for-mysql.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
'use strict'
22
module.exports = {
3-
up: function (queryInterface, Sequelize) {
4-
queryInterface.changeColumn('Notes', 'content', { type: Sequelize.TEXT('long') })
5-
queryInterface.changeColumn('Revisions', 'patch', { type: Sequelize.TEXT('long') })
6-
queryInterface.changeColumn('Revisions', 'content', { type: Sequelize.TEXT('long') })
7-
queryInterface.changeColumn('Revisions', 'lastContent', { type: Sequelize.TEXT('long') })
3+
up: async function (queryInterface, Sequelize) {
4+
await queryInterface.changeColumn('Notes', 'content', { type: Sequelize.TEXT('long') })
5+
await queryInterface.changeColumn('Revisions', 'patch', { type: Sequelize.TEXT('long') })
6+
await queryInterface.changeColumn('Revisions', 'content', { type: Sequelize.TEXT('long') })
7+
await queryInterface.changeColumn('Revisions', 'lastContent', { type: Sequelize.TEXT('long') })
88
},
99

10-
down: function (queryInterface, Sequelize) {
11-
queryInterface.changeColumn('Notes', 'content', { type: Sequelize.TEXT })
12-
queryInterface.changeColumn('Revisions', 'patch', { type: Sequelize.TEXT })
13-
queryInterface.changeColumn('Revisions', 'content', { type: Sequelize.TEXT })
14-
queryInterface.changeColumn('Revisions', 'lastContent', { type: Sequelize.TEXT })
10+
down: async function (queryInterface, Sequelize) {
11+
await queryInterface.changeColumn('Notes', 'content', { type: Sequelize.TEXT })
12+
await queryInterface.changeColumn('Revisions', 'patch', { type: Sequelize.TEXT })
13+
await queryInterface.changeColumn('Revisions', 'content', { type: Sequelize.TEXT })
14+
await queryInterface.changeColumn('Revisions', 'lastContent', { type: Sequelize.TEXT })
1515
}
1616
}

‎lib/migrations/20180209120907-longtext-of-authorship.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
'use strict'
22

33
module.exports = {
4-
up: function (queryInterface, Sequelize) {
5-
queryInterface.changeColumn('Notes', 'authorship', { type: Sequelize.TEXT('long') })
6-
queryInterface.changeColumn('Revisions', 'authorship', { type: Sequelize.TEXT('long') })
4+
up: async function (queryInterface, Sequelize) {
5+
await queryInterface.changeColumn('Notes', 'authorship', { type: Sequelize.TEXT('long') })
6+
await queryInterface.changeColumn('Revisions', 'authorship', { type: Sequelize.TEXT('long') })
77
},
88

9-
down: function (queryInterface, Sequelize) {
10-
queryInterface.changeColumn('Notes', 'authorship', { type: Sequelize.TEXT })
11-
queryInterface.changeColumn('Revisions', 'authorship', { type: Sequelize.TEXT })
9+
down: async function (queryInterface, Sequelize) {
10+
await queryInterface.changeColumn('Notes', 'authorship', { type: Sequelize.TEXT })
11+
await queryInterface.changeColumn('Revisions', 'authorship', { type: Sequelize.TEXT })
1212
}
1313
}

‎lib/migrations/20180306150303-fix-enum.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
'use strict'
22

33
module.exports = {
4-
up: function (queryInterface, Sequelize) {
5-
queryInterface.changeColumn('Notes', 'permission', { type: Sequelize.ENUM('freely', 'editable', 'limited', 'locked', 'protected', 'private') })
4+
up: async function (queryInterface, Sequelize) {
5+
await queryInterface.changeColumn('Notes', 'permission', { type: Sequelize.ENUM('freely', 'editable', 'limited', 'locked', 'protected', 'private') })
66
},
77

8-
down: function (queryInterface, Sequelize) {
9-
queryInterface.changeColumn('Notes', 'permission', { type: Sequelize.ENUM('freely', 'editable', 'locked', 'private') })
8+
down: async function (queryInterface, Sequelize) {
9+
await queryInterface.changeColumn('Notes', 'permission', { type: Sequelize.ENUM('freely', 'editable', 'locked', 'private') })
1010
}
1111
}

‎lib/response.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var config = require('./config')
1414
var logger = require('./logger')
1515
var models = require('./models')
1616
var utils = require('./utils')
17+
var history = require('./history')
1718

1819
// public
1920
var response = {
@@ -106,6 +107,12 @@ function responseCodiMD (res, note) {
106107
})
107108
}
108109

110+
function updateHistory (userId, note, document, time) {
111+
var noteId = note.alias ? note.alias : models.Note.encodeNoteId(note.id)
112+
history.updateHistory(userId, noteId, document, time)
113+
logger.info('history updated')
114+
}
115+
109116
function newNote (req, res, next) {
110117
var owner = null
111118
var body = ''
@@ -125,6 +132,10 @@ function newNote (req, res, next) {
125132
alias: req.alias ? req.alias : null,
126133
content: body
127134
}).then(function (note) {
135+
if (req.isAuthenticated()) {
136+
updateHistory(owner, note, body)
137+
}
138+
128139
return res.redirect(config.serverURL + '/' + models.Note.encodeNoteId(note.id))
129140
}).catch(function (err) {
130141
logger.error(err)

‎lib/web/auth/mattermost/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22
require('babel-polyfill')
3-
require('isomorphic-fetch');
3+
require('isomorphic-fetch')
44
const Router = require('express').Router
55
const passport = require('passport')
66
const MattermostClient = require('mattermost-redux/client/client4').default

‎lib/web/imageRouter/filesystem.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,12 @@ exports.uploadImage = function (imagePath, callback) {
1616
return
1717
}
1818

19-
callback(null, (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href)
19+
let url
20+
try {
21+
url = (new URL(path.basename(imagePath), config.serverURL + '/uploads/')).href
22+
} catch (e) {
23+
url = config.serverURL + '/uploads/' + path.basename(imagePath)
24+
}
25+
26+
callback(null, url)
2027
}

‎lib/web/imageRouter/minio.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ exports.uploadImage = function (imagePath, callback) {
4040
callback(new Error(err), null)
4141
return
4242
}
43-
callback(null, `${protocol}://${config.minio.endPoint}:${config.minio.port}/${config.s3bucket}/${key}`)
43+
let hidePort = [80, 443].includes(config.minio.port)
44+
let urlPort = hidePort ? '' : `:${config.minio.port}`
45+
callback(null, `${protocol}://${config.minio.endPoint}${urlPort}/${config.s3bucket}/${key}`)
4446
})
4547
})
4648
}

0 commit comments

Comments
 (0)