michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-24 03:43:42 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Exclude blocked instances from linked instances in federated_instances response

Browse source
This commit is contained in:
freamon 2024-10-29 10:33:59 +00:00
parent 57191c2c23
commit e2d3f6d23d
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/activitypub/routes.py
View file

@ -206,17 +206,18 @@ def lemmy_federated_instances():
linked = [] linked = []
allowed = [] allowed = []
blocked = [] blocked = []
for instance in AllowedInstances.query.all():
allowed.append({"id": instance.id, "domain": instance.domain, "published": utcnow(), "updated": utcnow()})
for instance in BannedInstances.query.all():
blocked.append({"id": instance.id, "domain": instance.domain, "published": utcnow(), "updated": utcnow()})
for instance in instances: for instance in instances:
instance_data = {"id": instance.id, "domain": instance.domain, "published": instance.created_at.isoformat(), "updated": instance.updated_at.isoformat()} instance_data = {"id": instance.id, "domain": instance.domain, "published": instance.created_at.isoformat(), "updated": instance.updated_at.isoformat()}
if instance.software: if instance.software:
instance_data['software'] = instance.software instance_data['software'] = instance.software
if instance.version: if instance.version:
instance_data['version'] = instance.version instance_data['version'] = instance.version
if not any(blocked_instance.get('domain') == instance.domain for blocked_instance in blocked):
linked.append(instance_data) linked.append(instance_data)
for instance in AllowedInstances.query.all():
allowed.append({"id": instance.id, "domain": instance.domain, "published": utcnow(), "updated": utcnow()})
for instance in BannedInstances.query.all():
blocked.append({"id": instance.id, "domain": instance.domain, "published": utcnow(), "updated": utcnow()})
return jsonify({ return jsonify({
"federated_instances": { "federated_instances": {
"linked": linked, "linked": linked,