zelo72/mastodon-ios
2
2
Fork 1
mirror of https://github.com/mastodon/mastodon-ios synced 2025-04-11 22:58:02 +02:00
Code Issues 20 Releases Wiki Activity

Correct display of custom emoji contained in user names on notification screen

Browse Source 
Contributes to #399 [BUG] Multiple interactions do not collapse into a single notification
This commit is contained in:
shannon 2025-03-03 10:25:05 -05:00
parent 725a004f33
commit b199a6c630
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Mastodon/In Progress New Layout and Datamodel/NotificationRowView.swift
View File

@ -13,13 +13,13 @@ import SwiftUI
enum AuthorName {
case me
case other(named: String)
case other(named: String, emojis: [MastodonContent.Shortcode : String ])
var string: String {
var plainString: String {
switch self {
case .me:
return "You"
case .other(let name):
case .other(let name, _):
return name
}
}
@ -118,7 +118,7 @@ extension GroupedNotificationType {
assert(totalAuthorCount == 1)
//assert(self == .poll)
return AttributedString(L10n.Scene.Notification.GroupedNotificationDescription.yourPollHasEnded)
case .other(let firstAuthorName):
case .other(let firstAuthorName, let emojis):
var plainString: String
if totalAuthorCount == 1 {
switch self {
@ -159,13 +159,10 @@ extension GroupedNotificationType {
var composedString = AttributedString(plainString)
if let range = composedString.range(of: firstAuthorName) {
let authorNameComponent = stylableNameComponent(firstAuthorName)
composedString.replaceSubrange(range, with: authorNameComponent)
let nameStyling = AttributeContainer.font(
.system(.body, weight: .bold))
let nameContainer = AttributeContainer.personNameComponent(
.givenName)
composedString.replaceAttributes(nameContainer, with: nameStyling)
let authorNameComponent = styledNameComponent(firstAuthorName, style: nameStyling, emojis: emojis)
composedString.replaceSubrange(range, with: authorNameComponent)
}
return composedString
}
@ -177,7 +174,8 @@ extension Mastodon.Entity.Report {
// "Someone reported X posts from someone else for rule violation"
var summary: AttributedString {
if let targetedAccountName = targetAccount?.displayNameWithFallback {
let boldedName = stylableNameComponent(targetedAccountName)
let boldedName = styledNameComponent(targetedAccountName, style: AttributeContainer.font(
.system(.body, weight: .bold)), emojis: targetAccount?.emojiMeta)
if let postCount = flaggedStatusIDs?.count {
return AttributedString(
"Someone reported \(postCount) posts from ") + boldedName
@ -762,9 +760,9 @@ enum NotificationViewComponent: Identifiable {
}
}
func stylableNameComponent(_ name: String) -> AttributedString {
let nameComponent = PersonNameComponents(givenName: name).formatted(
.name(style: .long).attributed)
func styledNameComponent(_ name: String, style: AttributeContainer, emojis: [MastodonContent.Shortcode: String]?) -> AttributedString {
var nameComponent = attributedString(fromHtml: name, emojis: emojis ?? [:])
nameComponent.setAttributes(style)
return nameComponent
}

2
Mastodon/In Progress New Layout and Datamodel/NotificationRowViewModel.swift
View File

@ -753,7 +753,7 @@ extension NotificationSourceAccounts {
switch authorName {
case .me, .none:
return nil
case .other(let name):
case .other(let name, _):
if totalActorCount > 1 {
let formatter = ListFormatter()
return formatter.string(from: [name, L10n.Plural.Count.others(totalActorCount - 1)])

2
Mastodon/Scene/Notification/NotificationView/NotificationView+Configuration.swift
View File

@ -641,7 +641,7 @@ extension AccountInfo {
return .me
} else {
guard let fullAccount else { return nil }
return .other(named: fullAccount.displayNameWithFallback)
return .other(named: fullAccount.displayNameWithFallback, emojis: fullAccount.emojiMeta)
}
}
}