Merge remote-tracking branch 'origin/main'

MareSynchronosAPI/Data/Enum/TypingScope.cs

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

MareSynchronosAPI/Dto/Group/SyncshellDiscoveryVisibilityRequestDto.cs

@@ -7,4 +7,10 @@ public sealed record SyncshellDiscoveryVisibilityRequestDto
 {
     public string GID { get; init; } = string.Empty;
     public bool AutoDetectVisible { get; init; }
+    
+    public int? DisplayDurationHours { get; init; }
+    public int[]? ActiveWeekdays { get; init; }
+    public string? TimeStartLocal { get; init; }
+    public string? TimeEndLocal { get; init; }
+    public string? TimeZone { get; init; }
 }

MareSynchronosAPI/Dto/McdfShare/McdfShareEntryDto.cs

@@ -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; }
+    [Key(0)] public Guid Id { get; set; }
-    public string Description { get; set; } = string.Empty;
+    [Key(1)] public string Description { get; set; } = string.Empty;
-    public DateTime CreatedUtc { get; set; }
+    [Key(2)] public DateTime CreatedUtc { get; set; }
-    public DateTime? UpdatedUtc { get; set; }
+    [Key(3)] public DateTime? UpdatedUtc { get; set; }
-    public DateTime? ExpiresAtUtc { get; set; }
+    [Key(4)] public DateTime? ExpiresAtUtc { get; set; }
-    public bool IsOwner { get; set; }
+    [Key(5)] public bool IsOwner { get; set; }
-    public string OwnerUid { get; set; } = string.Empty;
+    [Key(6)] public string OwnerUid { get; set; } = string.Empty;
-    public string OwnerAlias { get; set; } = string.Empty;
+    [Key(7)] public string OwnerAlias { get; set; } = string.Empty;
-    public int DownloadCount { get; set; }
+    [Key(8)] public int DownloadCount { get; set; }
-    public List<string> AllowedIndividuals { get; set; } = [];
+    [Key(9)] public List<string> AllowedIndividuals { get; set; } = [];
-    public List<string> AllowedSyncshells { get; set; } = [];
+    [Key(10)] public List<string> AllowedSyncshells { get; set; } = [];
 }

MareSynchronosAPI/Dto/McdfShare/McdfSharePayloadDto.cs

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

MareSynchronosAPI/Dto/McdfShare/McdfShareUpdateRequestDto.cs

@@ -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; }
+    [Key(0)] public Guid ShareId { get; set; }
-    public string Description { get; set; } = string.Empty;
+    [Key(1)] public string Description { get; set; } = string.Empty;
-    public DateTime? ExpiresAtUtc { get; set; }
+    [Key(2)] public DateTime? ExpiresAtUtc { get; set; }
-    public List<string> AllowedIndividuals { get; set; } = [];
+    [Key(3)] public List<string> AllowedIndividuals { get; set; } = [];
-    public List<string> AllowedSyncshells { get; set; } = [];
+    [Key(4)] public List<string> AllowedSyncshells { get; set; } = [];
 }

MareSynchronosAPI/Dto/McdfShare/McdfShareUploadRequestDto.cs

@@ -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; }
+    [Key(0)] public Guid ShareId { get; set; }
-    public string Description { get; set; } = string.Empty;
+    [Key(1)] public string Description { get; set; } = string.Empty;
-    public byte[] CipherData { get; set; } = Array.Empty<byte>();
+    [Key(2)] public byte[] CipherData { get; set; } = Array.Empty<byte>();
-    public byte[] Nonce { get; set; } = Array.Empty<byte>();
+    [Key(3)] public byte[] Nonce { get; set; } = Array.Empty<byte>();
-    public byte[] Salt { get; set; } = Array.Empty<byte>();
+    [Key(4)] public byte[] Salt { get; set; } = Array.Empty<byte>();
-    public byte[] Tag { get; set; } = Array.Empty<byte>();
+    [Key(5)] public byte[] Tag { get; set; } = Array.Empty<byte>();
-    public DateTime? ExpiresAtUtc { get; set; }
+    [Key(6)] public DateTime? ExpiresAtUtc { get; set; }
-    public List<string> AllowedIndividuals { get; set; } = [];
+    [Key(7)] public List<string> AllowedIndividuals { get; set; } = [];
-    public List<string> AllowedSyncshells { get; set; } = [];
+    [Key(8)] public List<string> AllowedSyncshells { get; set; } = [];
 }

MareSynchronosAPI/Dto/User/TypingStateDto.cs

@@ -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;
 }

MareSynchronosAPI/MareSynchronos.API.csproj

@@ -4,6 +4,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <NoWarn>$(NoWarn);NU1900</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

MareSynchronosAPI/SignalR/IMareHub.cs

@@ -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);