bugfixes

Author: Mike Renoir

Telegram-Mac.xcworkspace/contents.xcworkspacedata

@@ -1,4 +1,5 @@
 import Foundation
+import WebKit
 import UserNotifications
 import TGUIKit
 import SwiftSignalKit
@@ -323,6 +324,7 @@ final class AuthorizedApplicationContext: NSObject, SplitViewDelegate {
         self.loggedOutDisposable.set(context.account.loggedOut.start(next: { value in
             if value {
                 let _ = logoutFromAccount(id: accountId, accountManager: context.sharedContext.accountManager, alreadyLoggedOutRemotely: false).start()
+                FastSettings.clear_uuid(context.account.id.int64)
             }
         }))
 

Telegram-Mac/ApplicationContext.swift

@@ -820,10 +820,24 @@ class ChatMessageItem: ChatRowItem {
                 header = TextNode.layoutText(.initialize(string: lg.prefixWithDots(15), color: blockColor.main, font: .medium(.text)), nil, 1, .end, NSMakeSize(.greatestFiniteMagnitude, .greatestFiniteMagnitude), nil, false, .left)
 
                 let tetriary: NSColor
+                let dark: Bool
                 if bubbled {
-                    tetriary = NSColor.black
+                    let isIncoming = message?.isIncoming(context.account, bubbled) ?? false
+                    if isIncoming {
+                        tetriary = blockColor.main
+                        dark = isDark
+                    } else {
+                        if isDark {
+                            tetriary = NSColor.black
+                            dark = isDark
+                        } else {
+                            tetriary = blockColor.main
+                            dark = false
+                        }
+                    }
                 } else {
                     tetriary = blockColor.main
+                    dark = isDark
                 }
 
                 string.addAttribute(TextInputAttributes.quote, value: TextViewBlockQuoteData(id: Int(arc4random64()), colors: .init(main: blockColor.main, secondary: nil, tertiary: tetriary), isCode: true, space: 4, header: header), range: range)
@@ -832,9 +846,9 @@ class ChatMessageItem: ChatRowItem {
                 string.addAttribute(TextInputAttributes.monospace, value: true as NSNumber, range: range)
 
 
-                if let language = language {
+                if let language = language?.lowercased() {
                     let code = string.attributedSubstring(from: range).string
-                    let syntaxed = CodeSyntax.syntax(code: code, language: language, theme: .init(dark: bubbled ? true : isDark, textColor: textColor, textFont: .code(fontSize), italicFont: .italicMonospace(fontSize), mediumFont: .semiboldMonospace(fontSize)))
+                    let syntaxed = CodeSyntax.syntax(code: code, language: language, theme: .init(dark: dark, textColor: textColor, textFont: .code(fontSize), italicFont: .italicMonospace(fontSize), mediumFont: .semiboldMonospace(fontSize)))
                     CodeSyntax.apply(syntaxed, to: string, offset: range.location)
                 }
 

Telegram-Mac/ChatMessageItem.swift

@@ -451,8 +451,6 @@ class ChatServiceItem: ChatRowItem {
                         }
                         attributedString.detectBoldColorInString(with: .medium(theme.fontSize))
                     }
-                case let .botDomainAccessGranted(domain):
-                    _ = attributedString.append(string: strings().chatServiceBotPermissionAllowed(domain), color: grayTextColor, font: NSFont.normal(theme.fontSize))
                 case let .botSentSecureValues(types):
                     let permissions = types.map({$0.rawValue}).joined(separator: ", ")
                      _ = attributedString.append(string: strings().chatServiceSecureIdAccessGranted(peer.displayTitle, permissions), color: grayTextColor, font: NSFont.normal(theme.fontSize))
@@ -898,6 +896,14 @@ class ChatServiceItem: ChatRowItem {
                     }
                     let _ = attributedString.append(string: text, color: grayTextColor, font: NSFont.normal(theme.fontSize))
                     attributedString.detectBoldColorInString(with: .medium(theme.fontSize))
+                    
+                    let messageId: MessageId? = message.replyAttribute?.messageId
+                    
+                    if let messageId = messageId {
+                        attributedString.add(link: inAppLink.callback("", { [weak chatInteraction] _ in
+                            chatInteraction?.focusMessageId(nil, .init(messageId: messageId, string: nil), .CenterEmpty)
+                        }), for: attributedString.range, color: grayTextColor)
+                    }
                 default:
                     break
                 }

Telegram-Mac/ChatServiceItem.swift

@@ -650,6 +650,16 @@ class FastSettings {
         }
     }
 
+    static func clear_uuid(_ id: Int64) {
+#if DEBUG
+        if #available(macOS 14.0, *) {
+            if let uuid = FastSettings.getUUID(id) {
+                WKWebsiteDataStore.remove(forIdentifier: uuid, completionHandler: { _ in
+                })
+            }
+        }
+#endif
+    }
 }
 
 fileprivate let TelegramFileMediaBoxPath:String = "TelegramFileMediaBoxPathAttributeKey"

Telegram-Mac/FastSettings.swift

@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>256491</string>
+	<string>256563</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

Telegram-Mac/Info.plist

@@ -12,6 +12,7 @@ import TelegramCore
 
 import Postbox
 import SwiftSignalKit
+import WebKit
 
 private struct LogoutControllerState : Equatable {
 
@@ -127,6 +128,9 @@ func LogoutViewController(context: AccountContext, f: @escaping((ViewController)
         verifyAlert_button(for: context.window, header: strings().accountConfirmLogout, information: strings().accountConfirmLogoutText, successHandler: { _ in
             closeAllModals()
             _ = logoutFromAccount(id: context.account.id, accountManager: context.sharedContext.accountManager, alreadyLoggedOutRemotely: false).start()
+            
+            FastSettings.clear_uuid(context.account.id.int64)
+            
         })
     })