Skip to content

Commit e83c00b

Browse files
committed
Merge branch 'develop' into PBE-5254-Convert-enums-in-generated-DTOs-from-the-OpenAPI-spec-to-custom-structs
# Conflicts: # Assets/Plugins/StreamChat/Core/InternalDTO/Events/AnyEventInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Events/EventInternalDTO.cs.meta # Assets/Plugins/StreamChat/Core/InternalDTO/Events/FlagUpdatedEventInternalDTO.cs.meta # Assets/Plugins/StreamChat/Core/InternalDTO/Events/MessageUndeletedEventInternalDTO.cs.meta # Assets/Plugins/StreamChat/Core/InternalDTO/Models/APIErrorCode.cs.meta # Assets/Plugins/StreamChat/Core/InternalDTO/Models/AutomodBehaviourType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Models/AutomodType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Models/BlockListOptionsInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Models/ImageCropType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Models/ImageResizeType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Models/MessageType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Models/PushProviderType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/ConnectRequestQueryInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreateCallRequestType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreateDeviceRequestInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/CreatePollRequestInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/MessageRequestType.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/TranslateMessageRequestLanguage.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Requests/UpdatePollRequestInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Responses/ChannelMemberResponseInternalDTO.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Responses/ChannelMemberResponseRole.cs # Assets/Plugins/StreamChat/Core/InternalDTO/Responses/MessageResponseInternalDTO.cs # Assets/Plugins/StreamChat/Core/LowLevelClient/Models/Message.cs # Assets/Plugins/StreamChat/Core/Responses/StreamChannelTypeUnreadCounts.cs # Assets/Plugins/StreamChat/Core/Responses/StreamChannelUnreadCounts.cs # Assets/Plugins/StreamChat/Core/Responses/StreamCurrentUnreadCounts.cs # Assets/Plugins/StreamChat/Core/Responses/StreamThreadUnreadCounts.cs # Assets/Plugins/StreamChat/Core/StatefulModels/StreamMessage.cs
2 parents b1f9206 + 3d03290 commit e83c00b

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

Assets/Plugins/StreamChat/Core/InternalDTO/Models/BlockListOptionsInternalDTO.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ internal partial class BlockListOptionsInternalDTO
2020
[Newtonsoft.Json.JsonConverter(typeof(StreamChat.Core.Serialization.EnumeratedStructConverter<BlockListOptionsBehaviorInternalDTO>))]
2121
public BlockListOptionsBehaviorInternalDTO Behavior { get; set; }
2222

23-
[Newtonsoft.Json.JsonProperty("blocklist", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
24-
public string Blocklist { get; set; }
25-
2623
private System.Collections.Generic.Dictionary<string, object> _additionalProperties;
2724

2825
[Newtonsoft.Json.JsonExtensionData]

0 commit comments

Comments
 (0)