2 files changed, 22 insertions, 4 deletions
diff --git a/lib/models/revision.js b/lib/models/revision.js
index 6f3a746f..225a95d4 100644
--- a/lib/models/revision.js
+++ b/lib/models/revision.js
@@ -110,7 +110,7 @@ module.exports = function (sequelize, DataTypes) {
           where: {
             noteId: note.id
           },
-          order: '"createdAt" DESC'
+          order: [['createdAt', 'DESC']]
         }).then(function (revisions) {
           var data = []
           for (var i = 0, l = revisions.length; i < l; i++) {
@@ -131,7 +131,7 @@ module.exports = function (sequelize, DataTypes) {
           where: {
             noteId: note.id
           },
-          order: '"createdAt" DESC'
+          order: [['createdAt', 'DESC']]
         }).then(function (revisions) {
           if (revisions.length <= 0) return callback(null, null)
           // measure target revision position
@@ -142,7 +142,7 @@ module.exports = function (sequelize, DataTypes) {
                 $gte: time
               }
             },
-            order: '"createdAt" DESC'
+            order: [['createdAt', 'DESC']]
           }).then(function (count) {
             if (count <= 0) return callback(null, null)
             sendDmpWorker({
@@ -231,7 +231,7 @@ module.exports = function (sequelize, DataTypes) {
           where: {
             noteId: note.id
           },
-          order: '"createdAt" DESC'
+          order: [['createdAt', 'DESC']]
         }).then(function (revisions) {
           if (revisions.length <= 0) {
             // if no revision available
diff --git a/lib/models/user.js b/lib/models/user.js
index e59b86cc..f421fe43 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -111,6 +111,15 @@ module.exports = function (sequelize, DataTypes) {
               photo = letterAvatars(profile.username)
             }
             break
+          case 'mattermost':
+            photo = profile.avatarUrl
+            if (photo) {
+              if (bigger) photo = photo.replace(/(\?s=)\d*$/i, '$1400')
+              else photo = photo.replace(/(\?s=)\d*$/i, '$196')
+            } else {
+              photo = letterAvatars(profile.username)
+            }
+            break
           case 'dropbox':
             // no image api provided, use gravatar
             photo = 'https://www.gravatar.com/avatar/' + md5(profile.emails[0].value)
@@ -134,6 +143,15 @@ module.exports = function (sequelize, DataTypes) {
               photo = letterAvatars(profile.username)
             }
             break
+          case 'saml':
+            if (profile.emails[0]) {
+              photo = 'https://www.gravatar.com/avatar/' + md5(profile.emails[0])
+              if (bigger) photo += '?s=400'
+              else photo += '?s=96'
+            } else {
+              photo = letterAvatars(profile.username)
+            }
+            break
         }
         return photo
       },