diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-20 03:01:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-20 03:01:44 -0500 |
| commit | 56a3d2b64bb096bc771c1d3c043a9d44d41c3291 (patch) | |
| tree | 6917de2e59e69f5ad0dc9b1471a7c7c8659c1af8 /app/helpers/stream_entries_helper.rb | |
| parent | 625c4f36ef394215e65e19157bfaf60e7de94b5f (diff) | |
| parent | b481e4fac1c564b8008f6f1d0eea1727ec9faa08 (diff) | |
Merge pull request #494 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers/stream_entries_helper.rb')
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 707c8e26c..a91a28935 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -5,7 +5,11 @@ module StreamEntriesHelper EMBEDDED_ACTION = 'embed' def display_name(account, **options) - Formatter.instance.format_display_name(account, options) + if options[:custom_emojify] + Formatter.instance.format_display_name(account, options) + else + account.display_name.presence || account.username + end end def account_description(account) |