restore nullable enums being nullable type -> it might be handy to differentiate between "empty value" and "no value"

sierpinskid · sierpinskid · commit d86082881697 · 2024-09-04T13:01:53.000+02:00
diff --git a/Assets/Plugins/StreamChat/Core/Helpers/EnumeratedStructExt.cs b/Assets/Plugins/StreamChat/Core/Helpers/EnumeratedStructExt.cs
@@ -0,0 +1,23 @@
+﻿using System;
+using StreamChat.Core.LowLevelClient;
+
+namespace StreamChat.Core.Helpers
+{
+    /// <summary>
+    /// Extensions for <see cref="IEnumeratedStruct{TType}"/>
+    /// </summary>
+    internal static class EnumeratedStructExt
+    {
+        public static TDomain? TryLoadNullableStructFromDto<TDomain, TDto>(this TDomain? domain, TDto? dto)
+            where TDomain : struct, IEquatable<TDomain>, ILoadableFrom<TDto, TDomain>
+            where TDto : struct, IEnumeratedStruct<TDto>
+        {
+            if (!dto.HasValue)
+            {
+                return null;
+            }
+
+            return domain?.LoadFromDto(dto.Value) ?? default(TDomain).LoadFromDto(dto.Value);
+        }
+    }
+}
diff --git a/Assets/Plugins/StreamChat/Core/Helpers/EnumeratedStructExt.cs.meta b/Assets/Plugins/StreamChat/Core/Helpers/EnumeratedStructExt.cs.meta
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Models/BlockListOptionsInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Models/BlockListOptionsInternalDTO.cs
@@ -20,6 +20,9 @@ internal partial class BlockListOptionsInternalDTO
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<BlockListOptionsBehaviorInternalDTO>))]
         public BlockListOptionsBehaviorInternalDTO Behavior { get; set; }
 
+        [Newtonsoft.Json.JsonProperty("blocklist", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
+        public string Blocklist { get; set; }
+
         private System.Collections.Generic.Dictionary<string, object> _additionalProperties;
 
         [Newtonsoft.Json.JsonExtensionData]
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Models/ChannelConfigInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Models/ChannelConfigInternalDTO.cs
@@ -35,7 +35,7 @@ internal partial class ChannelConfigInternalDTO
 
         [Newtonsoft.Json.JsonProperty("blocklist_behavior", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<AutomodBehaviourTypeInternalDTO>))]
-        public AutomodBehaviourTypeInternalDTO BlocklistBehavior { get; set; }
+        public AutomodBehaviourTypeInternalDTO? BlocklistBehavior { get; set; }
 
         [Newtonsoft.Json.JsonProperty("blocklists", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public System.Collections.Generic.List<BlockListOptionsInternalDTO> Blocklists { get; set; }
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Models/ChannelConfigWithInfoInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Models/ChannelConfigWithInfoInternalDTO.cs
@@ -35,7 +35,7 @@ internal partial class ChannelConfigWithInfoInternalDTO
 
         [Newtonsoft.Json.JsonProperty("blocklist_behavior", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<AutomodBehaviourTypeInternalDTO>))]
-        public AutomodBehaviourTypeInternalDTO BlocklistBehavior { get; set; }
+        public AutomodBehaviourTypeInternalDTO? BlocklistBehavior { get; set; }
 
         [Newtonsoft.Json.JsonProperty("blocklists", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         public System.Collections.Generic.List<BlockListOptionsInternalDTO> Blocklists { get; set; }
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Models/ImageSizeInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Models/ImageSizeInternalDTO.cs
@@ -21,7 +21,7 @@ internal partial class ImageSizeInternalDTO
         /// </summary>
         [Newtonsoft.Json.JsonProperty("crop", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<ImageCropTypeInternalDTO>))]
-        public ImageCropTypeInternalDTO Crop { get; set; }
+        public ImageCropTypeInternalDTO? Crop { get; set; }
 
         /// <summary>
         /// Target image height
@@ -34,7 +34,7 @@ internal partial class ImageSizeInternalDTO
         /// </summary>
         [Newtonsoft.Json.JsonProperty("resize", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<ImageResizeTypeInternalDTO>))]
-        public ImageResizeTypeInternalDTO Resize { get; set; }
+        public ImageResizeTypeInternalDTO? Resize { get; set; }
 
         /// <summary>
         /// Target image width
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreatePollRequestInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreatePollRequestInternalDTO.cs
@@ -69,7 +69,7 @@ internal partial class CreatePollRequestInternalDTO
 
         [Newtonsoft.Json.JsonProperty("voting_visibility", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<CreatePollRequestVotingVisibilityInternalDTO>))]
-        public CreatePollRequestVotingVisibilityInternalDTO VotingVisibility { get; set; }
+        public CreatePollRequestVotingVisibilityInternalDTO? VotingVisibility { get; set; }
 
         private System.Collections.Generic.Dictionary<string, object> _additionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Requests/MessageRequestInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Requests/MessageRequestInternalDTO.cs
@@ -71,7 +71,7 @@ internal partial class MessageRequestInternalDTO
 
         [Newtonsoft.Json.JsonProperty("type", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<MessageRequestTypeInternalDTO>))]
