diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index af299ee..1b01dc7 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,7 +1,7 @@ # These are supported funding model platforms -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: sayo_melu # Replace with a single Patreon username +github: [jinyuzu99] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] +patreon: jinyuzu99 # Replace with a single Patreon username open_collective: # Replace with a single Open Collective username ko_fi: # Replace with a single Ko-fi username tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: # Replace with a single Liberapay username issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: 'afdian.net/@sayo-melu'# Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] diff --git a/document/contribute.md b/document/contribute.md index 54ee1e7..20bb62b 100644 --- a/document/contribute.md +++ b/document/contribute.md @@ -1,61 +1,59 @@ -# contribute +# Contribute -## feedback +## Feedback -if you want to: +If you want to: -- ask question -- report bug -- request feature -- vote for feature request +- Ask question +- Report bugs +- Request feature +- Vote for feature request -please create or check issue to make contribution. +Please create or check issue to make contribution. -## contribute to code +## Contribute to Code -if you want to contribute directly to the code base, please follow the step below. +If you want to contribute directly to the code base, please follow the steps below. -### get the source +### 1. Environment -``` -git clone https://github.com/sayomelu/nothingblock -``` - -### prerequisite +- Git +- Web browser +- Ad Blocker + - uBlock Origin + - other... +- Code editor -- git -- web browser -- blocker - - ublock original - - adblock plus - - ... -- code editor +### 2. Get the Source -### writing filter +``` +git clone https://github.com/jinyuzu99/nothingblock +``` -setup with **ublock original** + **visual studio code**, other are similar. +### 3. Writing Filters -1. open the website you want to block on your **web browser** with **ad blocker** enabled. -2. **secondary click** on the website element you want to block, then choose **block element**. -3. find the appropriate fliter in **cosmetic filters**, then choose **preview** to check your fliter. -4. choose **create** to create a new filter. -5. repeat step **2** ~ **4** until there is nothing to block. -6. go to **ad blocker** -> **dashboard** -> **my filter**, then copy all the filter. -7. create and open a new `[website name with lowercase and hyphen: sample-website].txt` file in `nothingblock/item/` with **code editor**. -8. paste the text to `[website name with lowercase and hyphen: sample-website].txt`. -9. edit the file in the format below: +Setup with **uBlock Origin** + **Visual Studio Code**, others are similar. +1. Open the website you want to block on your **web browser** with **uBlock Origin** enabled. +2. **Secondary click** on the website element you want to block, then choose **Block Element**. +3. Find the appropriate fliter in **Cosmetic Filters**, then choose **Preview** to check your fliter. +4. Choose **Create** to create a new filter. +5. Repeat step **2** - **4** until there is nothing to block. +6. Go to **uBlock Origin** -> **Dashboard** -> **My Filter**, then copy all the filter. +7. Create and open a new `[website name with lowercase and hyphen: sample-website].txt` file in `nothingblock/website/` with ****. +8. Paste the text to `[website name with lowercase and hyphen: sample-website].txt`. +9. Edit the file in the format below: ```adp - ! [website section 1] + ! [Website Section 1] [filter 1] [filter 2] ... - ! [website section 2] + ! [Website Section 2] [filter 3] [filter 4] ... ``` -### pull request +### 4. Pull Request -after writing your filter, you can pull request to nothingblock. +After writing your filters, you can pull request to NothingBlock. diff --git a/document/resource/nothongblock logo.psd b/document/resource/nothongblock-logo.psd similarity index 100% rename from document/resource/nothongblock logo.psd rename to document/resource/nothongblock-logo.psd diff --git a/filter.txt b/filter.txt index 37153d6..9d001f1 100644 --- a/filter.txt +++ b/filter.txt @@ -1,7 +1,7 @@ [Adblock Plus 3.0] -! Title: nothingblock filter +! Title: NothingBlock filter ! Description: block unnecessary web element to have 'nothing more to take away'. -! Homepage: https://github.com/dorjmi/nothingblock +! Homepage: https://github.com/jinyuzu99/nothingblock ! Version: 2023.11.16.1315 ! Expires: 7 days acfun.cn###appguideBox diff --git a/generate.py b/generate.py index a220f45..79d4ece 100755 --- a/generate.py +++ b/generate.py @@ -8,7 +8,7 @@ head = """\ [Adblock Plus 3.0] -! Title: nothingblock filter +! Title: NothingBlock filter ! Description: block unnecessary web element to have 'nothing more to take away'. ! Homepage: https://github.com/dorjmi/nothingblock ! Version: {version} diff --git a/license.txt b/license.txt index 2823ba1..714bdfd 100644 --- a/license.txt +++ b/license.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 sayo melu +Copyright (c) 2021 Yuzu Jin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/readme.md b/readme.md index c2250b8..024fdaf 100644 --- a/readme.md +++ b/readme.md @@ -1,33 +1,33 @@

