Skip to content

Commit

Permalink
SonarLint analysis (#1444)
Browse files Browse the repository at this point in the history
* Implement groups.getTagList

Signed-off-by: Bird Egop <sampletext32@bk.ru>

* Implement groups.setSettings

Signed-off-by: Bird Egop <sampletext32@bk.ru>

* Implement groups.setUserNote

Signed-off-by: Bird Egop <sampletext32@bk.ru>

* Restrict groups.setUserNote Note field to be not more than 96 chars

Signed-off-by: Bird Egop <sampletext32@bk.ru>

* Fix missing GroupTag [Serializable]

Signed-off-by: Bird Egop <sampletext32@bk.ru>

* Implement groups.tagAdd

* Заменяет SafetyEnum на StringEnum для NameRequest

* Заменяет SafetyEnum на StringEnum для CampaignType

* Заменяет SafetyEnum на StringEnum для CallbackServerStatus

* Заменяет SafetyEnum на StringEnum для Button

* Заменяет SafetyEnum на StringEnum для AudioCatalogSourceType

* Заменяет SafetyEnum на StringEnum для AudioAlbumType

* Заменяет SafetyEnum на StringEnum для AppWidgetType

* Убирает лишнее приведение к строке

* Заменяет SafetyEnum на StringEnum для AppType

* Заменяет SafetyEnum на StringEnum для AppSort

* Заменяет SafetyEnum на StringEnum для AppRequestType

* Заменяет SafetyEnum на StringEnum для AppPlatforms

* Заменяет SafetyEnum на StringEnum для AdsLinkType

* Заменяет SafetyEnum на StringEnum для AdRequestStatus

* Заменяет SafetyEnum на StringEnum для CarouselElementActionType

* Заменяет SafetyEnum на StringEnum для MonthlyLimit

* Заменяет SafetyEnum на StringEnum для OrderState

* Убрал не испольузуемые конвертеры

* Удаляет имплисит преобразование StoryType

* Исправляет GetHistoryAttachments #1418

* Добавляет OwnerState в User #1255

* Добавляет ContentRestricted в Audio #1245

* Добавляет события GroupUpdate - AppPayload, MarketOrderNew, MarketOrderEdit #1069

* Добавил отсутствующие поля в результат работы метода account.getProfileInfo #1008

* Добавил в AccountSaveProfileInfoParams поле CancelRequestId #1009

* Добавил carousel в объект ClientInfo #1050

* Добавил обработку параметра Extended в GetList, GetListEx #1046

* date и views_count теперь возвращаются только администратору группы, которой принадлежит товар #1066

* Обновляет пакеты #1422

* duplicate

* Аннотацию для ссылочных типов, допускающих значение NULL, следует использовать только в контексте аннотаций #nullable

* Исправление XML комментариев

* Аннотацию для ссылочных типов, допускающих значение NULL, следует использовать только в контексте аннотаций #nullable

* Аннотацию для ссылочных типов, допускающих значение NULL, следует использовать только в контексте аннотаций #nullable

* Rename parameter 'str' to 'name' to match the base class declaration

* Use a constructor overloads that allows a more meaningful exception message to be provided

* S3887: Use an immutable collection or reduce the accessibility of the non-private readonly field 'Subjects'

* Исправление XML комментариев

* Убрал лишние свойства (используются в другом объекте в качестве параметров) - дубликат

* Generic type parameters should be co/contravariant when possible

* Поправить возможность использования перегрузок методов + параметр title необязательный #988

* 5.105 В объект приложения добавлены 2 новых поля #994

* Пометил устаревшее поле #1003

* Добавляет метод messages.setMemberRole #1031

* 5.115 В stories.getViewers изменился ответ #1063

* 5.118 изменен процесс загрузки историй #1064

* Обновил настройки приватности #1158

* Добавление отсутствующих методов в groups

* Заменил Call на Call<T>

* Method overloads with default parameter values should not overlap

* Исправление XML комментариев

* Method overloads with default parameter values should not overlap

* Extended всегда true

* Исправил перегрузку метода

* Исправление XML комментариев

---------

Signed-off-by: Bird Egop <sampletext32@bk.ru>
Co-authored-by: Bird Egop <sampletext32@bk.ru>
Co-authored-by: bird_egop <e_sinitsa@head-point.ru>
Co-authored-by: inyutin-maxim <inyutin_maxim@mail.ru>
  • Loading branch information
4 people committed Mar 20, 2023
1 parent 38d4375 commit a3d9f26
Show file tree
Hide file tree
Showing 36 changed files with 236 additions and 235 deletions.
2 changes: 1 addition & 1 deletion VkNet/Abstractions/Category/Async/IAudioCategoryAsync.cs
Expand Up @@ -361,7 +361,7 @@ public interface IAudioCategoryAsync
/// <remarks>
/// Страница документации ВКонтакте http://vk.com/dev/audio.getUploadServer
/// </remarks>
Task<Uri> GetUploadServerAsync();
Task<UploadServer> GetUploadServerAsync();

/// <summary>
/// Перемещает аудиозаписи в плейлист.
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Abstractions/Category/Async/IPollsCategoryAsync.cs
Expand Up @@ -109,7 +109,7 @@ public interface IPollsCategoryAsync
/// <remarks>
/// Страница документации ВКонтакте http://vk.com/dev.php?method=polls.getPhotoUploadServer
/// </remarks>
Task<PhotoUploadServer> GetPhotoUploadServerAsync(long ownerId);
Task<UploadServer> GetPhotoUploadServerAsync(long ownerId);

/// <summary>
/// Сохраняет фотографию, загруженную в опрос.
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Abstractions/Category/IAudioCategory.cs
Expand Up @@ -62,7 +62,7 @@ public interface IAudioCategory : IAudioCategoryAsync
uint? offset = null, bool? shuffle = null);

