From 2e9acf15786cc23a270429d6657b8991db91dc65 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Sun, 30 Jun 2024 18:33:23 +0200 Subject: [PATCH] asdjf --- OwnChar/Api/IDataManager.cs | 2 +- OwnChar/Data/Managers/DefaultDataManager.cs | 2 +- OwnChar/Data/OnActionEventArgs.cs | 4 ++-- OwnChar/Manager/Modules/GroupsManager.cs | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OwnChar/Api/IDataManager.cs b/OwnChar/Api/IDataManager.cs index 6656d07..b414a51 100644 --- a/OwnChar/Api/IDataManager.cs +++ b/OwnChar/Api/IDataManager.cs @@ -15,7 +15,7 @@ public interface IDataManager bool Logout(UserAccount? account); // Action - DataManagerActionResult ExecuteAction(DataManagerAction action, DataManagerActionType actionType, UserAccount currentUser, OwnCharObject? obj, params object?[] parameters); + DataManagerActionResult ExecuteAction(DataManagerAction action, DataManagerActionType actionType, UserAccount currentUser, object? obj, params object?[] parameters); //// User management //UserProfile? GetUserProfile(UserAccount account); diff --git a/OwnChar/Data/Managers/DefaultDataManager.cs b/OwnChar/Data/Managers/DefaultDataManager.cs index d8df803..2ca84cd 100644 --- a/OwnChar/Data/Managers/DefaultDataManager.cs +++ b/OwnChar/Data/Managers/DefaultDataManager.cs @@ -20,7 +20,7 @@ public class DefaultDataManager : IDataManager Initialize(false); } - public virtual DataManagerActionResult ExecuteAction(DataManagerAction action, DataManagerActionType actionType, UserAccount currentUser, OwnCharObject? obj, params object?[] parameters) + public virtual DataManagerActionResult ExecuteAction(DataManagerAction action, DataManagerActionType actionType, UserAccount currentUser, object? obj, params object?[] parameters) { var success = false; var e = new OnActionEventArgs(action, actionType, currentUser, obj, parameters); diff --git a/OwnChar/Data/OnActionEventArgs.cs b/OwnChar/Data/OnActionEventArgs.cs index 27c3eb8..0cab076 100644 --- a/OwnChar/Data/OnActionEventArgs.cs +++ b/OwnChar/Data/OnActionEventArgs.cs @@ -2,12 +2,12 @@ namespace OwnChar.Data; -public class OnActionEventArgs(DataManagerAction action, DataManagerActionType actionType, UserAccount currentUser, OwnCharObject obj, object?[] parameters) : EventArgs +public class OnActionEventArgs(DataManagerAction action, DataManagerActionType actionType, UserAccount currentUser, object? obj, object?[] parameters) : EventArgs { public DataManagerAction Action { get; } = action; public DataManagerActionType ActionType { get; } = actionType; public UserAccount CurrentUser { get; } = currentUser; - public OwnCharObject Object { get; } = obj; + public object? Object { get; } = obj; public object?[] Parameters { get; } = parameters; public bool IsHandled { get; set; } public object? Result { get; set; } diff --git a/OwnChar/Manager/Modules/GroupsManager.cs b/OwnChar/Manager/Modules/GroupsManager.cs index a08dfa1..ddc7833 100644 --- a/OwnChar/Manager/Modules/GroupsManager.cs +++ b/OwnChar/Manager/Modules/GroupsManager.cs @@ -11,14 +11,14 @@ public class GroupsManager(OwnCharManager manager) : OwnCharManagerModule(manage { ArgumentNullException.ThrowIfNull(group, nameof(group)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Get, Manager.CurrentUser!, group).HasSuccess; + return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Get, Manager.CurrentUser, group).HasSuccess; } public IEnumerable? GetMembers(Group? group) { ArgumentNullException.ThrowIfNull(group, nameof(group)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Get, Manager.CurrentUser!, group).HasSuccess; + return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Get, Manager.CurrentUser, group).HasSuccess; } public bool AddMember(UserProfile? profile, Group? group) @@ -26,7 +26,7 @@ public class GroupsManager(OwnCharManager manager) : OwnCharManagerModule(manage ArgumentNullException.ThrowIfNull(profile, nameof(profile)); ArgumentNullException.ThrowIfNull(group, nameof(group)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Set, Manager.CurrentUser!, group, profile).HasSuccess; + return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Set, Manager.CurrentUser, group, profile).HasSuccess; } public bool DeleteMember(UserProfile? profile, Group? group) @@ -34,20 +34,20 @@ public class GroupsManager(OwnCharManager manager) : OwnCharManagerModule(manage ArgumentNullException.ThrowIfNull(profile, nameof(profile)); ArgumentNullException.ThrowIfNull(group, nameof(group)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Delete, Manager.CurrentUser!, group, profile).HasSuccess; + return Manager.DataManager.ExecuteAction(DataManagerActions.Association.Members, DataManagerActionType.Delete, Manager.CurrentUser, group, profile).HasSuccess; } public Group? CreateGroup(string? name) { ArgumentException.ThrowIfNullOrWhiteSpace(name, nameof(name)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Creation.Group, DataManagerActionType.Default, Manager.CurrentUser!, null, name).Result as Group; + return Manager.DataManager.ExecuteAction(DataManagerActions.Creation.Group, DataManagerActionType.Default, Manager.CurrentUser, null, name).Result as Group; } public bool DeleteGroup(Group? group) { ArgumentNullException.ThrowIfNull(group, nameof(group)); Manager.CheckLogin(); - return Manager.DataManager.ExecuteAction(DataManagerActions.Delete, DataManagerActionType.Default, Manager.CurrentUser!, group).HasSuccess; + return Manager.DataManager.ExecuteAction(DataManagerActions.Delete, DataManagerActionType.Default, Manager.CurrentUser, group).HasSuccess; } }