From ae931af9e50f3f68125afed7fcf929b7ec55e35b Mon Sep 17 00:00:00 2001
From: Marcos Defendi <marcos.defendi@ulbra.inf.br>
Date: Thu, 3 May 2018 12:22:04 -0300
Subject: [PATCH] Fix  REST /me endpoint,  returning all existing settings,
 whether they are defaults, or set by user.

---
 .../rest-api/authentication/me/README.md      | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/developer-guides/rest-api/authentication/me/README.md b/developer-guides/rest-api/authentication/me/README.md
index bc3309f778..0cbc061f2b 100644
--- a/developer-guides/rest-api/authentication/me/README.md
+++ b/developer-guides/rest-api/authentication/me/README.md
@@ -36,31 +36,37 @@ curl -H "X-Auth-Token: 9HqLlyZOugoStsXCUfD_0YdwnNnunAJF8V47U3QHXSq" \
       "admin"
   ],
   "settings": {
-    "preferences": {
-          "newRoomNotification": "door",
-          "newMessageNotification": "chime",
-          "useEmojis": true,
-          "convertAsciiEmoji": true,
-          "saveMobileBandwidth": true,
-          "collapseMediaByDefault": false,
-          "muteFocusedConversations": true,
-          "hideUsernames": false,
-          "hideFlexTab": false,
-          "hideAvatars": false,
-          "sendOnEnter": "normal",
-          "autoImageLoad": true,
-          "emailNotificationMode": "all",
-          "desktopNotificationDuration": 0,
-          "desktopNotifications": "default",
-          "mobileNotifications": "default",
-          "unreadAlert": true,
-          "notificationsSoundVolume": 100,
-          "roomCounterSidebar": false,
-          "highlights": [],
-          "hideRoles": false,
-          "enableAutoAway": false,
-          "idleTimeLimit": 300000
-      }
+        "preferences": {
+            "enableAutoAway": false,
+            "idleTimeoutLimit": 300,
+            "desktopNotificationDuration": 0,
+            "audioNotifications": "mentions",
+            "desktopNotifications": "mentions",
+            "mobileNotifications": "mentions",
+            "unreadAlert": true,
+            "useEmojis": true,
+            "convertAsciiEmoji": true,
+            "autoImageLoad": true,
+            "saveMobileBandwidth": true,
+            "collapseMediaByDefault": false,
+            "hideUsernames": false,
+            "hideRoles": false,
+            "hideFlexTab": false,
+            "hideAvatars": false,
+            "roomsListExhibitionMode": "category",
+            "sidebarViewMode": "medium",
+            "sidebarHideAvatar": false,
+            "sidebarShowUnread": false,
+            "sidebarShowFavorites": true,
+            "sendOnEnter": "normal",
+            "messageViewMode": 0,
+            "emailNotificationMode": "all",
+            "roomCounterSidebar": false,
+            "newRoomNotification": "door",
+            "newMessageNotification": "chime",
+            "muteFocusedConversations": true,
+            "notificationsSoundVolume": 100
+        }
   },
   "success": true
 }