Fixup status header author details

This commit is contained in:
Daniel Schwarz 2023-12-19 15:02:50 -05:00
parent 28da101929
commit 48b49ebf7c
1 changed files with 6 additions and 15 deletions

View File

@ -414,18 +414,15 @@ class StatusDetails(urwid.Pile):
else: else:
aimg = urwid.BoxAdapter(urwid.SolidFill(fill_char=" "), 2) aimg = urwid.BoxAdapter(urwid.SolidFill(fill_char=" "), 2)
account_color = ( account_color = ("highlight" if self.status.original.author.account in
"highlight" self.timeline.tui.followed_accounts else "account")
if self.status.original.author.account in self.timeline.tui.followed_accounts
else "account"
)
atxt = urwid.Pile([("pack", atxt = urwid.Pile([("pack",
urwid.AttrMap( urwid.AttrMap(
EmojiText(self.status.original.author.display_name, EmojiText(self.status.author.display_name,
self.status.original.data["account"]["emojis"]), self.status.data["account"]["emojis"]),
"account")), "bold")),
("pack", urwid.Text((account_color, self.status.original.author.account)))]) ("pack", urwid.Text((account_color, self.status.author.account)))])
columns = urwid.Columns([aimg, ("weight", 9999, atxt)], dividechars=1, min_width=5) columns = urwid.Columns([aimg, ("weight", 9999, atxt)], dividechars=1, min_width=5)
return columns return columns
@ -443,12 +440,6 @@ class StatusDetails(urwid.Pile):
yield ("pack", urwid.AttrMap(urwid.Divider("-"), "dim")) yield ("pack", urwid.AttrMap(urwid.Divider("-"), "dim"))
yield self.author_header(reblogged_by) yield self.author_header(reblogged_by)
if status.author.display_name:
yield ("pack", urwid.Text(("bold", status.author.display_name)))
account_color = "highlight" if status.author.account in self.followed_accounts else "account"
yield ("pack", urwid.Text((account_color, status.author.account)))
yield ("pack", urwid.Divider()) yield ("pack", urwid.Divider())
if status.data["spoiler_text"]: if status.data["spoiler_text"]: