ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-15 13:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Fixes

Browse Source
This commit is contained in:
Kylmakalle 2025-05-09 12:18:39 +03:00
parent bc1796f172
commit 86987f5059
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramUI/Sources/Chat/ChatControllerLoadDisplayNode.swift
View File

@ -717,7 +717,7 @@ extension ChatControllerImpl {
// MARK: Swiftgram // MARK: Swiftgram
self.chatLanguagePredictionDisposable = ( self.chatLanguagePredictionDisposable = (
chatTranslationState(context: context, peerId: peerId, forcePredict: true) chatTranslationState(context: context, peerId: peerId, threadId: chatLocation.threadId, forcePredict: true)
|> map { translationState -> ChatPresentationTranslationState? in |> map { translationState -> ChatPresentationTranslationState? in
if let translationState, !translationState.fromLang.isEmpty { if let translationState, !translationState.fromLang.isEmpty {
return ChatPresentationTranslationState(isEnabled: translationState.isEnabled, fromLang: translationState.fromLang, toLang: translationState.toLang ?? baseLanguageCode) return ChatPresentationTranslationState(isEnabled: translationState.isEnabled, fromLang: translationState.fromLang, toLang: translationState.toLang ?? baseLanguageCode)

6
submodules/TelegramUI/Sources/ChatHistoryListNode.swift
View File

@ -1980,7 +1980,7 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
// MARK: Swiftgram // MARK: Swiftgram
// var translateToLanguage: (fromLang: String, toLang: String)? // var translateToLanguage: (fromLang: String, toLang: String)?
// if let translationState, (isPremium || autoTranslate) && translationState.isEnabled { // if let translationState, (isPremium || autoTranslate) && translationState.isEnabled {
var languageCode = translationState.toLang ?? chatPresentationData.strings.baseLanguageCode var languageCode = translationState?.toLang ?? chatPresentationData.strings.baseLanguageCode
let rawSuffix = "-raw" let rawSuffix = "-raw"
if languageCode.hasSuffix(rawSuffix) { if languageCode.hasSuffix(rawSuffix) {
languageCode = String(languageCode.dropLast(rawSuffix.count)) languageCode = String(languageCode.dropLast(rawSuffix.count))
@ -1995,7 +1995,7 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
let associatedData = extractAssociatedData(translateToLanguageSG: translateToLanguageSG, translationSettings: translationSettings, /* MARK: Swiftgram */ chatLocation: chatLocation, view: view, automaticDownloadNetworkType: networkType, preferredStoryHighQuality: preferredStoryHighQuality, animatedEmojiStickers: animatedEmojiStickers, additionalAnimatedEmojiStickers: additionalAnimatedEmojiStickers, subject: subject, currentlyPlayingMessageId: currentlyPlayingMessageIdAndType?.0, isCopyProtectionEnabled: isCopyProtectionEnabled, availableReactions: availableReactions, availableMessageEffects: availableMessageEffects, savedMessageTags: savedMessageTags, defaultReaction: defaultReaction, isPremium: isPremium, alwaysDisplayTranscribeButton: alwaysDisplayTranscribeButton, accountPeer: accountPeer, topicAuthorId: topicAuthorId, hasBots: chatHasBots, translateToLanguage: translateToLanguage, maxReadStoryId: maxReadStoryId, recommendedChannels: recommendedChannels, audioTranscriptionTrial: audioTranscriptionTrial, chatThemes: chatThemes, deviceContactsNumbers: deviceContactsNumbers, isInline: !rotated, showSensitiveContent: contentSettings.ignoreContentRestrictionReasons.contains("sensitive")) let associatedData = extractAssociatedData(translateToLanguageSG: translateToLanguageSG, translationSettings: translationSettings, /* MARK: Swiftgram */ chatLocation: chatLocation, view: view, automaticDownloadNetworkType: networkType, preferredStoryHighQuality: preferredStoryHighQuality, animatedEmojiStickers: animatedEmojiStickers, additionalAnimatedEmojiStickers: additionalAnimatedEmojiStickers, subject: subject, currentlyPlayingMessageId: currentlyPlayingMessageIdAndType?.0, isCopyProtectionEnabled: isCopyProtectionEnabled, availableReactions: availableReactions, availableMessageEffects: availableMessageEffects, savedMessageTags: savedMessageTags, defaultReaction: defaultReaction, isPremium: isPremium, alwaysDisplayTranscribeButton: alwaysDisplayTranscribeButton, accountPeer: accountPeer, topicAuthorId: topicAuthorId, hasBots: chatHasBots, translateToLanguage: translateToLanguage?.toLang, maxReadStoryId: maxReadStoryId, recommendedChannels: recommendedChannels, audioTranscriptionTrial: audioTranscriptionTrial, chatThemes: chatThemes, deviceContactsNumbers: deviceContactsNumbers, isInline: !rotated, showSensitiveContent: contentSettings.ignoreContentRestrictionReasons.contains("sensitive"))
var includeEmbeddedSavedChatInfo = false var includeEmbeddedSavedChatInfo = false
if case let .replyThread(message) = chatLocation, message.peerId == context.account.peerId, !rotated { if case let .replyThread(message) = chatLocation, message.peerId == context.account.peerId, !rotated {
@ -2096,7 +2096,7 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
var scrollAnimationCurve: ListViewAnimationCurve? = nil var scrollAnimationCurve: ListViewAnimationCurve? = nil
if let strongSelf = self, case .default = source { if let strongSelf = self, case .default = source {
if let translateToLanguage { if let translateToLanguage {
strongSelf.translationLang = (fromLang: nil, toLang: translateToLanguage) strongSelf.translationLang = (fromLang: translateToLanguage.fromLang, toLang: translateToLanguage.toLang)
} else { } else {
strongSelf.translationLang = nil strongSelf.translationLang = nil
} }

4
submodules/TelegramUI/Sources/TelegramRootController.swift
View File

@ -681,7 +681,7 @@ public final class TelegramRootController: NavigationController, TelegramRootCon
defer { defer {
TempBox.shared.dispose(tempFile) TempBox.shared.dispose(tempFile)
} }
if let imageData = compressImageToJPEG(image, quality: quality: Float(SGSimpleSettings.shared.outgoingPhotoQuality) / 100.0, tempFilePath: tempFile.path) { if let imageData = compressImageToJPEG(image, quality: Float(SGSimpleSettings.shared.outgoingPhotoQuality) / 100.0, tempFilePath: tempFile.path) {
media = .image(dimensions: dimensions, data: imageData, stickers: result.stickers) media = .image(dimensions: dimensions, data: imageData, stickers: result.stickers)
} }
case let .video(content, firstFrameImage, values, duration, dimensions): case let .video(content, firstFrameImage, values, duration, dimensions):
@ -704,7 +704,7 @@ public final class TelegramRootController: NavigationController, TelegramRootCon
defer { defer {
TempBox.shared.dispose(tempFile) TempBox.shared.dispose(tempFile)
} }
let imageData = firstFrameImage.flatMap { compressImageToJPEG($0, quality: quality: Float(SGSimpleSettings.shared.outgoingPhotoQuality) / 100.0, tempFilePath: tempFile.path) } let imageData = firstFrameImage.flatMap { compressImageToJPEG($0, quality: Float(SGSimpleSettings.shared.outgoingPhotoQuality) / 100.0, tempFilePath: tempFile.path) }
let firstFrameFile = imageData.flatMap { data -> TempBoxFile? in let firstFrameFile = imageData.flatMap { data -> TempBoxFile? in
let file = TempBox.shared.tempFile(fileName: "image.jpg") let file = TempBox.shared.tempFile(fileName: "image.jpg")
if let _ = try? data.write(to: URL(fileURLWithPath: file.path)) { if let _ = try? data.write(to: URL(fileURLWithPath: file.path)) {