hotfix: blacklist gab.best domains
This commit is contained in:
parent
e523f3a859
commit
0cd19e597d
|
@ -54,6 +54,11 @@ class PersonalInstanceException(Exception):
|
||||||
"""
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
class BlacklistedDomainException(Exception):
|
||||||
|
"""
|
||||||
|
Used for instances whose domain is blacklisted.
|
||||||
|
"""
|
||||||
|
pass
|
||||||
|
|
||||||
def get_key(data, keys: list):
|
def get_key(data, keys: list):
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -17,7 +17,7 @@ from django import db
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from scraper.models import Instance, PeerRelationship
|
from scraper.models import Instance, PeerRelationship
|
||||||
from scraper.management.commands._util import require_lock, InvalidResponseException, get_key, log, validate_int, PersonalInstanceException
|
from scraper.management.commands._util import require_lock, InvalidResponseException, get_key, log, validate_int, PersonalInstanceException, BlacklistedDomainException
|
||||||
|
|
||||||
# TODO: use the /api/v1/server/followers and /api/v1/server/following endpoints in peertube instances
|
# TODO: use the /api/v1/server/followers and /api/v1/server/following endpoints in peertube instances
|
||||||
|
|
||||||
|
@ -142,6 +142,9 @@ class Command(BaseCommand):
|
||||||
"""Given an instance, get all the data we're interested in"""
|
"""Given an instance, get all the data we're interested in"""
|
||||||
data = dict()
|
data = dict()
|
||||||
try:
|
try:
|
||||||
|
if instance.name.endswith("gab.best"):
|
||||||
|
raise BlacklistedDomainException
|
||||||
|
|
||||||
data['instance_name'] = instance.name
|
data['instance_name'] = instance.name
|
||||||
data['info'] = self.get_instance_info(instance.name)
|
data['info'] = self.get_instance_info(instance.name)
|
||||||
|
|
||||||
|
@ -163,6 +166,7 @@ class Command(BaseCommand):
|
||||||
|
|
||||||
except (InvalidResponseException,
|
except (InvalidResponseException,
|
||||||
PersonalInstanceException,
|
PersonalInstanceException,
|
||||||
|
BlacklistedDomainException,
|
||||||
requests.exceptions.RequestException,
|
requests.exceptions.RequestException,
|
||||||
json.decoder.JSONDecodeError) as e:
|
json.decoder.JSONDecodeError) as e:
|
||||||
data['instance_name'] = instance.name
|
data['instance_name'] = instance.name
|
||||||
|
|
Loading…
Reference in a new issue