some refactoring, fixed crash when an event fails to concretize

baking-bad · May 9, 2023 · 59960a1 · 59960a1
1 parent 07bafb6
commit 59960a1
Show file tree

Hide file tree

Showing 23 changed files with 127 additions and 190 deletions.
diff --git a/Matrix.Sdk.Sample.Console/Sample.cs b/Matrix.Sdk.Sample.Console/Sample.cs
@@ -3,7 +3,7 @@ namespace Matrix.Sdk.Sample.Console
     using System;
     using System.Threading;
     using System.Threading.Tasks;
-    using Core.Domain.MatrixRoom;
+    using Core.Domain.Room;
     using Core.Domain.RoomEvent;
     using Core.Infrastructure.Dto.Room.Create;
     using Serilog;

diff --git a/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoom.cs b/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoom.cs
@@ -1,27 +1,31 @@
-namespace Matrix.Sdk.Core.Domain.MatrixRoom
+namespace Matrix.Sdk.Core.Domain.Room
 {
     using System.Collections.Generic;
+    using Infrastructure.Dto.Sync;
+    using Infrastructure.Dto.Sync.Event.Room;
+    using RoomEvent;
 
-    public record MatrixRoom
+    public record MatrixRoom(string Id, MatrixRoomStatus Status, List<string> JoinedUserIds)
     {
-        public MatrixRoom(string id, MatrixRoomStatus status, List<string> joinedUserIds)
+        public static MatrixRoom Create(string roomId, RoomResponse joinedRoom, MatrixRoomStatus status)
         {
-            Id = id;
-            Status = status;
-            JoinedUserIds = joinedUserIds;
-        }
+            var joinedUserIds = new List<string>();
+            foreach (RoomEventResponse timelineEvent in joinedRoom.Timeline.Events)
+                if (JoinRoomEvent.Factory.TryCreateFrom(timelineEvent, roomId, out JoinRoomEvent joinRoomEvent))
+                    joinedUserIds.Add(joinRoomEvent!.SenderUserId);
 
-        public MatrixRoom(string id, MatrixRoomStatus status)
-        {
-            Id = id;
-            Status = status;
-            JoinedUserIds = new List<string>();
+            return new MatrixRoom(roomId, status, joinedUserIds);
         }
 
-        public string Id { get; }
-
-        public MatrixRoomStatus Status { get; }
+        public static MatrixRoom CreateInvite(string roomId, InvitedRoom invitedRoom)
+        {
+            var joinedUserIds = new List<string>();
+            foreach (RoomStrippedState timelineEvent in invitedRoom.InviteState.Events)
+                if (JoinRoomEvent.Factory.TryCreateFromStrippedState(timelineEvent, roomId,
+                        out JoinRoomEvent joinRoomEvent))
+                    joinedUserIds.Add(joinRoomEvent!.SenderUserId);
 
-        public List<string> JoinedUserIds { get; }
+            return new MatrixRoom(roomId, MatrixRoomStatus.Invited, joinedUserIds);
+        }
     }
 }
