Merge branch 'master' into develop

This commit is contained in:
jesopo 2020-01-16 16:19:36 +00:00
commit f6f87ad9df

View file

@ -17,7 +17,7 @@ class Actor(object):
if response.code == 200: if response.code == 200:
response = response.json() response = response.json()
self.username = response["preferredUsername"] self.username = response["preferredUsername"]
self.display_name = response.get("name", self.username) self.display_name = response.get("name") or self.username
self.inbox = Inbox(response["inbox"]) self.inbox = Inbox(response["inbox"])
self.outbox = Outbox(response["outbox"]) self.outbox = Outbox(response["outbox"])
self.followers = response["followers"] self.followers = response["followers"]