From 63f5652ac2b7991a13da7090ca042aecd57c1c97 Mon Sep 17 00:00:00 2001
From: Gus Caplan <me@gus.host>
Date: Thu, 1 Jun 2017 03:38:34 -0500
Subject: [PATCH] object.entries (#1549)

* Update DiscordAPIError.js

* Update ClientUserSettings.js
---
 src/client/rest/DiscordAPIError.js   | 12 ++++++------
 src/structures/ClientUserSettings.js |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/client/rest/DiscordAPIError.js b/src/client/rest/DiscordAPIError.js
index c5bd31b15..94f491ddc 100644
--- a/src/client/rest/DiscordAPIError.js
+++ b/src/client/rest/DiscordAPIError.js
@@ -24,15 +24,15 @@ class DiscordAPIError extends Error {
   static flattenErrors(obj, key = '') {
     let messages = [];
 
-    for (const k of Object.keys(obj)) {
+    for (const [k, v] of Object.entries(obj)) {
       const newKey = key ? isNaN(k) ? `${key}.${k}` : `${key}[${k}]` : k;
 
-      if (obj[k]._errors) {
-        messages.push(`${newKey}: ${obj[k]._errors.map(e => e.message).join(' ')}`);
-      } else if (obj[k].code || obj[k].message) {
-        messages.push(`${obj[k].code ? `${obj[k].code}: ` : ''}${obj[k].message}`.trim());
+      if (v._errors) {
+        messages.push(`${newKey}: ${v._errors.map(e => e.message).join(' ')}`);
+      } else if (v.code || v.message) {
+        messages.push(`${v.code ? `${v.code}: ` : ''}${v.message}`.trim());
       } else {
-        messages = messages.concat(this.flattenErrors(obj[k], newKey));
+        messages = messages.concat(this.flattenErrors(v, newKey));
       }
     }
 
diff --git a/src/structures/ClientUserSettings.js b/src/structures/ClientUserSettings.js
index 7ba29f71a..3c095df6d 100644
--- a/src/structures/ClientUserSettings.js
+++ b/src/structures/ClientUserSettings.js
@@ -15,8 +15,7 @@ class ClientUserSettings {
    * @param {Object} data Data to patch this with
    */
   patch(data) {
-    for (const key of Object.keys(Constants.UserSettingsMap)) {
-      const value = Constants.UserSettingsMap[key];
+    for (const [key, value] of Object.entries(Constants.UserSettingsMap)) {
       if (!data.hasOwnProperty(key)) continue;
       if (typeof value === 'function') {
         this[value.name] = value(data[key]);