revert
This commit is contained in:
parent
4d360e6b53
commit
3592c97627
|
@ -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,7 +482,6 @@ 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
|
||||||
|
@ -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}")
|
||||||
|
|
Loading…
Reference in New Issue