Keda/UmbraAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Keda:f75f16fb13637ba3e2b7cfc4c79de252f4d4eea6
Branches Tags
Keda:main
..
compare: Keda:d105d2050722a0f2e6ab695dc22adbf2437dd9c1
Branches Tags
Keda:main

3 Commits
f75f16fb13 ... d105d20507

Author SHA1 Message Date
Keda
d105d20507 Merge remote-tracking branch 'origin/main' 2025-11-02 17:19:57 +01:00
Keda
f817187088 API TypingState et mise à jour des éléments associés. 2025-11-02 17:18:23 +01:00
Keda
7728ef2390 "Add MessagePack annotations to MCDF Share DTOs for serialization support" 2025-11-02 12:25:12 +01:00
7 changed files with 54 additions and 34 deletions
Expand all files Collapse all files

9
MareSynchronosAPI/Data/Enum/TypingScope.cs Normal file
View File

@@ -0,0 +1,9 @@
namespace MareSynchronos.API.Data.Enum;
public enum TypingScope
{
Unknown = 0,
Proximity = 1, // Parler/Crier/Hurler
Party = 2,
CrossParty = 3
}

24
MareSynchronosAPI/Dto/McdfShare/McdfShareEntryDto.cs
View File

@@ -1,19 +1,21 @@
using System;
using System.Collections.Generic;
using MessagePack;
namespace MareSynchronos.API.Dto.McdfShare;
[MessagePackObject]
public class McdfShareEntryDto
{
public Guid Id { get; set; }
public string Description { get; set; } = string.Empty;
public DateTime CreatedUtc { get; set; }
public DateTime? UpdatedUtc { get; set; }
public DateTime? ExpiresAtUtc { get; set; }
public bool IsOwner { get; set; }
public string OwnerUid { get; set; } = string.Empty;
public string OwnerAlias { get; set; } = string.Empty;
public int DownloadCount { get; set; }
public List<string> AllowedIndividuals { get; set; } = [];
public List<string> AllowedSyncshells { get; set; } = [];
[Key(0)] public Guid Id { get; set; }
[Key(1)] public string Description { get; set; } = string.Empty;
[Key(2)] public DateTime CreatedUtc { get; set; }
[Key(3)] public DateTime? UpdatedUtc { get; set; }
[Key(4)] public DateTime? ExpiresAtUtc { get; set; }
[Key(5)] public bool IsOwner { get; set; }
[Key(6)] public string OwnerUid { get; set; } = string.Empty;
[Key(7)] public string OwnerAlias { get; set; } = string.Empty;
[Key(8)] public int DownloadCount { get; set; }
[Key(9)] public List<string> AllowedIndividuals { get; set; } = [];
[Key(10)] public List<string> AllowedSyncshells { get; set; } = [];
}

18
MareSynchronosAPI/Dto/McdfShare/McdfSharePayloadDto.cs
View File

@@ -1,15 +1,17 @@
using System;
using MessagePack;
namespace MareSynchronos.API.Dto.McdfShare;
[MessagePackObject]
public class McdfSharePayloadDto
{
public Guid ShareId { get; set; }
public string Description { get; set; } = string.Empty;
public byte[] CipherData { get; set; } = Array.Empty<byte>();
public byte[] Nonce { get; set; } = Array.Empty<byte>();
public byte[] Salt { get; set; } = Array.Empty<byte>();
public byte[] Tag { get; set; } = Array.Empty<byte>();
public DateTime CreatedUtc { get; set; }
public DateTime? ExpiresAtUtc { get; set; }
[Key(0)] public Guid ShareId { get; set; }
[Key(1)] public string Description { get; set; } = string.Empty;
[Key(2)] public byte[] CipherData { get; set; } = Array.Empty<byte>();
[Key(3)] public byte[] Nonce { get; set; } = Array.Empty<byte>();
[Key(4)] public byte[] Salt { get; set; } = Array.Empty<byte>();
[Key(5)] public byte[] Tag { get; set; } = Array.Empty<byte>();
[Key(6)] public DateTime CreatedUtc { get; set; }
[Key(7)] public DateTime? ExpiresAtUtc { get; set; }
}

