Merge pull request #12806 from brave/topsites/excluded/10411

fix topsites never returning after exclusion
brave · Jan 23, 2018 · 4e6cbdd · 4e6cbdd
2 parents ccd3684 + c77674e
commit 4e6cbdd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/app/browser/api/topSites.js b/app/browser/api/topSites.js
@@ -28,6 +28,10 @@ const isPinned = (state, siteKey) => {
   })
 }
 
+const isIgnored = (state, siteKey) => {
+  return aboutNewTabState.getIgnoredTopSites(state).includes(siteKey)
+}
+
 const sortCountDescending = (left, right) => {
   const leftCount = left.get('count', 0)
   const rightCount = right.get('count', 0)
@@ -85,6 +89,7 @@ const getTopSiteData = () => {
   let sites = historyState.getSites(state)
     .filter((site, key) => !isSourceAboutUrl(site.get('location')) &&
       !isPinned(state, key) &&
+      !isIgnored(state, key) &&
       (minCountOfTopSites === undefined || (site.get('count') || 0) >= minCountOfTopSites) &&
       (minAccessOfTopSites === undefined || (site.get('lastAccessedTime') || 0) >= minAccessOfTopSites)
     )
@@ -118,7 +123,7 @@ const getTopSiteData = () => {
     const preDefined = staticData
       // TODO: this doesn't work properly
       .filter((site) => {
-        return !isPinned(state, site.get('key'))
+        return !isPinned(state, site.get('key')) && !isIgnored(state, site.get('key'))
       })
       .map(site => {
         const bookmarkKey = bookmarkLocationCache.getCacheKey(state, site.get('location'))