Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Testing out #467 #469

Merged
merged 3 commits into from
Sep 9, 2018
Merged

Conversation

DandelionSprout
Copy link
Contributor

I made a quick pull to test out the mirror linking. I chose to keep it pretty simple for now, only adding my own mirror and the non-uBO-hosted mirrors on their assets.json list.

I am also removing two lists of mine that I am planning to discontinue and delete in the very near future: Norwegian Cashback Helper because its functionality has long since been incorporated into the main Norwegian list (and because there was insufficient public demand to undo the incorporation), and the iOS list because I couldn't prove that it was even possible to add custom lists with that specific syntax to any iOS Safari extensions.

@collinbarrett collinbarrett added the directory-data changes to basic FilterLists data label Sep 9, 2018
@collinbarrett
Copy link
Owner

Cool. FYI, #467 is not implemented yet, so you won't actually see these mirrors in the UI. Feel free to subscribe to that issue to be notified when it is.

@DandelionSprout
Copy link
Contributor Author

Feel free to subscribe to that issue to be notified when it is.

Done. 🙂

@@ -5120,8 +5120,8 @@
"submissionUrl": null,
"syntaxId": 3,
"viewUrl": "https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt",
"viewUrlMirror1": null,
"viewUrlMirror2": null
"viewUrlMirror1": "https://fanboy.co.nz/fanboy-social.txt",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fanboy Social and Fanboy Annoyance are different lists, I think. So, probably not mirrors.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for spotting.

@@ -206,8 +206,8 @@
"submissionUrl": "https://www.malwaredomainlist.com/contact.php",
"syntaxId": 1,
"viewUrl": "https://www.malwaredomainlist.com/hostslist/hosts.txt",
"viewUrlMirror1": null,
"viewUrlMirror2": null
"viewUrlMirror1": "https://cdn.rawgit.com/NanoMeow/MDLMirror/master/hosts.txt",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these aren't really mirrors since they are a different syntax (hosts vs domains). should probably be separate lists in FilterList.json and linked in Fork.json

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

...or just not added as mirrors for now, if you don't want to spend the time with that. I just think we should keep mirrors pretty strictly to "mirrors" (exact copies of the original).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case it's slightly odd that https://github.com/gorhill/uBlock/blob/master/assets/assets.json seems to think of them as being the same list.

@DandelionSprout
Copy link
Contributor Author

The two errors should have been resolved now.

@collinbarrett collinbarrett merged commit afa2be4 into collinbarrett:master Sep 9, 2018
collinbarrett added a commit that referenced this pull request Sep 9, 2018
collinbarrett added a commit that referenced this pull request Sep 9, 2018
hawkeye116477 pushed a commit to hawkeye116477/FilterLists that referenced this pull request Feb 4, 2019
hawkeye116477 pushed a commit to hawkeye116477/FilterLists that referenced this pull request Feb 4, 2019
hawkeye116477 pushed a commit to hawkeye116477/FilterLists that referenced this pull request Feb 4, 2019
hawkeye116477 pushed a commit to hawkeye116477/FilterLists that referenced this pull request Feb 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
directory-data changes to basic FilterLists data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants