Mastodon
/
metatext-app-ios-iphone-ipad
mirror of https://github.com/metabolist/metatext
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve reply indicator logic

This commit is contained in:
Justin Mazzocchi 2020-10-24 23:18:35 -07:00
parent 8ad01a6ecf
commit 3a1d8d4470
No known key found for this signature in database
GPG Key ID: E223E6937AAFB01C
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DB/Sources/DB/Content/ContextItemsInfo.swift
View File

@ -28,16 +28,26 @@ extension ContextItemsInfo {
section.filtered(regularExpression: regularExpression) section.filtered(regularExpression: regularExpression)
.enumerated() .enumerated()
.map { index, statusInfo in .map { index, statusInfo in
let isReplyInContext = index > 0 let isContextParent = statusInfo.record.id == parent.record.id
&& section[index - 1].record.id == statusInfo.record.inReplyToId let isReplyInContext: Bool
let hasReplyFollowing = section.count > index + 1
&& section[index + 1].record.inReplyToId == statusInfo.record.id if isContextParent {
isReplyInContext = !ancestors.isEmpty
&& statusInfo.record.inReplyToId == ancestors.last?.record.id
} else {
isReplyInContext = index > 0
&& section[index - 1].record.id == statusInfo.record.inReplyToId
}
let hasReplyFollowing = (section.count > index + 1
&& section[index + 1].record.inReplyToId == statusInfo.record.id)
|| (statusInfo == ancestors.last && parent.record.inReplyToId == statusInfo.record.id)
return .status( return .status(
.init(info: statusInfo), .init(info: statusInfo),
.init(showContentToggled: statusInfo.showContentToggled, .init(showContentToggled: statusInfo.showContentToggled,
showAttachmentsToggled: statusInfo.showAttachmentsToggled, showAttachmentsToggled: statusInfo.showAttachmentsToggled,
isContextParent: statusInfo.record.id == parent.record.id, isContextParent: isContextParent,
isReplyInContext: isReplyInContext, isReplyInContext: isReplyInContext,
hasReplyFollowing: hasReplyFollowing)) hasReplyFollowing: hasReplyFollowing))
} }