Merge branch 'main' into filelink-duplicate-check

This commit is contained in:
Mouse Reeve 2024-03-09 07:37:26 -08:00 committed by GitHub
commit b68a4cc392
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -80,10 +80,7 @@ def json_export(
exported_user = user.to_activity() exported_user = user.to_activity()
# I don't love this but it prevents a JSON encoding error # I don't love this but it prevents a JSON encoding error
# when there is no user image # when there is no user image
if isinstance( if exported_user.get("icon") in (None, dataclasses.MISSING):
exported_user["icon"],
dataclasses._MISSING_TYPE, # pylint: disable=protected-access
):
exported_user["icon"] = {} exported_user["icon"] = {}
else: else:
# change the URL to be relative to the JSON file # change the URL to be relative to the JSON file