/// <inheritdoc cref="IAudioCategoryAsync.GetUploadServerAsync"/>
Uri GetUploadServer();
UploadServer GetUploadServer();

/// <inheritdoc cref="IAudioCategoryAsync.AddToPlaylistAsync"/>
IEnumerable<long> AddToPlaylist(long ownerId, long playlistId, IEnumerable<string> audioIds);
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Abstractions/Category/IDocsCategory.cs
Expand Up @@ -27,7 +27,7 @@ public interface IDocsCategory : IDocsCategoryAsync
/// <inheritdoc cref="IDocsCategoryAsync.SaveAsync(string,string,string)"/>
ReadOnlyCollection<Attachment> Save(string file, string title = null, string tags = null);

/// <inheritdoc cref="IDocsCategoryAsync.SaveAsync(string,string,string,long?,string)"/>
/// <inheritdoc cref="IDocsCategoryAsync.SaveAsync(string,long?,string,string,string)"/>
[Obsolete(ObsoleteText.CaptchaNeeded, true)]
ReadOnlyCollection<Attachment> Save(string file, long? captchaSid = null, string title = null ,string tags = null,
string captchaKey = null);
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Abstractions/Category/IPollsCategory.cs
Expand Up @@ -32,7 +32,7 @@ public interface IPollsCategory : IPollsCategoryAsync
ReadOnlyCollection<GetBackgroundsResult> GetBackgrounds();

/// <inheritdoc cref="IPollsCategoryAsync.GetPhotoUploadServerAsync"/>
PhotoUploadServer GetPhotoUploadServer(long ownerId);
UploadServer GetPhotoUploadServer(long ownerId);

/// <inheritdoc cref="IPollsCategoryAsync.SavePhotoAsync"/>
SavePhotoResult SavePhoto(SavePhotoParams @params);
Expand Down
6 changes: 4 additions & 2 deletions VkNet/Abstractions/Category/IStoriesCategory.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
using JetBrains.Annotations;
using VkNet.Abstractions.Category;
using VkNet.Model;
Expand Down Expand Up @@ -55,10 +56,11 @@ public interface IStoriesCategory : IStoriesCategoryAsync
/// <inheritdoc cref="IStoriesCategoryAsync.UnbanOwnerAsync"/>
bool UnbanOwner(IEnumerable<long> ownersIds);

/// <inheritdoc cref="IStoriesCategoryAsync.SaveAsync"/>
/// <inheritdoc cref="IStoriesCategoryAsync.SaveAsync(StoryServerUrl, CancellationToken)"/>
VkCollection<Story> Save(StoryServerUrl uploadResults);

/// <inheritdoc cref="IStoriesCategoryAsync.SaveAsync"/>
/// <inheritdoc cref="IStoriesCategoryAsync.SaveAsync(StoryServerUrl, bool, IEnumerable{string}, CancellationToken)"/>

[Obsolete("Начиная с версии 5.118 используется только параметр uploadResults")]
VkCollection<Story> Save(StoryServerUrl uploadResults, bool extended, IEnumerable<string> fields);

