ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-28 14:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Peter Iakovlev
2018-02-26 15:13:43 +04:00
parent 89a2a1c47f
commit fa8633d2ba
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Postbox/Message.swift
View File

@@ -459,10 +459,6 @@ public extension MessageAttribute {
public struct MessageGroupInfo: Equatable {
public let stableId: UInt32
public init(stableId: UInt32) {
self.stableId = stableId
}
public static func ==(lhs: MessageGroupInfo, rhs: MessageGroupInfo) -> Bool {
return lhs.stableId == rhs.stableId
}
@@ -510,11 +506,6 @@ public final class Message {
self.peers = peers
self.associatedMessages = associatedMessages
self.associatedMessageIds = associatedMessageIds
if media.isEmpty && text.isEmpty {
var bp:Int = 0
bp += 1
}
}
public func withUpdatedFlags(_ flags: MessageFlags) -> Message {

9
Postbox/MessageHistoryTable.swift
View File

@@ -1133,9 +1133,7 @@ final class MessageHistoryTable: Table {
let (_, lowerGroup) = lowerEntryAndGroup
let (_, upperGroup) = upperEntryAndGroup
NSLog("\(lowerEntryAndGroup.1), \(upperEntryAndGroup.1)")
switch (lowerEntryAndGroup.1, upperEntryAndGroup.1) {
switch (lowerGroup, upperGroup) {
case (.none, .none):
groupInfo = self.generateNewGroupInfo()
case (.none, .otherGroup):
@@ -1961,13 +1959,16 @@ final class MessageHistoryTable: Table {
self.valueBox.remove(self.table, key: self.key(index))
//TODO changed updatedIndex -> index
#if os(iOS)
assert(false)
#endif
let updatedGroupInfo = self.updateMovingGroupInfo(index: index, updatedIndex: index, groupingKey: previousMessage.groupingKey, previousInfo: previousMessage.groupInfo, updatedGroupInfos: &updatedGroupInfos)
if let updatedGroupInfo = updatedGroupInfo, previousMessage.groupInfo != updatedGroupInfo {
updatedGroupInfos[index.id] = updatedGroupInfo
}
let updatedMessage = IntermediateMessage(stableId: previousMessage.stableId, stableVersion: previousMessage.stableVersion + 1, id: previousMessage.id, globallyUniqueId: previousMessage.globallyUniqueId, groupingKey: previousMessage.groupingKey, groupInfo: updatedGroupInfo, timestamp: timestamp, flags: previousMessage.flags, tags: previousMessage.tags, globalTags: previousMessage.globalTags, localTags: previousMessage.localTags, forwardInfo: previousMessage.forwardInfo, authorId: previousMessage.authorId, text: previousMessage.text, attributesData: previousMessage.attributesData, embeddedMediaData: previousMessage.embeddedMediaData, referencedMedia: previousMessage.referencedMedia)
self.storeIntermediateMessage(updatedMessage, sharedKey: self.key(index))
self.storeIntermediateMessage(updatedMessage, sharedKey: self.key(updatedIndex))
let tags = previousMessage.tags.rawValue
if tags != 0 {