diff --git a/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoomEventFactory.cs b/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoomEventFactory.cs
diff --git a/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoomFactory.cs b/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoomFactory.cs
diff --git a/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoomStatus.cs b/Matrix.Sdk/Core/Domain/MatrixRoom/MatrixRoomStatus.cs
@@ -1,4 +1,4 @@
-namespace Matrix.Sdk.Core.Domain.MatrixRoom
+namespace Matrix.Sdk.Core.Domain.Room
 {
     public enum MatrixRoomStatus
     {

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/BaseRoomEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/BaseRoomEvent.cs
@@ -1,6 +1,62 @@
 using System;
+using System.Collections.Generic;
+using Matrix.Sdk.Core.Infrastructure.Dto.Sync;
+using Matrix.Sdk.Core.Infrastructure.Dto.Sync.Event.Room;
 
 namespace Matrix.Sdk.Core.Domain.RoomEvent
 {
-    public abstract record BaseRoomEvent(string EventId, string RoomId, string SenderUserId, DateTimeOffset Timestamp);
+    public abstract record BaseRoomEvent(string EventId, string RoomId, string SenderUserId, DateTimeOffset Timestamp)
+    {
+        public static List<BaseRoomEvent> Create(string roomId, RoomResponse joinedRoom)
+        {
+            var roomEvents = new List<BaseRoomEvent>();
+
+            foreach (RoomEventResponse timelineEvent in joinedRoom.Timeline.Events)
+            {
+                var e = Create(roomId, timelineEvent);
+                if (e != null) roomEvents.Add(e);
+
+            }
+            return roomEvents;
+        }
+
+        public static BaseRoomEvent Create(string roomId, RoomEventResponse timelineEvent)
+        {
+            if (JoinRoomEvent.Factory.TryCreateFrom(timelineEvent, roomId, out JoinRoomEvent joinRoomEvent)) return joinRoomEvent;
+            if (CreateRoomEvent.Factory.TryCreateFrom(timelineEvent, roomId, out var createRoomEvent)) return createRoomEvent;
+            if (InviteToRoomEvent.Factory.TryCreateFrom(timelineEvent, roomId, out var inviteToRoomEvent)) return inviteToRoomEvent;
+            if (TextMessageEvent.Factory.TryCreateFrom(timelineEvent, roomId, out var textMessageEvent)) return textMessageEvent;
+            if (ImageMessageEvent.Factory.TryCreateFrom(timelineEvent, roomId, out var imageMessageEvent)) return imageMessageEvent;
+            if (RedactionEvent.Factory.TryCreateFrom(timelineEvent, roomId, out var redactionEvent)) return redactionEvent;
+            if (ReactionEvent.Factory.TryCreateFrom(timelineEvent, roomId, out var reactionEvent)) return reactionEvent;
+            return null;
+        }
+
+        public static List<BaseRoomEvent> CreateFromInvited(string roomId, InvitedRoom invitedRoom)
+        {
+            var roomEvents = new List<BaseRoomEvent>();
+
+            foreach (RoomStrippedState inviteStateEvent in invitedRoom.InviteState.Events)
+            {
+                var e = CreateFromInvited(roomId, inviteStateEvent);
+                if (e != null)
+                {
+                    roomEvents.Add(e);
+                }
+            }
+            return roomEvents;
+        }
+
+        public static BaseRoomEvent CreateFromInvited(string roomId, RoomStrippedState inviteStateEvent)
+        {
+            if (JoinRoomEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var joinRoomEvent)) return joinRoomEvent;
+            if (CreateRoomEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var createRoomEvent)) return createRoomEvent;
+            if (InviteToRoomEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var inviteToRoomEvent)) return inviteToRoomEvent;
+            if (TextMessageEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var textMessageEvent)) return textMessageEvent;
+            if (ImageMessageEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var imageMessageEvent)) return imageMessageEvent;
+            if (RedactionEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var redactionEvent)) return redactionEvent;
+            if (ReactionEvent.Factory.TryCreateFromStrippedState(inviteStateEvent, roomId, out var reactionEvent)) return reactionEvent;
+            return null;
+        }
+    }
 }
diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/CreateRoomEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/CreateRoomEvent.cs
@@ -11,7 +11,7 @@ public record CreateRoomEvent(string EventId, string RoomId, string SenderUserId
     {
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId, out CreateRoomEvent createRoomEvent)
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId, out CreateRoomEvent createRoomEvent)
             {
                 RoomCreateContent content = roomEvent.Content.ToObject<RoomCreateContent>();
                 if (roomEvent.EventType == EventType.Create && content != null)

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/ImageMessageEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/ImageMessageEvent.cs
@@ -11,7 +11,7 @@ public record ImageMessageEvent(string EventId, string RoomId, string SenderUser
     {
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId, out ImageMessageEvent textMessageEvent)
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId, out ImageMessageEvent textMessageEvent)
             {
                 ImageContent content = roomEvent.Content.ToObject<ImageContent>();
                 if (roomEvent.EventType == EventType.Message && content?.MessageType == MessageType.Image)

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/InviteToRoomEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/InviteToRoomEvent.cs
@@ -10,7 +10,7 @@ public record InviteToRoomEvent(string EventId, string RoomId, string SenderUser
     {
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId,
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId,
                 out InviteToRoomEvent inviteToRoomEvent)
             {
                 RoomMemberContent content = roomEvent.Content.ToObject<RoomMemberContent>();

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/JoinRoomEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/JoinRoomEvent.cs
@@ -10,7 +10,7 @@ public record JoinRoomEvent(string EventId, string RoomId, string SenderUserId,
     {
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId, out JoinRoomEvent joinRoomEvent)
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId, out JoinRoomEvent joinRoomEvent)
             {
                 RoomMemberContent content = roomEvent.Content.ToObject<RoomMemberContent>();
                 if (roomEvent.EventType == EventType.Member && content?.UserMembershipState == UserMembershipState.Join)

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/ReactionEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/ReactionEvent.cs
@@ -12,7 +12,7 @@ public record ReactionEvent(string EventId, string RoomId, string SenderUserId,
 
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId, out ReactionEvent reactionEvent)
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId, out ReactionEvent reactionEvent)
             {
                 MessageContent content = roomEvent.Content.ToObject<MessageContent>();
                 if (roomEvent.EventType == EventType.Reaction && content?.relatesTo.rel_type == "m.annotation")

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/RedactionEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/RedactionEvent.cs
@@ -12,7 +12,7 @@ private record ReasonObj(string reason);
 
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId, out RedactionEvent redactionEvent)
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId, out RedactionEvent redactionEvent)
             {
                 ReasonObj content = roomEvent.Content.ToObject<ReasonObj>();
                 if (roomEvent.EventType == EventType.Redaction)

diff --git a/Matrix.Sdk/Core/Domain/RoomEvent/TextMessageEvent.cs b/Matrix.Sdk/Core/Domain/RoomEvent/TextMessageEvent.cs
@@ -11,7 +11,7 @@ public record TextMessageEvent(string EventId, string RoomId, string SenderUserI
     {
         public static class Factory
         {
-            public static bool TryCreateFrom(RoomEvent roomEvent, string roomId, out TextMessageEvent textMessageEvent)
+            public static bool TryCreateFrom(RoomEventResponse roomEvent, string roomId, out TextMessageEvent textMessageEvent)
             {
                 MessageContent content = roomEvent.Content.ToObject<MessageContent>();
                 if (roomEvent.EventType == EventType.Message && content?.MessageType == MessageType.Text)

diff --git a/Matrix.Sdk/Core/Domain/Services/IPollingService.cs b/Matrix.Sdk/Core/Domain/Services/IPollingService.cs
@@ -1,7 +1,7 @@
 namespace Matrix.Sdk.Core.Domain.Services
 {
     using System;
-    using MatrixRoom;
+    using Room;
 
     public interface IPollingService : IDisposable
     {

diff --git a/Matrix.Sdk/Core/Domain/Services/PollingService.cs b/Matrix.Sdk/Core/Domain/Services/PollingService.cs
@@ -8,7 +8,7 @@ namespace Matrix.Sdk.Core.Domain.Services
     using System.Threading.Tasks;
     using Infrastructure.Dto.Sync;
     using Infrastructure.Services;
-    using MatrixRoom;
+    using Room;
     using Microsoft.Extensions.Logging;
 
     public class PollingService : IPollingService

diff --git a/Matrix.Sdk/Core/Domain/SyncBatch.cs b/Matrix.Sdk/Core/Domain/SyncBatch.cs
@@ -3,12 +3,12 @@ namespace Matrix.Sdk.Core.Domain
     using System.Collections.Generic;
     using System.Linq;
     using Infrastructure.Dto.Sync;
-    using MatrixRoom;
+    using Room;
     using RoomEvent;
 
     public record SyncBatch
     {
-        private SyncBatch(string nextBatch, List<MatrixRoom.MatrixRoom> matrixRooms,
+        private SyncBatch(string nextBatch, List<Room.MatrixRoom> matrixRooms,
             List<BaseRoomEvent> matrixRoomEvents)
         {
             NextBatch = nextBatch;
@@ -17,29 +17,26 @@ public record SyncBatch
         }
 
         public string NextBatch { get; }
-        public List<MatrixRoom.MatrixRoom> MatrixRooms { get; }
+        public List<Room.MatrixRoom> MatrixRooms { get; }
         public List<BaseRoomEvent> MatrixRoomEvents { get; }
 
         internal static class Factory
         {
-            private static readonly MatrixRoomFactory MatrixRoomFactory = new();
-            private static readonly MatrixRoomEventFactory MatrixRoomEventFactory = new();
-
             public static SyncBatch CreateFromSync(string nextBatch, Rooms rooms)
             {
-                List<MatrixRoom.MatrixRoom> matrixRooms = GetMatrixRoomsFromSync(rooms);
+                List<Room.MatrixRoom> matrixRooms = GetMatrixRoomsFromSync(rooms);
                 List<BaseRoomEvent> matrixRoomEvents = GetMatrixEventsFromSync(rooms);
 
                 return new SyncBatch(nextBatch, matrixRooms, matrixRoomEvents);
             }
 
-            private static List<MatrixRoom.MatrixRoom> GetMatrixRoomsFromSync(Rooms rooms)
+            private static List<Room.MatrixRoom> GetMatrixRoomsFromSync(Rooms rooms)
             {
-                var joinedMatrixRooms = rooms.Join.Select(pair => MatrixRoomFactory.Create(pair.Key, pair.Value, MatrixRoomStatus.Joined))
+                var joinedMatrixRooms = rooms.Join.Select(pair => Room.MatrixRoom.Create(pair.Key, pair.Value, MatrixRoomStatus.Joined))
                     .ToList();
                 var invitedMatrixRooms = rooms.Invite
-                    .Select(pair => MatrixRoomFactory.CreateInvite(pair.Key, pair.Value)).ToList();
-                var leftMatrixRooms = rooms.Leave.Select(pair => MatrixRoomFactory.Create(pair.Key, pair.Value, MatrixRoomStatus.Left))
+                    .Select(pair => Room.MatrixRoom.CreateInvite(pair.Key, pair.Value)).ToList();
+                var leftMatrixRooms = rooms.Leave.Select(pair => Room.MatrixRoom.Create(pair.Key, pair.Value, MatrixRoomStatus.Left))
                     .ToList();
 
                 return joinedMatrixRooms.Concat(invitedMatrixRooms).Concat(leftMatrixRooms).ToList();
@@ -48,11 +45,11 @@ private static List<MatrixRoom.MatrixRoom> GetMatrixRoomsFromSync(Rooms rooms)
             private static List<BaseRoomEvent> GetMatrixEventsFromSync(Rooms rooms)
             {
                 var joinedMatrixRoomEvents = rooms.Join
-                    .SelectMany(pair => MatrixRoomEventFactory.CreateFromJoined(pair.Key, pair.Value)).ToList();
+                    .SelectMany(pair => BaseRoomEvent.Create(pair.Key, pair.Value)).ToList();
                 var invitedMatrixRoomEvents = rooms.Invite
-                    .SelectMany(pair => MatrixRoomEventFactory.CreateFromInvited(pair.Key, pair.Value)).ToList();
+                    .SelectMany(pair => BaseRoomEvent.CreateFromInvited(pair.Key, pair.Value)).ToList();
                 var leftMatrixRoomEvents = rooms.Leave
-                    .SelectMany(pair => MatrixRoomEventFactory.CreateFromJoined(pair.Key, pair.Value)).ToList();
+                    .SelectMany(pair => BaseRoomEvent.Create(pair.Key, pair.Value)).ToList();
 
                 return joinedMatrixRoomEvents.Concat(invitedMatrixRoomEvents).Concat(leftMatrixRoomEvents).ToList();
             }

diff --git a/...tructure/Dto/Sync/Event/Room/RoomEvent.cs → .../Dto/Sync/Event/Room/RoomEventResponse.cs b/...tructure/Dto/Sync/Event/Room/RoomEvent.cs → .../Dto/Sync/Event/Room/RoomEventResponse.cs
@@ -3,7 +3,7 @@
 
 namespace Matrix.Sdk.Core.Infrastructure.Dto.Sync.Event.Room
 {
-    public record RoomEvent : BaseEvent
+    public record RoomEventResponse : BaseEvent
     {
         /// <summary>
         ///     <b>Required.</b> The globally unique event identifier.

diff --git a/Matrix.Sdk/Core/Infrastructure/Dto/Sync/Event/Room/RoomStateEvent.cs b/Matrix.Sdk/Core/Infrastructure/Dto/Sync/Event/Room/RoomStateEvent.cs
@@ -1,6 +1,6 @@
 namespace Matrix.Sdk.Core.Infrastructure.Dto.Sync.Event.Room
 {
-    public record RoomStateEvent : RoomEvent
+    public record RoomStateEvent : RoomEventResponse
     {
         /// <summary>
         ///     <b>Required.</b>