mirror of https://github.com/oxen-io/session-ios
Further work on unit tests (and a couple of bug fixes found when testing)
Removed a couple remaining TODOs Added 'standardUserDefaults' to the 'Dependencies' type Tweaked the OpenGroupAPI to only update the 'lastOpen' timestamp if it successfully polls Refactored a couple of methods in the ConversationViewItem into swift so we can clean up the OpenGroupAPI more Updated the OpenGroupAPI so it no longer has static variables for state (shifted to the OpenGroupManager and made them instance variables) Fixed an encoding issue with the Capabilities.Capabilitypull/592/head
Morgan Pretty
3 years ago
parent
f9468219d9
commit
17a9e510c5
@ -0,0 +1,126 @@
|
|||||||
|
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
import SessionSnodeKit
|
||||||
|
import SessionMessagingKit
|
||||||
|
|
||||||
|
extension ConversationViewItem {
|
||||||
|
func deleteLocallyAction() {
|
||||||
|
guard let message: TSMessage = self.interaction as? TSMessage else { return }
|
||||||
|
|
||||||
|
Storage.write { transaction in
|
||||||
|
MessageInvalidator.invalidate(message, with: transaction)
|
||||||
|
message.remove(with: transaction)
|
||||||
|
|
||||||
|
if message.interactionType() == .outgoingMessage {
|
||||||
|
Storage.shared.cancelPendingMessageSendJobIfNeeded(for: message.timestamp, using: transaction)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func deleteRemotelyAction() {
|
||||||
|
guard let message: TSMessage = self.interaction as? TSMessage else { return }
|
||||||
|
|
||||||
|
if isGroupThread {
|
||||||
|
guard let groupThread: TSGroupThread = message.thread as? TSGroupThread else { return }
|
||||||
|
|
||||||
|
// Only allow deletion on incoming and outgoing messages
|
||||||
|
guard message.interactionType() == .incomingMessage || message.interactionType() == .outgoingMessage else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if groupThread.isOpenGroup {
|
||||||
|
// Make sure it's an open group message and get the open group
|
||||||
|
guard message.isOpenGroupMessage, let uniqueId: String = groupThread.uniqueId, let openGroup: OpenGroup = Storage.shared.getOpenGroup(for: uniqueId) else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// If it's an incoming message the user must have moderator status
|
||||||
|
if message.interactionType() == .incomingMessage {
|
||||||
|
guard let userPublicKey: String = Storage.shared.getUserPublicKey() else { return }
|
||||||
|
|
||||||
|
if !OpenGroupManager.isUserModeratorOrAdmin(userPublicKey, for: openGroup.room, on: openGroup.server) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete the message
|
||||||
|
OpenGroupAPI.messageDelete(message.openGroupServerMessageID, in: openGroup.room, on: openGroup.server)
|
||||||
|
.catch { _ in
|
||||||
|
// Roll back
|
||||||
|
message.save()
|
||||||
|
}
|
||||||
|
.retainUntilComplete()
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
guard let serverHash: String = message.serverHash else { return }
|
||||||
|
|
||||||
|
let groupPublicKey: String = LKGroupUtilities.getDecodedGroupID(groupThread.groupModel.groupId)
|
||||||
|
|
||||||
|
SnodeAPI.deleteMessage(publicKey: groupPublicKey, serverHashes: [serverHash])
|
||||||
|
.catch { _ in
|
||||||
|
// Roll back
|
||||||
|
message.save()
|
||||||
|
}
|
||||||
|
.retainUntilComplete()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
guard let contactThread: TSContactThread = message.thread as? TSContactThread, let serverHash: String = message.serverHash else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
SnodeAPI.deleteMessage(publicKey: contactThread.contactSessionID(), serverHashes: [serverHash])
|
||||||
|
.catch { _ in
|
||||||
|
// Roll back
|
||||||
|
message.save()
|
||||||
|
}
|
||||||
|
.retainUntilComplete()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove this after the unsend request is enabled
|
||||||
|
func deleteAction() {
|
||||||
|
Storage.write { transaction in
|
||||||
|
self.interaction.remove(with: transaction)
|
||||||
|
|
||||||
|
if self.interaction.interactionType() == .outgoingMessage {
|
||||||
|
Storage.shared.cancelPendingMessageSendJobIfNeeded(for: self.interaction.timestamp, using: transaction)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if self.isGroupThread {
|
||||||
|
guard let message: TSMessage = self.interaction as? TSMessage, let groupThread: TSGroupThread = message.thread as? TSGroupThread else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only allow deletion on incoming and outgoing messages
|
||||||
|
guard message.interactionType() == .incomingMessage || message.interactionType() == .outgoingMessage else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make sure it's an open group message and get the open group
|
||||||
|
guard message.isOpenGroupMessage, let uniqueId: String = groupThread.uniqueId, let openGroup: OpenGroup = Storage.shared.getOpenGroup(for: uniqueId) else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// If it's an incoming message the user must have moderator status
|
||||||
|
if message.interactionType() == .incomingMessage {
|
||||||
|
guard let userPublicKey: String = Storage.shared.getUserPublicKey() else { return }
|
||||||
|
|
||||||
|
if !OpenGroupManager.isUserModeratorOrAdmin(userPublicKey, for: openGroup.room, on: openGroup.server) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete the message
|
||||||
|
OpenGroupAPI.messageDelete(message.openGroupServerMessageID, in: openGroup.room, on: openGroup.server)
|
||||||
|
.catch { _ in
|
||||||
|
// Roll back
|
||||||
|
message.save()
|
||||||
|
}
|
||||||
|
.retainUntilComplete()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,8 +0,0 @@
|
|||||||
import PromiseKit
|
|
||||||
|
|
||||||
extension OpenGroupAPI {
|
|
||||||
@objc(deleteMessageWithServerID:fromRoom:onServer:)
|
|
||||||
public static func objc_deleteMessage(with serverID: Int64, from room: String, on server: String) -> AnyPromise {
|
|
||||||
return AnyPromise.from(messageDelete(serverID, in: room, on: server))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,27 @@
|
|||||||
|
// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved.
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
import SessionUtilitiesKit
|
||||||
|
|
||||||
|
class TestUserDefaults: UserDefaultsType {
|
||||||
|
var storage: [String: Any] = [:]
|
||||||
|
|
||||||
|
func object(forKey defaultName: String) -> Any? { return storage[defaultName] }
|
||||||
|
func string(forKey defaultName: String) -> String? { return storage[defaultName] as? String }
|
||||||
|
func array(forKey defaultName: String) -> [Any]? { return storage[defaultName] as? [Any] }
|
||||||
|
func dictionary(forKey defaultName: String) -> [String: Any]? { return storage[defaultName] as? [String: Any] }
|
||||||
|
func data(forKey defaultName: String) -> Data? { return storage[defaultName] as? Data }
|
||||||
|
func stringArray(forKey defaultName: String) -> [String]? { return storage[defaultName] as? [String] }
|
||||||
|
func integer(forKey defaultName: String) -> Int { return ((storage[defaultName] as? Int) ?? 0) }
|
||||||
|
func float(forKey defaultName: String) -> Float { return ((storage[defaultName] as? Float) ?? 0) }
|
||||||
|
func double(forKey defaultName: String) -> Double { return ((storage[defaultName] as? Double) ?? 0) }
|
||||||
|
func bool(forKey defaultName: String) -> Bool { return ((storage[defaultName] as? Bool) ?? false) }
|
||||||
|
func url(forKey defaultName: String) -> URL? { return storage[defaultName] as? URL }
|
||||||
|
|
||||||
|
func set(_ value: Any?, forKey defaultName: String) { storage[defaultName] = value }
|
||||||
|
func set(_ value: Int, forKey defaultName: String) { storage[defaultName] = value }
|
||||||
|
func set(_ value: Float, forKey defaultName: String) { storage[defaultName] = value }
|
||||||
|
func set(_ value: Double, forKey defaultName: String) { storage[defaultName] = value }
|
||||||
|
func set(_ value: Bool, forKey defaultName: String) { storage[defaultName] = value }
|
||||||
|
func set(_ url: URL?, forKey defaultName: String) { storage[defaultName] = url }
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue