search

DandelionSprout / adfilt

The place where I, DandelionSprout, store my web filter lists for countless topics, including my Nordic adblock list. As simple as that, really.
Other
1.3k stars 143 forks source link

Update LegitimateURLShortener.txt #310

Closed DeepChirp closed 2 years ago

DeepChirp commented 2 years ago
  1. Baidu: https://top.baidu.com/board?platform=pc&sa=pcindex_a_right
  2. Sogou: https://www.sogou.com/web?user_ip=***.***.***.***&bh=1&interation&interV=kKIOkrELjboMmLkEkL0TkKIMkLELjboImLkEk74TkKIMkrELjbkRmLkEmrELjbgRmLkEkLYTEiTeRFjtjb0EyvdB2u8GwOVFmUHpGz2IOzXejb0Ew+dByOsG0OV/zPsGwOVFmUG8H03sOEX3jb0E0O5Nwu9CyudHj+lHzo==_701355754&htdbg=on&ie=utf8&hintidx=0&query=%E5%BE%B7%E5%AE%89%E6%9D%B0%E6%B4%9B%E5%BE%B7%E5%86%85%E7%BD%97%E9%87%87%E8%AE%BF
  3. I think it would be better to order the sites by dictionary (a-z), so AliExpress should come before Baidu.
DeepChirp commented 2 years ago

Bing: https://cn.bing.com/search?q=test&go=%E6%90%9C%E7%B4%A2 How about integrating Bing?

DeepChirp commented 2 years ago

I have divided the rules into general rules and special rules for easy viewing.

iam-py-test commented 2 years ago

This is huge! This will take a while for me to review, but the problem is that if I make any changes to Legit URL Shortener (i.e https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1524659) it will probably break this PR

DandelionSprout commented 2 years ago

It could take some hours before I can look into it, but I feel I'd need to look into optimising the section-headers and empty lines, and also sort out https://github.com/DandelionSprout/adfilt/blob/58784bbc08c9e5e372ee46781dcb2afdb02cafa9/LegitimateURLShortener.txt#L1294-L1303 and a couple other paragraphs.

DeepChirp commented 2 years ago

@iam-py-test OK. Also, if you think this structure is bad, there is no need to merge it and I will remove several parameters mentioned above.

iam-py-test commented 2 years ago

@iam-py-test OK. Also, if you think this structure is bad, there is no need to merge it and I will remove several parameters mentioned above.

I think you misunderstood my comment. My comment was that there may be conflicts causing this PR to be hard to merge if changes are made to Legit URL Shortener on the main branch

DeepChirp commented 2 years ago

@iam-py-test Yes, but you may not like this structure. In this case, there is no need to resolve the conflict.

iam-py-test commented 2 years ago

@iam-py-test Yes, but you may not like this structure. In this case, there is no need to resolve the conflict.

I have not had time to look over it enough to give a determination. I defiantly think that it was a good idea to organize them in that way, but its up to Imre

DeepChirp commented 2 years ago

Thank you, I have solved it. Please take some time to check it out.

iam-py-test commented 2 years ago

@DandelionSprout After this PR is done, you might want to look at https://gitlab.com/KevinRoebert/ClearUrls/-/issues/1017, as there are a few params but I don't know if they are already removed

iam-py-test commented 2 years ago

I think it would be better to order the sites by dictionary (a-z), so AliExpress should come before Baidu.

@shenzhiming88 I do have a question; did you make that change? Because, I see asahi.com right before malwarebytes.com, and yahoo.com before belk.com

DeepChirp commented 2 years ago

@iam-py-test I made changes in the broad categories, and those specific filters, I did not make changes.

iam-py-test commented 2 years ago

@iam-py-test I made changes in the broad categories, and those specific filters, I did not make changes.

Ah. Thanks

DandelionSprout commented 2 years ago

Okay, so this looks better now than it did earlier today.

Although I find it odd that the PR-Chinese entries weren't included in the generic/specific split, this looks good enough that I can try to merge it and see what happens.