Expand Down
3 changes: 2 additions & 1 deletion VkNet/Abstractions/Core/IVkApiInvoke.cs
Expand Up @@ -28,8 +28,9 @@ public interface IVkApiInvoke
/// <param name="methodName"> Название метода. </param>
/// <param name="parameters"> Параметры. </param>
/// <param name="skipAuthorization"> Если <c> true </c> то пропустить авторизацию. </param>
/// /// <param name="jsonConverters"> JsonConverters </param>
/// <returns> </returns>
VkResponse Call(string methodName, VkParameters parameters, bool skipAuthorization = false);
VkResponse Call(string methodName, VkParameters parameters, bool skipAuthorization = false, params JsonConverter[] jsonConverters);

/// <summary>
/// Вызвать метод.
Expand Down
3 changes: 2 additions & 1 deletion VkNet/Abstractions/Core/IVkLongPollInvoke.cs
Expand Up @@ -17,8 +17,9 @@ public interface IVkLongPollInvoke
/// </summary>
/// <param name="server"> Сервер. </param>
/// <param name="parameters"> Параметры. </param>
/// /// <param name="jsonConverters"> JsonConverters </param>
/// <returns> </returns>
VkResponse CallLongPoll(string server, VkParameters parameters);
VkResponse CallLongPoll(string server, VkParameters parameters, params JsonConverter[] jsonConverters);

/// <summary>
/// Вызвать ожидание событий LongPoll API.
Expand Down
18 changes: 9 additions & 9 deletions VkNet/Categories/AccountCategory.cs
Expand Up @@ -66,14 +66,14 @@ public bool SetOnline(bool? voip = null)
}

/// <inheritdoc />
public bool SetOffline() => _vk.Call("account.setOffline", VkParameters.Empty);
public bool SetOffline() => _vk.Call<bool>("account.setOffline", VkParameters.Empty);

/// <inheritdoc />
public bool RegisterDevice(AccountRegisterDeviceParams @params)
{
VkErrors.ThrowIfNullOrEmpty(() => @params.Token);

return _vk.Call("account.registerDevice",
return _vk.Call<bool>("account.registerDevice",
new()
{
{
Expand Down Expand Up @@ -115,7 +115,7 @@ public bool UnregisterDevice(string deviceId, bool? sandbox = null)
}
};

return _vk.Call("account.unregisterDevice", parameters);
return _vk.Call<bool>("account.unregisterDevice", parameters);
}

/// <inheritdoc />
Expand All @@ -139,7 +139,7 @@ public bool SetSilenceMode(string deviceId, int? time = null, int? peerId = null
}
};

return _vk.Call("account.setSilenceMode", parameters);
return _vk.Call<bool>("account.setSilenceMode", parameters);
}

/// <inheritdoc />
Expand Down Expand Up @@ -175,7 +175,7 @@ public bool SetPushSettings(string deviceId, PushSettings settings, string key,
}
};

return _vk.Call("account.setPushSettings", parameters);
return _vk.Call<bool>("account.setPushSettings", parameters);
}

/// <inheritdoc />
Expand All @@ -188,7 +188,7 @@ public long GetAppPermissions(long userId)
}
};

return _vk.Call("account.getAppPermissions", parameters);
return _vk.Call<long>("account.getAppPermissions", parameters);
}

/// <inheritdoc />
Expand Down Expand Up @@ -221,7 +221,7 @@ public bool Ban(long ownerId)
}
};

return _vk.Call("account.ban", parameters);
return _vk.Call<bool>("account.ban", parameters);
}

/// <inheritdoc />
Expand All @@ -238,7 +238,7 @@ public bool Unban(long ownerId)
}
};

return _vk.Call("account.unban", parameters);
return _vk.Call<bool>("account.unban", parameters);
}

/// <inheritdoc />
Expand Down Expand Up @@ -282,7 +282,7 @@ public bool SetInfo(string name, string value)
}
};

return _vk.Call("account.setInfo", parameters);
return _vk.Call<bool>("account.setInfo", parameters);
}

/// <inheritdoc />
Expand Down
10 changes: 5 additions & 5 deletions VkNet/Categories/AppsCategory.cs
Expand Up @@ -87,7 +87,7 @@ public AppGetObject Get(AppGetParams @params, bool skipAuthorization = false)
}

