Upstream130125

Content.Client/BoomBox/UI/BoomBoxBoundUi.cs

@@ -0,0 +1,73 @@
+using Content.Shared.BoomBox;
+using JetBrains.Annotations;
+using Robust.Client.GameObjects;
+
+namespace Content.Client.BoomBox.UI;
+
+[UsedImplicitly]
+public sealed class BoomBoxBoundUi : BoundUserInterface
+{
+    [ViewVariables]
+    private BoomBoxWindow? _window;
+
+    public BoomBoxBoundUi(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+    {
+    }
+
+    protected override void Open()
+    {
+        base.Open();
+
+        _window = new BoomBoxWindow();
+        _window.OpenCentered();
+
+        _window.OnClose += Close;
+        _window.MinusVolButtonPressed += OnMinusVolButtonPressed;
+        _window.PlusVolButtonPressed += OnPlusVolButtonPressed;
+        _window.StartButtonPressed += OnStartButtonPressed;
+        _window.StopButtonPressed += OnStopButtonPressed;
+        _window.PlaybackSliderChanged += OnPlaybackSliderChanged;
+    }
+
+    private void OnPlaybackSliderChanged(float newPosition)
+    {
+        SendMessage(new BoomBoxSetTimeMessage(newPosition)); // Отправка сообщения при изменении ползунка
+    }
+
+    private void OnMinusVolButtonPressed()
+    {
+        SendMessage(new BoomBoxMinusVolMessage());
+    }
+
+    private void OnPlusVolButtonPressed()
+    {
+        SendMessage(new BoomBoxPlusVolMessage());
+    }
+
+    private void OnStartButtonPressed()
+    {
+        SendMessage(new BoomBoxStartMessage());
+    }
+
+    private void OnStopButtonPressed()
+    {
+        SendMessage(new BoomBoxStopMessage());
+    }
+
+    protected override void UpdateState(BoundUserInterfaceState state)
+    {
+        base.UpdateState(state);
+
+        if (_window == null || state is not BoomBoxUiState cast)
+            return;
+
+        _window.UpdateState(cast);
+    }
+
+    protected override void Dispose(bool disposing)
+    {
+        base.Dispose(disposing);
+        if (disposing)
+            _window?.Dispose();
+    }
+}

Content.Client/BoomBox/UI/BoomBoxWindow.xaml

@@ -0,0 +1,28 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc 'boombox-ui-window'}"
+               MinSize="280 130"
+               SetSize="280 130">
+    <BoxContainer Orientation="Vertical" VerticalExpand="True">
+        <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+            <Button Name="MinusVolButton"
+                    Text="{Loc 'boombox-ui-minusvol-button'}"
+                    HorizontalExpand="True"
+                    Disabled="True" />
+            <Button Name="StartButton"
+                    Text="{Loc 'boombox-ui-start-button'}"
+                    HorizontalExpand="True"
+                    Disabled="True" />
+            <Button Name="StopButton"
+                    Text="{Loc 'boombox-ui-stop-button'}"
+                    HorizontalExpand="True"
+                    Disabled="True" />
+            <Button Name="PlusVolButton"
+                    Text="{Loc 'boombox-ui-plusvol-button'}"
+                    HorizontalExpand="True"
+                    Disabled="True" />
+        </BoxContainer>
+        <Slider Name="PlaybackSlider" HorizontalExpand="True"/>
+    </BoxContainer>
+</DefaultWindow>
+
+

Content.Client/BoomBox/UI/BoomBoxWindow.xaml.cs

@@ -0,0 +1,41 @@
+using System.Linq;
+using Content.Shared.BoomBox;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.BoomBox.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class BoomBoxWindow : DefaultWindow
+{
+    public event Action? MinusVolButtonPressed;
+    public event Action? PlusVolButtonPressed;
+    public event Action? StartButtonPressed;
+    public event Action? StopButtonPressed;
+    public event Action<float>? PlaybackSliderChanged;
+
+    private bool _isSliderDragging = false;
+
+    public BoomBoxWindow()
+    {
+        RobustXamlLoader.Load(this);
+
+        MinusVolButton.OnPressed += _ => MinusVolButtonPressed?.Invoke();
+        PlusVolButton.OnPressed += _ => PlusVolButtonPressed?.Invoke();
+        StartButton.OnPressed += _ => StartButtonPressed?.Invoke();
+        StopButton.OnPressed += _ => StopButtonPressed?.Invoke();
+        PlaybackSlider.OnValueChanged += args => PlaybackSliderChanged?.Invoke(args.Value);
+    }
+
+    public void UpdateState(BoomBoxUiState state)
+    {
+        MinusVolButton.Disabled = !state.CanMinusVol;
+        PlusVolButton.Disabled = !state.CanPlusVol;
+        StartButton.Disabled = !state.CanStart;
+        StopButton.Disabled = !state.CanStop;
+
+        PlaybackSlider.MaxValue = state.SoundDuration;
+        PlaybackSlider.SetValueWithoutEvent(state.PlaybackPosition);
+    }
+}

Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs

@@ -76,7 +76,6 @@ protected override void Open()
                                                          ("time", Loc.GetString("microwave-menu-instant-button")));
                 }
             };
-
             // Frontier: UI customization
             _menu.Title = Loc.GetString(_menuTitle);
             _menu.LeftFooter.Text = Loc.GetString(_leftFlavorText);

Content.Client/MainMenu/UI/MainMenuControl.xaml.cs

@@ -22,7 +22,7 @@ public MainMenuControl(IResourceCache resCache, IConfigurationManager configMan)
         LayoutContainer.SetMarginTop(VBox, 30);
         LayoutContainer.SetGrowHorizontal(VBox, LayoutContainer.GrowDirection.Begin);
 
