projectmoon
/
fediblockhole-misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert

This commit is contained in:
Shawn Grigson 2023-09-12 08:13:17 -05:00
parent 4d360e6b53
commit 3592c97627
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fediblockhole/__init__.py
View File

@ -402,9 +402,6 @@ def fetch_instance_blocklist(host: str, token: str=None, admin: bool=False,
link = True link = True
while link: while link:
response = requests.get(url, headers=headers, timeout=REQUEST_TIMEOUT) response = requests.get(url, headers=headers, timeout=REQUEST_TIMEOUT)
if response.status_code == 401:
log.error(f"Cannot fetch remote blocklist. Access token has been revoked for {host}, skipping....")
break
if response.status_code != 200: if response.status_code != 200:
log.error(f"Cannot fetch remote blocklist: {response.content}") log.error(f"Cannot fetch remote blocklist: {response.content}")
raise ValueError("Unable to fetch domain block list: %s", response) raise ValueError("Unable to fetch domain block list: %s", response)
@ -485,8 +482,7 @@ def fetch_instance_follows(token: str, host: str, domain: str, scheme: str='http
if response.status_code == 403: if response.status_code == 403:
log.error(f"Cannot fetch follow information for {domain} from {host}: {response.content}") log.error(f"Cannot fetch follow information for {domain} from {host}: {response.content}")
if response.status_code != 401: raise ValueError(f"Something went wrong: {response.status_code}: {response.content}")
raise ValueError(f"Something went wrong: {response.status_code}: {response.content}")
# Get the total returned # Get the total returned
follows = int(response.json()[0]['total']) follows = int(response.json()[0]['total'])
@ -555,9 +551,6 @@ def add_block(token: str, host: str, blockdata: DomainBlock, scheme: str='https'
err = json.loads(response.content) err = json.loads(response.content)
log.warning(err['error']) log.warning(err['error'])
elif response.status_code == 401:
log.warning(f"Access token has been revoked for {host}, no blocks being updated.")
elif response.status_code != 200: elif response.status_code != 200:
raise ValueError(f"Something went wrong: {response.status_code}: {response.content}") raise ValueError(f"Something went wrong: {response.status_code}: {response.content}")