diff --git a/app/activitypub/routes.py b/app/activitypub/routes.py index 0bff76ef..52f16cbf 100644 --- a/app/activitypub/routes.py +++ b/app/activitypub/routes.py @@ -1080,6 +1080,8 @@ def process_inbox_request(request_json, activitypublog_id, ip_address): user.instance.last_seen = utcnow() # user.instance.ip_address = ip_address user.instance.dormant = False + user.instance.gone_forever = False + user.instance.failures = 0 else: activity_log.exception_message = 'Instance blocked' diff --git a/app/community/util.py b/app/community/util.py index 2c859440..43f57acc 100644 --- a/app/community/util.py +++ b/app/community/util.py @@ -656,7 +656,7 @@ def send_to_remote_instance_task(instance_id: int, community_id: int, payload): instance.failures += 1 instance.most_recent_attempt = utcnow() instance.start_trying_again = utcnow() + timedelta(seconds=instance.failures ** 4) - if instance.failures > 2: + if instance.failures > 10: instance.dormant = True db.session.commit()