diff options
| author |  jesopo | 2019-12-10 11:45:29 +0000 |
|---|---|---|
| committer | jesopo | 2019-12-10 11:45:29 +0000 |
| commit | 3848d878a40f9db5e800a4fef1876ba02f034687 (patch) | |
| tree | 5294066b2b44e30f25143327a6dade8c6ec2eb3a /modules | |
| parent | support bot-wide aliases with `!balias` (diff) | |
| signature | ||
use fediverse display names when available
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/fediverse/ap_actor.py | 2 | ||||
| -rw-r--r-- | modules/fediverse/ap_utils.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/modules/fediverse/ap_actor.py b/modules/fediverse/ap_actor.py index f87069a5..9296453c 100644 --- a/modules/fediverse/ap_actor.py +++ b/modules/fediverse/ap_actor.py @@ -7,6 +7,7 @@ class Actor(object): self.url = url self.username = None + self.display_name = None self.inbox = None self.outbox = None self.followers = None @@ -16,6 +17,7 @@ class Actor(object): if response.code == 200: response = response.json() self.username = response["preferredUsername"] + self.display_name = response.get("name", self.username) self.inbox = Inbox(response["inbox"]) self.outbox = Outbox(response["outbox"]) self.followers = response["followers"] diff --git a/modules/fediverse/ap_utils.py b/modules/fediverse/ap_utils.py index 3f5b6312..d4a3efa4 100644 --- a/modules/fediverse/ap_utils.py +++ b/modules/fediverse/ap_utils.py @@ -132,10 +132,11 @@ def parse_note(actor, note, type="Create"): original_tooter = ap_actor.Actor(retoot["attributedTo"]) original_tooter.load() - retooted_user = "@%s@%s" % (original_tooter.username, retoot_instance) + retooted_user = "@%s@%s" % (original_tooter.display_name, + retoot_instance) retoot_content = _content(retoot) - author = "%s (boost %s)" % (actor.username, retooted_user) + author = "%s (boost %s)" % (actor.display_name, retooted_user) return (retoot.get("summary", None), author, retoot_content, retoot_url) @@ -144,6 +145,6 @@ def parse_note(actor, note, type="Create"): content = _content(note) url = note.get("url", note["id"]) - return note.get("summary", None), actor.username, content, url + return note.get("summary", None), actor.display_name, content, url return None |