Refactor string generation

submodules/TelegramStringFormatting/Sources/DateFormat.swift

@@ -64,7 +64,7 @@ public func stringForMediumDate(timestamp: Int32, strings: PresentationStrings,
     
     let timeString = stringForShortTimestamp(hours: Int32(timeinfo.tm_hour), minutes: Int32(timeinfo.tm_min), dateTimeFormat: dateTimeFormat)
     
-    return strings.Time_MediumDate(dateString, timeString).0
+    return strings.Time_MediumDate(dateString, timeString).string
 }
 
 public func stringForFullDate(timestamp: Int32, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) -> String {
@@ -76,7 +76,7 @@ public func stringForFullDate(timestamp: Int32, strings: PresentationStrings, da
     let yearString = "\(2000 + timeinfo.tm_year - 100)"
     let timeString = stringForShortTimestamp(hours: Int32(timeinfo.tm_hour), minutes: Int32(timeinfo.tm_min), dateTimeFormat: dateTimeFormat)
     
-    let monthFormat: (String, String, String) -> (String, [(Int, NSRange)])
+    let monthFormat: (String, String, String) -> PresentationStrings.FormattedString
     switch timeinfo.tm_mon + 1 {
     case 1:
         monthFormat = strings.Time_PreciseDate_m1
@@ -106,7 +106,7 @@ public func stringForFullDate(timestamp: Int32, strings: PresentationStrings, da
         return ""
     }
 
-    return monthFormat(dayString, yearString, timeString).0
+    return monthFormat(dayString, yearString, timeString).string
 }
 
 public func stringForDate(timestamp: Int32, strings: PresentationStrings) -> String {

submodules/TelegramStringFormatting/Sources/MessageContentKind.swift

@@ -198,7 +198,7 @@ public func stringForMediaKind(_ kind: MessageContentKind, strings: Presentation
         if text.isEmpty {
             return (strings.Message_Sticker, true)
         } else {
-            return (strings.Message_StickerText(text).0, true)
+            return (strings.Message_StickerText(text).string, true)
         }
     case .animation:
         return (strings.Message_Animation, true)

submodules/TelegramStringFormatting/Sources/PeerNotificationSoundStrings.swift

@@ -59,7 +59,7 @@ public func localizedPeerNotificationSoundString(strings: PresentationStrings, s
                 } else {
                     actualName = name
                 }
-                return strings.UserInfo_NotificationsDefaultSound(actualName).0
+                return strings.UserInfo_NotificationsDefaultSound(actualName).string
             } else {
                 return strings.UserInfo_NotificationsDefault
             }

submodules/TelegramStringFormatting/Sources/PresenceStrings.swift

@@ -83,29 +83,29 @@ public func stringForMonth(strings: PresentationStrings, month: Int32, ofYear ye
     let yearString = "\(1900 + year)"
     switch month {
     case 0:
-        return strings.Time_MonthOfYear_m1(yearString).0
+        return strings.Time_MonthOfYear_m1(yearString).string
     case 1:
-        return strings.Time_MonthOfYear_m2(yearString).0
+        return strings.Time_MonthOfYear_m2(yearString).string
     case 2:
-        return strings.Time_MonthOfYear_m3(yearString).0
+        return strings.Time_MonthOfYear_m3(yearString).string
     case 3:
-        return strings.Time_MonthOfYear_m4(yearString).0
+        return strings.Time_MonthOfYear_m4(yearString).string
     case 4:
-        return strings.Time_MonthOfYear_m5(yearString).0
+        return strings.Time_MonthOfYear_m5(yearString).string
     case 5:
-        return strings.Time_MonthOfYear_m6(yearString).0
+        return strings.Time_MonthOfYear_m6(yearString).string
     case 6:
-        return strings.Time_MonthOfYear_m7(yearString).0
+        return strings.Time_MonthOfYear_m7(yearString).string
     case 7:
-        return strings.Time_MonthOfYear_m8(yearString).0
+        return strings.Time_MonthOfYear_m8(yearString).string
     case 8:
-        return strings.Time_MonthOfYear_m9(yearString).0
+        return strings.Time_MonthOfYear_m9(yearString).string
     case 9:
-        return strings.Time_MonthOfYear_m10(yearString).0
+        return strings.Time_MonthOfYear_m10(yearString).string
     case 10:
-        return strings.Time_MonthOfYear_m11(yearString).0
+        return strings.Time_MonthOfYear_m11(yearString).string
     default:
-        return strings.Time_MonthOfYear_m12(yearString).0
+        return strings.Time_MonthOfYear_m12(yearString).string
     }
 }
 
@@ -119,15 +119,15 @@ public func stringForUserPresence(strings: PresentationStrings, day: RelativeTim
     let dayString: String
     switch day {
     case .today, .tomorrow:
-        dayString = strings.LastSeen_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+        dayString = strings.LastSeen_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).string
     case .yesterday:
-        dayString = strings.LastSeen_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+        dayString = strings.LastSeen_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).string
     }
     return dayString
 }
 
-private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32, format: HumanReadableStringFormat? = nil) -> (String, [(Int, NSRange)]) {
-    let result: (String, [(Int, NSRange)])
+private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32, format: HumanReadableStringFormat? = nil) -> PresentationStrings.FormattedString {
+    let result: PresentationStrings.FormattedString
     switch day {
         case .today:
             let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)
@@ -144,12 +144,17 @@ private func humanReadableStringForTimestamp(strings: PresentationStrings, day:
 }
 
 public struct HumanReadableStringFormat {
-    let dateFormatString: (String) -> (String, [(Int, NSRange)])
-    let tomorrowFormatString: (String) -> (String, [(Int, NSRange)])
-    let todayFormatString: (String) -> (String, [(Int, NSRange)])
-    let yesterdayFormatString: (String) -> (String, [(Int, NSRange)])
+    let dateFormatString: (String) -> PresentationStrings.FormattedString
+    let tomorrowFormatString: (String) -> PresentationStrings.FormattedString
+    let todayFormatString: (String) -> PresentationStrings.FormattedString
+    let yesterdayFormatString: (String) -> PresentationStrings.FormattedString
     
-    public init(dateFormatString: @escaping (String) -> (String, [(Int, NSRange)]), tomorrowFormatString:  @escaping (String) -> (String, [(Int, NSRange)]), todayFormatString: @escaping (String) -> (String, [(Int, NSRange)]), yesterdayFormatString:  @escaping (String) -> (String, [(Int, NSRange)]) = { ($0, []) }) {
+    public init(
+        dateFormatString: @escaping (String) -> PresentationStrings.FormattedString,
+        tomorrowFormatString: @escaping (String) -> PresentationStrings.FormattedString,
+        todayFormatString: @escaping (String) -> PresentationStrings.FormattedString,
+        yesterdayFormatString: @escaping (String) -> PresentationStrings.FormattedString = { PresentationStrings.FormattedString(string: $0, ranges: []) }
+    ) {
         self.dateFormatString = dateFormatString
         self.tomorrowFormatString = tomorrowFormatString
         self.todayFormatString = todayFormatString
@@ -157,7 +162,7 @@ public struct HumanReadableStringFormat {
     }
 }
 
-public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, timestamp: Int32, alwaysShowTime: Bool = false, allowYesterday: Bool = true, format: HumanReadableStringFormat? = nil) -> (String, [(Int, NSRange)]) {
+public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, timestamp: Int32, alwaysShowTime: Bool = false, allowYesterday: Bool = true, format: HumanReadableStringFormat? = nil) -> PresentationStrings.FormattedString {
     var t: time_t = time_t(timestamp)
     var timeinfo: tm = tm()
     localtime_r(&t, &timeinfo)
@@ -174,7 +179,7 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi
         } else {
             string = stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)
         }
-        return format?.dateFormatString(string) ?? (string, [])
+        return format?.dateFormatString(string) ?? PresentationStrings.FormattedString(string: string, ranges: [])
     }
     
     let dayDifference = timeinfo.tm_yday - timeinfoNow.tm_yday
