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

Merge branch 'macos-9.5-release'

Browse Source 
# Conflicts:
This commit is contained in:
Mike Renoir 2023-03-23 12:08:23 +04:00
commit 604f10f697
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramCore/Sources/Network/NetworkFrameworkTcpConnectionInterface.swift
View File

@ -239,7 +239,7 @@ final class NetworkFrameworkTcpConnectionInterface: NSObject, MTTcpConnectionInt
if data.count != 0 && data.count <= currentReadRequest.request.length - currentReadRequest.readyLength {
currentReadRequest.data.withUnsafeMutableBytes { currentBuffer in
guard let currentBytes = currentBuffer.assumingMemoryBound(to: UInt8.self).baseAddress else {
guard let currentBytes = currentBuffer.baseAddress?.assumingMemoryBound(to: UInt8.self) else {
return
}
data.copyBytes(to: currentBytes.advanced(by: currentReadRequest.readyLength), count: data.count)

2
submodules/TelegramCore/Sources/Utils/MessageUtils.swift
View File

@ -225,7 +225,7 @@ func locallyRenderedMessage(message: StoreMessage, peers: [PeerId: Peer], associ
public extension Message {
func effectivelyIncoming(_ accountPeerId: PeerId) -> Bool {
if self.id.peerId == accountPeerId {
if self.author?.id == accountPeerId, self.id.peerId != accountPeerId {
if self.forwardInfo != nil {
return true
} else {