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

Avoid error caused by fstab.sh admin with a http:// URL

Browse source
This commit is contained in:
freamon 2024-12-01 02:31:37 +00:00
parent 64c40b11db
commit dfce93202e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/cli.py
View file

@ -283,12 +283,14 @@ def register(app):
instance_data = response.json() instance_data = response.json()
admin_profile_ids = [] admin_profile_ids = []
for admin in instance_data['admins']: for admin in instance_data['admins']:
admin_profile_ids.append(admin['person']['actor_id'].lower()) profile_id = admin['person']['actor_id']
user = find_actor_or_create(admin['person']['actor_id']) if profile_id.startswith('https://'):
if user and not instance.user_is_admin(user.id): admin_profile_ids.append(profile_id.lower())
new_instance_role = InstanceRole(instance_id=instance.id, user_id=user.id, user = find_actor_or_create(profile_id)
role='admin') if user and not instance.user_is_admin(user.id):
db.session.add(new_instance_role) new_instance_role = InstanceRole(instance_id=instance.id, user_id=user.id,
role='admin')
db.session.add(new_instance_role)
# remove any InstanceRoles that are no longer part of instance-data['admins'] # remove any InstanceRoles that are no longer part of instance-data['admins']
for instance_admin in InstanceRole.query.filter_by(instance_id=instance.id): for instance_admin in InstanceRole.query.filter_by(instance_id=instance.id):
if instance_admin.user.profile_id() not in admin_profile_ids: if instance_admin.user.profile_id() not in admin_profile_ids: