From: Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Date: Sat, 24 Mar 2018 12:36:44 +0000 (+0900)
Subject: Rename variables to have semantic meanings in notifications reducer (#6890)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=59657e24b9737cb2b38ea6b0f9e99192908b15df;p=mastodon.git

Rename variables to have semantic meanings in notifications reducer (#6890)
---

diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 264db4f55..06c36c89a 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -49,11 +49,11 @@ const normalizeNotification = (state, notification) => {
 };
 
 const normalizeNotifications = (state, notifications, next) => {
-  let items    = ImmutableList();
+  let newItems    = ImmutableList();
   const loaded = state.get('loaded');
 
   notifications.forEach((n, i) => {
-    items = items.set(i, notificationToMap(n));
+    newItems = newItems.set(i, notificationToMap(n));
   });
 
   if (state.get('next') === null) {
@@ -61,7 +61,7 @@ const normalizeNotifications = (state, notifications, next) => {
   }
 
   return state
-    .update('items', list => loaded ? items.concat(list) : list.concat(items))
+    .update('items', oldItems => loaded ? newItems.concat(oldItems) : oldItems.concat(newItems))
     .set('loaded', true)
     .set('isLoading', false);
 };