[CHANGE] Rework && adding channel fetching
This commit is contained in:
@@ -1,19 +1,15 @@
|
||||
using System.Net;
|
||||
using DotBased.Monads;
|
||||
using Manager.YouTube.Models.Innertube;
|
||||
using Manager.YouTube.Models;
|
||||
|
||||
namespace Manager.YouTube;
|
||||
|
||||
public sealed class YouTubeClient : IDisposable
|
||||
{
|
||||
public string Id { get; private set; } = "";
|
||||
public string AccountName => ClientState?.UserAccountName ?? "";
|
||||
public string? AccountHandle { get; set; }
|
||||
public string? AccountImage { get; set; }
|
||||
public string? UserAgent { get; set; }
|
||||
public CookieContainer CookieContainer { get; } = new() { PerDomainCapacity = 50 };
|
||||
public ClientState? ClientState { get; private set; }
|
||||
public List<string> DatasyncIds { get; set; } = [];
|
||||
public ClientExternalData External { get; set; } = new();
|
||||
public Cookie? SapisidCookie => CookieContainer.GetAllCookies()["SAPISID"];
|
||||
public HttpClient? GetHttpClient() => _httpClient;
|
||||
|
||||
@@ -40,17 +36,17 @@ public sealed class YouTubeClient : IDisposable
|
||||
|
||||
public async Task<Result> BuildClientAsync()
|
||||
{
|
||||
if (ClientState == null || !ClientState.LoggedIn)
|
||||
if (External.State is not { LoggedIn: true })
|
||||
{
|
||||
var state = await NetworkService.GetClientStateAsync(this);
|
||||
if (!state.IsSuccess)
|
||||
{
|
||||
return state;
|
||||
}
|
||||
ClientState = state.Value;
|
||||
External.State = state.Value;
|
||||
}
|
||||
|
||||
if (string.IsNullOrWhiteSpace(ClientState.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId))
|
||||
if (string.IsNullOrWhiteSpace(External.State.WebPlayerContextConfig?.WebPlayerContext?.DatasyncId))
|
||||
{
|
||||
var datasyncResult = await NetworkService.GetDatasyncIds(this);
|
||||
if (!datasyncResult.IsSuccess)
|
||||
@@ -60,22 +56,25 @@ public sealed class YouTubeClient : IDisposable
|
||||
|
||||
foreach (var id in datasyncResult.Value)
|
||||
{
|
||||
if (DatasyncIds.Contains(id))
|
||||
if (External.DatasyncIds.Contains(id))
|
||||
continue;
|
||||
DatasyncIds.Add(id);
|
||||
External.DatasyncIds.Add(id);
|
||||
}
|
||||
}
|
||||
|
||||
var accountInfoResult = await NetworkService.GetCurrentAccountInfoAsync(this);
|
||||
if (!accountInfoResult.IsSuccess)
|
||||
if (string.IsNullOrWhiteSpace(Id))
|
||||
{
|
||||
return accountInfoResult;
|
||||
}
|
||||
var accountInfoResult = await NetworkService.GetCurrentAccountIdAsync(this);
|
||||
if (!accountInfoResult.IsSuccess)
|
||||
{
|
||||
return accountInfoResult;
|
||||
}
|
||||
|
||||
Id = accountInfoResult.Value.AccountId ?? "";
|
||||
AccountHandle = accountInfoResult.Value.AccountHandle;
|
||||
AccountImage = accountInfoResult.Value.ImageUrl;
|
||||
Id = accountInfoResult.Value;
|
||||
}
|
||||
|
||||
var accountInfo = await NetworkService.GetChannelAsync(Id, this);
|
||||
|
||||
return Result.Success();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user