Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Mass-media console update (#18466)

Browse Source 
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization

* Convert News read tab to cartridge

Convert the News read tab into a cartridge, and fix a couple of bugs

* Just another fix

* Some updates

* More fixing!!

Fix cooldown, add author label to read menu

* Again, fix cooldown bug

* Some minor changes

* Revert "Some minor changes"

This reverts commit 470c8d727629ac79994f70e56162adae8659e944.

* Some minor updates

* News write Ui update

* Just another fix

* See commit below comments

* More code readability, more!
This commit is contained in:
MishaUnity
2023-07-31 08:34:22 +03:00
committed by GitHub
parent 4c6d576f98
commit 87d06110d8
7 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Server/MassMedia/Systems/NewsSystem.cs
View File

@@ -14,6 +14,7 @@ using Content.Shared.CartridgeLoader.Cartridges;
using Content.Server.CartridgeLoader;
using Robust.Shared.Timing;
using TerraFX.Interop.Windows;
using Content.Server.Popups;
namespace Content.Server.MassMedia.Systems;
@@ -23,6 +24,8 @@ public sealed class NewsSystem : EntitySystem
[Dependency] private readonly UserInterfaceSystem _ui = default!;
[Dependency] private readonly RingerSystem _ringer = default!;
[Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly AccessReaderSystem _accessReader = default!;
@@ -131,6 +134,8 @@ public sealed class NewsSystem : EntitySystem
}
}
_audio.PlayPvs(component.ConfirmSound, uid);
_articles.Add(article);
component.ShareAvalible = false;
@@ -146,20 +151,15 @@ public sealed class NewsSystem : EntitySystem
if (msg.ArticleNum > _articles.Count)
return;
var articleToDelete = _articles[msg.ArticleNum];
if (articleToDelete.AuthorStationRecordKeyIds == null || !articleToDelete.AuthorStationRecordKeyIds.Any())
if (CheckDeleteAccess(_articles[msg.ArticleNum], uid, msg.Session.AttachedEntity))
{
_articles.RemoveAt(msg.ArticleNum);
_audio.PlayPvs(component.ConfirmSound, uid);
}
else
{
var author = msg.Session.AttachedEntity;
if (author.HasValue
&& _accessReader.FindStationRecordKeys(author.Value, out var recordKeys)
&& recordKeys.Intersect(articleToDelete.AuthorStationRecordKeyIds).Any())
{
_articles.RemoveAt(msg.ArticleNum);
}
_popup.PopupEntity(Loc.GetString("news-write-no-access-popup"), uid);
_audio.PlayPvs(component.NoAccessSound, uid);
}
UpdateReadDevices();
@@ -217,6 +217,30 @@ public sealed class NewsSystem : EntitySystem
}
}
private bool CheckDeleteAccess(NewsArticle articleToDelete, EntityUid device, EntityUid? user)
{
if (EntityManager.TryGetComponent<AccessReaderComponent>(device, out var accessReader) &&
user.HasValue &&
_accessReader.IsAllowed(user.Value, accessReader))
{
return true;
}
if (articleToDelete.AuthorStationRecordKeyIds == null ||
!articleToDelete.AuthorStationRecordKeyIds.Any())
{
return true;
}
if (user.HasValue
&& _accessReader.FindStationRecordKeys(user.Value, out var recordKeys)
&& recordKeys.Intersect(articleToDelete.AuthorStationRecordKeyIds).Any())
{
return true;
}
return false;
}
public override void Update(float frameTime)
{
base.Update(frameTime);