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

no message

Browse Source
This commit is contained in:
Peter 2017-03-06 17:22:54 +03:00
parent 49d1aea8d2
commit 91ed2e4bd0
4 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TelegramCore/ApplyUpdateMessage.swift
View File

@ -105,7 +105,15 @@ func applyUpdateMessage(postbox: Postbox, stateManager: AccountStateManager, mes
} }
} }
return StoreMessage(id: updatedId, globallyUniqueId: nil, timestamp: updatedTimestamp ?? currentMessage.timestamp, flags: [], tags: tagsForStoreMessage(media), forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: text, attributes: attributes, media: media) var entitiesAttribute: TextEntitiesMessageAttribute?
for attribute in attributes {
if let attribute = attribute as? TextEntitiesMessageAttribute {
entitiesAttribute = attribute
break
}
}
return StoreMessage(id: updatedId, globallyUniqueId: nil, timestamp: updatedTimestamp ?? currentMessage.timestamp, flags: [], tags: tagsForStoreMessage(media: media, textEntities: entitiesAttribute?.entities), forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: text, attributes: attributes, media: media)
}) })
if let updatedTimestamp = updatedTimestamp { if let updatedTimestamp = updatedTimestamp {
modifier.offsetPendingMessagesTimestamps(lowerBound: message.id, timestamp: updatedTimestamp) modifier.offsetPendingMessagesTimestamps(lowerBound: message.id, timestamp: updatedTimestamp)

21
TelegramCore/EnqueueMessage.swift
View File

@ -156,7 +156,15 @@ func enqueueMessages(modifier: Modifier, account: Account, peerId: PeerId, messa
mediaList.append(media) mediaList.append(media)
} }
storeMessages.append(StoreMessage(peerId: peerId, namespace: Namespaces.Message.Local, globallyUniqueId: randomId, timestamp: timestamp, flags: flags, tags: tagsForStoreMessage(mediaList), forwardInfo: nil, authorId: account.peerId, text: text, attributes: attributes, media: mediaList)) var entitiesAttribute: TextEntitiesMessageAttribute?
for attribute in attributes {
if let attribute = attribute as? TextEntitiesMessageAttribute {
entitiesAttribute = attribute
break
}
}
storeMessages.append(StoreMessage(peerId: peerId, namespace: Namespaces.Message.Local, globallyUniqueId: randomId, timestamp: timestamp, flags: flags, tags: tagsForStoreMessage(media: mediaList, textEntities: entitiesAttribute?.entities), forwardInfo: nil, authorId: account.peerId, text: text, attributes: attributes, media: mediaList))
case let .forward(source): case let .forward(source):
if let sourceMessage = modifier.getMessage(source), let author = sourceMessage.author { if let sourceMessage = modifier.getMessage(source), let author = sourceMessage.author {
if let peer = peer as? TelegramSecretChat { if let peer = peer as? TelegramSecretChat {
@ -186,7 +194,16 @@ func enqueueMessages(modifier: Modifier, account: Account, peerId: PeerId, messa
} }
forwardInfo = StoreMessageForwardInfo(authorId: author.id, sourceId: sourceId, sourceMessageId: sourceMessageId, date: sourceMessage.timestamp) forwardInfo = StoreMessageForwardInfo(authorId: author.id, sourceId: sourceId, sourceMessageId: sourceMessageId, date: sourceMessage.timestamp)
} }
storeMessages.append(StoreMessage(peerId: peerId, namespace: Namespaces.Message.Local, globallyUniqueId: randomId, timestamp: timestamp, flags: flags, tags: tagsForStoreMessage(sourceMessage.media), forwardInfo: forwardInfo, authorId: account.peerId, text: sourceMessage.text, attributes: attributes, media: sourceMessage.media))
var entitiesAttribute: TextEntitiesMessageAttribute?
for attribute in attributes {
if let attribute = attribute as? TextEntitiesMessageAttribute {
entitiesAttribute = attribute
break
}
}
storeMessages.append(StoreMessage(peerId: peerId, namespace: Namespaces.Message.Local, globallyUniqueId: randomId, timestamp: timestamp, flags: flags, tags: tagsForStoreMessage(media: sourceMessage.media, textEntities: entitiesAttribute?.entities), forwardInfo: forwardInfo, authorId: account.peerId, text: sourceMessage.text, attributes: attributes, media: sourceMessage.media))
} }
} }
} }

11
TelegramCore/ProcessSecretChatIncomingDecryptedOperations.swift
View File