12
MareSynchronosAPI/Dto/McdfShare/McdfShareUpdateRequestDto.cs
View File

@@ -1,13 +1,15 @@
using System;
using System.Collections.Generic;
using MessagePack;
namespace MareSynchronos.API.Dto.McdfShare;
[MessagePackObject]
public class McdfShareUpdateRequestDto
{
public Guid ShareId { get; set; }
public string Description { get; set; } = string.Empty;
public DateTime? ExpiresAtUtc { get; set; }
public List<string> AllowedIndividuals { get; set; } = [];
public List<string> AllowedSyncshells { get; set; } = [];
[Key(0)] public Guid ShareId { get; set; }
[Key(1)] public string Description { get; set; } = string.Empty;
[Key(2)] public DateTime? ExpiresAtUtc { get; set; }
[Key(3)] public List<string> AllowedIndividuals { get; set; } = [];
[Key(4)] public List<string> AllowedSyncshells { get; set; } = [];
}

20
MareSynchronosAPI/Dto/McdfShare/McdfShareUploadRequestDto.cs
View File

@@ -1,17 +1,19 @@
using System;
using System.Collections.Generic;
using MessagePack;
namespace MareSynchronos.API.Dto.McdfShare;
[MessagePackObject]
public class McdfShareUploadRequestDto
{
public Guid ShareId { get; set; }
public string Description { get; set; } = string.Empty;
public byte[] CipherData { get; set; } = Array.Empty<byte>();
public byte[] Nonce { get; set; } = Array.Empty<byte>();
public byte[] Salt { get; set; } = Array.Empty<byte>();
public byte[] Tag { get; set; } = Array.Empty<byte>();
public DateTime? ExpiresAtUtc { get; set; }
public List<string> AllowedIndividuals { get; set; } = [];
public List<string> AllowedSyncshells { get; set; } = [];
[Key(0)] public Guid ShareId { get; set; }
[Key(1)] public string Description { get; set; } = string.Empty;
[Key(2)] public byte[] CipherData { get; set; } = Array.Empty<byte>();
[Key(3)] public byte[] Nonce { get; set; } = Array.Empty<byte>();
[Key(4)] public byte[] Salt { get; set; } = Array.Empty<byte>();
[Key(5)] public byte[] Tag { get; set; } = Array.Empty<byte>();
[Key(6)] public DateTime? ExpiresAtUtc { get; set; }
[Key(7)] public List<string> AllowedIndividuals { get; set; } = [];
[Key(8)] public List<string> AllowedSyncshells { get; set; } = [];
}

4
MareSynchronosAPI/Dto/User/TypingStateDto.cs
View File

@@ -1,11 +1,13 @@
using MareSynchronos.API.Data;
using MareSynchronos.API.Data.Enum;
using MessagePack;
namespace MareSynchronos.API.Dto.User;
[MessagePackObject(keyAsPropertyName: true)]
public record TypingStateDto(UserData User, bool IsTyping)
public record TypingStateDto(UserData User, bool IsTyping, TypingScope Scope)
{
public UserData User { get; set; } = User;
public bool IsTyping { get; set; } = IsTyping;
public TypingScope Scope { get; set; } = Scope;
}

1
MareSynchronosAPI/SignalR/IMareHub.cs
View File

@@ -131,6 +131,7 @@ public interface IMareHub
Task UserSetProfile(UserProfileDto userDescription);
Task UserSetTypingState(bool isTyping);
Task UserSetTypingState(bool isTyping, TypingScope scope);
Task<CharaDataFullDto?> CharaDataCreate();
Task<CharaDataFullDto?> CharaDataUpdate(CharaDataUpdateDto updateDto);
Task<bool> CharaDataDelete(string id);