forked from sim0n00ps/OF-DL
Fixed parameters to ensure no null values are passed incorrectly
This commit is contained in:
parent
a91940cfd8
commit
67961ed80d
@ -246,7 +246,7 @@ public class APIHelper : IAPIHelper
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<User?> GetUserInfo(string endpoint)
|
public async Task<User?> GetUserInfo(string username, string endpoint)
|
||||||
{
|
{
|
||||||
Log.Debug($"Calling GetUserInfo: {endpoint}");
|
Log.Debug($"Calling GetUserInfo: {endpoint}");
|
||||||
|
|
||||||
@ -275,7 +275,7 @@ public class APIHelper : IAPIHelper
|
|||||||
user = JsonConvert.DeserializeObject<Entities.User>(body, m_JsonSerializerSettings);
|
user = JsonConvert.DeserializeObject<Entities.User>(body, m_JsonSerializerSettings);
|
||||||
|
|
||||||
if (user is not null && !endpoint.EndsWith("/me"))
|
if (user is not null && !endpoint.EndsWith("/me"))
|
||||||
await m_DBHelper.UpdateUserInfo(user);
|
await m_DBHelper.UpdateUserInfo(username, user);
|
||||||
|
|
||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -254,9 +254,9 @@ namespace OF_DL.Helpers
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task UpdateUserInfo(User? user)
|
public async Task UpdateUserInfo(string username, User? user)
|
||||||
{
|
{
|
||||||
if (user is null)
|
if (user?.id is null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
SqliteConnection connection = await GetAndOpenConnectionAsync($"Data Source={Directory.GetCurrentDirectory()}/users.db");
|
SqliteConnection connection = await GetAndOpenConnectionAsync($"Data Source={Directory.GetCurrentDirectory()}/users.db");
|
||||||
@ -270,7 +270,7 @@ namespace OF_DL.Helpers
|
|||||||
);
|
);
|
||||||
|
|
||||||
cmdInfo.Parameters.AddWithValue("@userId", user.id);
|
cmdInfo.Parameters.AddWithValue("@userId", user.id);
|
||||||
cmdInfo.Parameters.AddWithValue("@name", user.name);
|
cmdInfo.Parameters.AddWithValue("@name", user.name ?? user.username ?? username);
|
||||||
cmdInfo.Parameters.AddWithValue("@about", user.about);
|
cmdInfo.Parameters.AddWithValue("@about", user.about);
|
||||||
cmdInfo.Parameters.AddWithValue("@expiresOn", user.subscribedByExpireDate);
|
cmdInfo.Parameters.AddWithValue("@expiresOn", user.subscribedByExpireDate);
|
||||||
cmdInfo.Parameters.AddWithValue("@photoCount", user.photosCount ?? 0);
|
cmdInfo.Parameters.AddWithValue("@photoCount", user.photosCount ?? 0);
|
||||||
|
|||||||
@ -29,7 +29,7 @@ namespace OF_DL.Helpers
|
|||||||
Task<PaidMessageCollection> GetPaidMessages(string endpoint, string folder, string username, int userId, IDownloadConfig config, StatusContext ctx);
|
Task<PaidMessageCollection> GetPaidMessages(string endpoint, string folder, string username, int userId, IDownloadConfig config, StatusContext ctx);
|
||||||
Task<Dictionary<string, int>> GetPurchasedTabUsers(string endpoint, IDownloadConfig config, Dictionary<string, int> users);
|
Task<Dictionary<string, int>> GetPurchasedTabUsers(string endpoint, IDownloadConfig config, Dictionary<string, int> users);
|
||||||
Task<List<PurchasedTabCollection>> GetPurchasedTab(string endpoint, string folder, IDownloadConfig config, Dictionary<string, int> users);
|
Task<List<PurchasedTabCollection>> GetPurchasedTab(string endpoint, string folder, IDownloadConfig config, Dictionary<string, int> users);
|
||||||
Task<User> GetUserInfo(string endpoint);
|
Task<User> GetUserInfo(string username, string endpoint);
|
||||||
Task<JObject> GetUserInfoById(string endpoint);
|
Task<JObject> GetUserInfoById(string endpoint);
|
||||||
Dictionary<string, string> GetDynamicHeaders(string path, string queryParam);
|
Dictionary<string, string> GetDynamicHeaders(string path, string queryParam);
|
||||||
Task<Dictionary<string, int>> GetActiveSubscriptions(string endpoint, bool includeRestrictedSubscriptions, IDownloadConfig config);
|
Task<Dictionary<string, int>> GetActiveSubscriptions(string endpoint, bool includeRestrictedSubscriptions, IDownloadConfig config);
|
||||||
|
|||||||
@ -15,6 +15,6 @@ namespace OF_DL.Helpers
|
|||||||
Task<long> GetStoredFileSize(string folder, long media_id, string api_type);
|
Task<long> GetStoredFileSize(string folder, long media_id, string api_type);
|
||||||
Task<bool> CheckDownloaded(string folder, long media_id, string api_type);
|
Task<bool> CheckDownloaded(string folder, long media_id, string api_type);
|
||||||
Task<DateTime?> GetMostRecentPostDate(string folder);
|
Task<DateTime?> GetMostRecentPostDate(string folder);
|
||||||
Task UpdateUserInfo(User? user);
|
Task UpdateUserInfo(string username, User? user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -843,7 +843,7 @@ public class Program
|
|||||||
//Check if auth is valid
|
//Check if auth is valid
|
||||||
var apiHelper = new APIHelper(auth, config);
|
var apiHelper = new APIHelper(auth, config);
|
||||||
|
|
||||||
Entities.User? validate = await apiHelper.GetUserInfo($"/users/me");
|
Entities.User? validate = await apiHelper.GetUserInfo(string.Empty, $"/users/me");
|
||||||
if (validate == null || (validate?.name == null && validate?.username == null))
|
if (validate == null || (validate?.name == null && validate?.username == null))
|
||||||
{
|
{
|
||||||
Log.Error("Auth failed");
|
Log.Error("Auth failed");
|
||||||
@ -983,8 +983,8 @@ public class Program
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
Log.Information("Updating User Info for for: {Username:l}");
|
Log.Information("Updating User Info for for: {Username:l}");
|
||||||
User? user_info = await m_ApiHelper.GetUserInfo($"/users/{username}");
|
User? user_info = await m_ApiHelper.GetUserInfo(username, $"/users/{username}");
|
||||||
await dbHelper.UpdateUserInfo(user_info);
|
await dbHelper.UpdateUserInfo(username, user_info);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -1212,7 +1212,7 @@ public class Program
|
|||||||
Log.Debug($"Folder for {user.Key} already created");
|
Log.Debug($"Folder for {user.Key} already created");
|
||||||
}
|
}
|
||||||
|
|
||||||
Entities.User user_info = await m_ApiHelper.GetUserInfo($"/users/{user.Key}");
|
Entities.User user_info = await m_ApiHelper.GetUserInfo(user.Key, $"/users/{user.Key}");
|
||||||
|
|
||||||
await dBHelper.CreateDB(path);
|
await dBHelper.CreateDB(path);
|
||||||
}
|
}
|
||||||
@ -1405,7 +1405,7 @@ public class Program
|
|||||||
|
|
||||||
var downloadContext = new DownloadContext(Auth, Config, GetCreatorFileNameFormatConfig(Config, user.Key), m_ApiHelper, dBHelper);
|
var downloadContext = new DownloadContext(Auth, Config, GetCreatorFileNameFormatConfig(Config, user.Key), m_ApiHelper, dBHelper);
|
||||||
|
|
||||||
User? user_info = await m_ApiHelper.GetUserInfo($"/users/{user.Key}");
|
User? user_info = await m_ApiHelper.GetUserInfo(user.Key, $"/users/{user.Key}");
|
||||||
|
|
||||||
if (Config.DownloadAvatarHeaderPhoto && user_info != null)
|
if (Config.DownloadAvatarHeaderPhoto && user_info != null)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user