keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

WIP: disappearing messages for control messages

Browse Source
pull/941/head
ryanzhao 2 years ago
parent dd13125a90
commit 1c4981cb5d
8 changed files with 61 additions and 66 deletions
Show Stats Download Patch File Download Diff File

59
Session/Conversations/ConversationVC+Interaction.swift
Unescape Escape View File

@ -25,29 +25,13 @@ extension ConversationVC:
// Don't take the user to settings for unapproved threads
guard viewModel.threadData.threadRequiresApproval == false else { return }
openSettings()
openSettingsFromTitleView()
}
@objc func openSettings() {
@objc func openSettingsFromTitleView() {
switch self.titleView.currentLabelType {
case.empty, .notificationSettings, .userCount:
let viewController = SessionTableViewController(viewModel: ThreadSettingsViewModel(
threadId: self.viewModel.threadData.threadId,
threadVariant: self.viewModel.threadData.threadVariant,
didTriggerSearch: { [weak self] in
DispatchQueue.main.async {
self?.showSearchUI()
self?.popAllConversationSettingsViews {
// Note: Without this delay the search bar doesn't show
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self?.searchController.uiSearchController.searchBar.becomeFirstResponder()
}
}
}
}
)
)
navigationController?.pushViewController(viewController, animated: true)
openSettings()
break
case .disappearingMessageSetting:
let viewController = SessionTableViewController(viewModel: ThreadDisappearingMessagesViewModel(
@ -61,6 +45,26 @@ extension ConversationVC:
break
}
}
@objc func openSettings() {
let viewController = SessionTableViewController(viewModel: ThreadSettingsViewModel(
threadId: self.viewModel.threadData.threadId,
threadVariant: self.viewModel.threadData.threadVariant,
didTriggerSearch: { [weak self] in
DispatchQueue.main.async {
self?.showSearchUI()
self?.popAllConversationSettingsViews {
// Note: Without this delay the search bar doesn't show
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self?.searchController.uiSearchController.searchBar.becomeFirstResponder()
}
}
}
}
)
)
navigationController?.pushViewController(viewController, animated: true)
}
// MARK: - ScrollToBottomButtonDelegate
@ -452,13 +456,6 @@ extension ConversationVC:
body: text,
timestampMs: sentTimestampMs,
hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: text),
// No matter the disappearing message type is D.A.R or D.A.S, it is the same on the sender's side
expiresInSeconds: try? DisappearingMessagesConfiguration
.select(.durationSeconds)
.filter(id: threadId)
.filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
.asRequest(of: TimeInterval.self)
.fetchOne(db),
linkPreviewUrl: linkPreviewDraft?.urlString
).inserted(db)
@ -575,13 +572,7 @@ extension ConversationVC:
variant: .standardOutgoing,
body: text,
timestampMs: sentTimestampMs,
hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: text),
expiresInSeconds: try? DisappearingMessagesConfiguration
.select(.durationSeconds)
.filter(id: threadId)
.filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
.asRequest(of: TimeInterval.self)
.fetchOne(db)
hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: text)
).inserted(db)
try MessageSender.send(

2
Session/Conversations/Settings/ThreadDisappearingMessagesViewModel.swift
Unescape Escape View File

@ -239,7 +239,7 @@ class ThreadDisappearingMessagesViewModel: SessionTableViewModel<ThreadDisappear
SectionModel(
model: .timer,
elements: DisappearingMessagesConfiguration
.validDurationsSeconds(currentSelection.type ?? .disappearAfterRead)
.validDurationsSeconds(currentSelection.type ?? .disappearAfterSend)
.map { duration in
let title: String = duration.formatted(format: .long)

8
Session/Notifications/AppNotifications.swift
Unescape Escape View File

@ -533,13 +533,7 @@ class NotificationActionHandler {
variant: .standardOutgoing,
body: replyText,
timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000)),
hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: replyText),
expiresInSeconds: try? DisappearingMessagesConfiguration
.select(.durationSeconds)
.filter(id: threadId)
.filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
.asRequest(of: TimeInterval.self)
.fetchOne(db)
hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: replyText)
).inserted(db)
try Interaction.markAsRead(

2
SessionMessagingKit/Database/Models/DisappearingMessageConfiguration.swift
Unescape Escape View File

@ -187,6 +187,7 @@ extension DisappearingMessagesConfiguration {
switch type {
case .disappearAfterRead:
return [
60, // TODO: remove this, for test purpose only
(5 * 60),
(1 * 60 * 60),
(12 * 60 * 60),
@ -196,6 +197,7 @@ extension DisappearingMessagesConfiguration {
]
case .disappearAfterSend:
return [
60, // TODO: remove this, for test purpose only
(12 * 60 * 60),
(24 * 60 * 60),
(7 * 24 * 60 * 60),

29
SessionMessagingKit/Database/Models/Interaction.swift
Unescape Escape View File

@ -102,15 +102,27 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu
switch self {
case .standardIncoming: return true
case .infoCall: return true
case .infoDisappearingMessagesUpdate, .infoScreenshotNotification, .infoMediaSavedNotification: return true
case .standardOutgoing, .standardIncomingDeleted: return false
case .infoClosedGroupCreated, .infoClosedGroupUpdated, .infoClosedGroupCurrentUserLeft,
.infoDisappearingMessagesUpdate, .infoScreenshotNotification, .infoMediaSavedNotification,
.infoMessageRequestAccepted:
return false
}
}
fileprivate var shouldFollowDisappearingMessagesConfiguration: Bool {
switch self {
case .standardIncoming, .standardOutgoing,
.infoCall,
.infoDisappearingMessagesUpdate,
.infoScreenshotNotification, .infoMediaSavedNotification:
return true
default: return false
}
}
}
/// The `id` value is auto incremented by the database, if the `Interaction` hasn't been inserted into
@ -170,12 +182,12 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu
public let hasMention: Bool
/// The number of seconds until this message should expire
public let expiresInSeconds: TimeInterval?
public var expiresInSeconds: TimeInterval?
/// The timestamp in milliseconds since 1970 at which this messages expiration timer started counting
/// down (this is stored in order to allow the `expiresInSeconds` value to be updated before a
/// message has expired)
public let expiresStartedAtMs: Double?
public var expiresStartedAtMs: Double?
/// This value is the url for the link preview for this interaction
///
@ -320,6 +332,17 @@ public struct Interaction: Codable, Identifiable, Equatable, FetchableRecord, Mu
// Automatically mark interactions which can't be unread as read so the unread count
// isn't impacted
self.wasRead = (self.wasRead || !self.variant.canBeUnread)
// Automatically add disapeparing messages configuration
if self.variant.shouldFollowDisappearingMessagesConfiguration,
let disappearingMessagesConfiguration = try? DisappearingMessagesConfiguration.fetchOne(db, id: self.threadId),
disappearingMessagesConfiguration.isEnabled
{
self.expiresInSeconds = disappearingMessagesConfiguration.durationSeconds
if disappearingMessagesConfiguration.type == .disappearAfterSend {
self.expiresStartedAtMs = Double(self.timestampMs)
}
}
}
public func aroundInsert(_ db: Database, insert: () throws -> InsertionSuccess) throws {

14
SessionMessagingKit/Sending & Receiving/Message Handling/MessageReceiver+VisibleMessages.swift
Unescape Escape View File

@ -91,14 +91,6 @@ extension MessageReceiver {
if let interactionId: Int64 = try handleEmojiReactIfNeeded(db, message: message, associatedWithProto: proto, sender: sender, messageSentTimestamp: messageSentTimestamp, openGroupId: openGroupId, thread: thread) {
return interactionId
}
// Retrieve the disappearing messages config to set the 'expiresInSeconds' value
// accoring to the config
let disappearingMessagesConfiguration: DisappearingMessagesConfiguration = (try? thread.disappearingMessagesConfiguration.fetchOne(db))
.defaulting(to: DisappearingMessagesConfiguration.defaultWith(thread.id))
let expiresStartedAtMs: Double? = (disappearingMessagesConfiguration.isEnabled && disappearingMessagesConfiguration.type == .disappearAfterSend) ? Double(message.sentTimestamp ?? 0) : nil
// Try to insert the interaction
//
// Note: There are now a number of unique constraints on the database which
@ -121,12 +113,6 @@ extension MessageReceiver {
body: message.text,
quoteAuthorId: dataMessage.quote?.author
),
// Note: Ensure we don't ever expire open group messages
expiresInSeconds: (disappearingMessagesConfiguration.isEnabled && message.openGroupServerMessageId == nil ?
disappearingMessagesConfiguration.durationSeconds :
nil
),
expiresStartedAtMs: expiresStartedAtMs,
// OpenGroupInvitations are stored as LinkPreview's in the database
linkPreviewUrl: (message.linkPreview?.url ?? message.openGroupInvitation?.url),
// Keep track of the open group server message ID ↔ message ID relationship

7
SessionMessagingKit/Sending & Receiving/MessageReceiver.swift
Unescape Escape View File

@ -356,6 +356,9 @@ public enum MessageReceiver {
lastChangeTimestampMs: protoLastChangeTimestampMs
)
let expireInSeconds: TimeInterval? = (remoteConfig.isEnabled && message.openGroupServerMessageId == nil) ? remoteConfig.durationSeconds : nil
let expiresStartedAtMs: Double? = (remoteConfig.isEnabled && remoteConfig.type == .disappearAfterSend) ? Double(message.sentTimestamp ?? 0) : nil
_ = try Interaction(
serverHash: nil, // Intentionally null so sync messages are seen as duplicates
threadId: threadId,
@ -368,7 +371,9 @@ public enum MessageReceiver {
),
isPreviousOff: !localConfig.isEnabled
),
timestampMs: protoLastChangeTimestampMs
timestampMs: protoLastChangeTimestampMs,
expiresInSeconds: expireInSeconds,
expiresStartedAtMs: expiresStartedAtMs
).inserted(db)
try remoteConfig.save(db)

6
SessionShareExtension/ThreadPickerVC.swift
Unescape Escape View File

@ -198,12 +198,6 @@ final class ThreadPickerVC: UIViewController, UITableViewDataSource, UITableView
body: body,
timestampMs: Int64(floor(Date().timeIntervalSince1970 * 1000)),
hasMention: Interaction.isUserMentioned(db, threadId: threadId, body: body),
expiresInSeconds: try? DisappearingMessagesConfiguration
.select(.durationSeconds)
.filter(id: threadId)
.filter(DisappearingMessagesConfiguration.Columns.isEnabled == true)
.asRequest(of: TimeInterval.self)
.fetchOne(db),
linkPreviewUrl: (isSharingUrl ? attachments.first?.linkPreviewDraft?.urlString : nil)
).inserted(db)

Write Preview
Loading…
Cancel
Save