chore: cleanup
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
using Telegram.Bot;
|
||||
using Telegram.Bot.Types;
|
||||
using User = JOBot.Proto.User;
|
||||
|
||||
namespace JOBot.TClient.Services;
|
||||
|
||||
@@ -9,7 +8,7 @@ public class MenuService(ITelegramBotClient bot)
|
||||
public async Task RenderMenu(Update update, CancellationToken ct = default)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(update.Message?.From);
|
||||
|
||||
await bot.SendMessage(update.Message.From.Id,"PrepareUser stage is done.", cancellationToken: ct);
|
||||
|
||||
await bot.SendMessage(update.Message.From.Id, "PrepareUser stage is done.", cancellationToken: ct);
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
|
||||
private readonly User.UserClient _userClient = userClient;
|
||||
|
||||
/// <summary>
|
||||
/// Get or register user on system
|
||||
/// Get or register user on system
|
||||
/// </summary>
|
||||
/// <param name="update">Telegram Update object</param>
|
||||
/// <param name="ct">Cancellation Token</param>
|
||||
@@ -26,21 +26,21 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
|
||||
var result = await _userClient.RegisterAsync(new RegisterRequest
|
||||
{
|
||||
UserId = update.Message.From.Id,
|
||||
Username = update.Message.From.Username,
|
||||
Username = update.Message.From.Username
|
||||
});
|
||||
|
||||
if (!result.Success)
|
||||
{
|
||||
await _bot.SendMessage(chatId: update.Message.Chat.Id,
|
||||
await _bot.SendMessage(update.Message.Chat.Id,
|
||||
TextResource.FallbackMessage,
|
||||
cancellationToken: ct);
|
||||
|
||||
throw new FallbackException(TextResource.FallbackMessage, update.Message, _bot);
|
||||
}
|
||||
|
||||
var user = await _userClient.GetUserAsync(new GetUserRequest()
|
||||
var user = await _userClient.GetUserAsync(new GetUserRequest
|
||||
{
|
||||
UserId = update.Message.From.Id,
|
||||
UserId = update.Message.From.Id
|
||||
});
|
||||
|
||||
if (user == null)
|
||||
@@ -50,7 +50,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get Eula Agreement from user
|
||||
/// Get Eula Agreement from user
|
||||
/// </summary>
|
||||
/// <param name="update">Telegram Update object</param>
|
||||
/// <param name="ct">Cancellation Token</param>
|
||||
@@ -66,7 +66,7 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Accept EULA for user
|
||||
/// Accept EULA for user
|
||||
/// </summary>
|
||||
/// <param name="update">Telegram update object</param>
|
||||
/// <param name="ct">Cancellation Token</param>
|
||||
@@ -74,10 +74,10 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
|
||||
public async Task AcceptEula(Update update, CancellationToken ct = default)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(update.Message?.From);
|
||||
var result = await _userClient.AcceptEulaAsync(new()
|
||||
var result = await _userClient.AcceptEulaAsync(new AcceptEulaRequest
|
||||
{
|
||||
EulaAccepted = true,
|
||||
UserId = update.Message.From.Id,
|
||||
UserId = update.Message.From.Id
|
||||
});
|
||||
|
||||
if (!result.Success)
|
||||
@@ -87,22 +87,23 @@ public class PrepareUserService(ITelegramBotClient bot, User.UserClient userClie
|
||||
public async Task Auth(Update update, CancellationToken ct = default)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(update.Message?.From);
|
||||
|
||||
var url = await _userClient.GetHeadHunterAuthHookAsync(new GetHeadHunterAuthHookRequest()
|
||||
|
||||
var url = await _userClient.GetHeadHunterAuthHookAsync(new GetHeadHunterAuthHookRequest
|
||||
{
|
||||
UserId = update.Message.From.Id
|
||||
});
|
||||
|
||||
await _bot.SendMessage(
|
||||
update.Message.From.Id,
|
||||
string.Format(TextResource.AskForAuth, [url.RegistrationUrl]),
|
||||
update.Message.From.Id,
|
||||
string.Format(TextResource.AskForAuth, [url.RegistrationUrl]),
|
||||
cancellationToken: ct);
|
||||
}
|
||||
|
||||
public async Task SelectCv(Update update, CancellationToken ct = default)
|
||||
{
|
||||
ArgumentNullException.ThrowIfNull(update.Message?.From);
|
||||
|
||||
await _bot.SendMessage(update.Message.From.Id, "Давайте выберем одно из доступных резюме:", cancellationToken: ct); //TODO: https://git.lisoveliy.su/Lisoveliy/JOBot/issues/9
|
||||
|
||||
await _bot.SendMessage(update.Message.From.Id, "Давайте выберем одно из доступных резюме:",
|
||||
cancellationToken: ct); //TODO: https://git.lisoveliy.su/Lisoveliy/JOBot/issues/9
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,7 @@ namespace JOBot.TClient.Services;
|
||||
public class UserService(ITelegramBotClient bot, User.UserClient userClient)
|
||||
{
|
||||
/// <summary>
|
||||
/// Get user
|
||||
/// Get user
|
||||
/// </summary>
|
||||
/// <param name="update">Telegram Update object</param>
|
||||
/// <param name="ct">Cancellation Token</param>
|
||||
@@ -26,7 +26,7 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)
|
||||
{
|
||||
user = await userClient.GetUserAsync(new GetUserRequest() //Получаем пользователя
|
||||
{
|
||||
UserId = update.Message.From.Id,
|
||||
UserId = update.Message.From.Id
|
||||
});
|
||||
}
|
||||
catch (RpcException e) //Пользователь не найден?
|
||||
@@ -36,6 +36,7 @@ public class UserService(ITelegramBotClient bot, User.UserClient userClient)
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
return user;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user