@ -512,7 +512,16 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
if let replyToRandomId = replyToRandomId, let replyMessageId = messageIdForGloballyUniqueMessageId(replyToRandomId) { if let replyToRandomId = replyToRandomId, let replyMessageId = messageIdForGloballyUniqueMessageId(replyToRandomId) {
attributes.append(ReplyMessageAttribute(messageId: replyMessageId)) attributes.append(ReplyMessageAttribute(messageId: replyMessageId))
} }
return (StoreMessage(id: MessageId(peerId: peerId, namespace: Namespaces.Message.SecretIncoming, id: tagLocalIndex), globallyUniqueId: randomId, timestamp: timestamp, flags: [.Incoming], tags: tagsForStoreMessage(parsedMedia), forwardInfo: nil, authorId: authorId, text: text, attributes: attributes, media: parsedMedia), resources)
var entitiesAttribute: TextEntitiesMessageAttribute?
for attribute in attributes {
if let attribute = attribute as? TextEntitiesMessageAttribute {
entitiesAttribute = attribute
break
}
}
return (StoreMessage(id: MessageId(peerId: peerId, namespace: Namespaces.Message.SecretIncoming, id: tagLocalIndex), globallyUniqueId: randomId, timestamp: timestamp, flags: [.Incoming], tags: tagsForStoreMessage(media: parsedMedia, textEntities: entitiesAttribute?.entities), forwardInfo: nil, authorId: authorId, text: text, attributes: attributes, media: parsedMedia), resources)
case let .decryptedMessageService(randomId, action): case let .decryptedMessageService(randomId, action):
switch action { switch action {
case let .decryptedMessageActionDeleteMessages(randomIds): case let .decryptedMessageActionDeleteMessages(randomIds):

27
TelegramCore/StoreMessage_Telegram.swift
View File

@ -5,12 +5,12 @@ import Foundation
import Postbox import Postbox
#endif #endif
func tagsForStoreMessage(_ medias: [Media]) -> MessageTags { func tagsForStoreMessage(media: [Media], textEntities: [MessageTextEntity]?) -> MessageTags {
var tags = MessageTags() var tags = MessageTags()
for media in medias { for attachment in media {
if let _ = media as? TelegramMediaImage { if let _ = attachment as? TelegramMediaImage {
let _ = tags.insert(.PhotoOrVideo) let _ = tags.insert(.PhotoOrVideo)
} else if let file = media as? TelegramMediaFile { } else if let file = attachment as? TelegramMediaFile {
if file.isSticker || file.isAnimated { if file.isSticker || file.isAnimated {
} else if file.isVideo { } else if file.isVideo {
let _ = tags.insert(.PhotoOrVideo) let _ = tags.insert(.PhotoOrVideo)
@ -21,10 +21,20 @@ func tagsForStoreMessage(_ medias: [Media]) -> MessageTags {
} else { } else {
let _ = tags.insert(.File) let _ = tags.insert(.File)
} }
} else if let webpage = media as? TelegramMediaWebpage, case .Loaded = webpage.content { } else if let webpage = attachment as? TelegramMediaWebpage, case .Loaded = webpage.content {
tags.insert(.WebPage) tags.insert(.WebPage)
} }
} }
if let textEntities = textEntities, !textEntities.isEmpty && !tags.contains(.WebPage) {
for entity in textEntities {
switch entity.type {
case .Url, .Email:
tags.insert(.WebPage)
default:
break
}
}
}
return tags return tags
} }
@ -351,8 +361,11 @@ extension StoreMessage {
attributes.append(EditedMessageAttribute(date: editDate)) attributes.append(EditedMessageAttribute(date: editDate))
} }
var entitiesAttribute: TextEntitiesMessageAttribute?
if let entities = entities, !entities.isEmpty { if let entities = entities, !entities.isEmpty {
attributes.append(TextEntitiesMessageAttribute(entities: messageTextEntitiesFromApiEntities(entities))) let attribute = TextEntitiesMessageAttribute(entities: messageTextEntitiesFromApiEntities(entities))
entitiesAttribute = attribute
attributes.append(attribute)
} }
var storeFlags = StoreMessageFlags() var storeFlags = StoreMessageFlags()
@ -372,7 +385,7 @@ extension StoreMessage {
storeFlags.insert(.Personal) storeFlags.insert(.Personal)
} }
self.init(id: MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: id), globallyUniqueId: nil, timestamp: date, flags: storeFlags, tags: tagsForStoreMessage(medias), forwardInfo: forwardInfo, authorId: authorId, text: messageText, attributes: attributes, media: medias) self.init(id: MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: id), globallyUniqueId: nil, timestamp: date, flags: storeFlags, tags: tagsForStoreMessage(media: medias, textEntities: entitiesAttribute?.entities), forwardInfo: forwardInfo, authorId: authorId, text: messageText, attributes: attributes, media: medias)
case .messageEmpty: case .messageEmpty:
return nil return nil
case let .messageService(flags, id, fromId, toId, replyToMsgId, date, action): case let .messageService(flags, id, fromId, toId, replyToMsgId, date, action):