summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--lib/letter-avatars.js4
-rw-r--r--package.json8
3 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 2ce5723c..887299b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ jobs:
- export PATH="$HOME/.yarn/bin:$PATH"
- env: task=npm-test
node_js:
- - 7
+ - 8
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version "$YARN_VERSION"
- export PATH="$HOME/.yarn/bin:$PATH"
diff --git a/lib/letter-avatars.js b/lib/letter-avatars.js
index 53fa011a..55cf9c3a 100644
--- a/lib/letter-avatars.js
+++ b/lib/letter-avatars.js
@@ -27,6 +27,10 @@ exports.generateAvatar = function (name) {
exports.generateAvatarURL = function (name, email = '', big = true) {
let photo
+ if (typeof email !== 'string') {
+ email = '' + name + '@example.com'
+ }
+
if (email !== '' && config.allowGravatar) {
photo = 'https://www.gravatar.com/avatar/' + md5(email.toLowerCase())
if (big) {
diff --git a/package.json b/package.json
index 1740500c..b257a114 100644
--- a/package.json
+++ b/package.json
@@ -19,8 +19,8 @@
"archiver": "^2.1.1",
"async": "^2.1.4",
"aws-sdk": "^2.7.20",
- "base64url": "^3.0.0",
"azure-storage": "^2.7.0",
+ "base64url": "^3.0.0",
"blueimp-md5": "^2.6.0",
"body-parser": "^1.15.2",
"bootstrap": "^3.3.7",
@@ -62,7 +62,7 @@
"keymaster": "^1.6.2",
"list.js": "^1.5.0",
"lodash": "^4.17.4",
- "lz-string": "1.4.4",
+ "lz-string": "git+https://github.com/hackmdio/lz-string.git",
"markdown-it": "^8.2.2",
"markdown-it-abbr": "^1.0.4",
"markdown-it-container": "^2.0.0",
@@ -78,8 +78,8 @@
"markdown-it-sup": "^1.0.0",
"markdown-pdf": "^9.0.0",
"mathjax": "~2.7.0",
- "mermaid": "~7.1.0",
"mattermost": "^3.4.0",
+ "mermaid": "~7.1.0",
"meta-marked": "^0.4.2",
"method-override": "^2.3.7",
"minimist": "^1.2.0",
@@ -98,8 +98,8 @@
"passport-ldapauth": "^2.0.0",
"passport-local": "^1.0.0",
"passport-oauth2": "^1.4.0",
- "passport-twitter": "^1.0.4",
"passport-saml": "^0.31.0",
+ "passport-twitter": "^1.0.4",
"passport.socketio": "^3.7.0",
"pdfobject": "^2.0.201604172",
"pg": "^6.1.2",