Фиксы спонсорки

Content.Client/ADT/RPD/RPDMenu.xaml

@@ -1,6 +1,5 @@
 <ui:RadialMenu xmlns="https://spacestation14.io"
                 xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-                xmlns:rpd="clr-namespace:Content.Client.RPD"
                 BackButtonStyleClass="RadialMenuBackButton"
                 CloseButtonStyleClass="RadialMenuCloseButton"
                 VerticalExpand="True"

Content.Client/Administration/AdminNameOverlay.cs

@@ -65,6 +65,18 @@ protected override void Draw(in OverlayDrawArgs args)
                 {
                     args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed);
                 }
+
+                if (playerInfo.Sponsor != null)
+                {
+                    var sponsorOffset = playerInfo.Antag ? lineoffset * 3 : lineoffset * 2;
+                    var sponsorString = $"Sponsor ({playerInfo.Sponsor.Tier})";
+                    if (playerInfo.Sponsor.AllowJob)
+                        sponsorString += " (allJobs)";
+
+                    sponsorString += $" до {playerInfo.Sponsor.ExpireDate.ToString("dd.MM.yyyy")}";
+
+                    args.ScreenHandle.DrawString(_font, screenCoordinates + sponsorOffset, sponsorString, Color.GreenYellow);
+                }
                 args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White);
                 args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White);
             }

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs

@@ -197,11 +197,27 @@ private int Compare(PlayerInfo x, PlayerInfo y)
                 Header.Character => Compare(x.CharacterName, y.CharacterName),
                 Header.Job => Compare(x.StartingJob, y.StartingJob),
                 Header.Antagonist => x.Antag.CompareTo(y.Antag),
+                Header.Sponsor => Compare(x.Sponsor?.Tier, y.Sponsor?.Tier),
                 Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default),
                 _ => 1
             };
         }
 
+        private int Compare(int? x, int? y)
+        {
+            if (!x.HasValue)
+                return -1;
+            if (!y.HasValue)
+                return 1;
+
+            if (x == y)
+                return 0;
+            else if (x > y)
+                return 1;
+            else
+                return -1;
+        }
+
         private int Compare(string x, string y)
         {
             return string.Compare(x, y, StringComparison.OrdinalIgnoreCase);

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml

@@ -24,6 +24,11 @@
                HorizontalExpand="True"
                ClipText="True"/>
         <customControls:VSeparator/>
+        <Label Name="SponsorLabel"
+               SizeFlagsStretchRatio="1"
+               HorizontalExpand="True"
+               ClipText="True"/>
+        <customControls:VSeparator/>
         <Label Name="OverallPlaytimeLabel"
                SizeFlagsStretchRatio="1"
                HorizontalExpand="True"

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs

@@ -23,6 +23,7 @@ public PlayerTabEntry(PlayerInfo player, StyleBoxFlat styleBoxFlat)
         if (player.IdentityName != player.CharacterName)
             CharacterLabel.Text += $" [{player.IdentityName}]";
         AntagonistLabel.Text = Loc.GetString(player.Antag ? "player-tab-is-antag-yes" : "player-tab-is-antag-no");
+        SponsorLabel.Text = Loc.GetString(player.Sponsor != null ? "player-tab-is-sponsor-yes" : "player-tab-is-sponsor-no");
         BackgroundColorPanel.PanelOverride = styleBoxFlat;
         OverallPlaytimeLabel.Text = player.PlaytimeString;
         PlayerEntity = player.NetEntity;

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml

@@ -32,6 +32,13 @@
                Text="{Loc player-tab-antagonist}"
                MouseFilter="Pass"/>
         <cc:VSeparator/>
+        <Label Name="SponsorLabel"
+               SizeFlagsStretchRatio="1"
+               HorizontalExpand="True"
+               ClipText="True"
+               Text="{Loc player-tab-sponsor}"
+               MouseFilter="Pass"/>
+        <cc:VSeparator/>
         <Label Name="PlaytimeLabel"
                SizeFlagsStretchRatio="1"
                HorizontalExpand="True"

Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs

@@ -19,6 +19,7 @@ public PlayerTabHeader()
         CharacterLabel.OnKeyBindDown += CharacterClicked;
         JobLabel.OnKeyBindDown += JobClicked;
         AntagonistLabel.OnKeyBindDown += AntagonistClicked;
+        SponsorLabel.OnKeyBindDown += SponsorClicked;
         PlaytimeLabel.OnKeyBindDown += PlaytimeClicked;
     }
 
@@ -30,6 +31,7 @@ public Label GetHeader(Header header)
             Header.Character => CharacterLabel,
             Header.Job => JobLabel,
             Header.Antagonist => AntagonistLabel,
+            Header.Sponsor => SponsorLabel,
             Header.Playtime => PlaytimeLabel,
             _ => throw new ArgumentOutOfRangeException(nameof(header), header, null)
         };
@@ -41,6 +43,7 @@ public void ResetHeaderText()
         CharacterLabel.Text = Loc.GetString("player-tab-character");
         JobLabel.Text = Loc.GetString("player-tab-job");
         AntagonistLabel.Text = Loc.GetString("player-tab-antagonist");
+        SponsorLabel.Text = Loc.GetString("player-tab-sponsor");
         PlaytimeLabel.Text = Loc.GetString("player-tab-playtime");
     }
 
@@ -75,6 +78,11 @@ private void AntagonistClicked(GUIBoundKeyEventArgs args)
         HeaderClicked(args, Header.Antagonist);
     }
 
+    private void SponsorClicked(GUIBoundKeyEventArgs args)
+    {
+        HeaderClicked(args, Header.Sponsor);
+    }
+
     private void PlaytimeClicked(GUIBoundKeyEventArgs args)
     {
         HeaderClicked(args, Header.Playtime);
@@ -90,6 +98,7 @@ protected override void Dispose(bool disposing)
             CharacterLabel.OnKeyBindDown -= CharacterClicked;
             JobLabel.OnKeyBindDown -= JobClicked;
             AntagonistLabel.OnKeyBindDown -= AntagonistClicked;
+            SponsorLabel.OnKeyBindDown -= SponsorClicked;
             PlaytimeLabel.OnKeyBindDown -= PlaytimeClicked;
         }
     }
@@ -100,6 +109,7 @@ public enum Header
         Character,
         Job,
         Antagonist,
+        Sponsor,
         Playtime
     }
 }

Content.Server.Database/Migrations/Postgres/20231226154937_AdminLogPk.cs

@@ -14,21 +14,21 @@ protected override void Up(MigrationBuilder migrationBuilder)
             //     name: "FK_admin_log_player_admin_log_log_id_round_id",
             //     table: "admin_log_player");
 
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_admin_log_player",
-                table: "admin_log_player");
-
-            migrationBuilder.DropIndex(
-                name: "IX_admin_log_player_log_id_round_id",
-                table: "admin_log_player");
-
-            migrationBuilder.DropPrimaryKey(
-                name: "PK_admin_log",
-                table: "admin_log");
-
-            migrationBuilder.DropIndex(
-                name: "IX_admin_log_round_id",
-                table: "admin_log");
+            // migrationBuilder.DropPrimaryKey(
+            //     name: "PK_admin_log_player",
+            //     table: "admin_log_player");
+            //
+            // migrationBuilder.DropIndex(
+            //     name: "IX_admin_log_player_log_id_round_id",
+            //     table: "admin_log_player");
+            //
+            // migrationBuilder.DropPrimaryKey(
+            //     name: "PK_admin_log",
+            //     table: "admin_log");
+            //
+            // migrationBuilder.DropIndex(
+            //     name: "IX_admin_log_round_id",
+            //     table: "admin_log");
 
             migrationBuilder.AddPrimaryKey(
                 name: "PK_admin_log_player",

Content.Server.Database/Model.cs

@@ -38,8 +38,6 @@ protected ServerDbContext(DbContextOptions options) : base(options)
         public DbSet<PlayTime> PlayTime { get; set; } = default!;
         public DbSet<UploadedResourceLog> UploadedResourceLog { get; set; } = default!;
         public DbSet<AdminNote> AdminNotes { get; set; } = null!;
-        public DbSet<Sponsor> Sponsors { get; set; } = null!; //ADT-Sponsors
-
         public DbSet<AdminWatchlist> AdminWatchlists { get; set; } = null!;
         public DbSet<AdminMessage> AdminMessages { get; set; } = null!;
         public DbSet<RoleWhitelist> RoleWhitelists { get; set; } = null!;

Content.Server/Administration/Systems/AdminSystem.cs

@@ -1,6 +1,7 @@
 using System.Linq;
 using Content.Server.Administration.Managers;
 using Content.Server.Chat.Managers;
+using Content.Server.Corvax.Sponsors;
 using Content.Server.Forensics;
 using Content.Server.GameTicking;
 using Content.Server.Hands.Systems;
@@ -12,6 +13,7 @@
 using Content.Shared.Administration.Events;
 using Content.Shared.CCVar;
 using Content.Shared.Corvax.CCCVars;
+using Content.Shared.Corvax.Sponsors;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;
@@ -52,6 +54,9 @@ public sealed class AdminSystem : EntitySystem
         [Dependency] private readonly SharedAudioSystem _audio = default!;
         [Dependency] private readonly StationRecordsSystem _stationRecords = default!;
         [Dependency] private readonly TransformSystem _transform = default!;
+        //ADT-SPONSORS
+        [Dependency] private readonly SponsorsManager _sponsorsManager = default!;
+        //ADT-SPONSORS
 
         private readonly Dictionary<NetUserId, PlayerInfo> _playerList = new();
 
@@ -248,7 +253,10 @@ private PlayerInfo GetPlayerInfo(SessionData data, ICommonSession? session)
                 overallPlaytime = playTime;
             }
 