-        var logoTexture = resCache.GetResource<TextureResource>("/Textures/Logo/logo.png");
+        var logoTexture = resCache.GetResource<TextureResource>("/Textures/Logo/logo-ru.png");
         Logo.Texture = logoTexture;
 
         var currentUserName = configMan.GetCVar(CVars.PlayerName);

Content.Client/Medical/CrewMonitoring/CrewMonitoringNavMapControl.cs

@@ -82,4 +82,4 @@ protected override void FrameUpdate(FrameEventArgs args)
         _trackedEntityLabel.Text = string.Empty;
         _trackedEntityPanel.Visible = false;
     }
-}
+}

Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs

@@ -56,6 +56,7 @@ private void OnClassItemSelected(OptionButton.ItemSelectedEventArgs args)
     {
         SetClassText(args.Id);
         PopulateProducts(_lastAvailableProtos, _lastUnavailableProtos, _freeListings, _validId);
+
     }
 
     private void OnEngineItemSelected(OptionButton.ItemSelectedEventArgs args)
@@ -79,6 +80,7 @@ private void SetClassText(int id)
         _class = id == 0 ? null : _classStrings[id];
         Classes.SelectId(id);
     }
+
     private void SetEngineText(int id)
     {
         _engine = id == 0 ? null : _engineStrings[id];

Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs

@@ -210,7 +210,7 @@ await server.WaitAssertion(() =>
             consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide");
             Assert.Multiple(() =>
             {
-                //Assert.That(mobStateSystem.IsAlive(player, mobStateComp)); // DeltaV: 
+                //Assert.That(mobStateSystem.IsAlive(player, mobStateComp)); // DeltaV:
                 Assert.That(entManager.TryGetComponent<GhostComponent>(mindComponent.CurrentEntity, out var ghostComp) &&
                             !ghostComp.CanReturnToBody);
             });

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -45,7 +45,6 @@ public sealed class PostMapInitTest
         };
 
         private static readonly string[] GameMaps = FrontierConstants.GameMapPrototypes; // Frontier: not inline constants
-
         /// <summary>
         /// Asserts that specific files have been saved as grids and not maps.
         /// </summary>

Content.Server/Administration/ServerApi.cs

@@ -6,13 +6,16 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
+using Content.Server.Administration.Managers;
 using Content.Server.Administration.Systems;
+using Content.Server.Database;
 using Content.Server.Administration.Managers;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Presets;
 using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Maps;
 using Content.Server.RoundEnd;
+using Content.Shared.Administration;
 using Content.Shared.Administration.Managers;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
@@ -21,6 +24,7 @@
 using Robust.Server.ServerStatus;
 using Robust.Shared.Asynchronous;
 using Robust.Shared.Configuration;
+using Robust.Shared.Console;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -60,6 +64,10 @@ public sealed partial class ServerApi : IPostInjectInit
     [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!;
     [Dependency] private readonly ILocalizationManager _loc = default!;
+    [Dependency] private readonly IPlayerLocator _locator = default!;
+    [Dependency] private readonly IConsoleHost _shell = default!;
+    [Dependency] private readonly IServerDbManager _db = default!;
+    [Dependency] private readonly IBanManager _bans = default!;
 
     private string _token = string.Empty;
     private ISawmill _sawmill = default!;
@@ -75,6 +83,7 @@ void IPostInjectInit.PostInject()
 
         // Post
         RegisterActorHandler(HttpMethod.Post, "/admin/actions/round/start", ActionRoundStart);
+        RegisterActorHandler(HttpMethod.Post, "/admin/actions/ahelp/send", ActionAhelpSend);
         RegisterActorHandler(HttpMethod.Post, "/admin/actions/round/end", ActionRoundEnd);
         RegisterActorHandler(HttpMethod.Post, "/admin/actions/round/restartnow", ActionRoundRestartNow);
         RegisterActorHandler(HttpMethod.Post, "/admin/actions/kick", ActionKick);
@@ -433,6 +442,35 @@ await RespondError(
 
     }
 
+    private async Task ActionAhelpSend(IStatusHandlerContext context, Actor actor)
+    {
+        var body = await ReadJson<DiscordAhelpBody>(context);
+        if (body == null)
+            return;
+        if (body.Text == null)
+        {
+            await context.RespondErrorAsync(HttpStatusCode.BadRequest);
+            return;
+        }
+        var bwoinkSystem = _entitySystemManager.GetEntitySystem<BwoinkSystem>();
+        var data = await _locator.LookupIdByNameOrIdAsync($"{body.PlayerNickname}");
+        if (data != null)
+        {
+            var playerUserId = new NetUserId(data.UserId);
+
+            var senderUserId = new NetUserId(body.SenderUserId);
+            var message = new SharedBwoinkSystem.BwoinkTextMessage(playerUserId, senderUserId, body.Text);
+            await RunOnMainThread(async () =>
+            {
+                if (_playerManager.TryGetSessionById(playerUserId, out var session))
+                {
+                    bwoinkSystem.DiscordAhelpSendMessage(message, new EntitySessionEventArgs(session));
+                    await RespondOk(context);
+                }
+            });
+        }
+    }
+
     #endregion
 
     #region Fetching
@@ -641,7 +679,12 @@ await RespondError(
     }
 
     #region From Client
-
+    private sealed class DiscordAhelpBody
+    {
+        public required string PlayerNickname { get; init; }
+        public required Guid SenderUserId { get; init; }
+        public string? Text { get; init; }
+    }
     private sealed class Actor
     {
         public required Guid Guid { get; init; }