cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 22:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix BroadcastMessage controller checks

Browse Source
This commit is contained in:
Jordan Dominion
2023-11-16 23:05:15 -05:00
parent 37f1fb259b
commit 20c882c96c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+2 -2
View File
@@ -216,7 +216,7 @@ namespace Tgstation.Server.Host.Controllers
|| CheckModified(x => x.Visibility, DreamDaemonRights.SetVisibility)
|| (model.SoftRestart.HasValue && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.SoftRestart))
|| (model.SoftShutdown.HasValue && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.SoftShutdown))
|| (model.BroadcastMessage != null && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.BroadcastMessage))
|| (!String.IsNullOrWhiteSpace(model.BroadcastMessage) && !AuthenticationContext.InstancePermissionSet.DreamDaemonRights.Value.HasFlag(DreamDaemonRights.BroadcastMessage))
|| CheckModified(x => x.StartupTimeout, DreamDaemonRights.SetStartupTimeout)
|| CheckModified(x => x.HealthCheckSeconds, DreamDaemonRights.SetHealthCheckInterval)
|| CheckModified(x => x.DumpOnHealthCheckRestart, DreamDaemonRights.CreateDump)
@@ -231,7 +231,7 @@ namespace Tgstation.Server.Host.Controllers
async instance =>
{
var watchdog = instance.Watchdog;
if (model.BroadcastMessage != null
if (!String.IsNullOrWhiteSpace(model.BroadcastMessage)
&& !await watchdog.Broadcast(model.BroadcastMessage, cancellationToken))
return Conflict(new ErrorMessageResponse(ErrorCode.BroadcastFailure));