Merge quotes before sending

TelegramMessenger · Oct 29, 2023 · 333011a · 333011a
1 parent 37e8618
commit 333011a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/submodules/TelegramCore/Sources/SyncCore/SyncCore_TextEntitiesMessageAttribute.swift b/submodules/TelegramCore/Sources/SyncCore/SyncCore_TextEntitiesMessageAttribute.swift
@@ -27,8 +27,8 @@ public enum MessageTextEntityType: Equatable {
 }
 
 public struct MessageTextEntity: PostboxCoding, Codable, Equatable {
-    public let range: Range<Int>
-    public let type: MessageTextEntityType
+    public var range: Range<Int>
+    public var type: MessageTextEntityType
 
     public init(range: Range<Int>, type: MessageTextEntityType) {
         self.range = range

diff --git a/submodules/TextFormat/Sources/GenerateTextEntities.swift b/submodules/TextFormat/Sources/GenerateTextEntities.swift
@@ -181,6 +181,35 @@ public func generateChatInputTextEntities(_ text: NSAttributedString, maxAnimate
         }
     }
 
+    while true {
+        var hadReductions = false
+
+        scan: for i in 0 ..< entities.count {
+            if case .BlockQuote = entities[i].type {
+                inner: for j in 0 ..< entities.count {
+                    if j == i {
+                        continue inner
+                    }
+                    if case .BlockQuote = entities[j].type {
+                        if entities[i].range.upperBound == entities[j].range.lowerBound || entities[i].range.lowerBound == entities[j].range.upperBound {
+                            entities[i].range = min(entities[i].range.lowerBound, entities[j].range.lowerBound) ..< max(entities[i].range.upperBound, entities[j].range.upperBound)
+                            entities.remove(at: j)
+
+                            hadReductions = true
+                            break scan
+                        }
+                    }
+                }
+
+                break scan
+            }
+        }
+
+        if !hadReductions {
+            break
+        }
+    }
+
     return entities
 }