Skip to content

Fix custom server emojis displaying as raw shortcodes in headers #2496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jadetheda wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −3
Open

Fix custom server emojis displaying as raw shortcodes in headers #2496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion IceCubesApp/App/Tabs/Settings/AccountSettingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Account
import AppAccount
import DesignSystem
import EmojiText
import Env
import Models
import NetworkClient
Expand Down Expand Up @@ -107,7 +108,7 @@ struct AccountSettingsView: View {
ToolbarItem(placement: .principal) {
HStack {
AvatarView(account.avatar, config: .embed)
Text(account.safeDisplayName)
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.headline)
}
}
Expand Down
4 changes: 3 additions & 1 deletion Packages/Account/Sources/Account/Detail/Components/AccountDetailToolbar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import DesignSystem
import EmojiText
import Env
import Models
import NetworkClient
Expand All @@ -25,7 +26,8 @@ struct AccountDetailToolbar: ToolbarContent {
ToolbarItem(placement: .principal) {
if let account = account, displayTitle {
VStack {
Text(account.displayName ?? "").font(.headline)
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.headline)
Text("account.detail.featured-tags-n-posts \(account.statusesCount ?? 0)")
.font(.footnote)
.foregroundStyle(.secondary)
Expand Down
9 changes: 8 additions & 1 deletion Packages/Account/Sources/Account/Detail/MediaGrid/AccountDetailMediaGridView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import DesignSystem
import EmojiText
import Env
import MediaUI
import Models
Expand Down Expand Up @@ -100,7 +101,13 @@ public struct AccountDetailMediaGridView: View {
}
}
}
.navigationTitle(account.displayName ?? "")
.navigationBarTitleDisplayMode(.inline)
.toolbar {
ToolbarItem(placement: .principal) {
EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.headline)
}
}
#if !os(visionOS)
.scrollContentBackground(.hidden)
.background(theme.primaryBackgroundColor)
Expand Down
Loading