Skip to content

Commit

Permalink
Merge pull request #6 from MentallyStable4sure/dev
Browse files Browse the repository at this point in the history
Content moved
  • Loading branch information
dentalmisorder authored Jun 8, 2023
2 parents 3b5cdf0 + 7d8e75e commit b5842b1
Show file tree
Hide file tree
Showing 30 changed files with 5 additions and 4 deletions.
2 changes: 0 additions & 2 deletions Eremite/Data/GenshinData/PlayerInfo.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@

using DiscordBot.GenshinData;

namespace Eremite.Data.GenshinData
{
[Serializable]
Expand Down
2 changes: 1 addition & 1 deletion Eremite/Data/GenshinData/ProfilePicture.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

namespace DiscordBot.GenshinData
namespace Eremite.Data.GenshinData
{
[Serializable]
public class ProfilePicture
Expand Down
5 changes: 4 additions & 1 deletion Eremite/Services/BotProfileHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ public async Task<DiscordConfiguration> SetConfig()
var rawConfig = await DataGrabber.GrabFromConfigs(StartupConfig);

rawConfig.LogStatus(StartupConfig);
botStartupConfig = JsonSerializer.Deserialize<StartupConfig>(rawConfig);

//in order to properly deserealize list
var options = new JsonSerializerOptions() { IncludeFields = true };
botStartupConfig = JsonSerializer.Deserialize<StartupConfig>(rawConfig, options);

return CreateDiscordConfig(botStartupConfig);
}
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes

0 comments on commit b5842b1

Please # to comment.