Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #621 from mastodon/fix-thread-logic 

Fix thread logic to use the original order
This commit is contained in:
CMK 2022-11-18 16:06:10 +08:00 committed by GitHub
parent 0b0252fca2 b5d883865d
commit 87d6fe9fc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Mastodon/Scene/Thread/ThreadViewModel+LoadThreadState.swift
View File

@ -92,19 +92,27 @@ extension ThreadViewModel.LoadThreadState {
from: response.value.ancestors from: response.value.ancestors
) )
) )
// deprecated: Tree mode replies
// viewModel.mastodonStatusThreadViewModel.appendDescendant(
// domain: threadContext.domain,
// nodes: MastodonStatusThreadViewModel.Node.children(
// of: threadContext.statusID,
// from: response.value.descendants
// )
// )
// new: the same order from API
viewModel.mastodonStatusThreadViewModel.appendDescendant( viewModel.mastodonStatusThreadViewModel.appendDescendant(
domain: threadContext.domain, domain: threadContext.domain,
nodes: MastodonStatusThreadViewModel.Node.children( nodes: response.value.descendants.map { status in
of: threadContext.statusID, return .init(statusID: status.id, children: [])
from: response.value.descendants }
)
) )
} catch { } catch {
logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch status context for \(threadContext.statusID) fail: \(error.localizedDescription)") logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public): fetch status context for \(threadContext.statusID) fail: \(error.localizedDescription)")
await enter(state: Fail.self) await enter(state: Fail.self)
} }
} // end Task
}
} }
} }

126
Mastodon/Scene/Thread/ThreadViewModel.swift
View File

