github/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-03-15 21:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2281 from hedgedoc/renovate/master-major-linters

Browse source
This commit is contained in:
Yannick Bungers 2022-05-01 19:28:32 +00:00 committed by GitHub
commit 67a21ba2a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 117 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app.js
View file

@ -46,7 +46,7 @@ if (config.useSSL) {
const options = {
key: fs.readFileSync(config.sslKeyPath, 'utf8'),
cert: fs.readFileSync(config.sslCertPath, 'utf8'),
ca: ca,
ca,
dhparam: fs.readFileSync(config.dhParamPath, 'utf8'),
requestCert: false,
rejectUnauthorized: false
@ -242,7 +242,7 @@ app.get('*', function (req, res) {
io.use(realtime.secure)
// socket.io auth
io.use(passportSocketIo.authorize({
cookieParser: cookieParser,
cookieParser,
key: config.sessionName,
secret: config.sessionSecret,
store: sessionStore,

6
lib/config/index.js
View file

@ -24,10 +24,10 @@ const sourceURL = getGitHubURL(repository.url, commitID || version)
const fullversion = commitID ? `${version}-${commitID}` : version
const packageConfig = {
version: version,
version,
minimumCompatibleVersion: '0.5.0',
fullversion: fullversion,
sourceURL: sourceURL
fullversion,
sourceURL
}
const configFilePath = path.resolve(appRootPath, process.env.CMD_CONFIG_FILE ||

6
lib/errors.js
View file

@ -37,9 +37,9 @@ module.exports = {
function responseError (res, code, detail, msg) {
res.status(code).render('error.ejs', {
title: code + ' ' + detail + ' ' + msg,
code: code,
detail: detail,
msg: msg,
code,
detail,
msg,
opengraph: []
})
}

8
lib/history.js
View file

@ -10,10 +10,10 @@ const errors = require('./errors')
// public
const History = {
historyGet: historyGet,
historyPost: historyPost,
historyDelete: historyDelete,
updateHistory: updateHistory
historyGet,
historyPost,
historyDelete,
updateHistory
}
function getHistory (userid, callback) {

2
lib/models/index.js
View file

@ -73,7 +73,7 @@ const umzug = new Umzug({
},
storage: 'sequelize',
storageOptions: {
sequelize: sequelize
sequelize
}
})

4
lib/models/note.js
View file

@ -207,7 +207,7 @@ module.exports = function (sequelize, DataTypes) {
const title = Note.parseNoteTitle(body)
if (fsModifiedTime.isAfter(dbModifiedTime) && note.content !== body) {
note.update({
title: title,
title,
content: body,
lastchangeAt: fsModifiedTime
}).then(function (note) {
@ -221,7 +221,7 @@ module.exports = function (sequelize, DataTypes) {
authorship = Note.updateAuthorshipByOperation(operations[i], null, authorship)
}
note.update({
authorship: authorship
authorship
}).then(function (note) {
return callback(null, note.id)
}).catch(function (err) {

8
lib/models/revision.js
View file

@ -47,7 +47,7 @@ function sendDmpWorker (data, callback) {
const cacheKey = Date.now() + '_' + shortId.generate()
dmpCallbackCache[cacheKey] = callback
data = Object.assign(data, {
cacheKey: cacheKey
cacheKey
})
dmpWorker.send(data)
}
@ -151,8 +151,8 @@ module.exports = function (sequelize, DataTypes) {
if (count <= 0) return callback(null, null)
sendDmpWorker({
msg: 'get revision',
revisions: revisions,
count: count
revisions,
count
}, callback)
}).catch(function (err) {
return callback(err, null)
@ -272,7 +272,7 @@ module.exports = function (sequelize, DataTypes) {
} else {
Revision.create({
noteId: note.id,
patch: patch,
patch,
content: note.content,
length: note.content.length,
authorship: note.authorship

54
lib/realtime.js
View file

@ -21,12 +21,12 @@ const ot = require('./ot')
// public
const realtime = {
io: null,
onAuthorizeSuccess: onAuthorizeSuccess,
onAuthorizeFail: onAuthorizeFail,
secure: secure,
connection: connection,
getStatus: getStatus,
isReady: isReady,
onAuthorizeSuccess,
onAuthorizeFail,
secure,
connection,
getStatus,
isReady,
maintenance: true
}
@ -160,7 +160,7 @@ function finishUpdateNote (note, _note, callback) {
const body = note.server.document
const title = note.title = models.Note.parseNoteTitle(body)
const values = {
title: title,
title,
content: body,
authorship: note.authorship,
lastchangeuserId: note.lastchangeuser,
@ -242,7 +242,7 @@ function getStatus (callback) {
})
models.User.count().then(function (regcount) {
return callback
// eslint-disable-next-line node/no-callback-literal
// eslint-disable-next-line n/no-callback-literal
? callback({
onlineNotes: Object.keys(notes).length,
onlineUsers: Object.keys(users).length,
@ -251,9 +251,9 @@ function getStatus (callback) {
registeredUsers: regcount,
onlineRegisteredUsers: regaddresses.length,
distinctOnlineRegisteredUsers: distinctregaddresses.length,
isConnectionBusy: isConnectionBusy,
isConnectionBusy,
connectionSocketQueueLength: connectionSocketQueue.length,
isDisconnectBusy: isDisconnectBusy,
isDisconnectBusy,
disconnectSocketQueueLength: disconnectSocketQueue.length
})
: null
@ -303,7 +303,7 @@ function emitOnlineUsers (socket) {
if (user) { users.push(buildUserOutData(user)) }
})
const out = {
users: users
users
}
realtime.io.to(noteId).emit('online users', out)
}
@ -458,7 +458,7 @@ function startConnection (socket) {
where: {
id: noteId
},
include: include
include
}).then(function (note) {
if (!note) {
return failConnection(404, 'note not found', socket)
@ -492,18 +492,18 @@ function startConnection (socket) {
id: noteId,
alias: note.alias,
title: note.title,
owner: owner,
ownerprofile: ownerprofile,
owner,
ownerprofile,
permission: note.permission,
lastchangeuser: lastchangeuser,
lastchangeuserprofile: lastchangeuserprofile,
lastchangeuser,
lastchangeuserprofile,
socks: [],
users: {},
tempUsers: {},
createtime: moment(createtime).valueOf(),
updatetime: moment(updatetime).valueOf(),
server: server,
authors: authors,
server,
authors,
authorship: note.authorship
}
@ -523,7 +523,7 @@ function failConnection (code, err, socket) {
connectNextSocket()
// emit error info
socket.emit('info', {
code: code
code
})
return socket.disconnect(true)
}
@ -665,12 +665,12 @@ function operationCallback (socket, operation) {
if (!note.authors[userId]) {
models.Author.findOrCreate({
where: {
noteId: noteId,
userId: userId
noteId,
userId
},
defaults: {
noteId: noteId,
userId: userId,
noteId,
userId,
color: user.color
}
}).spread(function (author, created) {
@ -739,7 +739,7 @@ function connection (socket) {
id: socket.id,
address: socket.handshake.headers['x-forwarded-for'] || socket.handshake.address,
'user-agent': socket.handshake.headers['user-agent'],
color: color,
color,
cursor: null,
login: false,
userid: null,
@ -784,7 +784,7 @@ function connection (socket) {
if (permission === 'freely' && !config.allowAnonymous && !config.allowAnonymousEdits) return
note.permission = permission
models.Note.update({
permission: permission
permission
}, {
where: {
id: noteId
@ -794,7 +794,7 @@ function connection (socket) {
return
}
const out = {
permission: permission
permission
}
realtime.io.to(note.id).emit('permission', out)
for (let i = 0, l = note.socks.length; i < l; i++) {
@ -870,7 +870,7 @@ function connection (socket) {
if (user) { users.push(buildUserOutData(user)) }
})
const out = {
users: users
users
}
socket.emit('online users', out)
})

14
lib/response.js
View file

@ -13,9 +13,9 @@ const errors = require('./errors')
// public
const response = {
showIndex: showIndex,
githubActions: githubActions,
gitlabActions: gitlabActions
showIndex,
githubActions,
gitlabActions
}
function showIndex (req, res, next) {
@ -29,7 +29,7 @@ function showIndex (req, res, next) {
imprint: fs.existsSync(path.join(config.docsPath, 'imprint.md')),
privacyStatement: fs.existsSync(path.join(config.docsPath, 'privacy.md')),
termsOfUse: fs.existsSync(path.join(config.docsPath, 'terms-of-use.md')),
deleteToken: deleteToken
deleteToken
}
if (authStatus) {
@ -72,8 +72,8 @@ function githubActionGist (req, res, note) {
const data = {
client_id: config.github.clientID,
client_secret: config.github.clientSecret,
code: code,
state: state
code,
state
}
const authUrl = 'https://github.com/login/oauth/access_token'
fetch(authUrl, {
@ -100,7 +100,7 @@ function githubActionGist (req, res, note) {
files: {}
}
gist.files[filename] = {
content: content
content
}
const gistUrl = 'https://api.github.com/gists'
return fetch(gistUrl, {

2
lib/web/auth/email/index.js
View file

@ -18,7 +18,7 @@ passport.use(new LocalStrategy({
if (!validator.isEmail(email)) return done(null, false)
models.User.findOne({
where: {
email: email
email
}
}).then(function (user) {
if (!user) return done(null, false)

2
lib/web/auth/index.js
View file

@ -18,7 +18,7 @@ passport.serializeUser(function (user, done) {
passport.deserializeUser(function (id, done) {
models.User.findOne({
where: {
id: id
id
}
}).then(function (user) {
// Don't die on non-existent user

2
lib/web/auth/ldap/index.js
View file

@ -41,7 +41,7 @@ passport.use(new LDAPStrategy({
const profile = {
id: 'LDAP-' + uuid,
username: username,
username,
displayName: user.displayName,
emails: user.mail ? Array.isArray(user.mail) ? user.mail : [user.mail] : [],
avatarUrl: null,

4
lib/web/auth/oauth2/index.js
View file

@ -60,8 +60,8 @@ function parseProfile (data) {
return {
id: id || username,
username: username,
displayName: displayName,
username,
displayName,
emails: email ? [email] : []
}
}

4
lib/web/auth/utils.js
View file

@ -11,8 +11,8 @@ exports.passportGeneralCallback = function callback (accessToken, refreshToken,
},
defaults: {
profile: stringifiedProfile,
accessToken: accessToken,
refreshToken: refreshToken
accessToken,
refreshToken
}
}).spread(function (user, created) {
if (user) {

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

@ -18,8 +18,8 @@ exports.getInfo = function getInfo (req, res, note) {
title: meta.title || title,
description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
viewcount: note.viewcount,
createtime: createtime,
updatetime: updatetime
createtime,
updatetime
}
res.set({
'Access-Control-Allow-Origin': '*', // allow CORS as API

4
lib/web/note/controller.js
View file

@ -75,8 +75,8 @@ exports.showNote = function (req, res, next) {
'X-Robots-Tag': 'noindex, nofollow' // prevent crawling
})
return res.render('hedgedoc.ejs', {
title: title,
opengraph: opengraph
title,
opengraph
})
})
}

6
lib/web/note/util.js
View file

@ -98,12 +98,12 @@ exports.getPublishData = function (req, res, note, callback) {
title = models.Note.generateWebTitle(meta.title || title)
const ogdata = models.Note.parseOpengraph(meta, title)
const data = {
title: title,
title,
description: meta.description || (markdown ? models.Note.generateDescription(markdown) : null),
lang: meta.lang || null,
viewcount: note.viewcount,
createtime: createtime,
updatetime: updatetime,
createtime,
updatetime,
body: markdown,
theme: meta.slideOptions && isRevealTheme(meta.slideOptions.theme),
meta: JSON.stringify(extracted.meta),

2
lib/web/statusRouter.js
View file

@ -70,7 +70,7 @@ statusRouter.post('/temp', urlencodedParser, function (req, res) {
} else {
logger.debug(`SERVER received temp from [${host}]: ${req.body.data}`)
models.Temp.create({
data: data
data
}).then(function (temp) {
if (temp) {
res.header('Access-Control-Allow-Origin', '*')

4
lib/workers/dmpWorker.js
View file

@ -49,7 +49,7 @@ process.on('message', function (data) {
const result = getRevision(data.revisions, data.count)
process.send({
msg: 'check',
result: result,
result,
cacheKey: data.cacheKey
})
} catch (err) {
@ -128,7 +128,7 @@ function getRevision (revisions, count) {
const data = {
content: finalContent,
patch: dmp.patch_fromText(lastPatch),
authorship: authorship
authorship
}
const msEnd = new Date().getTime()
logger.debug(msEnd - msStart + 'ms')

3
package.json
View file

@ -151,8 +151,9 @@
"esbuild-loader": "2.18.0",
"escape-html": "1.0.3",
"eslint": "8.14.0",
"eslint-config-standard": "16.0.3",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-n": "15.2.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.0.0",
"eslint-plugin-standard": "4.1.0",

2
public/js/history.js
View file

@ -220,7 +220,7 @@ export function getStorageHistory (callback) {
if (typeof data === 'string') { data = JSON.parse(data) }
callback(data)
}
// eslint-disable-next-line node/no-callback-literal
// eslint-disable-next-line n/no-callback-literal
callback([])
}

8
public/js/index.js
View file

@ -1230,7 +1230,7 @@ ui.toolbar.export.dropbox.click(function (event) {
files: [
{
url: noteurl + '/download',
filename: filename
filename
}
],
error: function (errorMessage) {
@ -1538,7 +1538,7 @@ function initRevisionViewer () {
const revisionViewerTextArea = document.getElementById('revisionViewer')
revisionViewer = CodeMirror.fromTextArea(revisionViewerTextArea, {
mode: defaultEditorMode,
viewportMargin: viewportMargin,
viewportMargin,
lineNumbers: true,
lineWrapping: true,
showCursorWhenSelecting: true,
@ -2005,7 +2005,7 @@ function importFromUrl (url) {
}
$.ajax({
method: 'GET',
url: url,
url,
success: function (data) {
const extension = url.split('.').pop()
if (extension === 'html') {
@ -2999,7 +2999,7 @@ function emitUserStatus (force) {
const userStatus = {
idle: idle.isAway,
type: type
type
}
if (force || JSON.stringify(userStatus) !== JSON.stringify(userStatusCache)) {

4
public/js/lib/editor/index.js
View file

@ -99,7 +99,7 @@ export default class Editor {
const ch = match[1].length
const pos = {
line: cursor.line,
ch: ch
ch
}
if (cm.getOption('indentWithTabs')) {
cm.replaceRange(tab, pos, pos, '+input')
@ -618,7 +618,7 @@ export default class Editor {
mode: defaultEditorMode,
backdrop: defaultEditorMode,
keyMap: 'sublime',
viewportMargin: viewportMargin,
viewportMargin,
styleActiveLine: true,
lineNumbers: true,
lineWrapping: true,

4
public/js/render.js
View file

@ -36,7 +36,7 @@ whiteList.figcaption = []
const filterXSSOptions = {
allowCommentTag: true,
whiteList: whiteList,
whiteList,
escapeHtml: function (html) {
// allow html comment in multiple lines
return html.replace(/<(?!!--)/g, '&lt;').replace(/-->/g, '__HTML_COMMENT_END__').replace(/>/g, '&gt;').replace(/__HTML_COMMENT_END__/g, '-->')
@ -73,6 +73,6 @@ function preventXSS (html) {
window.preventXSS = preventXSS
module.exports = {
preventXSS: preventXSS,
preventXSS,
escapeAttrValue: filterXSS.escapeAttrValue
}

6
public/js/reveal-markdown.js
View file

@ -348,8 +348,8 @@ import { md } from './extra'
convertSlides()
},
// TODO: Do these belong in the API?
processSlides: processSlides,
convertSlides: convertSlides,
slidify: slidify
processSlides,
convertSlides,
slidify
}
}))

43
yarn.lock
View file

@ -626,7 +626,6 @@
"Idle.Js@git+https://github.com/shawnmclean/Idle.js":
version "0.0.1"
uid "2b57cc6e49d177b7ddce0cca00ef5cbe07453541"
resolved "git+https://github.com/shawnmclean/Idle.js#2b57cc6e49d177b7ddce0cca00ef5cbe07453541"
JSV@^4.0.x:
@ -2286,7 +2285,6 @@ cls-bluebird@^2.1.0:
"codemirror@git+https://github.com/hedgedoc/CodeMirror.git":
version "5.58.2"
uid f780b569b3717cdff4c8507538cc63101bfa02e1
resolved "git+https://github.com/hedgedoc/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1"
collection-visit@^1.0.0:
@ -3526,7 +3524,6 @@ dezalgo@1.0.3:
"diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git":
version "1.1.1"
uid c2f8fb9d69aa9490b764850aa86ba442c93ccf78
resolved "git+https://github.com/hackmdio/diff-match-patch.git#c2f8fb9d69aa9490b764850aa86ba442c93ccf78"
diff@5.0.0, diff@^5.0.0:
@ -4065,10 +4062,10 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
eslint-config-standard@16.0.3:
version "16.0.3"
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516"
integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg==
eslint-config-standard@17.0.0:
version "17.0.0"
resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-17.0.0.tgz#fd5b6cf1dcf6ba8d29f200c461de2e19069888cf"
integrity sha512-/2ks1GKyqSOkH7JFvXJicu0iMpoojkwB+f5Du/1SC0PtBL+s8v30k9njRZ21pm2drKYm2342jFnGWzttxPmZVg==
eslint-import-resolver-node@^0.3.6:
version "0.3.6"
@ -4094,6 +4091,14 @@ eslint-plugin-es@^3.0.0:
eslint-utils "^2.0.0"
regexpp "^3.0.0"
eslint-plugin-es@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9"
integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ==
dependencies:
eslint-utils "^2.0.0"
regexpp "^3.0.0"
eslint-plugin-import@2.26.0:
version "2.26.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b"
@ -4113,6 +4118,20 @@ eslint-plugin-import@2.26.0:
resolve "^1.22.0"
tsconfig-paths "^3.14.1"
eslint-plugin-n@15.2.0:
version "15.2.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.2.0.tgz#fd378274bdf1c3ca11af84e7a4b5cb524b63ae1c"
integrity sha512-lWLg++jGwC88GDGGBX3CMkk0GIWq0y41aH51lavWApOKcMQcYoL3Ayd0lEdtD3SnQtR+3qBvWQS3qGbR2BxRWg==
dependencies:
builtins "^4.0.0"
eslint-plugin-es "^4.1.0"
eslint-utils "^3.0.0"
ignore "^5.1.1"
is-core-module "^2.3.0"
minimatch "^3.0.4"
resolve "^1.10.1"
semver "^6.3.0"
eslint-plugin-node@11.1.0:
version "11.1.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d"
@ -5566,6 +5585,13 @@ is-callable@^1.1.4, is-callable@^1.2.4:
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
is-core-module@^2.3.0:
version "2.9.0"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
dependencies:
has "^1.0.3"
is-core-module@^2.8.1:
version "2.8.1"
resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
@ -5978,7 +6004,6 @@ js-cookie@3.0.1:
"js-sequence-diagrams@git+https://github.com/hedgedoc/js-sequence-diagrams.git":
version "2.0.1"
uid bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39
resolved "git+https://github.com/hedgedoc/js-sequence-diagrams.git#bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39"
dependencies:
lodash "4.17.x"
@ -6521,7 +6546,6 @@ lutim@^1.0.2:
"lz-string@git+https://github.com/hackmdio/lz-string.git":
version "1.4.4"
uid efd1f64676264d6d8871b01f4f375fc6ef4f9022
resolved "git+https://github.com/hackmdio/lz-string.git#efd1f64676264d6d8871b01f4f375fc6ef4f9022"
make-dir@^1.0.0:
@ -6808,7 +6832,6 @@ mermaid@9.0.1:
"meta-marked@git+https://github.com/hedgedoc/meta-marked":
version "0.4.5"
uid "0cb5065253ab0f9851baec34dc9edbb40eabf3d0"
resolved "git+https://github.com/hedgedoc/meta-marked#0cb5065253ab0f9851baec34dc9edbb40eabf3d0"
dependencies:
js-yaml "~4.1.0"