mirror of
https://github.com/ihabunek/toot.git
synced 2024-09-22 04:25:55 -04:00
Fall back to "username" when "display_name" is unset
We add a "username" field to Author entity, this is then used when displaying the "reblogged by" information when respective account has no display name.
This commit is contained in:
parent
fdbed57f23
commit
690a91ce04
@ -2,7 +2,7 @@ from collections import namedtuple
|
|||||||
|
|
||||||
from .utils import parse_datetime
|
from .utils import parse_datetime
|
||||||
|
|
||||||
Author = namedtuple("Author", ["account", "display_name"])
|
Author = namedtuple("Author", ["account", "display_name", "username"])
|
||||||
|
|
||||||
|
|
||||||
class Status:
|
class Status:
|
||||||
@ -73,7 +73,7 @@ class Status:
|
|||||||
def _get_author(self):
|
def _get_author(self):
|
||||||
acct = self.data['account']['acct']
|
acct = self.data['account']['acct']
|
||||||
acct = acct if "@" in acct else "{}@{}".format(acct, self.default_instance)
|
acct = acct if "@" in acct else "{}@{}".format(acct, self.default_instance)
|
||||||
return Author(acct, self.data['account']['display_name'])
|
return Author(acct, self.data['account']['display_name'], self.data['account']['username'])
|
||||||
|
|
||||||
def _get_account(self):
|
def _get_account(self):
|
||||||
acct = self.data['account']['acct']
|
acct = self.data['account']['acct']
|
||||||
|
@ -220,7 +220,7 @@ class StatusDetails(urwid.Pile):
|
|||||||
|
|
||||||
def content_generator(self, status, reblogged_by):
|
def content_generator(self, status, reblogged_by):
|
||||||
if reblogged_by:
|
if reblogged_by:
|
||||||
text = "♺ {} boosted".format(reblogged_by.display_name)
|
text = "♺ {} boosted".format(reblogged_by.display_name or reblogged_by.username)
|
||||||
yield ("pack", urwid.Text(("gray", text)))
|
yield ("pack", urwid.Text(("gray", text)))
|
||||||
yield ("pack", urwid.AttrMap(urwid.Divider("-"), "gray"))
|
yield ("pack", urwid.AttrMap(urwid.Divider("-"), "gray"))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user