Merge commit 'e3ee1dde7ecfd1867c15c94c3ac04c63764d39f8'

# Conflicts:
#	Telegram/Telegram-iOS/en.lproj/Localizable.strings
#	submodules/TelegramApi/Sources/Api0.swift
#	submodules/TelegramApi/Sources/Api15.swift
#	submodules/TelegramCore/Sources/ApiUtils/TelegramMediaAction.swift
This commit is contained in:
Isaac
2024-12-27 20:11:21 +08:00
132 changed files with 3502 additions and 2005 deletions

View File

@@ -1197,7 +1197,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let controller = PremiumIntroScreen(context: strongSelf.context, source: .gift(from: fromPeerId, to: toPeerId, duration: duration, giftCode: nil))
strongSelf.push(controller)
return true
case .starGift:
case .starGift, .starGiftUnique:
let controller = strongSelf.context.sharedContext.makeGiftViewScreen(context: strongSelf.context, message: EngineMessage(message))
strongSelf.push(controller)
return true
@@ -5758,10 +5758,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var autoremoveTimeout: Int32?
var copyProtectionEnabled: Bool = false
var hasBirthdayToday = false
var displayVerificationDescription = false
var peerVerification: PeerVerification?
if let peer = peerView.peers[peerView.peerId] {
if let _ = peer.verification, !displayedPeerVerification {
displayVerificationDescription = true
if !displayedPeerVerification {
if let cachedUserData = peerView.cachedData as? CachedUserData {
peerVerification = cachedUserData.verification
} else if let cachedChannelData = peerView.cachedData as? CachedChannelData {
peerVerification = cachedChannelData.verification
}
}
copyProtectionEnabled = peer.isCopyProtectionEnabled
if let cachedGroupData = peerView.cachedData as? CachedGroupData {
@@ -5933,7 +5937,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
.updatedHasBirthdayToday(hasBirthdayToday)
.updatedBusinessIntro(businessIntro)
.updatedAdMessage(adMessage)
.updatedDisplayVerificationDescription(displayVerificationDescription)
.updatedPeerVerification(peerVerification)
.updatedInterfaceState { interfaceState in
var interfaceState = interfaceState