-            return new PlayerInfo(name, entityName, identityName, startingRole, antag, GetNetEntity(session?.AttachedEntity), data.UserId,
+            SponsorInfo? sponsorInfo = null;
+            _sponsorsManager.TryGetInfo(data.UserId, out sponsorInfo);
+
+            return new PlayerInfo(name, entityName, identityName, startingRole, antag, sponsorInfo, GetNetEntity(session?.AttachedEntity), data.UserId,
                 connected, _roundActivePlayers.Contains(data.UserId), overallPlaytime);
         }
 

Content.Server/Corvax/Sponsors/CheckSponsorSystem.cs

@@ -28,7 +28,7 @@ public bool CheckUser(string player)
         else
             return false;
 
-        if (sponsorData != null && sponsorData.Tier > 0)
+        if (sponsorData != null && (sponsorData.Tier > 0 || sponsorData.AllowJob))
             return true;
         else
             return false;

Content.Server/Corvax/Sponsors/SponsorsManager.cs

@@ -90,27 +90,7 @@ private void OnDisconnect(object? sender, NetDisconnectedArgs e)
 
             return await response.Content.ReadFromJsonAsync<SponsorInfo>();
         }
-        else
-        {
-            var sponsorInfo = await _dbManager.GetSponsorInfo(userId);
-            if (sponsorInfo != null)
-            {
-                return new SponsorInfo()
-                {
-                    Tier = sponsorInfo.Tier,
-                    AllowedMarkings = sponsorInfo.AllowedMarkings.Split(";",StringSplitOptions.RemoveEmptyEntries),
-                    CharacterName = string.Empty,
-                    ExtraSlots = sponsorInfo.ExtraSlots,
-                    HavePriorityJoin = sponsorInfo.HavePriorityJoin,
-                    OOCColor = sponsorInfo.OOCColor,
-                    ExpireDate = sponsorInfo.ExpireDate,
-                    AllowJob = sponsorInfo.AllowJob
-                };
-            }
-            else
-            {
-                return null;
-            }
-        }
+
+        return null;
     }
 }

Content.Server/Database/ServerDbBase.cs

@@ -1608,23 +1608,6 @@ protected async Task<List<ServerRoleBanNoteRecord>> GetGroupedServerRoleBansAsNo
 
         #endregion
 
