liza/PalacePal
liza/PalacePal
1
0
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases 47 Activity

Config: Remove Pal.Client.Net dependency for HasRole check

Browse Source
This commit is contained in:
Liza 2023-02-16 13:27:28 +01:00
parent 5c82382161
commit 7e2ccd3b42
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Pal.Client/Configuration/ConfigurationV7.cs
View File

@ -2,7 +2,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using Pal.Client.Net;
namespace Pal.Client.Configuration namespace Pal.Client.Configuration
{ {
@ -47,12 +46,12 @@ namespace Pal.Client.Configuration
Accounts.RemoveAll(a => a.Server == server && a.IsUsable); Accounts.RemoveAll(a => a.Server == server && a.IsUsable);
} }
public bool HasRoleOnCurrentServer(string role) public bool HasRoleOnCurrentServer(string server, string role)
{ {
if (Mode != EMode.Online) if (Mode != EMode.Online)
return false; return false;
var account = FindAccount(RemoteApi.RemoteUrl); var account = FindAccount(server);
return account == null || account.CachedRoles.Contains(role); return account == null || account.CachedRoles.Contains(role);
} }
} }

2
Pal.Client/Configuration/IPalacePalConfiguration.cs
View File

@ -30,7 +30,7 @@ namespace Pal.Client.Configuration
IAccountConfiguration? FindAccount(string server); IAccountConfiguration? FindAccount(string server);
void RemoveAccount(string server); void RemoveAccount(string server);
bool HasRoleOnCurrentServer(string role); bool HasRoleOnCurrentServer(string server, string role);
} }
public class DeepDungeonConfiguration public class DeepDungeonConfiguration

2
Pal.Client/DependencyInjection/StatisticsService.cs
View File

@ -33,7 +33,7 @@ namespace Pal.Client.DependencyInjection
private async Task FetchFloorStatistics() private async Task FetchFloorStatistics()
{ {
if (!_configuration.HasRoleOnCurrentServer("statistics:view")) if (!_configuration.HasRoleOnCurrentServer(RemoteApi.RemoteUrl, "statistics:view"))
{ {
_chatGui.PalError(Localization.Command_pal_stats_CurrentFloor); _chatGui.PalError(Localization.Command_pal_stats_CurrentFloor);
return; return;

2
Pal.Client/Windows/ConfigWindow.cs
View File

@ -296,7 +296,7 @@ namespace Pal.Client.Windows
private void DrawExportTab() private void DrawExportTab()
{ {
if (_configuration.HasRoleOnCurrentServer("export:run") && if (_configuration.HasRoleOnCurrentServer(RemoteApi.RemoteUrl, "export:run") &&
ImGui.BeginTabItem($"{Localization.ConfigTab_Export}###TabExport")) ImGui.BeginTabItem($"{Localization.ConfigTab_Export}###TabExport"))
{ {
string todaysFileName = $"export-{DateTime.Today:yyyy-MM-dd}.pal"; string todaysFileName = $"export-{DateTime.Today:yyyy-MM-dd}.pal";