diff options
| author | Hygna <hygna@proton.me> | 2022-09-18 17:13:07 +0100 |
|---|---|---|
| committer | Hygna <hygna@proton.me> | 2022-09-18 17:13:07 +0100 |
| commit | a72a32612032280fb994c7f4495ca153123ac5c7 (patch) | |
| tree | 11820b350683a0b53dcc10587f44453e751f9e5a | |
| parent | removed ref_src and ref_url from twitter urls https://github.com/libredirect/... (diff) | |
| download | libredirect-a72a32612032280fb994c7f4495ca153123ac5c7.zip | |
Rollback master to pre-OOP
| -rw-r--r-- | .woodpecker/instances.yml | 23 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/instances/beatbump.json | 7 | ||||
| -rw-r--r-- | src/instances/bibliogram.json | 6 | ||||
| -rw-r--r-- | src/instances/get_instances.py | 13 |
5 files changed, 35 insertions, 16 deletions
diff --git a/.woodpecker/instances.yml b/.woodpecker/instances.yml new file mode 100644 index 00000000..96fe59f6 --- /dev/null +++ b/.woodpecker/instances.yml @@ -0,0 +1,23 @@ +pipeline: + instancefetch: + image: python:3.8 + secrets: [token, mail] + when: + event: cron + commands: + - python -m pip install --upgrade pip + - pip install requests bs4 colorama + - python src/instances/get_instances.py + # Git configuration + - git config --global user.email $MAIL + - git config --global user.name "Woodpecker CI" + - git commit -am "updated instances" + - mkdir ~/.ssh + - ssh-keyscan -t ed25519 codeberg.org >> ~/.ssh/known_hosts + - git remote set-url origin git@codeberg.org:libredirect/libredirect.git + #- echo $TOKEN > key + #- chmod 0600 key + - eval `ssh-agent` + - echo "$TOKEN" | tr -d '\r' | ssh-add - + #- ssh-add key + - git push --set-upstream origin master @@ -36,7 +36,7 @@ Send Files => [Send](https://gitlab.com/timvisee/send) **Note**: The Extension will be using random instances by default. You can modify this and add custom instances too. -[FAQ](https://libredirect.github.io/faq.html) +# Please read the [FAQ](https://libredirect.github.io/faq.html) if you have any questions! ## Donate diff --git a/src/instances/beatbump.json b/src/instances/beatbump.json index df5a20f7..e09273dd 100644 --- a/src/instances/beatbump.json +++ b/src/instances/beatbump.json @@ -1,9 +1,6 @@ { - "normal": [ - "https://beatbump.ml", - "https://beatbump.esmailelbob.xyz" - ], - "tor": [], + "normal": ["https://beatbump.ml", "https://beatbump.esmailelbob.xyz"], + "tor": ["http://beatbump.esmail5pdn24shtvieloeedh7ehz3nrwcdivnfhfcedl7gf4kwddhkqd.onion"], "i2p": [], "loki": [] } diff --git a/src/instances/bibliogram.json b/src/instances/bibliogram.json new file mode 100644 index 00000000..d72f2129 --- /dev/null +++ b/src/instances/bibliogram.json @@ -0,0 +1,6 @@ +{ + "normal": ["https://bibliogram.1d4.us", "https://bibliogram.froth.zone", "https://ig.tokhmi.xyz", "https://ig.beparanoid.de", "https://bibliogram.priv.pw"], + "tor": [], + "i2p": [], + "loki": [] +} diff --git a/src/instances/get_instances.py b/src/instances/get_instances.py index 085d7273..250dd258 100644 --- a/src/instances/get_instances.py +++ b/src/instances/get_instances.py @@ -230,16 +230,9 @@ def nitter(): def bibliogram(): - r = requests.get('https://bibliogram.art/api/instances') - rJson = json.loads(r.text) - bibliogramList = {} - bibliogramList['normal'] = [] - bibliogramList['tor'] = [] - bibliogramList['i2p'] = [] - bibliogramList['loki'] = [] - for item in rJson['data']: - bibliogramList['normal'].append(item['address']) - mightyList['bibliogram'] = bibliogramList + json_object = json.dumps(mightyList, ensure_ascii=False, indent=2) + with open('./src/instances/bibliogram.json') as file: + mightyList['bibliogram'] = json.load(file) print(Fore.GREEN + 'Fetched ' + Style.RESET_ALL + 'Bibliogram') |