@@ -195,7 +200,7 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi
         } else {
             string = stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)
         }
-        return format?.dateFormatString(string) ?? (string, [])
+        return format?.dateFormatString(string) ?? PresentationStrings.FormattedString(string: string, ranges: [])
     }
 }
 
@@ -289,7 +294,7 @@ public func stringForRelativeLiveLocationTimestamp(strings: PresentationStrings,
         let minutes = timeinfo.tm_min
         
         if dayDifference == 0 {
-            return strings.LiveLocationUpdated_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+            return strings.LiveLocationUpdated_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).string
         } else {
             return stringForFullDate(timestamp: relativeTimestamp, strings: strings, dateTimeFormat: dateTimeFormat)
         }
@@ -311,7 +316,7 @@ public func stringForRelativeSymbolicTimestamp(strings: PresentationStrings, rel
     let minutes = timeinfo.tm_min
     
     if dayDifference == 0 {
-        return strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+        return strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).string
     } else {
         return stringForFullDate(timestamp: relativeTimestamp, strings: strings, dateTimeFormat: dateTimeFormat)
     }
@@ -366,7 +371,7 @@ public func stringAndActivityForUserPresence(strings: PresentationStrings, dateT
                 localtime_r(&now, &timeinfoNow)
                 
                 if timeinfo.tm_year != timeinfoNow.tm_year {
-                    return (strings.LastSeen_AtDate(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)).0, false)
+                    return (strings.LastSeen_AtDate(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)).string, false)
                 }
                 
                 let dayDifference = timeinfo.tm_yday - timeinfoNow.tm_yday
