This repository has been archived by the owner on Jun 6, 2019. It is now read-only.
do now allow duplicated items for resources blocked #43
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- this allows iterating of iterators which is useful for array deduping using Set() for example @see https://www.typescriptlang.org/docs/handbook/iterators-and-generators.html
bbondy
reviewed
Jul 3, 2018
| * License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
| * You can obtain one at http://mozilla.org/MPL/2.0/. */ | ||
|
|
||
| export const unique = (arr: Array<string>) => [...new Set(arr)] |
bbondy
reviewed
Jul 3, 2018
| const newProps = Object.assign(fakeProps, { | ||
| adsBlockedResources: [ | ||
| 'https://everbodys-got-something-to-hide-except-me-and-my-monkey.cool', | ||
| 'https://everbodys-got-something-to-hide-except-me-and-my-monkey.cool' |
yrliou
reviewed
Jul 3, 2018
app/state/shieldsPanelState.ts
Outdated
| @@ -74,22 +75,22 @@ export const updateResourceBlocked: shieldState.UpdateResourceBlocked = (state, | |||
|
|
|||
| if (blockType === 'ads') { | |||
| tabs[tabId].adsBlocked++ | |||
| tabs[tabId].adsBlockedResources = [ ...tabs[tabId].adsBlockedResources, subresource ] | |||
| tabs[tabId].adsBlockedResources = unique([ ...tabs[tabId].adsBlockedResources, subresource ]) | |||
There was a problem hiding this comment.
Our block counts will not match the counts of resources we are showing, I think it might be better to match both.
There was a problem hiding this comment.
Maybe set adsBlocked to the length of adsBlockedResources after this line?
bbondy
approved these changes
Jul 3, 2018
bbondy
suggested changes
Jul 3, 2018
- auditors: @yrliou addresses #42 (review)
|
ok ready w/ updates:
Note: an ad that is also blocked as tracker is kept as-is and not deduped. Visiting https://cezaraugusto.net will show 2 resources blocked with the same analytics url. Workaround for this took a lot of code changes and not worth the effort. Better take would be just making clear for adblock what/what not is an ad/tracker. |
bbondy
approved these changes
Jul 6, 2018
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix brave/brave-browser#420
Test Plan:
covered by automated tests