-        public MessageRequestTypeInternalDTO Type { get; set; }
+        public MessageRequestTypeInternalDTO? Type { get; set; }
 
         private System.Collections.Generic.Dictionary<string, object> _additionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Requests/UpdatePollRequestInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Requests/UpdatePollRequestInternalDTO.cs
@@ -78,7 +78,7 @@ internal partial class UpdatePollRequestInternalDTO
         /// </summary>
         [Newtonsoft.Json.JsonProperty("voting_visibility", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<UpdatePollRequestVotingVisibilityInternalDTO>))]
-        public UpdatePollRequestVotingVisibilityInternalDTO VotingVisibility { get; set; }
+        public UpdatePollRequestVotingVisibilityInternalDTO? VotingVisibility { get; set; }
 
         private System.Collections.Generic.Dictionary<string, object> _additionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/InternalDTO/Responses/ChannelMemberResponseInternalDTO.cs b/Assets/Plugins/StreamChat/Core/InternalDTO/Responses/ChannelMemberResponseInternalDTO.cs
@@ -75,7 +75,7 @@ internal partial class ChannelMemberResponseInternalDTO
         /// </summary>
         [Newtonsoft.Json.JsonProperty("role", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
         [Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<ChannelMemberResponseRoleInternalDTO>))]
-        public ChannelMemberResponseRoleInternalDTO Role { get; set; }
+        public ChannelMemberResponseRoleInternalDTO? Role { get; set; }
 
         /// <summary>
         /// Whether member is shadow banned in this channel or not
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ChannelConfig.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ChannelConfig.cs
@@ -25,7 +25,7 @@ public class ChannelConfig : ModelBase, ILoadableFrom<ChannelConfigWithInfoInter
         /// <summary>
         /// Sets behavior of blocklist
         /// </summary>
-        public AutomodBehaviourType BlocklistBehavior { get; set; }
+        public AutomodBehaviourType? BlocklistBehavior { get; set; }
 
         /// <summary>
         /// List of commands that channel supports
@@ -127,7 +127,7 @@ ChannelConfig ILoadableFrom<ChannelConfigWithInfoInternalDTO, ChannelConfig>.Loa
             AutomodBehavior = AutomodBehavior.TryLoadFromDto(dto.AutomodBehavior);
             AutomodThresholds = AutomodThresholds.TryLoadFromDto(dto.AutomodThresholds);
             Blocklist = dto.Blocklist;
-            BlocklistBehavior = BlocklistBehavior.TryLoadFromDto(dto.BlocklistBehavior);
+            BlocklistBehavior = BlocklistBehavior.TryLoadNullableStructFromDto(dto.BlocklistBehavior);
             Commands = Commands.TryLoadFromDtoCollection(dto.Commands);
             ConnectEvents = dto.ConnectEvents;
             CreatedAt = dto.CreatedAt;
diff --git a/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ImageSize.cs b/Assets/Plugins/StreamChat/Core/LowLevelClient/Models/ImageSize.cs
@@ -1,4 +1,5 @@
-﻿using StreamChat.Core.Helpers;
+﻿using System;
+using StreamChat.Core.Helpers;
 using StreamChat.Core.InternalDTO.Models;
 
 namespace StreamChat.Core.LowLevelClient.Models
@@ -8,7 +9,7 @@ public partial class ImageSize  : ModelBase, ILoadableFrom<ImageSizeInternalDTO,
         /// <summary>
         /// Crop mode
         /// </summary>