@@ -384,7 +389,7 @@ public func stringAndActivityForUserPresence(strings: PresentationStrings, dateT
                     }
                     return (stringForUserPresence(strings: strings, day: day, dateTimeFormat: dateTimeFormat, hours: timeinfo.tm_hour, minutes: timeinfo.tm_min), false)
                 } else {
-                    return (strings.LastSeen_AtDate(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)).0, false)
+                    return (strings.LastSeen_AtDate(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)).string, false)
                 }
             }
         }

submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift

@@ -60,19 +60,19 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                     if forChatList {
                         attributedString = NSAttributedString(string: strings.Notification_CreatedGroup, font: titleFont, textColor: primaryTextColor)
                     } else {
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_CreatedChatWithTitle(authorName, title), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_CreatedChatWithTitle(authorName, title)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                     }
                 }
             case let .addedMembers(peerIds):
                 if let peerId = peerIds.first, peerId == message.author?.id {
                     if let peer = message.peers[message.id.peerId] as? TelegramChannel, case .broadcast = peer.info {
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_JoinedChannel(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, peerId)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_JoinedChannel(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, peerId)]))
                     } else {
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_JoinedChat(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, peerId)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_JoinedChat(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, peerId)]))
                     }
                 } else {
                     var attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
-                    let resultTitleString: (String, [(Int, NSRange)])
+                    let resultTitleString: PresentationStrings.FormattedString
                     if peerIds.count == 1 {
                         attributePeerIds.append((1, peerIds.first))
                         resultTitleString = strings.Notification_Invited(authorName, peerDebugDisplayTitles(peerIds, message.peers))
@@ -80,21 +80,21 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                         resultTitleString = strings.Notification_InvitedMultiple(authorName, peerDebugDisplayTitles(peerIds, message.peers))
                     }
                     
-                    attributedString = addAttributesToStringWithRanges(resultTitleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                    attributedString = addAttributesToStringWithRanges(resultTitleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
                 }
             case let .removedMembers(peerIds):
                 if peerIds.first == message.author?.id {
                     if let peer = message.peers[message.id.peerId] as? TelegramChannel, case .broadcast = peer.info {
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_LeftChannel(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_LeftChannel(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                     } else {
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_LeftChat(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_LeftChat(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                     }
                 } else {
                     var attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
                     if peerIds.count == 1 {
                         attributePeerIds.append((1, peerIds.first))
                     }
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_Kicked(authorName, peerDebugDisplayTitles(peerIds, message.peers)), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_Kicked(authorName, peerDebugDisplayTitles(peerIds, message.peers))._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
                 }
             case let .photoUpdated(image):
                 if authorName.isEmpty || isChannel {
@@ -122,19 +122,19 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                 } else {
                     if let image = image {
                         if !image.videoRepresentations.isEmpty {
-                            attributedString = addAttributesToStringWithRanges(strings.Notification_ChangedGroupVideo(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                            attributedString = addAttributesToStringWithRanges(strings.Notification_ChangedGroupVideo(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                         } else {
-                            attributedString = addAttributesToStringWithRanges(strings.Notification_ChangedGroupPhoto(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                            attributedString = addAttributesToStringWithRanges(strings.Notification_ChangedGroupPhoto(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                         }
                     } else {
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_RemovedGroupPhoto(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_RemovedGroupPhoto(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                     }
                 }
             case let .titleUpdated(title):
                 if authorName.isEmpty || isChannel {
-                    attributedString = NSAttributedString(string: strings.Channel_MessageTitleUpdated(title).0, font: titleFont, textColor: primaryTextColor)
+                    attributedString = NSAttributedString(string: strings.Channel_MessageTitleUpdated(title).string, font: titleFont, textColor: primaryTextColor)
                 } else {
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_ChangedGroupName(authorName, title), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_ChangedGroupName(authorName, title)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 }
             case .pinnedMessageUpdated:
                 enum PinnnedMediaType {
@@ -219,45 +219,45 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                     if clippedText.count > 14 {
                         clippedText = "\(clippedText[...clippedText.index(clippedText.startIndex, offsetBy: 14)])..."
                     }
-                    let textWithRanges: (String, [(Int, NSRange)])
+                    let textWithRanges: PresentationStrings.FormattedString
                     if clippedText.isEmpty {
                         textWithRanges = strings.Message_PinnedGenericMessage(authorName)
                     } else {
                         textWithRanges = strings.Notification_PinnedTextMessage(authorName, clippedText)
                     }
-                    attributedString = addAttributesToStringWithRanges(textWithRanges, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(textWithRanges._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .game:
-                    attributedString = addAttributesToStringWithRanges(strings.Message_AuthorPinnedGame(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Message_AuthorPinnedGame(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .photo:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedPhotoMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedPhotoMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .video:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedVideoMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedVideoMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .round:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedRoundMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedRoundMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .audio:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedAudioMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedAudioMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .file:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedDocumentMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedDocumentMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .gif:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedAnimationMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedAnimationMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .sticker:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedStickerMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedStickerMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .location:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedLocationMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedLocationMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case .contact:
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedContactMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedContactMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 case let .poll(kind):
                     switch kind {
                     case .poll:
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedPollMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedPollMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                     case .quiz:
-                        attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedQuizMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                        attributedString = addAttributesToStringWithRanges(strings.Notification_PinnedQuizMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                     }
                 case .deleted:
-                    attributedString = addAttributesToStringWithRanges(strings.Message_PinnedGenericMessage(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Message_PinnedGenericMessage(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
                 }
             case .joinedByLink:
-                attributedString = addAttributesToStringWithRanges(strings.Notification_JoinedGroupByLink(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                attributedString = addAttributesToStringWithRanges(strings.Notification_JoinedGroupByLink(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
             case .channelMigratedFromGroup, .groupMigratedToChannel:
                 attributedString = NSAttributedString(string: "", font: titleFont, textColor: primaryTextColor)
             case let .messageAutoremoveTimeoutUpdated(timeout):
@@ -273,35 +273,26 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                 if timeout > 0 {
                     let timeValue = timeIntervalString(strings: strings, value: timeout, preferLowerValue: true)
                     
-                    /*
-                     "Conversation.AutoremoveTimerSetUserYou" = "You set messages to automatically delete after %2$@.";
-                     "Conversation.AutoremoveTimerSetUser" = "%1$@ set messages to automatically delete after %2$@.";
-                     "Conversation.AutoremoveTimerRemovedUserYou" = "You disabled the self-destruct timer";
-                     "Conversation.AutoremoveTimerRemovedUser" = "%1$@ disabled the self-destruct timer";
-                     "Conversation.AutoremoveTimerSetGroup" = "Messages will automatically delete after %1$@.";
-                     "Conversation.AutoremoveTimerRemovedGroup" = "Self-destruct timer was disabled";
-                     */
-                    
                     let string: String
                     if let _ = messagePeer as? TelegramUser {
                         if message.author?.id == accountPeerId {
-                            string = strings.Conversation_AutoremoveTimerSetUserYou(timeValue).0
+                            string = strings.Conversation_AutoremoveTimerSetUserYou(timeValue).string
                         } else {
-                            string = strings.Conversation_AutoremoveTimerSetUser(authorString, timeValue).0
+                            string = strings.Conversation_AutoremoveTimerSetUser(authorString, timeValue).string
                         }
                     } else if let _ = messagePeer as? TelegramGroup {
-                        string = strings.Conversation_AutoremoveTimerSetGroup(timeValue).0
+                        string = strings.Conversation_AutoremoveTimerSetGroup(timeValue).string
                     } else if let channel = messagePeer as? TelegramChannel {
                         if case .group = channel.info {
-                            string = strings.Conversation_AutoremoveTimerSetGroup(timeValue).0
+                            string = strings.Conversation_AutoremoveTimerSetGroup(timeValue).string
                         } else {
-                            string = strings.Conversation_AutoremoveTimerSetChannel(timeValue).0
+                            string = strings.Conversation_AutoremoveTimerSetChannel(timeValue).string
                         }
                     } else {
                         if message.author?.id == accountPeerId {
-                            string = strings.Notification_MessageLifetimeChangedOutgoing(timeValue).0
+                            string = strings.Notification_MessageLifetimeChangedOutgoing(timeValue).string
                         } else {
-                            string = strings.Notification_MessageLifetimeChanged(authorString, timeValue).0
+                            string = strings.Notification_MessageLifetimeChanged(authorString, timeValue).string
                         }
                     }
                     attributedString = NSAttributedString(string: string, font: titleFont, textColor: primaryTextColor)
@@ -311,7 +302,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                         if message.author?.id == accountPeerId {
                             string = strings.Conversation_AutoremoveTimerRemovedUserYou
                         } else {
-                            string = strings.Conversation_AutoremoveTimerRemovedUser(authorString).0
+                            string = strings.Conversation_AutoremoveTimerRemovedUser(authorString).string
                         }
                     } else if let _ = messagePeer as? TelegramGroup {
                         string = strings.Conversation_AutoremoveTimerRemovedGroup
@@ -325,7 +316,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                         if message.author?.id == accountPeerId {
                             string = strings.Notification_MessageLifetimeRemovedOutgoing
                         } else {
-                            string = strings.Notification_MessageLifetimeRemoved(authorString).0
+                            string = strings.Notification_MessageLifetimeRemoved(authorString).string
                         }
                     }
                     attributedString = NSAttributedString(string: string, font: titleFont, textColor: primaryTextColor)
@@ -335,7 +326,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
             case .historyScreenshot:
                 let text: String
                 if message.effectivelyIncoming(accountPeerId) {
-                    text = strings.Notification_SecretChatMessageScreenshot(message.author?.compactDisplayTitle ?? "").0
+                    text = strings.Notification_SecretChatMessageScreenshot(message.author?.compactDisplayTitle ?? "").string
                 } else {
                     text = strings.Notification_SecretChatMessageScreenshotSelf
                 }
@@ -423,7 +414,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                     }
                     attributedString = mutableString
                 } else {
-                    attributedString = NSAttributedString(string: strings.Message_PaymentSent(formatCurrencyAmount(totalAmount, currency: currency)).0, font: titleFont, textColor: primaryTextColor)
+                    attributedString = NSAttributedString(string: strings.Message_PaymentSent(formatCurrencyAmount(totalAmount, currency: currency)).string, font: titleFont, textColor: primaryTextColor)
                 }
             case let .phoneCall(_, discardReason, _, _):
                 var titleString: String
@@ -450,20 +441,20 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                 if let scheduleDate = scheduleDate {
                     if message.author?.id.namespace == Namespaces.Peer.CloudChannel {
                         let titleString = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: scheduleDate, alwaysShowTime: true, allowYesterday: false, format: HumanReadableStringFormat(dateFormatString: { strings.Notification_VoiceChatScheduledChannel($0) }, tomorrowFormatString: { strings.Notification_VoiceChatScheduledTomorrowChannel($0) }, todayFormatString: { strings.Notification_VoiceChatScheduledTodayChannel($0) }))
-                        attributedString = NSAttributedString(string: titleString.0, font: titleFont, textColor: primaryTextColor)
+                        attributedString = NSAttributedString(string: titleString.string, font: titleFont, textColor: primaryTextColor)
                     } else {
                         let titleString = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: scheduleDate, alwaysShowTime: true, allowYesterday: false, format: HumanReadableStringFormat(dateFormatString: { strings.Notification_VoiceChatScheduled(authorName, $0) }, tomorrowFormatString: { strings.Notification_VoiceChatScheduledTomorrow(authorName, $0) }, todayFormatString: { strings.Notification_VoiceChatScheduledToday(authorName, $0) }))
                         let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
-                        attributedString = addAttributesToStringWithRanges(titleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                        attributedString = addAttributesToStringWithRanges(titleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
                     }
                 } else if let duration = duration {
                     if message.author?.id.namespace == Namespaces.Peer.CloudChannel {
-                        let titleString = strings.Notification_VoiceChatEnded(callDurationString(strings: strings, value: duration)).0
+                        let titleString = strings.Notification_VoiceChatEnded(callDurationString(strings: strings, value: duration)).string
                         attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor)
                     } else {
                         let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
                         let titleString = strings.Notification_VoiceChatEndedGroup(authorName, callDurationString(strings: strings, value: duration))
-                        attributedString = addAttributesToStringWithRanges(titleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                        attributedString = addAttributesToStringWithRanges(titleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
                     }
                 } else {
                     if message.author?.id.namespace == Namespaces.Peer.CloudChannel {
@@ -472,13 +463,13 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                     } else {
                         let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
                         let titleString = strings.Notification_VoiceChatStarted(authorName)
-                        attributedString = addAttributesToStringWithRanges(titleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                        attributedString = addAttributesToStringWithRanges(titleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
                     }
                 }
             case let .customText(text, entities):
                 attributedString = stringWithAppliedEntities(text, entities: entities, baseColor: primaryTextColor, linkColor: primaryTextColor, baseFont: titleFont, linkFont: titleBoldFont, boldFont: titleBoldFont, italicFont: titleFont, boldItalicFont: titleBoldFont, fixedFont: titleFont, blockQuoteFont: titleFont, underlineLinks: false)
             case let .botDomainAccessGranted(domain):
-                attributedString = NSAttributedString(string: strings.AuthSessions_Message(domain).0, font: titleFont, textColor: primaryTextColor)
+                attributedString = NSAttributedString(string: strings.AuthSessions_Message(domain).string, font: titleFont, textColor: primaryTextColor)
             case let .botSentSecureValues(types):
                 var typesString = ""
                 var hasIdentity = false
@@ -508,23 +499,23 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                         typesString.append(strings.Notification_PassportValueEmail)
                     }
                 }
-                attributedString = NSAttributedString(string: strings.Notification_PassportValuesSentMessage(message.peers[message.id.peerId]?.compactDisplayTitle ?? "", typesString).0, font: titleFont, textColor: primaryTextColor)
+                attributedString = NSAttributedString(string: strings.Notification_PassportValuesSentMessage(message.peers[message.id.peerId]?.compactDisplayTitle ?? "", typesString).string, font: titleFont, textColor: primaryTextColor)
             case .peerJoined:
-                attributedString = addAttributesToStringWithRanges(strings.Notification_Joined(authorName), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
+                attributedString = addAttributesToStringWithRanges(strings.Notification_Joined(authorName)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)]))
             case .phoneNumberRequest:
                 attributedString = nil
             case let .geoProximityReached(fromId, toId, distance):
                 let distanceString = stringForDistance(strings: strings, distance: Double(distance))
                 if fromId == accountPeerId {
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_ProximityYouReached(distanceString, message.peers[toId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? ""), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(1, toId)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_ProximityYouReached(distanceString, message.peers[toId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "")._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(1, toId)]))
                 } else if toId == accountPeerId {
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_ProximityReachedYou(message.peers[fromId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "", distanceString), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, fromId)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_ProximityReachedYou(message.peers[fromId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "", distanceString)._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, fromId)]))
                 } else {
-                    attributedString = addAttributesToStringWithRanges(strings.Notification_ProximityReached(message.peers[fromId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "", distanceString, message.peers[toId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? ""), body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, fromId), (2, toId)]))
+                    attributedString = addAttributesToStringWithRanges(strings.Notification_ProximityReached(message.peers[fromId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "", distanceString, message.peers[toId]?.displayTitle(strings: strings, displayOrder: nameDisplayOrder) ?? "")._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, fromId), (2, toId)]))
                 }
             case let .inviteToGroupPhoneCall(_, _, peerIds):
                 var attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
-                let resultTitleString: (String, [(Int, NSRange)])
+                let resultTitleString: PresentationStrings.FormattedString
                 if peerIds.count == 1 {
                     if peerIds[0] == accountPeerId {
                         attributePeerIds.append((1, peerIds.first))
@@ -537,7 +528,7 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                     resultTitleString = strings.Notification_VoiceChatInvitation(authorName, peerDebugDisplayTitles(peerIds, message.peers))
                 }
                 
-                attributedString = addAttributesToStringWithRanges(resultTitleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                attributedString = addAttributesToStringWithRanges(resultTitleString._tuple, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
             case .unknown:
                 attributedString = nil
             }