- nothongblock logo + NothongBlock Logo - nothingblock + NothingBlock

-> you know you have achieved perfection in design, not when you have nothing more to add, but when you have nothing more to take away. -- antoine de saint exupery +> You know you have achieved perfection in design, not when you have nothing more to add, but when you have nothing more to take away. - Antoine de Saint-Exupéry -**nothingblock** block unnecessary web element to have 'nothing more to take away'. +**NothingBlock** blocks unnecessary web elements to have 'Nothing more to take away'. -![nothingblock sample](asset/nothingblock-sample.jpg) +![NothingBlock Sample](asset/nothingblock-sample.jpg) -## start +## Start -add the url below to your [blocker](https://github.com/topics/blocker) to use **all filter**. (or from [github](https://raw.githubusercontent.com/jinyuzu99/nothingblock/main/filter.txt)) +Add the URL below to your [blocker](https://github.com/topics/blocker) to use **All Filters**. (or from [GitHub](https://raw.githubusercontent.com/jinyuzu99/nothingblock/main/filter.txt)) ``` https://cdn.jsdelivr.net/gh/jinyuzu99/nothingblock/filter.txt ``` -to add **specific filter**, copy the filter below and paste to your ad blocker. +To add **Specific Filter**, copy the filter below and paste to your ad blocker. -### support website +### Support Websites -to check all support website, please check [filter-item](filter-item) folder. +To check all support website, please check [website](website) folder. -to apply for new website, report problem, or ask for new feature, please check [issue](../../issues). +To apply for new websites, report problems, or ask for new features, please check [Issues](../../issues). -## contribute +## Contribute -follow [contribute document](document/contribute.md) to make contribution. +Follow [Contribute Documents](document/contribute.md) to make contributions. diff --git a/filter-item/acfun.txt b/website/acfun.txt similarity index 100% rename from filter-item/acfun.txt rename to website/acfun.txt diff --git a/filter-item/amap.txt b/website/amap.txt similarity index 100% rename from filter-item/amap.txt rename to website/amap.txt diff --git a/filter-item/amazon.cn.txt b/website/amazon.cn.txt similarity index 100% rename from filter-item/amazon.cn.txt rename to website/amazon.cn.txt diff --git a/filter-item/amazon.co.jp.txt b/website/amazon.co.jp.txt similarity index 100% rename from filter-item/amazon.co.jp.txt rename to website/amazon.co.jp.txt diff --git a/filter-item/amazon.com.txt b/website/amazon.com.txt similarity index 100% rename from filter-item/amazon.com.txt rename to website/amazon.com.txt diff --git a/filter-item/baidu-search.txt b/website/baidu_search.txt similarity index 100% rename from filter-item/baidu-search.txt rename to website/baidu_search.txt diff --git a/filter-item/bilibili.txt b/website/bilibili.txt similarity index 100% rename from filter-item/bilibili.txt rename to website/bilibili.txt diff --git a/filter-item/bing.txt b/website/bing.txt similarity index 100% rename from filter-item/bing.txt rename to website/bing.txt diff --git a/filter-item/dmzj.txt b/website/dmzj.txt similarity index 100% rename from filter-item/dmzj.txt rename to website/dmzj.txt diff --git a/filter-item/dropbox.txt b/website/dropbox.txt similarity index 100% rename from filter-item/dropbox.txt rename to website/dropbox.txt diff --git a/filter-item/duckduckgo.txt b/website/duckduckgo.txt similarity index 100% rename from filter-item/duckduckgo.txt rename to website/duckduckgo.txt diff --git a/filter-item/ecosia.txt b/website/ecosia.txt similarity index 100% rename from filter-item/ecosia.txt rename to website/ecosia.txt diff --git a/filter-item/feedly.txt b/website/feedly.txt similarity index 100% rename from filter-item/feedly.txt rename to website/feedly.txt diff --git a/filter-item/google-search.txt b/website/google-search.txt similarity index 100% rename from filter-item/google-search.txt rename to website/google-search.txt diff --git a/filter-item/google-drive.txt b/website/google_drive.txt similarity index 100% rename from filter-item/google-drive.txt rename to website/google_drive.txt diff --git a/filter-item/google-map.txt b/website/google_map.txt similarity index 100% rename from filter-item/google-map.txt rename to website/google_map.txt diff --git a/filter-item/google-photo.txt b/website/google_photo.txt similarity index 100% rename from filter-item/google-photo.txt rename to website/google_photo.txt diff --git a/filter-item/icourse163.txt b/website/icourse163.txt similarity index 100% rename from filter-item/icourse163.txt rename to website/icourse163.txt diff --git a/filter-item/inoreader.txt b/website/inoreader.txt similarity index 100% rename from filter-item/inoreader.txt rename to website/inoreader.txt diff --git a/filter-item/instapaper.txt b/website/instapaper.txt similarity index 100% rename from filter-item/instapaper.txt rename to website/instapaper.txt diff --git a/filter-item/it-home.txt b/website/it_home.txt similarity index 100% rename from filter-item/it-home.txt rename to website/it_home.txt diff --git a/filter-item/jd.txt b/website/jd.txt similarity index 100% rename from filter-item/jd.txt rename to website/jd.txt diff --git a/filter-item/microsoft-office.txt b/website/microsoft_office.txt similarity index 100% rename from filter-item/microsoft-office.txt rename to website/microsoft_office.txt diff --git a/filter-item/netease-cc.txt b/website/netease_cc.txt similarity index 100% rename from filter-item/netease-cc.txt rename to website/netease_cc.txt diff --git a/filter-item/netease-music.txt b/website/netease_music.txt similarity index 100% rename from filter-item/netease-music.txt rename to website/netease_music.txt diff --git a/filter-item/pixiv.txt b/website/pixiv.txt similarity index 100% rename from filter-item/pixiv.txt rename to website/pixiv.txt diff --git a/filter-item/pocket.txt b/website/pocket.txt similarity index 100% rename from filter-item/pocket.txt rename to website/pocket.txt diff --git a/filter-item/pornhub.txt b/website/pornhub.txt similarity index 100% rename from filter-item/pornhub.txt rename to website/pornhub.txt diff --git a/filter-item/reddit.txt b/website/reddit.txt similarity index 100% rename from filter-item/reddit.txt rename to website/reddit.txt diff --git a/filter-item/spotify.txt b/website/spotify.txt similarity index 100% rename from filter-item/spotify.txt rename to website/spotify.txt diff --git a/filter-item/stackoverflow.txt b/website/stackoverflow.txt similarity index 100% rename from filter-item/stackoverflow.txt rename to website/stackoverflow.txt diff --git a/filter-item/taobao.txt b/website/taobao.txt similarity index 100% rename from filter-item/taobao.txt rename to website/taobao.txt diff --git a/filter-item/unsplash.txt b/website/unsplash.txt similarity index 100% rename from filter-item/unsplash.txt rename to website/unsplash.txt diff --git a/filter-item/wechat.txt b/website/wechat.txt similarity index 100% rename from filter-item/wechat.txt rename to website/wechat.txt diff --git a/filter-item/weibo.txt b/website/weibo.txt similarity index 100% rename from filter-item/weibo.txt rename to website/weibo.txt diff --git a/filter-item/youtube.txt b/website/youtube.txt similarity index 100% rename from filter-item/youtube.txt rename to website/youtube.txt diff --git a/filter-item/zhihu.txt b/website/zhihu.txt similarity index 100% rename from filter-item/zhihu.txt rename to website/zhihu.txt