From 70e87a1fc967b1980113959a34544764df904d29 Mon Sep 17 00:00:00 2001
From: Tdxdxoz <tdxdxoz@gmail.com>
Date: Tue, 28 Mar 2023 11:42:38 +0800
Subject: [PATCH] show display_name for mention

---
 app/lib/text_formatter.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 48e2fc233..6a585d874 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -4,6 +4,7 @@ class TextFormatter
   include ActionView::Helpers::TextHelper
   include ERB::Util
   include RoutingHelper
+  include AccountsHelper
 
   URL_PREFIX_REGEX = /\A(https?:\/\/(www\.)?|xmpp:)/.freeze
 
@@ -119,7 +120,8 @@ class TextFormatter
     return "@#{h(entity[:screen_name])}" if account.nil?
 
     url = ActivityPub::TagManager.instance.url_for(account)
-    display_username = same_username_hits&.positive? || with_domains? ? account.pretty_acct : account.username
+    # account may come from cache and has no display_name attribute because of .select(...)
+    display_username = same_username_hits&.positive? || with_domains? || !account.has_attribute?('display_name') ? account.pretty_acct : display_name(account)
 
     <<~HTML.squish
       <span class="h-card"><a href="#{h(url)}" class="u-url mention">@<span>#{h(display_username)}</span></a></span>