/// <inheritdoc />
public long SendRequest(AppSendRequestParams @params) => _vk.Call("apps.sendRequest", new()
public long SendRequest(AppSendRequestParams @params) => _vk.Call<long>("apps.sendRequest", new()
{
{
"user_id", @params.UserId
Expand All @@ -110,7 +110,7 @@ public long SendRequest(AppSendRequestParams @params) => _vk.Call("apps.sendRequ
});

/// <inheritdoc />
public bool DeleteAppRequests() => _vk.Call("apps.deleteAppRequests", VkParameters.Empty);
public bool DeleteAppRequests() => _vk.Call<bool>("apps.deleteAppRequests", VkParameters.Empty);

/// <inheritdoc />
public VkCollection<User> GetFriendsList(AppRequestType type
Expand Down Expand Up @@ -201,7 +201,7 @@ public long GetScore(long userId)
}
};

return _vk.Call("apps.getScore", parameters);
return _vk.Call<long>("apps.getScore", parameters);
}

/// <inheritdoc />
Expand All @@ -223,7 +223,7 @@ public long GetScore(long userId)
});

/// <inheritdoc />
public bool PromoHasActiveGift(ulong promoId, ulong? userId = null) => _vk.Call("apps.promoHasActiveGift",
public bool PromoHasActiveGift(ulong promoId, ulong? userId = null) => _vk.Call<bool>("apps.promoHasActiveGift",
new()
{
{
Expand All @@ -235,7 +235,7 @@ public long GetScore(long userId)
});

/// <inheritdoc />
public bool PromoUseGift(ulong promoId, ulong? userId = null) => _vk.Call("apps.promoUseGift",
public bool PromoUseGift(ulong promoId, ulong? userId = null) => _vk.Call<bool>("apps.promoUseGift",
new()
{
{
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Categories/Async/AudioCategoryAsync.cs
Expand Up @@ -76,7 +76,7 @@ public partial class AudioCategory
TypeHelper.TryInvokeMethodAsync(() => GetRecommendations(targetAudio, userId, count, offset, shuffle));

/// <inheritdoc />
public Task<Uri> GetUploadServerAsync() => TypeHelper.TryInvokeMethodAsync(GetUploadServer);
public Task<UploadServer> GetUploadServerAsync() => TypeHelper.TryInvokeMethodAsync(GetUploadServer);

/// <inheritdoc />
public Task<IEnumerable<long>> AddToPlaylistAsync(long ownerId, long playlistId, IEnumerable<string> audioIds) =>
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Categories/Async/PollsCategoryAsync.cs
Expand Up @@ -36,7 +36,7 @@ public partial class PollsCategory
TypeHelper.TryInvokeMethodAsync(func: () => GetBackgrounds());

/// <inheritdoc />
public Task<PhotoUploadServer> GetPhotoUploadServerAsync(long ownerId) =>
public Task<UploadServer> GetPhotoUploadServerAsync(long ownerId) =>
TypeHelper.TryInvokeMethodAsync(func: () => GetPhotoUploadServer(ownerId));

/// <inheritdoc />
Expand Down
6 changes: 2 additions & 4 deletions VkNet/Categories/AudioCategory.cs
Expand Up @@ -337,11 +337,9 @@ public IEnumerable<Audio> GetPopular(bool onlyEng = false, AudioGenre? genre = n
}

/// <inheritdoc />
public Uri GetUploadServer()
public UploadServer GetUploadServer()
{
var response = _vk.Call("audio.getUploadServer", VkParameters.Empty);

return response["upload_url"];
return _vk.Call<UploadServer>("audio.getUploadServer", VkParameters.Empty);
}

/// <inheritdoc />
Expand Down
4 changes: 2 additions & 2 deletions VkNet/Categories/AuthCategory.cs
Expand Up @@ -38,11 +38,11 @@ public bool CheckPhone(string phone, string clientSecret, long? clientId = null,
}
};

return _vk.Call("auth.checkPhone", parameters);
return _vk.Call<bool>("auth.checkPhone", parameters);
}

/// <inheritdoc />
public string Signup(AuthSignupParams @params) => _vk.Call("auth.signup", new()
public string Signup(AuthSignupParams @params) => _vk.Call<string>("auth.signup", new()
{
{
"first_name", @params.FirstName
Expand Down
20 changes: 10 additions & 10 deletions VkNet/Categories/BoardCategory.cs
Expand Up @@ -81,7 +81,7 @@ public TopicsFeed GetComments(BoardGetCommentsParams @params, bool skipAuthoriza
}

/// <inheritdoc />
public long AddTopic(BoardAddTopicParams @params) => _vk.Call("board.addTopic", new()
public long AddTopic(BoardAddTopicParams @params) => _vk.Call<long>("board.addTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -101,7 +101,7 @@ public long AddTopic(BoardAddTopicParams @params) => _vk.Call("board.addTopic",
});

/// <inheritdoc />
public bool DeleteTopic(BoardTopicParams @params) => _vk.Call("board.deleteTopic", new()
public bool DeleteTopic(BoardTopicParams @params) => _vk.Call<bool>("board.deleteTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -112,7 +112,7 @@ public bool DeleteTopic(BoardTopicParams @params) => _vk.Call("board.deleteTopic
});

/// <inheritdoc />
public bool CloseTopic(BoardTopicParams @params) => _vk.Call("board.closeTopic", new()
public bool CloseTopic(BoardTopicParams @params) => _vk.Call<bool>("board.closeTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -123,7 +123,7 @@ public bool CloseTopic(BoardTopicParams @params) => _vk.Call("board.closeTopic",
});

/// <inheritdoc />
public bool OpenTopic(BoardTopicParams @params) => _vk.Call("board.openTopic", new()
public bool OpenTopic(BoardTopicParams @params) => _vk.Call<bool>("board.openTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -134,7 +134,7 @@ public bool OpenTopic(BoardTopicParams @params) => _vk.Call("board.openTopic", n
});

/// <inheritdoc />
public bool FixTopic(BoardTopicParams @params) => _vk.Call("board.fixTopic", new()
public bool FixTopic(BoardTopicParams @params) => _vk.Call<bool>("board.fixTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -145,7 +145,7 @@ public bool FixTopic(BoardTopicParams @params) => _vk.Call("board.fixTopic", new
});

/// <inheritdoc />
public bool UnFixTopic(BoardTopicParams @params) => _vk.Call("board.unfixTopic", new()
public bool UnFixTopic(BoardTopicParams @params) => _vk.Call<bool>("board.unfixTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -156,7 +156,7 @@ public bool UnFixTopic(BoardTopicParams @params) => _vk.Call("board.unfixTopic",
});

/// <inheritdoc />
public bool EditTopic(BoardEditTopicParams @params) => _vk.Call("board.editTopic", new()
public bool EditTopic(BoardEditTopicParams @params) => _vk.Call<bool>("board.editTopic", new()
{
{
"group_id", @params.GroupId
Expand All @@ -170,7 +170,7 @@ public bool EditTopic(BoardEditTopicParams @params) => _vk.Call("board.editTopic
});

/// <inheritdoc />
public long CreateComment(BoardCreateCommentParams @params) => _vk.Call("board.createComment", new()
public long CreateComment(BoardCreateCommentParams @params) => _vk.Call<long>("board.createComment", new()
{
{
"group_id", @params.GroupId
Expand All @@ -196,7 +196,7 @@ public long CreateComment(BoardCreateCommentParams @params) => _vk.Call("board.c
});

/// <inheritdoc />
public bool DeleteComment(BoardCommentParams @params) => _vk.Call("board.deleteComment", new()
public bool DeleteComment(BoardCommentParams @params) => _vk.Call<bool>("board.deleteComment", new()
{
{
"group_id", @params.GroupId
Expand All @@ -210,7 +210,7 @@ public bool DeleteComment(BoardCommentParams @params) => _vk.Call("board.deleteC
});

/// <inheritdoc />
public bool EditComment(BoardEditCommentParams @params) => _vk.Call("board.editComment", new()
public bool EditComment(BoardEditCommentParams @params) => _vk.Call<bool>("board.editComment", new()
{
{
"group_id", @params.GroupId
Expand Down
6 changes: 3 additions & 3 deletions VkNet/Categories/DocsCategory.cs
Expand Up @@ -207,7 +207,7 @@ public bool Delete(long ownerId, long docId)
}
};

return _vk.Call("docs.delete", parameters);
return _vk.Call<bool>("docs.delete", parameters);
}

/// <inheritdoc />
Expand Down Expand Up @@ -235,7 +235,7 @@ public long Add(long ownerId, long docId, string accessKey = null)
}
};

return _vk.Call("docs.add", parameters);
return _vk.Call<long>("docs.add", parameters);
}

/// <inheritdoc />
Expand Down Expand Up @@ -292,7 +292,7 @@ public bool Edit(long ownerId, long docId, string title, IEnumerable<string> tag
}
};

return _vk.Call("docs.edit", parameters);
return _vk.Call<bool>("docs.edit", parameters);
}

/// <inheritdoc />
Expand Down
2 changes: 1 addition & 1 deletion VkNet/Categories/DonutCategory.cs
Expand Up @@ -29,7 +29,7 @@ public bool IsDon(long ownerId)
}
};

return _vk.Call("donut.isDon", parameters);
return _vk.Call<bool>("donut.isDon", parameters);
}

/// <inheritdoc/>
Expand Down

0 comments on commit a3d9f26

Please sign in to comment.