Raise an attempt-event when receiving client BUI messages. (#6113)

Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs

@@ -79,16 +79,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
             }
         }
 
-        private bool CheckInteract(ICommonSession session)
-        {
-            if (session.AttachedEntity is not {Valid: true} uid
-                || !_actionBlockerSystem.CanInteract(uid)
-                || !_actionBlockerSystem.CanUse(uid))
-                return false;
-
-            return true;
-        }
-
         private void DirtyUI(EntityUid uid,
             GasCanisterComponent? canister = null, NodeContainerComponent? nodeContainer = null,
             ContainerManagerComponent? containerManager = null)
@@ -120,9 +110,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnHoldingTankEjectMessage(EntityUid uid, GasCanisterComponent canister, GasCanisterHoldingTankEjectMessage args)
         {
-            if (!CheckInteract(args.Session))
-                return;
-
             if (!EntityManager.TryGetComponent(uid, out ContainerManagerComponent? containerManager)
                 || !containerManager.TryGetContainer(canister.ContainerName, out var container))
                 return;
@@ -136,9 +123,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnCanisterChangeReleasePressure(EntityUid uid, GasCanisterComponent canister, GasCanisterChangeReleasePressureMessage args)
         {
-            if (!CheckInteract(args.Session))
-                return;
-
             var pressure = Math.Clamp(args.Pressure, canister.MinReleasePressure, canister.MaxReleasePressure);
 
             _adminLogSystem.Add(LogType.CanisterPressure, LogImpact.Medium, $"{ToPrettyString(args.Session.AttachedEntity.GetValueOrDefault()):player} set the release pressure on {ToPrettyString(uid):canister} to {args.Pressure}");
@@ -149,9 +133,6 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems
 
         private void OnCanisterChangeReleaseValve(EntityUid uid, GasCanisterComponent canister, GasCanisterChangeReleaseValveMessage args)
         {
-            if (!CheckInteract(args.Session))
-                return;
-
             var impact = LogImpact.High;
             if (EntityManager.TryGetComponent(uid, out ContainerManagerComponent containerManager)
                 && containerManager.TryGetContainer(canister.ContainerName, out var container))

Content.Server/UserInterface/ActivatableUISystem.cs

@@ -1,9 +1,11 @@
 using System.Linq;
 using Content.Server.Administration.Managers;
+using Content.Server.Ghost.Components;
 using Content.Shared.ActionBlocker;
 using Content.Shared.Hands;
 using Content.Shared.Interaction;
 using Content.Shared.Popups;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -30,6 +32,23 @@ namespace Content.Server.UserInterface
             // *THIS IS A BLATANT WORKAROUND!* RATIONALE: Microwaves need it
             SubscribeLocalEvent<ActivatableUIComponent, EntParentChangedMessage>(OnParentChanged);
             SubscribeLocalEvent<ActivatableUIComponent, BoundUIClosedEvent>(OnUIClose);
+
+            SubscribeLocalEvent<ActivatableUIComponent, GetActivationVerbsEvent>(AddOpenUiVerb);
+        }
+
+        private void AddOpenUiVerb(EntityUid uid, ActivatableUIComponent component, GetActivationVerbsEvent args)
+        {
+            if (!args.CanAccess)
+                return;
+
+            if (!args.CanInteract && !HasComp<GhostComponent>(args.User))
+                return;
+
+            Verb verb = new();
+            verb.Act = () => InteractUI(args.User, component);
+            verb.Text = Loc.GetString("ui-verb-toggle-open");
+            // TODO VERBS add "open UI" icon?
+            args.Verbs.Add(verb);
         }
 
         private void OnActivate(EntityUid uid, ActivatableUIComponent component, ActivateInWorldEvent args)
@@ -63,7 +82,7 @@ namespace Content.Server.UserInterface
 
             if (aui.AdminOnly && !_adminManager.IsAdmin(actor.PlayerSession)) return false;
 
-            if (!_actionBlockerSystem.CanInteract(user))
+            if (!HasComp<GhostComponent>(user) && !_actionBlockerSystem.CanInteract(user))
             {
                 user.PopupMessageCursor(Loc.GetString("base-computer-ui-component-cannot-interact"));
                 return true;
@@ -103,27 +122,6 @@ namespace Content.Server.UserInterface
             RaiseLocalEvent(uid, new ActivatableUIPlayerChangedEvent(), false);
         }
 
-        public override void Update(float frameTime)
-        {
-            base.Update(frameTime);
-
-            foreach (var component in EntityManager.EntityQuery<ActivatableUIComponent>(true))
-            {
-                var ui = component.UserInterface;
-                if (ui == null) continue;
-                // Done to skip an allocation on anything that's not in use.
-                if (ui.SubscribedSessions.Count == 0) continue;
-                // Must ToList in order to close things safely.
-                foreach (var session in ui.SubscribedSessions.ToArray())
-                {
-                    if (session.AttachedEntity == null || !_actionBlockerSystem.CanInteract(session.AttachedEntity.Value))
-                    {
-                        ui.Close(session);
-                    }
-                }
-            }
-        }
-
         public void CloseAll(EntityUid uid, ActivatableUIComponent? aui = null)
         {
             if (!Resolve(uid, ref aui, false)) return;

Content.Shared/Interaction/SharedInteractionSystem.cs

@@ -50,6 +50,7 @@ namespace Content.Shared.Interaction
 
         public override void Initialize()
         {
+            SubscribeLocalEvent<BoundUserInterfaceMessageAttempt>(OnBoundInterfaceInteractAttempt);
             SubscribeAllEvent<InteractInventorySlotEvent>(HandleInteractInventorySlotEvent);
 
             CommandBinds.Builder
@@ -64,6 +65,30 @@ namespace Content.Shared.Interaction
             base.Shutdown();
         }
 
+        /// <summary>
+        ///     Check that the user that is interacting with the BUI is capable of interacting and can access the entity.
+        /// </summary>
+        private void OnBoundInterfaceInteractAttempt(BoundUserInterfaceMessageAttempt ev)
+        {
+            if (ev.Sender.AttachedEntity is not EntityUid user || !_actionBlockerSystem.CanInteract(user))
+            {
+                ev.Cancel();
+                return;
+            }
+
+            if (!user.IsInSameOrParentContainer(ev.Target) && !CanAccessViaStorage(user, ev.Target))
+            {
+                ev.Cancel();
+                return;
+            }
+
+            if (!user.InRangeUnobstructed(ev.Target))
+            {
+                ev.Cancel();
+                return;
+            }
+        }
+
         /// <summary>
         ///     Handles the event were a client uses an item in their inventory or in their hands, either by
         ///     alt-clicking it or pressing 'E' while hovering over it.

Resources/Locale/en-US/ui/verbs.ftl

@@ -0,0 +1,2 @@
+### Loc for the various UI-related verbs
+ui-verb-toggle-open = Toggle UI