depau/HackMD
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1110 from dsprenkels/issue_1106

Browse source 
Remove blueimp-md5 dependency
This commit is contained in:
Christoph (Sheogorath) Kern 2019-01-05 14:08:23 +01:00 committed by GitHub
commit 7a83fc0f14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/letter-avatars.js
View file

@ -1,6 +1,6 @@
'use strict' 'use strict'
// external modules // external modules
const md5 = require('blueimp-md5') const crypto = require('crypto')
const randomcolor = require('randomcolor') const randomcolor = require('randomcolor')
const config = require('./config') const config = require('./config')
@ -31,15 +31,19 @@ exports.generateAvatarURL = function (name, email = '', big = true) {
email = '' + name + '@example.com' email = '' + name + '@example.com'
} }
let hash = crypto.createHash('md5')
hash.update(email.toLowerCase())
let hexDigest = hash.digest('hex')
if (email !== '' && config.allowGravatar) { if (email !== '' && config.allowGravatar) {
photo = 'https://www.gravatar.com/avatar/' + md5(email.toLowerCase()) photo = 'https://www.gravatar.com/avatar/' + hexDigest;
if (big) { if (big) {
photo += '?s=400' photo += '?s=400'
} else { } else {
photo += '?s=96' photo += '?s=96'
} }
} else { } else {
photo = config.serverURL + '/user/' + (name || email.substring(0, email.lastIndexOf('@')) || md5(email.toLowerCase())) + '/avatar.svg' photo = config.serverURL + '/user/' + (name || email.substring(0, email.lastIndexOf('@')) || hexDigest) + '/avatar.svg'
} }
return photo return photo
} }

4
package.json
View file

@ -5,7 +5,7 @@
"main": "app.js", "main": "app.js",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
"test": "npm run-script eslint && npm run-script jsonlint", "test": "npm run-script eslint && npm run-script jsonlint && mocha",
"eslint": "node_modules/.bin/eslint lib public app.js", "eslint": "node_modules/.bin/eslint lib public app.js",
"jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done", "jsonlint": "find . -not -path './node_modules/*' -type f -name '*.json' -o -type f -name '*.json.example' | while read json; do echo $json ; jq . $json; done",
"standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1", "standard": "echo 'standard is no longer being used, use `npm run eslint` instead!' && exit 1",
@ -23,7 +23,6 @@
"aws-sdk": "^2.345.0", "aws-sdk": "^2.345.0",
"azure-storage": "^2.7.0", "azure-storage": "^2.7.0",
"base64url": "^3.0.0", "base64url": "^3.0.0",
"blueimp-md5": "^2.6.0",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
"bootstrap": "^3.3.7", "bootstrap": "^3.3.7",
"bootstrap-validator": "^0.11.8", "bootstrap-validator": "^0.11.8",
@ -184,6 +183,7 @@
"less": "^2.7.1", "less": "^2.7.1",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"mini-css-extract-plugin": "^0.4.1", "mini-css-extract-plugin": "^0.4.1",
"mocha": "^5.2.0",
"optimize-css-assets-webpack-plugin": "^5.0.0", "optimize-css-assets-webpack-plugin": "^5.0.0",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"string-loader": "^0.0.1", "string-loader": "^0.0.1",

11
test/letter-avatars.js Normal file
View file

@ -0,0 +1,11 @@
'use strict'
const assert = require('assert');
const avatars = require('../lib/letter-avatars')
describe('generateAvatarURL()', function() {
it('should return correct urls', function() {
assert.equal(avatars.generateAvatarURL('Daan Sprenkels', 'hello@dsprenkels.com', true), 'https://www.gravatar.com/avatar/d41b5f3508cc3f31865566a47dd0336b?s=400');
assert.equal(avatars.generateAvatarURL('Daan Sprenkels', 'hello@dsprenkels.com', false), 'https://www.gravatar.com/avatar/d41b5f3508cc3f31865566a47dd0336b?s=96');
});
});