This commit is contained in:
spaced4ndy
2025-07-21 18:20:50 +04:00
parent ec8d651b40
commit abbd48b334
2 changed files with 15 additions and 2 deletions
+8 -2
View File
@@ -731,7 +731,7 @@ struct ChatView: View {
case let .grouped(items, _, _, _, _, _, _, _): items.boxedValue.last!.item
}
return Group {
if case .chatBanner = ci.content {
if ci.isChatBanner {
ChatBannerView(chat: chat)
.padding(.bottom, 90)
.padding(.top, 8)
@@ -1494,8 +1494,14 @@ struct ChatView: View {
}
var body: some View {
let last = isLastItem ? im.reversedChatItems.last : nil
let listItem = merged.newest()
let last = (
(listItem.nextItem?.isChatBanner ?? false)
? listItem.item
: isLastItem
? im.reversedChatItems.last
: nil
)
let item = listItem.item
let range: ClosedRange<Int>? = if case let .grouped(_, _, _, rangeInReversed, _, _, _, _) = merged {
rangeInReversed.boxedValue
+7
View File
@@ -3021,6 +3021,13 @@ public struct ChatItem: Identifiable, Decodable, Hashable {
(content.msgContent != nil && !meta.isLive) || meta.itemDeleted != nil || isDeletedContent || mergeCategory != nil || showLocalDelete
}
public var isChatBanner: Bool {
switch content {
case .chatBanner: true
default: false
}
}
public static func getSample (_ id: Int64, _ dir: CIDirection, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, quotedItem: CIQuote? = nil, file: CIFile? = nil, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, deletable: Bool = true, editable: Bool = true) -> ChatItem {
ChatItem(
chatDir: dir,