Merge branch 'master' into f/channel-comments

apps/ios/SimpleXChat/AppGroup.swift

@@ -237,6 +237,8 @@ public let privacyEncryptLocalFilesGroupDefault = BoolDefault(defaults: groupDef
 
 public let privacyAskToApproveRelaysGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS)
 
+public let privacySanitizeLinksGroupDefault = BoolDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_PRIVACY_SANITIZE_LINKS)
+
 public let profileImageCornerRadiusGroupDefault = Default<Double>(defaults: groupDefaults, forKey: GROUP_DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
 
 public let ntfBadgeCountGroupDefault = IntDefault(defaults: groupDefaults, forKey: GROUP_DEFAULT_NTF_BADGE_COUNT)

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2657,11 +2657,12 @@ public struct GroupShortLinkData: Codable, Hashable {
 }
 
 public enum RelayStatus: String, Decodable, Equatable, Hashable {
-    case rsNew = "new"
-    case rsInvited = "invited"
-    case rsAccepted = "accepted"
-    case rsActive = "active"
-    case rsInactive = "inactive"
+    case new
+    case invited
+    case accepted
+    case active
+    case inactive
+    case rejected
 }
 
 public struct RelayProfile: Codable, Equatable, Hashable {
@@ -2730,11 +2731,12 @@ public struct GroupRelay: Identifiable, Decodable, Equatable, Hashable {
 extension RelayStatus {
     public var text: LocalizedStringKey {
         switch self {
-        case .rsNew: "new"
-        case .rsInvited: "invited"
-        case .rsAccepted: "accepted"
-        case .rsActive: "active"
-        case .rsInactive: "inactive"
+        case .new: "new"
+        case .invited: "invited"
+        case .accepted: "accepted"
+        case .active: "active"
+        case .inactive: "inactive"
+        case .rejected: "rejected"
         }
     }
 }
@@ -4154,6 +4156,7 @@ public enum CIDeleteMode: String, Decodable, Hashable {
     case cidmBroadcast = "broadcast"
     case cidmInternal = "internal"
     case cidmInternalMark = "internalMark"
+    case cidmHistory = "history"
 }
 
 protocol ItemContent {

apps/ios/SimpleXChat/ChatUtils.swift

@@ -53,11 +53,11 @@ extension ChatLike {
     }
 }
 
-public func filterChatsToForwardTo<C: ChatLike>(chats: [C]) -> [C] {
+public func filterChatsToForwardTo<C: ChatLike>(chats: [C], includeLocal: Bool = true) -> [C] {
     var filteredChats = chats.filter { c in
         c.chatInfo.chatType != .local && canForwardToChat(c.chatInfo)
     }
-    if let privateNotes = chats.first(where: { $0.chatInfo.chatType == .local }) {
+    if includeLocal, let privateNotes = chats.first(where: { $0.chatInfo.chatType == .local }) {
         filteredChats.insert(privateNotes, at: 0)
     }
     return filteredChats