allow ace permissions to be optional

update dependencies
all-in-simplicity · May 23, 2021 · b8bab0f · b8bab0f
1 parent a66e3d2
commit b8bab0f
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 37 deletions.
diff --git a/src/Hypnonema.Client/Hypnonema.Client.csproj b/src/Hypnonema.Client/Hypnonema.Client.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="CitizenFX.Core.Client, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CitizenFX.Core.Client.1.0.3246\lib\net45\CitizenFX.Core.Client.dll</HintPath>
+      <HintPath>..\..\packages\CitizenFX.Core.Client.1.0.3970\lib\net45\CitizenFX.Core.Client.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -77,11 +77,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.4.194\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
 </Project>
diff --git a/src/Hypnonema.Client/packages.config b/src/Hypnonema.Client/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CitizenFX.Core.Client" version="1.0.3246" targetFramework="net452" />
-  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="net452" developmentDependency="true" />
+  <package id="CitizenFX.Core.Client" version="1.0.3970" targetFramework="net452" />
+  <package id="Nerdbank.GitVersioning" version="3.4.194" targetFramework="net452" developmentDependency="true" />
 </packages>
diff --git a/src/Hypnonema.Server/Hypnonema.Server.csproj b/src/Hypnonema.Server/Hypnonema.Server.csproj
@@ -17,14 +17,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CitizenFX.Core.Server" Version="1.0.3246" />
+    <PackageReference Include="CitizenFX.Core.Server" Version="1.0.3970" />
     <PackageReference Include="LiteDB" Version="4.1.4" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.194">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Hypnonema.Server/ServerScript.cs → src/Hypnonema.Server/Server.cs b/src/Hypnonema.Server/ServerScript.cs → src/Hypnonema.Server/Server.cs
@@ -19,11 +19,13 @@
 
     using Logger = Hypnonema.Server.Utils.Logger;
 
-    public class ServerScript : BaseScript
+    public class Server : BaseScript
     {
         public static bool IsLoggingEnabled = true;
 
         private string cmdName = "hypnonema";
+
+        private bool isCommandRestricted = true;
 
         private string connectionString = "Filename=hypnonema.db";
 
@@ -37,17 +39,7 @@ public class ServerScript : BaseScript
 
         private static void RegisterCommand(string cmdName, InputArgument handler, bool restricted)
         {
-            try
-            {
-                API.RegisterCommand(cmdName, handler, restricted);
-            }
-            catch (Exception e)
-            {
-                Logger.WriteLine(
-                    $"failed to register the command {cmdName}. Error: {e.Message}",
-                    Logger.LogLevel.Error);
-                throw;
-            }
+            API.RegisterCommand(cmdName, handler, restricted);
         }
 
         private void AddChatMessage(Player player, string message, int[] color = null)
@@ -59,7 +51,7 @@ private void AddChatMessage(Player player, string message, int[] color = null)
 
         private bool IsPlayerAllowed(Player player)
         {
-            return API.IsPlayerAceAllowed(player.Handle, $"command.{this.cmdName}");
+            return !this.isCommandRestricted || API.IsPlayerAceAllowed(player.Handle, $"command.{this.cmdName}");
         }
 
         /// <summary>
@@ -258,6 +250,12 @@ private void OnResourceStart(string resourceName)
                 "hypnonema_db_connString",
                 0,
                 this.connectionString);
+            this.cmdName = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_command_name", 0, this.cmdName)
+                .Replace(" ", string.Empty);
+            this.syncInterval = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_sync_interval", 0, this.syncInterval);
+            this.isCommandRestricted = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_restrict_command", 0,
+                this.isCommandRestricted);
+            IsLoggingEnabled = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_logging_enabled", 0, IsLoggingEnabled);
 
             try
             {
@@ -273,20 +271,17 @@ private void OnResourceStart(string resourceName)
             // Create Example Screen if Database is empty
             this.PopulateDatabaseIfEmpty();
 
-            this.cmdName = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_command_name", 0, "hypnonema")
-                .Replace(" ", string.Empty);
-
-            this.syncInterval = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_sync_interval", 0, 5000);
-
             if (this.cmdName != "hypnonema")
                 Logger.WriteLine(
-                    $"Using {this.cmdName} as command name. Type /{this.cmdName} to open the NUI window.",
+                    $"Using '{this.cmdName}' as command name. Type /{this.cmdName} to open the NUI window.",
                     Logger.LogLevel.Information);
 
-            var loggingEnabled = ConfigReader.GetConfigKeyValue(resourceName, "hypnonema_logging_enabled", 0, false);
-            IsLoggingEnabled = loggingEnabled;
+            if (!this.isCommandRestricted)
+            {
+                Logger.WriteLine($"Command '{this.cmdName}' is NOT restricted", Logger.LogLevel.Information);
+            }
 
-            RegisterCommand(this.cmdName, new Action<int, List<object>, string>(this.OnHypnonemaCommand), true);
+            RegisterCommand(this.cmdName, new Action<int, List<object>, string>(this.OnHypnonemaCommand), this.isCommandRestricted);
         }
 
         [EventHandler("onResourceStop")]
@@ -326,11 +321,9 @@ private void OnStateTick([FromSource] Player p, string jsonState)
                              where screen != null
                              select new ScreenDuiState { Screen = screen, State = duiState }).ToList();
 
-            if (lastState.Any())
-            {
-                this.lastKnownState.StateList = lastState;
-                this.lastKnownState.Timestamp = DateTime.UtcNow;
-            }
+            if (!lastState.Any()) return;
+            this.lastKnownState.StateList = lastState;
+            this.lastKnownState.Timestamp = DateTime.UtcNow;
         }
 
         [EventHandler(ServerEvents.OnStopVideo)]

diff --git a/src/Hypnonema.Server/Utils/Logger.cs b/src/Hypnonema.Server/Utils/Logger.cs
@@ -49,7 +49,7 @@ public static void WriteLine(string message, LogLevel logLevel = LogLevel.Debug)
 
         private static bool IsLoggingEnabled()
         {
-            return ServerScript.IsLoggingEnabled;
+            return Server.IsLoggingEnabled;
         }
     }
 }
diff --git a/src/Hypnonema.Shared/Hypnonema.Shared.csproj b/src/Hypnonema.Shared/Hypnonema.Shared.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.194">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/fxmanifest.lua b/src/fxmanifest.lua
@@ -30,6 +30,8 @@ hypnonema_logging_enabled 'false'
 -- The sync interval in ms
 hypnonema_sync_interval '5000'
 
+-- Whether the command should be restricted or not
+hypnonema_restrict_command 'true'
 
 --------------------------------------------
 --------------------------------------------