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

no message

Browse Source
This commit is contained in:
Peter 2017-03-06 01:16:00 +03:00
parent 117004025d
commit ca74503c28
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TelegramCore/ChatContextResult.swift
View File

@ -374,7 +374,7 @@ extension ChatContextResult {
dimensions = CGSize(width: CGFloat(w), height: CGFloat(h))
}
self = .externalReference(id: id, type: type, title: title, description: description, url: url, thumbnailUrl: thumbUrl, contentUrl: contentUrl, contentType: contentType, dimensions: dimensions, duration: duration, message: ChatContextResultMessage(apiMessage: sendMessage))
case let .botInlineMediaResult(flags, id, type, photo, document, title, description, sendMessage):
case let .botInlineMediaResult(_, id, type, photo, document, title, description, sendMessage):
var image: TelegramMediaImage?
var file: TelegramMediaFile?
if let photo = photo, let parsedImage = telegramMediaImageFromApiPhoto(photo) {

2
TelegramCore/CloudFileMediaResource.swift
View File

@ -494,7 +494,7 @@ public struct SecretFileMediaResource: TelegramCloudMediaResource {
public struct EmptyMediaResourceId: MediaResourceId {
public var uniqueId: String {
return "empty"
return "empty-resource"
}
public var hashValue: Int {

2
TelegramCore/Fetch.swift
View File

@ -71,7 +71,7 @@ private func fetchLocalFileResource(path: String) -> Signal<MediaResourceDataFet
func fetchResource(account: Account, resource: MediaResource, range: Range<Int>) -> Signal<MediaResourceDataFetchResult, NoError> {
if let _ = resource as? EmptyMediaResource {
return .single(MediaResourceDataFetchResult(data: Data(), complete: false))
return .never()
} else if let secretFileResource = resource as? SecretFileMediaResource {
return .single(MediaResourceDataFetchResult(data: Data(), complete: false)) |> then(fetchSecretFileResource(account: account, resource: secretFileResource, range: range))
} else if let cloudResource = resource as? TelegramCloudMediaResource {

10
TelegramCore/MultipartFetch.swift
View File

@ -79,8 +79,14 @@ private final class MultipartFetchManager {
init(size: Int?, range: Range<Int>, encryptionKey: SecretFileEncryptionKey?, decryptedSize: Int32?, fetchPart: @escaping (Int, Int) -> Signal<Data, NoError>, partReady: @escaping (Data) -> Void, completed: @escaping () -> Void) {
self.completeSize = size
if let size = size {
self.range = range.lowerBound ..< min(range.upperBound, size)
self.parallelParts = 4
if size <= range.lowerBound {
//assertionFailure()
self.range = range
self.parallelParts = 0
} else {
self.range = range.lowerBound ..< min(range.upperBound, size)
self.parallelParts = 4
}
} else {
self.range = range
self.parallelParts = 1

2
TelegramCore/OutgoingMessageWithChatContextResult.swift
View File

@ -142,7 +142,7 @@ public func outgoingMessageWithChatContextResult(_ results: ChatContextResultCol
arc4random_buf(&randomId, 8)
let thumbnailResource = HttpReferenceMediaResource(url: thumbnailUrl, size: nil)
let imageDimensions = dimensions ?? CGSize(width: 128.0, height: 128.0)
let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: randomId), representations: [TelegramMediaImageRepresentation(dimensions: aspectFitSize(imageDimensions, to: CGSize(width: 90.0, height: 90.0)), resource: thumbnailResource), TelegramMediaImageRepresentation(dimensions: imageDimensions, resource: EmptyMediaResource())])
let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: randomId), representations: [TelegramMediaImageRepresentation(dimensions: aspectFitSize(imageDimensions, to: CGSize(width: 90.0, height: 90.0)), resource: thumbnailResource)])
return .message(text: caption, attributes: attributes, media: tmpImage, replyToMessageId: nil)
} else {
return .message(text: caption, attributes: attributes, media: nil, replyToMessageId: nil)