-        //ADT-Sponsors-Start
-        #region Sponsors
-
-        public async Task<Sponsor?> GetSponsorInfo(NetUserId userId)
-        {
-            await using var db = await GetDb();
-            return await db.DbContext.Sponsors.AsNoTracking().FirstOrDefaultAsync(x => x.UserId == userId.UserId);
-        }
-
-        public async Task<Sponsor[]?> GetSponsorList()
-        {
-            await using var db = await GetDb();
-            return await db.DbContext.Sponsors.AsNoTracking().ToArrayAsync();
-        }
-        #endregion
-        //ADT-Sponsors-End
-
         #region Job Whitelists
 
         public async Task<bool> AddJobWhitelist(Guid player, ProtoId<JobPrototype> job)

Content.Server/Database/ServerDbManager.cs

@@ -293,13 +293,6 @@ Task<int> AddConnectionLogAsync(
 
         #endregion
 
-        //ADT-Sponsors-Start
-        #region Sponsors
-        Task<Sponsor?> GetSponsorInfo(NetUserId userId, CancellationToken cancel = default);
-        Task<Sponsor[]?> GetSponsorList(CancellationToken cancel = default);
-        #endregion
-        //ADT-Sponsors-End
-
         #region Job Whitelists
 
         Task AddJobWhitelist(Guid player, ProtoId<JobPrototype> job);
@@ -969,20 +962,6 @@ private IAsyncEnumerable<T> RunDbCommand<T>(Func<IAsyncEnumerable<T>> command)
             return enumerable;
         }
 
-        //ADT-Sponsors-Start
-        public async Task<Sponsor?> GetSponsorInfo(NetUserId userId, CancellationToken cancel = default)
-        {
-            DbWriteOpsMetric.Inc();
-            return await _db.GetSponsorInfo(userId);
-        }
-
-        public async Task<Sponsor[]?> GetSponsorList(CancellationToken cancel = default)
-        {
-            DbWriteOpsMetric.Inc();
-            return await _db.GetSponsorList();
-        }
-        //ADT-Sponsors-End
-
         private DbContextOptions<PostgresServerDbContext> CreatePostgresOptions()
         {
             var host = _cfg.GetCVar(CCVars.DatabasePgHost);

Content.Shared/Administration/PlayerInfo.cs

@@ -1,3 +1,4 @@
+using Content.Shared.Corvax.Sponsors;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
@@ -10,6 +11,7 @@ public sealed record PlayerInfo(
         string IdentityName,
         string StartingJob,
         bool Antag,
+        SponsorInfo? Sponsor,
         NetEntity? NetEntity,
         NetUserId SessionId,
         bool Connected,

Resources/ConfigPresets/Build/debug.toml

@@ -4,3 +4,6 @@ enabled = false
 
 [shuttle]
 auto_call_time = 0
+
+[sponsor]
+api_url = "http://5.180.174.139:3080/api"

Resources/Locale/en-US/administration/ui/tabs/player-tab.ftl

@@ -3,10 +3,13 @@ player-tab-username = Username
 player-tab-character = Character
 player-tab-job = Job
 player-tab-antagonist = Antagonist
+player-tab-sponsor = Sponsor
 player-tab-playtime = Playtime
 player-tab-show-disconnected = Show Disconnected
 player-tab-overlay = Overlay
 player-tab-entry-tooltip = Playtime is displayed in days:hours:minutes.
 player-tab-filter-line-edit-placeholder = Filter
 player-tab-is-antag-yes = YES
 player-tab-is-antag-no = NO
+player-tab-is-sponsor-yes = YES
+player-tab-is-sponsor-no = NO

Resources/Locale/ru-RU/administration/ui/tabs/player-tab.ftl

@@ -3,10 +3,13 @@ player-tab-username = Пользователь
 player-tab-character = Персонаж
 player-tab-job = Должность
 player-tab-antagonist = Антагонист
+player-tab-sponsor = Спонсор
 player-tab-playtime = Игровое время
 player-tab-show-disconnected = Показать отключившихся
 player-tab-overlay = Оверлей
 player-tab-entry-tooltip = Игровое время отображается как дни:часы:минуты.
 player-tab-filter-line-edit-placeholder = Фильтр
 player-tab-is-antag-yes = ДА
 player-tab-is-antag-no = НЕТ
+player-tab-is-sponsor-yes = ДА
+player-tab-is-sponsor-no = НЕТ