friendlynamazu/client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

allow share type shared for public

Browse Source
This commit is contained in:
Stanley Dimant
2025-02-08 13:56:07 +01:00
parent d369e08397
commit aec2a2d1cb
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MareSynchronos/Services/CharaData/Models/CharaDataExtendedUpdateDto.cs
View File

@@ -93,10 +93,6 @@ public sealed record CharaDataExtendedUpdateDto : CharaDataUpdateDto
set set
{ {
base.AccessType = value; base.AccessType = value;
if (AccessType == AccessTypeDto.Public && ShareType == ShareTypeDto.Shared)
{
ShareType = ShareTypeDto.Private;
}
if (Equals(base.AccessType, _charaDataFullDto.AccessType)) if (Equals(base.AccessType, _charaDataFullDto.AccessType))
{ {
@@ -114,10 +110,6 @@ public sealed record CharaDataExtendedUpdateDto : CharaDataUpdateDto
set set
{ {
base.ShareType = value; base.ShareType = value;
if (ShareType == ShareTypeDto.Shared && AccessType == AccessTypeDto.Public)
{
base.ShareType = ShareTypeDto.Private;
}
if (Equals(base.ShareType, _charaDataFullDto.ShareType)) if (Equals(base.ShareType, _charaDataFullDto.ShareType))
{ {

18
MareSynchronos/UI/CharaDataHubUi.McdOnline.cs
View File

@@ -6,7 +6,6 @@ using ImGuiNET;
using MareSynchronos.API.Dto.CharaData; using MareSynchronos.API.Dto.CharaData;
using MareSynchronos.Services.CharaData.Models; using MareSynchronos.Services.CharaData.Models;
using System.Numerics; using System.Numerics;
using MareSynchronos.Services;
namespace MareSynchronos.UI; namespace MareSynchronos.UI;
@@ -141,25 +140,22 @@ internal sealed partial class CharaDataHubUi
ImGui.SetNextItemWidth(200); ImGui.SetNextItemWidth(200);
var dtoShareType = updateDto.ShareType; var dtoShareType = updateDto.ShareType;
using (ImRaii.Disabled(dtoAccessType == AccessTypeDto.Public)) if (ImGui.BeginCombo("Sharing", GetShareTypeString(dtoShareType)))
{ {
if (ImGui.BeginCombo("Sharing", GetShareTypeString(dtoShareType))) foreach (var shareType in Enum.GetValues(typeof(ShareTypeDto)).Cast<ShareTypeDto>())
{ {
foreach (var shareType in Enum.GetValues(typeof(ShareTypeDto)).Cast<ShareTypeDto>()) if (ImGui.Selectable(GetShareTypeString(shareType), shareType == dtoShareType))
{ {
if (ImGui.Selectable(GetShareTypeString(shareType), shareType == dtoShareType)) updateDto.ShareType = shareType;
{
updateDto.ShareType = shareType;
}
} }
ImGui.EndCombo();
} }
ImGui.EndCombo();
} }
_uiSharedService.DrawHelpText("This regulates how you want to distribute this character data." + UiSharedService.TooltipSeparator _uiSharedService.DrawHelpText("This regulates how you want to distribute this character data." + UiSharedService.TooltipSeparator
+ "Code Only: People require to have the code to download this character data" + Environment.NewLine + "Code Only: People require to have the code to download this character data" + Environment.NewLine
+ "Shared: People that are allowed through 'Access Restrictions' will have this character data entry displayed in 'Shared with You' (it can also be accessed through the code)" + UiSharedService.TooltipSeparator + "Shared: People that are allowed through 'Access Restrictions' will have this character data entry displayed in 'Shared with You' (it can also be accessed through the code)" + UiSharedService.TooltipSeparator
+ "Note: Shared is incompatible with Access Restriction 'Everyone'"); + "Note: Shared with Access Restriction 'Everyone' is the same as shared with Access Restriction 'All Pairs', it will not show up for everyone but just your pairs.");
ImGuiHelpers.ScaledDummy(10f); ImGuiHelpers.ScaledDummy(10f);
} }