diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa6f789..e828042 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: python-version: '3.8' - run: | python -m pip install --upgrade pip - pip install requests colorama pyyaml + pip install -r requirements.txt - run: python main.py - run: | git config --local user.email "action@github.com" diff --git a/blacklist.json b/blacklist.json index 17220da..74b3cfd 100644 --- a/blacklist.json +++ b/blacklist.json @@ -31,6 +31,7 @@ "https://rimgo.fascinated.cc", "https://rimgo.perennialte.ch", "https://rimgo.aketawi.space", + "https://pixivfe.darkness.services", "https://safetwitch.frontendfriendly.xyz", "https://safetwitch.r4fo.com", "https://safetwitch.darkness.services", @@ -38,13 +39,13 @@ "https://hp.iqbalrifai.eu.org", "https://hyperpipe.darkness.services", "https://www.openstreetmap.org", - "https://bonus01.hwb0307.com", - "https://private.rmconsulting.com", - "https://paste.3server.de", - "https://n0t.io", - "https://bin.oldgate.org", "https://pb.blackvoid.club", + "https://bin.oldgate.org", + "https://bonus01.hwb0307.com", "https://sendpass.ru", + "https://private.rmconsulting.com", + "https://n0t.io", + "https://paste.3server.de", "https://privatebin.io", "https://wikiless.rawbit.ninja", "https://w.sneed.network", diff --git a/data.json b/data.json index e5cc115..e77055f 100644 --- a/data.json +++ b/data.json @@ -7,10 +7,10 @@ "https://invidious.jing.rocks", "https://invidious.perennialte.ch", "https://invidious.reallyaweso.me", - "https://invidious.einfachzocken.eu", "https://yewtu.be", "https://invidious.nerdvpn.de", - "https://invidious.privacyredirect.com" + "https://invidious.privacyredirect.com", + "https://invidious.einfachzocken.eu" ], "tor": [ "http://inv.nadekonw7plitnjuawu6ytjsl7jlglk2t6pyq6eftptmiv3dvqndwvyd.onion", @@ -34,7 +34,7 @@ "clearnet": [ "https://watch.leptons.xyz", "https://piped.lunar.icu", - "http://ww25.yapi.vyper.me/?subid1=20240821-0732-1439-ac1f-4980fa340f80", + "http://ww25.yapi.vyper.me/?subid1=20240821-0805-3723-bc18-1ca661c8594c", "https://piped.r4fo.com", "https://piped.video", "https://piped.projectsegfau.lt", @@ -716,7 +716,13 @@ ] }, "pixivFe": { - "clearnet": [], + "clearnet": [ + "https://pixivfe.exozy.me", + "https://pixivfe.drgns.space", + "https://pixivfe.ducks.party", + "https://pixiv.perennialte.ch", + "https://pixivfe.darkness.services" + ], "tor": [], "i2p": [], "loki": [] @@ -840,47 +846,47 @@ }, "privateBin": { "clearnet": [ - "https://bonus01.hwb0307.com", - "https://extrait.facil.services", - "https://paste.momobako.com", - "https://paste.waays.fr", - "https://notebin.de", - "https://vip.ci", - "https://privatebin.wsmm.de", - "https://secret.hummel-web.at", - "https://p.darklab.sh", - "https://bin.bus-hit.me", - "https://paste.devsite.pl", - "https://ots.kocsar.at", "https://onetimesecret.trans-ix.nl", - "https://private.rmconsulting.com", - "https://zerobin.thican.net", "https://secrets.true.nl", - "https://paste.tuxcloud.net", - "https://paste.3server.de", - "https://n0t.io", - "https://bin.oldgate.org", "https://paste.techbag.app", - "https://bin.nixnet.services", - "https://privatebin.arch-linux.cz", - "https://paste.ottertelecom.com", - "https://paste.encrypt.co.il", - "https://encryp.ch/note", - "https://bin.ngn.tf", - "https://bin.0xfc.de", "https://pb.blackvoid.club", - "https://paste.tildeverse.org", - "https://paste.ononoki.org", - "https://sendpass.ru", - "https://snip.dssr.ch", - "https://privatebin.net", - "https://paste.hostux.net", - "https://privatebin.io", - "https://paste.hackliberty.org", - "https://p.vinci-concessions.com", - "https://0.jaegers.net", + "https://bin.oldgate.org", + "https://bonus01.hwb0307.com", "https://secrets.l25.cloud", - "https://privatebin.xi.ht" + "https://p.darklab.sh", + "https://sendpass.ru", + "https://paste.waays.fr", + "https://private.rmconsulting.com", + "https://extrait.facil.services", + "https://p.vinci-concessions.com", + "https://bin.nixnet.services", + "https://ots.kocsar.at", + "https://n0t.io", + "https://bin.bus-hit.me", + "https://notebin.de", + "https://paste.hostux.net", + "https://paste.tildeverse.org", + "https://snip.dssr.ch", + "https://privatebin.arch-linux.cz", + "https://vip.ci", + "https://secret.hummel-web.at", + "https://0.jaegers.net", + "https://paste.momobako.com", + "https://privatebin.xi.ht", + "https://paste.encrypt.co.il", + "https://bin.0xfc.de", + "https://zerobin.thican.net", + "https://paste.3server.de", + "https://paste.devsite.pl", + "https://paste.tuxcloud.net", + "https://paste.ononoki.org", + "https://bin.ngn.tf", + "https://encryp.ch/note", + "https://paste.hackliberty.org", + "https://privatebin.net", + "https://privatebin.wsmm.de", + "https://paste.ottertelecom.com", + "https://privatebin.io" ], "tor": [], "i2p": [], diff --git a/main.py b/main.py index 9f168c0..c9859d1 100755 --- a/main.py +++ b/main.py @@ -9,6 +9,7 @@ from services.translate import * from services.utils import * from services.wolfram import * from services.youtube import * +from services.pixiv import * mightyList = {} diff --git a/requirements.txt b/requirements.txt index 0dfc2c3..932a8e1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ requests colorama -pyyaml \ No newline at end of file +pyyaml +pandas \ No newline at end of file diff --git a/services/other.py b/services/other.py index 5b0c2fd..77e8f5d 100644 --- a/services/other.py +++ b/services/other.py @@ -298,13 +298,4 @@ def privateBin(mightyList): 'url', False, mightyList - ) - - -def pixivFe(mightyList): - fetchRegexList( - 'pixivFe', - 'https://codeberg.org/VnPower/pixivfe/raw/branch/main/README.md', - r"\| (https?:\/{2}(?:\S+\.)+[a-zA-Z0-9]*)\/? +\|", - mightyList - ) + ) \ No newline at end of file diff --git a/services/pixiv.py b/services/pixiv.py new file mode 100644 index 0000000..6454a88 --- /dev/null +++ b/services/pixiv.py @@ -0,0 +1,20 @@ +import pandas +import re + + +def pixivFe(mightyList): + df = pandas.read_csv( + 'https://gitlab.com/pixivfe/pixivfe-docs/-/raw/master/data/instances.csv?ref_type=heads') + + clearnet = [] + for value in df['URL']: + r = re.findall(r"\((.*?)\)", value) + if r: + clearnet.append(r[0]) + + mightyList['pixivFe'] = { + "clearnet": clearnet, + "tor": [], + "i2p": [], + "loki": [] + }