From c1f8cde3b52c3c03841eeac2c14fee733ed92d5e Mon Sep 17 00:00:00 2001 From: Imre Kristoffer Eilertsen Date: Wed, 27 Oct 2021 00:44:10 +0200 Subject: [PATCH] Tokenized RegExes where it was practically feasible to do so --- LegitimateURLShortener.txt | 92 ++++++++++++++++++++++++++------------ 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/LegitimateURLShortener.txt b/LegitimateURLShortener.txt index 832b0836f..4c2641aca 100644 --- a/LegitimateURLShortener.txt +++ b/LegitimateURLShortener.txt @@ -1,5 +1,5 @@ ! Title: ➗ Actually Legitimate URL Shortener Tool -! Version: 26October2021v5-Beta +! Version: 27October2021v1-Beta ! Expires: 2 days ! Description: In a world dominated by bit.ly, ad.fly, and several thousand other malware cover-up tools, this list reduces the length of URLs in a much more legitimate and transparent manner. Essentially, it automatically removes unnecessary $/& values from the URLs, making them easier to copy from the URL bar and pasting elsewhere as links. Enjoy. ! Homepage: https://github.com/DandelionSprout/adfilt/discussions/163 @@ -257,14 +257,14 @@ $removeparam=itid ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-715449 $removeparam=full_trSrc $removeparam=cmpg_for_af -$removeparam=/^ICID/i,domain=~api.mapbox.com +$removeparam=/^ICID=/i,domain=~api.mapbox.com $removeparam=/^utm-/ $removeparam=aff $removeparam=mc_cid $removeparam=mc_eid $removeparam=/^intgrtn_/ $removeparam=afftag -$removeparam=/^affid/i,domain=~redir.tradedoubler.com +$removeparam=/^affid=/i,domain=~redir.tradedoubler.com ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-728592 $removeparam=referralCode @@ -412,9 +412,6 @@ $removeparam=targetid $removeparam=elqCampaignId $removeparam=dc_campid $removeparam=dc_adgroupid - -! https://chggtrx.com/clk.trk?CID=267627&AFID=304351 -$removeparam=AFID,domain=~chggtrx.com $removeparam=adgroupid $removeparam=AFFNAME $removeparam=ACRID @@ -422,10 +419,12 @@ $removeparam=ASUBID $removeparam=ASID $removeparam=cm_sp $removeparam=cm_re -$removeparam=/^mbsy/ +$removeparam=/^mbsy[=_]/ $removeparam=campaignid $removeparam=mkref $removeparam=refer_code +! https://chggtrx.com/clk.trk?CID=267627&AFID=304351 +$removeparam=AFID,domain=~chggtrx.com ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1412160 $removeparam=loc,domain=~geizhals.de @@ -634,7 +633,7 @@ $removeparam=lcid $removeparam=usource ! http://www.bitdefender.com/?MPid=75107 -$removeparam=/^mpid/i +$removeparam=/^mpid=/i ! https://www.mcafee.com/consumer/en-us/landing-page/direct/aff/mtp-family/desktop/mcafee-total-protection.html?pkg_id=521&culture=en-us&csrc=cj&csrcl2=Black+Friday%2C+Ziff+Davis+LLC&ccoe=direct&ccoel2=am&ccstype=partnerlinks_412446610cc511ec82da00f00a180510&cctype=desktop&prgt=a ! https://www.vitacost.com/?csrc=SITEREF-CJ&cjbatcheventid=8807380&cjpid=8807380 @@ -915,7 +914,7 @@ $removeparam=_branch_match_id ! ——— Specific rules ——— ! !! ——— Can never be made generic ——— ! (e.g. due to sparebank1.no, RARbg.to, Disney+ newsletter unsubscriptions) -$removeparam=cid,domain=adshares.net|apple.com|www.microsoft.com|telenor.no|proshop.*|rightmove.co.uk|giphy.com|nbcnews.com|voxi.co.uk|lenovo.com|rei.com|adguard.com|gamestop.com|bitdefender.*|ae.com|anntaylor.com|blair.com|childrensplace.com|emirates.com|factoryoutletstore.com|haband.com|intuit.com|jared.com|jcpenney.com|kay.com|kohls.com|loft.com|nike.com|nyandcompany.com|overstock.com|radissonhotelsamericas.com|ray-ban.com|tommy.com|toms.com|tractorsupply.com|underarmour.com|vineyardvines.com|wine.com|wsj.com|zales.com|xg4ken.com +$removeparam=cid,domain=adshares.net|apple.com|www.microsoft.com|telenor.no|proshop.*|rightmove.co.uk|giphy.com|nbcnews.com|voxi.co.uk|lenovo.com|rei.com|adguard.com|gamestop.com|bitdefender.*|ae.com|anntaylor.com|blair.com|childrensplace.com|emirates.com|factoryoutletstore.com|haband.com|intuit.com|jared.com|jcpenney.com|kay.com|kohls.com|loft.com|nike.com|nyandcompany.com|overstock.com|radissonhotelsamericas.com|ray-ban.com|tommy.com|toms.com|tractorsupply.com|underarmour.com|vineyardvines.com|wine.com|wsj.com|zales.com|xg4ken.com|flipkart.com ! https://deal.no/apple-thunderbolt-to-gigabit-ethernet/cat-p/c/p4935744&ref=prisjakt (15/11/2020) ! https://www.amazon.com/s?k=disney+fairies&ref=nb_sb_noss_2 (27/11/2020) ! (https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-488495) @@ -957,7 +956,7 @@ $removeparam=trkCampaign $removeparam=trk,domain=splashthat.com|aws.amazon.com|aws $removeparam=es_id ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-700946 -||amazon.$removeparam=/__mk_*_*/ +||amazon.$removeparam=/^__mk_*_/ ||amazon.$removeparam=ascsubtag ||amazon.$removeparam=camp ||amazon.$removeparam=crid @@ -1175,7 +1174,13 @@ $removeparam=share_app_id $removeparam=share_item_id $removeparam=share_link_id ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-783185 -||tiktok.com^$~xmlhttprequest,removeparam=/(referer_url|referer_video_id|refer|sender_device|sender_web_id|is_from_webapp|is_copy_url)/ +||tiktok.com^$~xmlhttprequest,removeparam=referer_url +||tiktok.com^$~xmlhttprequest,removeparam=referer_video_id +||tiktok.com^$~xmlhttprequest,removeparam=refer +||tiktok.com^$~xmlhttprequest,removeparam=sender_device +||tiktok.com^$~xmlhttprequest,removeparam=sender_web_id +||tiktok.com^$~xmlhttprequest,removeparam=is_from_webapp +||tiktok.com^$~xmlhttprequest,removeparam=is_copy_url ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-810773 ||tiktok.com^$removeparam=c ||tiktok.com^$removeparam=is_retargeting @@ -1284,7 +1289,7 @@ $removeparam=tag,domain=amazon.*|argos.co.uk|tv2.no ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-750434 ||xbox.com^$removeparam=xr ||deepdiscount.com^$removeparam=bid -||deepdiscount.com^$removeparam=medium +$removeparam=medium,domain=deepdiscount.com|eonline.com ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-750307 $removeparam=rid,domain=giphy.com @@ -1294,9 +1299,13 @@ $removeparam=rid,domain=giphy.com ||ericgown.no^$removeparam=ggkey ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-766124 -||thegay.com^$removeparam=/(promo|fw)/ +||thegay.com^$removeparam=promo +||thegay.com^$removeparam=fr ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-770867 -||gamespot.com^$removeparam=/(ServiceType|UniqueID|PostType|TheTime)/ +||gamespot.com^$removeparam=ServiceType +||gamespot.com^$removeparam=UniqueID +||gamespot.com^$removeparam=PostType +||gamespot.com^$removeparam=TheTime ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-771456 ||banggood.com^$removeparam=p @@ -1311,8 +1320,6 @@ $removeparam=rid,domain=giphy.com ||disneyplus.com^$removeparam=linkId ||epidemicsound.com^$removeparam=_us ||epidemicsound.com^$removeparam=_usx - -! https://go.nordvpn.net/aff_c?offer_id=129&aff_id=614&aff_sub=06VOOBfmFXpFAcqqIHYIr28&aff_sub2=blackfriday.com ||photojobz.com^$removeparam=hop ||microsoft.com^$removeparam=headerid ||microsoft.com^$removeparam=/^AAAA/ @@ -1447,8 +1454,13 @@ $removeparam=ref_id,domain=expedia.com|intuit.com ||belk.com^$removeparam=start ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1203873 -||blue-tomato.com^$removeparam=/^(varid|campaign|ia-pkpmtrack|zanox|_)/ -||spartoo.$removeparam=/^(sx|track_id)/ +||blue-tomato.com^$removeparam=varid +||blue-tomato.com^$removeparam=campaign +||blue-tomato.com^$removeparam=ia-pkpmtrack +||blue-tomato.com^$removeparam=zanox +||blue-tomato.com^$removeparam=_ +||spartoo.$removeparam=sx +||spartoo.$removeparam=track_id ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1206280 $removeparam=impression_id,domain=nytimes.com|nytimes3xbfgragh.onion @@ -1497,7 +1509,7 @@ $removeparam=ogmap,domain=coach.com|loft.com $removeparam=ogmeas,domain=lanebryant.com $removeparam=partid,domain=bellacor.com $removeparam=/^partnerid/i,domain=1800contacts.com|al.to|allenedmonds.com|bloomingdales.com|combat.pl|famousfootwear.com|macys.com|naturalizer.com|shoes.com|x-kom.pl -$removeparam=pid,domain=123inkjets.com|bergfreunde.*|play.google.com|samsclub.com|th.bing.com +$removeparam=pid,domain=123inkjets.com|bergfreunde.*|play.google.com|samsclub.com|th.bing.com|flipkart.com $removeparam=/^pubcid/i,domain=ashford.com $removeparam=/^pubid/i,domain=conrad.de|express.com|ftd.com|verizon.com|vineyardvines.com $removeparam=/^pubname/i,domain=anntaylor.com|ashford.com|bloomingdales.com|express.com|famousfootwear.com|farmandfleet.com|hottopic.com|loft.com|naturalizer.com|samsclub.com @@ -1550,7 +1562,11 @@ $removeparam=scd,domain=ashleystewart.com ||norton.com^$removeparam=c ! https://hoteles.com/?tmid=hcom-us.dps.cj.package-.package&PSRC=AFF10&rffrid=aff.hcom.us.002.003.8807380.cjaff.kwrd=886b4ff00cb611ec806d4d080a18050d&wapa6=00aLOkbcDwTPhG5y3pNOVi2&sub_publisher=1397064&sub_site=8807380&sub_ad=10780389 -||hoteles.com^$removeparam=/^(PSRC|rffrid|wapa6|sub_|tmid)/ +||hoteles.com^$removeparam=PSRC +||hoteles.com^$removeparam=rffrid +||hoteles.com^$removeparam=wapa6 +||hoteles.com^$removeparam=/^sub_/ +||hoteles.com^$removeparam=tmid ! https://buschgardens.com/?AFS=CJ ||buschgardens.com^$removeparam=AFS @@ -1640,7 +1656,8 @@ $removeparam=site_refer,domain=saksfifthavenue.com|saksoff5th.com ! https://www.masku.com/tuotteet/382829-race-pelituoli/?refSrc=242869 ! https://www.masku.com/tuotteet/393766-smart-tyopoyta/?nosto=productpage-nosto-2&conf%5B1153%5D=10427&conf%5B2651%5D=10771 -||masku.com^$removeparam=/^(refSrc|nosto)/ +||masku.com^$removeparam=refSrc +||masku.com^$removeparam=nosto ! https://scontent.cdninstagram.com/v/t50.2886-16/228280186_4462339507137399_6165083647713647040_n.mp4?efg=eyJ2ZW5jb2RlX3RhZyI6InZ0c192b2RfdXJsZ2VuLjcyMC5zdG9yeS5kZWZhdWx0In0&_nc_ht=scontent-iev1-1.cdninstagram.com&_nc_ohc=nL_7kCFHgrcAX-HT6F1&edm=AOVtZ6oBAAAA&vs=17895914579221456_1489520608&_nc_vs=HBksFQAYJEdIcEhtdzEzcXpCaGVkb1BBTUNaaXVEcHhvNVZidXFIQUFBQRUAAsgBABUAGCRHTVdiZFE2Z2ZIa3dVWFVBQUtNZXdSNFhTQ2NSYnBrd0FBQUYVAgLIAQAoABgAGwGIB3VzZV9vaWwBMRUAACbCkMnRj5zWPxUCKAJDMywXQCREGJN0vGoYEmRhc2hfYmFzZWxpbmVfM192MREAdegHAA%3D%3D&ccb=7-4&oe=614B0BE1&oh=22849edcbcdb1949e3f0cbde56ddd89b&_nc_vts_prog=1&dl=1 ||cdninstagram.com^$removeparam=ccb @@ -1668,16 +1685,27 @@ $removeparam=site_refer,domain=saksfifthavenue.com|saksoff5th.com ||disq.us^$removeparam=cuid ! https://gitlab.com/anti-tracking/ClearURLs/rules/-/issues/58 -||eonline.com^$removeparam=/^(source|medium|content)=/ +$removeparam=source,domain=eonline.com|tokopedia.com +||eonline.com^$removeparam=content ! https://gitlab.com/anti-tracking/ClearURLs/rules/-/issues/53 -||tokopedia.com^$removeparam=/^(source|trkid|whid)=/ +||tokopedia.com^$removeparam=trkid +||tokopedia.com^$removeparam=whid ! https://github.com/ClearURLs/Rules/issues/13 -||mp.weixin.qq.com^$removeparam=/^(chksm|scene|xtrack|key|ascene|uin|devicetype|version|exportkey|pass_ticket)=/ +||mp.weixin.qq.com^$removeparam=ckhsm +||mp.weixin.qq.com^$removeparam=scene +||mp.weixin.qq.com^$removeparam=xtrack +||mp.weixin.qq.com^$removeparam=key +||mp.weixin.qq.com^$removeparam=ascene +||mp.weixin.qq.com^$removeparam=uin +||mp.weixin.qq.com^$removeparam=devicetype +||mp.weixin.qq.com^$removeparam=version +||mp.weixin.qq.com^$removeparam=exportkey +||mp.weixin.qq.com^$removeparam=pass_ticket ! https://www.flipkart.com/wildcraft-knight-mel-17-5-l-laptop-backpack/p/itmfejkcj45hnsdw?pid=BKPFEJKCFU49PCDE&lid=LSTBKPFEJKCFU49PCDEKYMJX4&marketplace=FLIPKART&store=reh%2F4d7%2Fak9&srno=b_1_1&otracker=hp_omu_Top%2BOffers%2BOn_3_13.dealCard.OMU_6NBH6T8TFQ5H_6&otracker1=hp_omu_WHITELISTED_neon%2Fmerchandising_Top%2BOffers%2BOn_NA_dealCard_cc_3_NA_view-all_6&fm=organic&iid=en_JRTu6S3VTYUNswfx2Vf%2BIxSVpVqAn%2BgBL%2F4egSHBpmeZwysjg95tdc%2B0VNBUu1uuBVLsn39nQeqsYzc7%2BsLNkQ%3D%3D&ppt=None&ppn=None&ssid=ooc70jk6kg0000001634312695177&cid=6NBH6T8TFQ5H -||flipkart.com^$removeparam=/^[cilp]id=/ +||flipkart.com^$removeparam=lid ||flipkart.com^$removeparam=fm ||flipkart.com^$removeparam=ppn ||flipkart.com^$removeparam=ppt @@ -1693,19 +1721,25 @@ $removeparam=site_refer,domain=saksfifthavenue.com|saksoff5th.com ||fiverr.com^$removeparam=funnel ! https://www.epicgames.com/store/en-US/p/humankind?epic_affiliate=raptoria&epic_gameId=02c14a01b7044db98de3f3a10813a42e -||epicgames.com^$removeparam=/^(epic_affiliate|epic_gameId)=/ +||epicgames.com^$removeparam=epic_affiliate +||epicgames.com^$removeparam=epic_gameId ! https://adele.lnk.to/EOM $removeparam=/^(cId|lId)=/,domain=apple.com|youtube.com &src=Linkfire^$removeparam=src,domain=apple.com|youtube.com -||music.apple.com^$removeparam=/^(ct|itsct|itscg|app)=/ +||music.apple.com^$removeparam=ct +||music.apple.com^$removeparam=itsct +||music.apple.com^$removeparam=itscg +||music.apple.com^$removeparam=app ! https://tv.apple.com/?ign-itscg=10000&ign-itsct=atv-0-tv_ovp-nav_stm-apl-avl-191111 ||apple.com^$removeparam=/^ign-/ ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-1490207 ! i.e. https://go.skimresources.com/?id=160612X1627478&xcust=adm2_841947&xs=1&url=https%3A%2F%2Fwalmart.com%2Fip%2F204105463 -||go.skimresources.com^$removeparam=/^id|xcust|xs$/ +||go.skimresources.com^$removeparam=id +||go.skimresources.com^$removeparam=xcust +||go.skimresources.com^$removeparam=xs ! https://github.com/DandelionSprout/adfilt/discussions/163#discussioncomment-969819 ! (Exception: booking.com in Firefox; see #256) @@ -1840,7 +1874,7 @@ $removeparam=fromRankId ||bilibili.com^$removeparam=/^from/ ||bilibili.com^$removeparam=/^network/ ||bilibili.com^$removeparam=/^playurl/ -||bilibili.com^$removeparam=/^share/ +||bilibili.com^$removeparam=/^share_/ ||bilibili.com^$removeparam=accept_quality ||bilibili.com^$removeparam=bbid ||bilibili.com^$removeparam=broadcast_type