From e2384e464f36c906ef43867a6a46b98c5dcff27a Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Fri, 19 May 2023 17:02:56 +1000 Subject: [PATCH 1/3] use snippet function in sql query for message search --- SessionMessagingKit/Shared Models/SessionThreadViewModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift index 793c07aaf..84de62d1f 100644 --- a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift +++ b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift @@ -1075,7 +1075,7 @@ public extension SessionThreadViewModel { \(interaction[.id]) AS \(ViewModel.interactionIdKey), \(interaction[.variant]) AS \(ViewModel.interactionVariantKey), \(interaction[.timestampMs]) AS \(ViewModel.interactionTimestampMsKey), - \(interaction[.body]) AS \(ViewModel.interactionBodyKey), + snippet(\(interactionFullTextSearch), -1, '', '', '...', 15) AS \(ViewModel.interactionBodyKey), \(interaction[.authorId]), IFNULL(\(profile[.nickname]), \(profile[.name])) AS \(ViewModel.authorNameInternalKey), From 66d7226d80941177560a3bf34ea8ef0c44c5b1e4 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 22 May 2023 11:07:22 +1000 Subject: [PATCH 2/3] get rid of truncating calculation and guard constant number --- Session/Shared/FullConversationCell.swift | 62 ++--------------------- 1 file changed, 3 insertions(+), 59 deletions(-) diff --git a/Session/Shared/FullConversationCell.swift b/Session/Shared/FullConversationCell.swift index c2de9ffa3..6d2c22b5f 100644 --- a/Session/Shared/FullConversationCell.swift +++ b/Session/Shared/FullConversationCell.swift @@ -8,11 +8,6 @@ import SessionMessagingKit public final class FullConversationCell: UITableViewCell { public static let unreadCountViewSize: CGFloat = 20 private static let statusIndicatorSize: CGFloat = 14 - // If a message is much too long, it will take forever to calculate its width and - // cause the app to be frozen. So if a search result string is longer than 100 - // characters, we assume it cannot be shown within one line and need to be truncated - // to avoid the calculation. - private static let maxApproxCharactersCanBeShownInOneLine: Int = 100 // MARK: - UI @@ -620,69 +615,18 @@ public final class FullConversationCell: UITableViewCell { } } - // We then want to truncate the content so the first matching term is visible - let startOfSnippet: String.Index = ( - firstMatchRange.map { - max( - mentionReplacedContent.startIndex, - mentionReplacedContent - .index( - $0.lowerBound, - offsetBy: -10, - limitedBy: mentionReplacedContent.startIndex - ) - .defaulting(to: mentionReplacedContent.startIndex) - ) - } ?? - mentionReplacedContent.startIndex - ) - - // This method determines if the content is probably too long and returns the truncated or untruncated - // content accordingly - func truncatingIfNeeded(approxWidth: CGFloat, content: NSAttributedString) -> NSAttributedString { - let approxFullWidth: CGFloat = (approxWidth + profilePictureView.size + (Values.mediumSpacing * 3)) - - guard ((bounds.width - approxFullWidth) < 0) else { return content } - - return content.attributedSubstring( - from: NSRange(startOfSnippet.. NSAttributedString? in guard !authorName.isEmpty else { return nil } let authorPrefix: NSAttributedString = NSAttributedString( - string: "\(authorName): ...", + string: "\(authorName): ", attributes: [ .foregroundColor: textColor ] ) - return authorPrefix - .appending( - truncatingIfNeeded( - approxWidth: ( - authorPrefix.size().width + - ( - result.length > Self.maxApproxCharactersCanBeShownInOneLine ? - bounds.width : - result.size().width - ) - ), - content: result - ) - ) + return authorPrefix.appending(result) } - .defaulting( - to: truncatingIfNeeded( - approxWidth: ( - result.length > Self.maxApproxCharactersCanBeShownInOneLine ? - bounds.width : - result.size().width - ), - content: result - ) - ) + .defaulting(to: result) } } From ffb3f0dd90830a9fb8bfa918eecaf3e040e3d451 Mon Sep 17 00:00:00 2001 From: Ryan Zhao Date: Mon, 22 May 2023 11:21:07 +1000 Subject: [PATCH 3/3] adjust snippet function parameters to get a good looking result --- SessionMessagingKit/Shared Models/SessionThreadViewModel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift index 84de62d1f..aba1a1a42 100644 --- a/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift +++ b/SessionMessagingKit/Shared Models/SessionThreadViewModel.swift @@ -1075,7 +1075,7 @@ public extension SessionThreadViewModel { \(interaction[.id]) AS \(ViewModel.interactionIdKey), \(interaction[.variant]) AS \(ViewModel.interactionVariantKey), \(interaction[.timestampMs]) AS \(ViewModel.interactionTimestampMsKey), - snippet(\(interactionFullTextSearch), -1, '', '', '...', 15) AS \(ViewModel.interactionBodyKey), + snippet(\(interactionFullTextSearch), -1, '', '', '...', 6) AS \(ViewModel.interactionBodyKey), \(interaction[.authorId]), IFNULL(\(profile[.nickname]), \(profile[.name])) AS \(ViewModel.authorNameInternalKey),