diff options
| author | Christoph (Sheogorath) Kern | 2018-04-17 22:29:37 +0200 |
|---|---|---|
| committer | GitHub | 2018-04-17 22:29:37 +0200 |
| commit | 763479bea8603b9bd18133b0534314edebc50777 (patch) | |
| tree | 73eaee79c74d451954b221a676411bb1284fcfdc /lib/models | |
| parent | 43fa5cf57fe84e9a859466d4080ad5936b22a9e2 (diff) | |
| parent | 69aed932820ab6175b3cdc778b152703bab81961 (diff) | |
Merge pull request #803 from SISheogorath/fix/letterAvatarCSP
Move letter-avatars into own request
Diffstat (limited to 'lib/models')
| -rw-r--r-- | lib/models/user.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/models/user.js b/lib/models/user.js index f421fe43..4c823355 100644 --- a/lib/models/user.js +++ b/lib/models/user.js @@ -6,7 +6,7 @@ var scrypt = require('scrypt') // core var logger = require('../logger') -var letterAvatars = require('../letter-avatars') +var {generateAvatarURL} = require('../letter-avatars') module.exports = function (sequelize, DataTypes) { var User = sequelize.define('User', { @@ -108,7 +108,7 @@ module.exports = function (sequelize, DataTypes) { if (bigger) photo = photo.replace(/(\?s=)\d*$/i, '$1400') else photo = photo.replace(/(\?s=)\d*$/i, '$196') } else { - photo = letterAvatars(profile.username) + photo = generateAvatarURL(profile.username) } break case 'mattermost': @@ -117,7 +117,7 @@ module.exports = function (sequelize, DataTypes) { if (bigger) photo = photo.replace(/(\?s=)\d*$/i, '$1400') else photo = photo.replace(/(\?s=)\d*$/i, '$196') } else { - photo = letterAvatars(profile.username) + photo = generateAvatarURL(profile.username) } break case 'dropbox': @@ -140,7 +140,7 @@ module.exports = function (sequelize, DataTypes) { if (bigger) photo += '?s=400' else photo += '?s=96' } else { - photo = letterAvatars(profile.username) + photo = generateAvatarURL(profile.username) } break case 'saml': @@ -149,7 +149,7 @@ module.exports = function (sequelize, DataTypes) { if (bigger) photo += '?s=400' else photo += '?s=96' } else { - photo = letterAvatars(profile.username) + photo = generateAvatarURL(profile.username) } break } |