ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 14:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f6ff9b86d0e76184cdc047b8d3856ce0aefe545b'

Browse Source 
# Conflicts:
#	submodules/TelegramUI/Sources/ChatController.swift
This commit is contained in:
Ali
2023-02-28 22:25:53 +04:00
parent 13e4d9d219 f6ff9b86d0
commit bc5e989351
28 changed files with 253 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift
View File

@@ -353,7 +353,10 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
let textFixedFont = Font.regular(fontSize)
let textBlockQuoteFont = Font.regular(fontSize)
let incoming = message.effectivelyIncoming(context.account.peerId)
var incoming = message.effectivelyIncoming(context.account.peerId)
if case .forwardedMessages = associatedData.subject {
incoming = false
}
var horizontalInsets = UIEdgeInsets(top: 0.0, left: 10.0, bottom: 0.0, right: 10.0)
if displayLine {
@@ -517,7 +520,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
}
if !skipStandardStatus {
if message.effectivelyIncoming(context.account.peerId) {
if incoming {
if isImage {
imageStatusType = .ImageIncoming
} else {
@@ -609,7 +612,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: file)
let statusType: ChatMessageDateAndStatusType
if message.effectivelyIncoming(context.account.peerId) {
if incoming {
statusType = .BubbleIncoming
} else {
if message.flags.contains(.Failed) {
@@ -633,7 +636,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
forcedIsEdited: false,
file: file,
automaticDownload: automaticDownload,
incoming: message.effectivelyIncoming(context.account.peerId),
incoming: incoming,
isRecentActions: false,
forcedResourceStatus: associatedData.forcedResourceStatus,
dateAndStatusType: statusType,