Merge branch 'develop' to '1222-feature/add-fields-to-marketSearch'

vknet · Aug 14, 2023 · fdd2a09 · fdd2a09
2 parents f2ddbc3 + f6fd60e
commit fdd2a09
Show file tree

Hide file tree

Showing 93 changed files with 187 additions and 281 deletions.
diff --git a/VkNet/Enums/StringEnums/AccessRole.cs b/VkNet/Enums/StringEnums/AccessRole.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Права пользователя в рекламном кабинете.
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AccessRole
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AccountType.cs b/VkNet/Enums/StringEnums/AccountType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип рекламного кабинета.
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AccountType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AdPlatform.cs b/VkNet/Enums/StringEnums/AdPlatform.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Рекламные площадки, на которых будет показываться объявление. (если значение применимо к данному формату объявления)
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AdPlatform
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AdRequestStatus.cs b/VkNet/Enums/StringEnums/AdRequestStatus.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Текущий статус запроса
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AdRequestStatus
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AdsLinkType.cs b/VkNet/Enums/StringEnums/AdsLinkType.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
@@ -9,7 +8,7 @@ namespace VkNet.Enums.StringEnums;
 /// Тип ссылки рекламы
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AdsLinkType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AppPlatforms.cs b/VkNet/Enums/StringEnums/AppPlatforms.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
@@ -11,7 +10,7 @@ namespace VkNet.Enums.StringEnums;
 /// По умолчанию используется web.
 /// </remarks>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AppPlatforms
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AppRatingType.cs b/VkNet/Enums/StringEnums/AppRatingType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Рейтинг приложений
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AppRatingType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AppRequestType.cs b/VkNet/Enums/StringEnums/AppRequestType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип запроса для приложений
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AppRequestType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AppSort.cs b/VkNet/Enums/StringEnums/AppSort.cs
@@ -1,15 +1,14 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 using VkNet.Utils;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Способ сортировки приложений
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AppSort
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AppWidgetType.cs b/VkNet/Enums/StringEnums/AppWidgetType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип виджета приложения
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AppWidgetType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AsrProcessModel.cs b/VkNet/Enums/StringEnums/AsrProcessModel.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Модель распознавания речи, которую нужно использовать
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AsrProcessModel
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AudioAlbumType.cs b/VkNet/Enums/StringEnums/AudioAlbumType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип источника альбома каталога
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AudioAlbumType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AudioCatalogSourceType.cs b/VkNet/Enums/StringEnums/AudioCatalogSourceType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип источника каталога
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AudioCatalogSourceType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/AudioCatalogType.cs b/VkNet/Enums/StringEnums/AudioCatalogType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип каталога
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum AudioCatalogType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/Button.cs b/VkNet/Enums/StringEnums/Button.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Кнопка для карусели
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum Button
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/CallbackServerStatus.cs b/VkNet/Enums/StringEnums/CallbackServerStatus.cs
@@ -1,15 +1,14 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 using VkNet.Utils;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Статус сервера
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum CallbackServerStatus
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/CampaignType.cs b/VkNet/Enums/StringEnums/CampaignType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип рекламного кабинета.
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum CampaignType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/CarouselElementActionType.cs b/VkNet/Enums/StringEnums/CarouselElementActionType.cs
@@ -1,6 +1,5 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
@@ -9,7 +8,7 @@ namespace VkNet.Enums.StringEnums;
 /// Тип элемента карусели
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum CarouselElementActionType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/ChangeNameStatus.cs b/VkNet/Enums/StringEnums/ChangeNameStatus.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Статус заявки на изменение имени
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum ChangeNameStatus
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/CommentObjectType.cs b/VkNet/Enums/StringEnums/CommentObjectType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип комментариев.
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum CommentObjectType
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/CommentsSort.cs b/VkNet/Enums/StringEnums/CommentsSort.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Порядок сортировки комментариев к записи.
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum CommentsSort
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/ConversationChatSettingsState.cs b/VkNet/Enums/StringEnums/ConversationChatSettingsState.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Настройки беседы
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum ConversationChatSettingsState
 {
 	/// <summary>

diff --git a/VkNet/Enums/StringEnums/ConversationPeerType.cs b/VkNet/Enums/StringEnums/ConversationPeerType.cs
@@ -1,14 +1,13 @@
 using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
+using VkNet.Utils.JsonConverter;
 
 namespace VkNet.Enums.StringEnums;
 
 /// <summary>
 /// Тип пира беседы
 /// </summary>
 [StringEnum]
-[JsonConverter(typeof(StringEnumConverter), typeof(SnakeCaseNamingStrategy))]
+[JsonConverter(typeof(TolerantStringEnumConverter))]
 public enum ConversationPeerType
 {
 	/// <summary>