@ -28,12 +28,6 @@ class ThreadViewModel {
let context: AppContext let context: AppContext
let authContext: AuthContext let authContext: AuthContext
let mastodonStatusThreadViewModel: MastodonStatusThreadViewModel let mastodonStatusThreadViewModel: MastodonStatusThreadViewModel
// let cellFrameCache = NSCache<NSNumber, NSValue>()
// let existStatusFetchedResultsController: StatusFetchedResultsController
// weak var contentOffsetAdjustableTimelineViewControllerDelegate: ContentOffsetAdjustableTimelineViewControllerDelegate?
// weak var tableView: UITableView?
// output // output
var diffableDataSource: UITableViewDiffableDataSource<StatusSection, StatusItem>? var diffableDataSource: UITableViewDiffableDataSource<StatusSection, StatusItem>?
@ -62,12 +56,6 @@ class ThreadViewModel {
self.authContext = authContext self.authContext = authContext
self.root = optionalRoot self.root = optionalRoot
self.mastodonStatusThreadViewModel = MastodonStatusThreadViewModel(context: context) self.mastodonStatusThreadViewModel = MastodonStatusThreadViewModel(context: context)
// self.rootNode = CurrentValueSubject(optionalStatus.flatMap { RootNode(domain: $0.domain, statusID: $0.id, replyToID: $0.inReplyToID) })
// self.rootItem = CurrentValueSubject(optionalStatus.flatMap { Item.root(statusObjectID: $0.objectID, attribute: Item.StatusAttribute()) })
// self.existStatusFetchedResultsController = StatusFetchedResultsController(managedObjectContext: context.managedObjectContext, domain: nil, additionalTweetPredicate: nil)
// self.navigationBarTitle = CurrentValueSubject(
// optionalStatus.flatMap { L10n.Scene.Thread.title($0.author.displayNameWithFallback) })
// self.navigationBarTitleEmojiMeta = CurrentValueSubject(optionalStatus.flatMap { $0.author.emojis.asDictionary } ?? [:])
// end init // end init
ManagedObjectObserver.observe(context: context.managedObjectContext) ManagedObjectObserver.observe(context: context.managedObjectContext)
@ -85,24 +73,6 @@ class ThreadViewModel {
}) })
.store(in: &disposeBag) .store(in: &disposeBag)
// // bind fetcher domain
// context.authenticationService.activeMastodonAuthenticationBox
// .receive(on: RunLoop.main)
// .sink { [weak self] box in
// guard let self = self else { return }
// self.existStatusFetchedResultsController.domain.value = box?.domain
// }
// .store(in: &disposeBag)
//
// rootNode
// .receive(on: DispatchQueue.main)
// .sink { [weak self] rootNode in
// guard let self = self else { return }
// guard rootNode != nil else { return }
// self.loadThreadStateMachine.enter(LoadThreadState.Loading.self)
// }
// .store(in: &disposeBag)
$root $root
.receive(on: DispatchQueue.main) .receive(on: DispatchQueue.main)
.sink { [weak self] root in .sink { [weak self] root in
@ -125,102 +95,6 @@ class ThreadViewModel {
}() }()
} }
.store(in: &disposeBag) .store(in: &disposeBag)
// rootItem
// .receive(on: DispatchQueue.main)
// .sink { [weak self] rootItem in
// guard let self = self else { return }
// guard case let .root(objectID, _) = rootItem else { return }
// self.context.managedObjectContext.perform {
// guard let status = self.context.managedObjectContext.object(with: objectID) as? Status else {
// return
// }
// self.rootItemObserver = ManagedObjectObserver.observe(object: status)
// .receive(on: DispatchQueue.main)
// .sink(receiveCompletion: { _ in
// // do nothing
// }, receiveValue: { [weak self] change in
// guard let self = self else { return }
// switch change.changeType {
// case .delete:
// self.rootItem.value = nil
// default:
// break
// }
// })
// }
// }
// .store(in: &disposeBag)
//
// ancestorNodes
// .receive(on: DispatchQueue.main)
// .compactMap { [weak self] nodes -> [Item]? in
// guard let self = self else { return nil }
// guard !nodes.isEmpty else { return [] }
//
// guard let diffableDataSource = self.diffableDataSource else { return nil }
// let oldSnapshot = diffableDataSource.snapshot()
// var oldSnapshotAttributeDict: [NSManagedObjectID : Item.StatusAttribute] = [:]
// for item in oldSnapshot.itemIdentifiers {
// switch item {
// case .reply(let objectID, let attribute):
// oldSnapshotAttributeDict[objectID] = attribute
// default:
// break
// }
// }
//
// var items: [Item] = []
// for node in nodes {
// let attribute = oldSnapshotAttributeDict[node.statusObjectID] ?? Item.StatusAttribute()
// items.append(Item.reply(statusObjectID: node.statusObjectID, attribute: attribute))
// }
//
// return items.reversed()
// }
// .assign(to: \.value, on: ancestorItems)
// .store(in: &disposeBag)
//
// descendantNodes
// .receive(on: DispatchQueue.main)
// .compactMap { [weak self] nodes -> [Item]? in
// guard let self = self else { return nil }
// guard !nodes.isEmpty else { return [] }
//
// guard let diffableDataSource = self.diffableDataSource else { return nil }
// let oldSnapshot = diffableDataSource.snapshot()
// var oldSnapshotAttributeDict: [NSManagedObjectID : Item.StatusAttribute] = [:]
// for item in oldSnapshot.itemIdentifiers {
// switch item {
// case .leaf(let objectID, let attribute):
// oldSnapshotAttributeDict[objectID] = attribute
// default:
// break
// }
// }
//
// var items: [Item] = []
//
// func buildThread(node: LeafNode) {
// let attribute = oldSnapshotAttributeDict[node.objectID] ?? Item.StatusAttribute()
// items.append(Item.leaf(statusObjectID: node.objectID, attribute: attribute))
// // only expand the first child
// if let firstChild = node.children.first {
// if !node.isChildrenExpanded {
// items.append(Item.leafBottomLoader(statusObjectID: node.objectID))
// } else {
// buildThread(node: firstChild)
// }
// }
// }
//
// for node in nodes {
// buildThread(node: node)
// }
// return items
// }
// .assign(to: \.value, on: descendantItems)
// .store(in: &disposeBag)
} }
deinit { deinit {