MatrixStoreRoomState

kloenk · kloenk · commit fd273ca6fd87 · 2022-04-26T09:21:29.000+02:00
diff --git a/Sources/MatrixClient/API/Events/Room/RoomStateEvent.swift b/Sources/MatrixClient/API/Events/Room/RoomStateEvent.swift
@@ -9,11 +9,27 @@ import AnyCodable
 import Foundation
 
 public struct MatrixStateEvent: MatrixEvent {
+    public init(
+        eventID: String? = nil,
+        stateKey: String = "",
+        sender: MatrixFullUserIdentifier? = nil,
+        date: Date? = nil,
+        unsigned: AnyCodable? = nil,
+        content: MatrixStateEventType
+    ) {
+        self.stateKey = stateKey
+        self.eventID = eventID
+        self.sender = sender
+        self.date = date
+        self.unsigned = unsigned
+        self.content = content
+    }
+
     public static let type: String = ""
 
     /// The content of the event.
     @MatrixCodableStateEventType
-    var content: MatrixStateEventType
+    public var content: MatrixStateEventType
 
     public var stateKey: String = ""
 
diff --git a/Sources/MatrixClient/API/Events/RoomEvent.swift b/Sources/MatrixClient/API/Events/RoomEvent.swift
@@ -149,7 +149,7 @@ public struct MatrixCodableEvents<Value: Collection>: Codable where Value.Elemen
             let wrappers = try container.decode([EventWrapper<Value.Element>].self)
             wrappedValue = wrappers.compactMap(\.wrappedEvent) as? Value
         } catch {
-            if #available(iOS 14.0, *) {
+            if #available(iOS 14.0, macOS 11.0, *) {
                 MatrixClient.logger.warning("Failed to parse sync: \(error.localizedDescription)")
             } else {}
         }
diff --git a/Sources/MatrixClient/API/Events/State/StateEvent+Codable.swift b/Sources/MatrixClient/API/Events/State/StateEvent+Codable.swift
@@ -23,7 +23,7 @@ public extension CodingUserInfoKey {
 }
 
 @propertyWrapper
-public struct MatrixCodableStateEventType {
+public struct MatrixCodableStateEventType: Encodable {
     public var wrappedValue: MatrixStateEventType
 
     public init(wrappedValue: MatrixStateEventType) {
@@ -62,8 +62,4 @@ public struct MatrixCodableStateEventType {
             }
         }
     }
-
-    struct Container<T: MatrixStateEventType>: Codable {
-        var content: T
-    }
 }
diff --git a/Sources/MatrixClient/API/Events/State/StateEvent.swift b/Sources/MatrixClient/API/Events/State/StateEvent.swift
@@ -31,6 +31,20 @@ public struct MatrixRoomCanonicalAliasEvent: MatrixStateEventType {
 
 /// This is the first event in a room and cannot be changed. It acts as the root of all other events.
 public struct MatrixRoomCreateEvent: MatrixStateEventType {
+    public init(
+        creator: MatrixFullUserIdentifier,
+        federate: Bool? = nil,
+        predecessor: MatrixRoomCreateEvent.PreviousRoom? = nil,
+        roomVersion: String? = nil,
+        roomType: String? = nil
+    ) {
+        self.creator = creator
+        self.federate = federate
+        self.predecessor = predecessor
+        self.roomVersion = roomVersion
+        self.roomType = roomType
+    }
+
     public static let type = "m.room.create"
 
     /// The ``MatrixFullUserIdentifier`` of the room creator.
@@ -54,7 +68,7 @@ public struct MatrixRoomCreateEvent: MatrixStateEventType {
     /// Unspecified room types are possible using Namespaced Identifiers.
     public var roomType: String?
 
-    public struct PreviousRoom: Codable {
+    public struct PreviousRoom: Codable, Equatable, Hashable {
         /// The event ID of the last known event in the old room.
         public var eventID: String
 
diff --git a/Sources/MatrixCore/MatrixStoreRoomState.swift b/Sources/MatrixCore/MatrixStoreRoomState.swift
@@ -12,6 +12,6 @@ public protocol MatrixStoreRoomState {
     var eventId: String { get }
     var roomId: String { get }
     var stateKey: String { get }
-    var contentType: String { get }
+    var sender: MatrixFullUserIdentifier? { get }
     var content: MatrixStateEventType { get }
 }

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public struct MatrixCodableEvents<Value: Collection>: Codable where Value.Elemen`
`149`	`149`	`let wrappers = try container.decode([EventWrapper<Value.Element>].self)`
`150`	`150`	`wrappedValue = wrappers.compactMap(\.wrappedEvent) as? Value`
`151`	`151`	`} catch {`
`152`		`- if #available(iOS 14.0, *) {`
	`152`	`+ if #available(iOS 14.0, macOS 11.0, *) {`
`153`	`153`	`MatrixClient.logger.warning("Failed to parse sync: \(error.localizedDescription)")`
`154`	`154`	`} else {}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public extension CodingUserInfoKey {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`@propertyWrapper`
`26`		`-public struct MatrixCodableStateEventType {`
	`26`	`+public struct MatrixCodableStateEventType: Encodable {`
`27`	`27`	`public var wrappedValue: MatrixStateEventType`
`28`	`28`
`29`	`29`	`public init(wrappedValue: MatrixStateEventType) {`
`@@ -62,8 +62,4 @@ public struct MatrixCodableStateEventType {`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
`65`		`-`
`66`		`- struct Container<T: MatrixStateEventType>: Codable {`
`67`		`- var content: T`
`68`		`- }`
`69`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ public protocol MatrixStoreRoomState {`
`12`	`12`	`var eventId: String { get }`
`13`	`13`	`var roomId: String { get }`
`14`	`14`	`var stateKey: String { get }`
`15`		`- var contentType: String { get }`
	`15`	`+ var sender: MatrixFullUserIdentifier? { get }`
`16`	`16`	`var content: MatrixStateEventType { get }`
`17`	`17`	`}`