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

Merge branch 'master' of gitlab.com:peter-iakovlev/postbox

Browse Source
This commit is contained in:
overtake
2019-06-11 17:21:36 +02:00
parent 43bd3a9bce d57b727960
commit 534443c710
4 changed files with 62 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Postbox/MutableBasicPeerView.swift Normal file
View File

@@ -0,0 +1,33 @@
import Foundation
final class MutableBasicPeerView: MutablePostboxView {
private let peerId: PeerId
fileprivate var peer: Peer?
init(postbox: Postbox, peerId: PeerId) {
self.peerId = peerId
self.peer = postbox.peerTable.get(peerId)
}
func replay(postbox: Postbox, transaction: PostboxTransaction) -> Bool {
var updated = false
if let peer = transaction.currentUpdatedPeers[self.peerId] {
self.peer = peer
updated = true
}
return updated
}
func immutableView() -> PostboxView {
return BasicPeerView(self)
}
}
public final class BasicPeerView: PostboxView {
public let peer: Peer?
init(_ view: MutableBasicPeerView) {
self.peer = view.peer
}
}

20
Postbox/PeerView.swift
View File

@@ -17,6 +17,7 @@ public struct PeerViewComponents: OptionSet {
final class MutablePeerView: MutablePostboxView {
let peerId: PeerId
let contactPeerId: PeerId
let components: PeerViewComponents
var notificationSettings: PeerNotificationSettings?
var cachedData: CachedPeerData?
@@ -28,8 +29,6 @@ final class MutablePeerView: MutablePostboxView {
init(postbox: Postbox, peerId: PeerId, components: PeerViewComponents) {
self.components = components
let cachedData = postbox.cachedPeerDataTable.get(peerId)
let peerIsContact = postbox.contactsTable.isContact(peerId: peerId)
let getPeer: (PeerId) -> Peer? = { peerId in
return postbox.peerTable.get(peerId)
@@ -40,16 +39,21 @@ final class MutablePeerView: MutablePostboxView {
}
self.peerId = peerId
self.cachedData = cachedData
self.peerIsContact = peerIsContact
self.groupId = postbox.chatListIndexTable.get(peerId: peerId).inclusion.groupId
var peerIds = Set<PeerId>()
var messageIds = Set<MessageId>()
peerIds.insert(peerId)
if let peer = getPeer(peerId), let associatedPeerId = peer.associatedPeerId {
peerIds.insert(associatedPeerId)
self.contactPeerId = associatedPeerId
self.peerIsContact = postbox.contactsTable.isContact(peerId: associatedPeerId)
} else {
self.contactPeerId = peerId
}
if let cachedData = cachedData {
self.cachedData = postbox.cachedPeerDataTable.get(contactPeerId)
self.peerIsContact = postbox.contactsTable.isContact(peerId: self.contactPeerId)
if let cachedData = self.cachedData {
peerIds.formUnion(cachedData.peerIds)
messageIds.formUnion(cachedData.messageIds)
}
@@ -102,7 +106,7 @@ final class MutablePeerView: MutablePostboxView {
var updateMessages = false
if let cachedData = updatedCachedPeerData[self.peerId], self.cachedData == nil || !self.cachedData!.isEqual(to: cachedData) {
if let cachedData = updatedCachedPeerData[self.contactPeerId], self.cachedData == nil || !self.cachedData!.isEqual(to: cachedData) {
if self.cachedData?.messageIds != cachedData.messageIds {
updateMessages = true
}
@@ -227,12 +231,12 @@ final class MutablePeerView: MutablePostboxView {
if let replaceContactPeerIds = replaceContactPeerIds {
if self.peerIsContact {
if !replaceContactPeerIds.contains(self.peerId) {
if !replaceContactPeerIds.contains(self.contactPeerId) {
self.peerIsContact = false
updated = true
}
} else {
if replaceContactPeerIds.contains(self.peerId) {
if replaceContactPeerIds.contains(self.contactPeerId) {
self.peerIsContact = true
updated = true
}

11
Postbox/Views.swift
View File

@@ -26,6 +26,7 @@ public enum PostboxViewKey: Hashable {
case synchronizeGroupMessageStats
case peerNotificationSettingsBehaviorTimestampView
case peerChatInclusion(PeerId)
case basicPeer(PeerId)
public var hashValue: Int {
switch self {
@@ -79,6 +80,8 @@ public enum PostboxViewKey: Hashable {
return 15
case let .peerChatInclusion(peerId):
return peerId.hashValue
case let .basicPeer(peerId):
return peerId.hashValue
}
}
@@ -234,6 +237,12 @@ public enum PostboxViewKey: Hashable {
} else {
return false
}
case let .basicPeer(id):
if case .basicPeer(id) = rhs {
return true
} else {
return false
}
}
}
}
@@ -290,5 +299,7 @@ func postboxViewForKey(postbox: Postbox, key: PostboxViewKey) -> MutablePostboxV
return MutablePeerNotificationSettingsBehaviorTimestampView(postbox: postbox)
case let .peerChatInclusion(peerId):
return MutablePeerChatInclusionView(postbox: postbox, peerId: peerId)
case let .basicPeer(peerId):
return MutableBasicPeerView(postbox: postbox, peerId: peerId)
}
}

6
Postbox_Xcode.xcodeproj/project.pbxproj
View File

@@ -272,6 +272,8 @@
D0BEAF6E1E54B77900BD963D /* AccountManagerRecordTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEAF6C1E54B77900BD963D /* AccountManagerRecordTable.swift */; };
D0BEAF701E54BC1E00BD963D /* AccountRecordsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEAF6F1E54BC1E00BD963D /* AccountRecordsView.swift */; };
D0BEAF711E54BC1E00BD963D /* AccountRecordsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BEAF6F1E54BC1E00BD963D /* AccountRecordsView.swift */; };
D0BFE51D22AFD5AF00143D08 /* MutableBasicPeerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BFE51C22AFD5AF00143D08 /* MutableBasicPeerView.swift */; };
D0BFE51E22AFD5AF00143D08 /* MutableBasicPeerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0BFE51C22AFD5AF00143D08 /* MutableBasicPeerView.swift */; };
D0C07F6A1B67DB4800966E43 /* SwiftSignalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0C07F691B67DB4800966E43 /* SwiftSignalKit.framework */; };
D0C0B5AB1EE1AB08000F4D2C /* ReverseAssociatedPeerTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C0B5AA1EE1AB08000F4D2C /* ReverseAssociatedPeerTable.swift */; };
D0C0B5AC1EE1AB08000F4D2C /* ReverseAssociatedPeerTable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0C0B5AA1EE1AB08000F4D2C /* ReverseAssociatedPeerTable.swift */; };
@@ -547,6 +549,7 @@
D0BEAF691E54B5FB00BD963D /* AccountManagerMetadataTable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountManagerMetadataTable.swift; sourceTree = "<group>"; };
D0BEAF6C1E54B77900BD963D /* AccountManagerRecordTable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountManagerRecordTable.swift; sourceTree = "<group>"; };
D0BEAF6F1E54BC1E00BD963D /* AccountRecordsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountRecordsView.swift; sourceTree = "<group>"; };
D0BFE51C22AFD5AF00143D08 /* MutableBasicPeerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MutableBasicPeerView.swift; sourceTree = "<group>"; };
D0C07F691B67DB4800966E43 /* SwiftSignalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SwiftSignalKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
D0C0B5AA1EE1AB08000F4D2C /* ReverseAssociatedPeerTable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReverseAssociatedPeerTable.swift; sourceTree = "<group>"; };
D0C26D7D1FE3FA4E004ABF18 /* PinnedItemId.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinnedItemId.swift; sourceTree = "<group>"; };
@@ -934,6 +937,7 @@
D0CA8E47227208FE008A74C3 /* SynchronizeGroupMessageStatsView.swift */,
D06CA13122772DE40094E707 /* PeerNotificationSettingsBehaviorTimestampView.swift */,
D0E1199F229834BC008CAE3A /* MutablePeerChatInclusionView.swift */,
D0BFE51C22AFD5AF00143D08 /* MutableBasicPeerView.swift */,
);
name = Views;
sourceTree = "<group>";
@@ -1295,6 +1299,7 @@
D0F7B1DD1E045C6A007EB8A5 /* PeerChatInterfaceStateTable.swift in Sources */,
D098C6F21D7E1201007784E4 /* Database.swift in Sources */,
D07E7B49224E562C00BB053B /* PostboxUpgrade_21to22.swift in Sources */,
D0BFE51E22AFD5AF00143D08 /* MutableBasicPeerView.swift in Sources */,
D0B844061DAB91B5005F29E1 /* MediaResourceStatus.swift in Sources */,
D0F7B1DB1E045C6A007EB8A5 /* ItemCollectionInfoTable.swift in Sources */,
D0F7B1D41E045C6A007EB8A5 /* PeerPresenceTable.swift in Sources */,
@@ -1558,6 +1563,7 @@
D0D510F41D63BA8400A97B8A /* PostboxTransaction.swift in Sources */,
D0977F9C1B822DB4009994B2 /* ValueBox.swift in Sources */,
D07516441B2D9CEF00AE42E0 /* sqlite3.c in Sources */,
D0BFE51D22AFD5AF00143D08 /* MutableBasicPeerView.swift in Sources */,
D001388620BD942B007C9721 /* PostboxUpgrade_16to17.swift in Sources */,
D0D511001D64A58900A97B8A /* IpcPipe.swift in Sources */,
D01C7EDE1EF73F71008305F1 /* MessageHistoryTextIndexTable.swift in Sources */,