-        public ImageCropType Crop { get; set; }
+        public ImageCropType? Crop { get; set; }
 
         /// <summary>
         /// Target image height
@@ -18,7 +19,7 @@ public partial class ImageSize  : ModelBase, ILoadableFrom<ImageSizeInternalDTO,
         /// <summary>
         /// Resize method
         /// </summary>
-        public ImageResizeType Resize { get; set; }
+        public ImageResizeType? Resize { get; set; }
 
         /// <summary>
         /// Target image width
@@ -27,9 +28,9 @@ public partial class ImageSize  : ModelBase, ILoadableFrom<ImageSizeInternalDTO,
 
         ImageSize ILoadableFrom<ImageSizeInternalDTO, ImageSize>.LoadFromDto(ImageSizeInternalDTO dto)
         {
-            Crop = Crop.TryLoadFromDto(dto.Crop);
+            Crop = Crop.TryLoadNullableStructFromDto(dto.Crop);
             Height = dto.Height;
-            Resize = Resize.TryLoadFromDto(dto.Resize);
+            Resize = Resize.TryLoadNullableStructFromDto(dto.Resize);
             Width = dto.Width;
             AdditionalProperties = dto.AdditionalProperties;
 
diff --git a/Assets/Plugins/StreamChat/Core/Models/StreamChannelConfig.cs b/Assets/Plugins/StreamChat/Core/Models/StreamChannelConfig.cs
@@ -28,7 +28,7 @@ public class StreamChannelConfig : IStateLoadableFrom<ChannelConfigWithInfoInter
         /// <summary>
         /// Sets behavior of blocklist
         /// </summary>
-        public StreamAutomodBehaviourType BlocklistBehavior { get; private set; }
+        public StreamAutomodBehaviourType? BlocklistBehavior { get; private set; }
 
         /// <summary>
         /// List of commands that channel supports
@@ -130,7 +130,7 @@ StreamChannelConfig IStateLoadableFrom<ChannelConfigWithInfoInternalDTO, StreamC
             AutomodBehavior = AutomodBehavior.TryLoadFromDto(dto.AutomodBehavior);
             AutomodThresholds = AutomodThresholds.TryLoadFromDto(dto.AutomodThresholds, cache);
             Blocklist = dto.Blocklist;
-            BlocklistBehavior = BlocklistBehavior.TryLoadFromDto(dto.BlocklistBehavior);
+            BlocklistBehavior = BlocklistBehavior.TryLoadNullableStructFromDto(dto.BlocklistBehavior);
             Commands = Commands.TryLoadFromDtoCollection(dto.Commands, cache);
             ConnectEvents = dto.ConnectEvents;
             CreatedAt = dto.CreatedAt;
diff --git a/Assets/Plugins/StreamChat/Core/Responses/StreamImageSize.cs b/Assets/Plugins/StreamChat/Core/Responses/StreamImageSize.cs
@@ -10,7 +10,7 @@ public sealed class StreamImageSize  : IStateLoadableFrom<ImageSizeInternalDTO,
         /// <summary>
         /// Crop mode
         /// </summary>
-        public StreamImageCropType Crop { get; private set; }
+        public StreamImageCropType? Crop { get; private set; }
 
         /// <summary>
         /// Target image height
@@ -20,7 +20,7 @@ public sealed class StreamImageSize  : IStateLoadableFrom<ImageSizeInternalDTO,
         /// <summary>
         /// Resize method
         /// </summary>
-        public StreamImageResizeType Resize { get; private set; }
+        public StreamImageResizeType? Resize { get; private set; }
 
         /// <summary>
         /// Target image width
@@ -29,9 +29,9 @@ public sealed class StreamImageSize  : IStateLoadableFrom<ImageSizeInternalDTO,
 
         StreamImageSize IStateLoadableFrom<ImageSizeInternalDTO, StreamImageSize>.LoadFromDto(ImageSizeInternalDTO dto, ICache cache)
         {
-            Crop = Crop.TryLoadFromDto(dto.Crop);
+            Crop = Crop.TryLoadNullableStructFromDto(dto.Crop);
             Height = dto.Height;
-            Resize = Resize.TryLoadFromDto(dto.Resize);
+            Resize = Resize.TryLoadNullableStructFromDto(dto.Resize);
             Width = dto.Width;
 
             return this;
