expand dto with urls of shards that have or don't have the requested file

Co-authored-by: Tsubasahane <wozaiha@gmail.com>
Reviewed-on: #20

LightlessSyncAPI/Data/Enum/GroupPermissions.cs

@@ -1,11 +1,12 @@
 namespace LightlessSync.API.Data.Enum;
 
 [Flags]
-public enum GroupPermissions
+public enum GroupPermissions
-{
+{
-    NoneSet = 0x0,
+    NoneSet = 0x0,
-    PreferDisableAnimations = 0x1,
+    PreferDisableAnimations = 0x1,
-    PreferDisableSounds = 0x2,
+    PreferDisableSounds = 0x2,
-    DisableInvites = 0x4,
+    DisableInvites = 0x4,
-    PreferDisableVFX = 0x8,
+    PreferDisableVFX = 0x8,
+    DisableChat = 0x10,
 }

LightlessSyncAPI/Data/Extensions/GroupPermissionsExtensions.cs

@@ -19,11 +19,16 @@ public static class GroupPermissionsExtensions
         return perm.HasFlag(GroupPermissions.PreferDisableSounds);
     }
 
-    public static bool IsPreferDisableVFX(this GroupPermissions perm)
+    public static bool IsPreferDisableVFX(this GroupPermissions perm)
-    {
+    {
-        return perm.HasFlag(GroupPermissions.PreferDisableVFX);
+        return perm.HasFlag(GroupPermissions.PreferDisableVFX);
-    }
+    }
-
+
+    public static bool IsDisableChat(this GroupPermissions perm)
+    {
+        return perm.HasFlag(GroupPermissions.DisableChat);
+    }
+
     public static void SetDisableInvites(this ref GroupPermissions perm, bool set)
     {
         if (set) perm |= GroupPermissions.DisableInvites;
@@ -42,9 +47,15 @@ public static class GroupPermissionsExtensions
         else perm &= ~GroupPermissions.PreferDisableSounds;
     }
 
-    public static void SetPreferDisableVFX(this ref GroupPermissions perm, bool set)
+    public static void SetPreferDisableVFX(this ref GroupPermissions perm, bool set)
-    {
+    {
-        if (set) perm |= GroupPermissions.PreferDisableVFX;
+        if (set) perm |= GroupPermissions.PreferDisableVFX;
-        else perm &= ~GroupPermissions.PreferDisableVFX;
+        else perm &= ~GroupPermissions.PreferDisableVFX;
-    }
+    }
+
+    public static void SetDisableChat(this ref GroupPermissions perm, bool set)
+    {
+        if (set) perm |= GroupPermissions.DisableChat;
+        else perm &= ~GroupPermissions.DisableChat;
+    }
 }

LightlessSyncAPI/Dto/CharaData/CharaDataFullDto.cs

@@ -59,6 +59,7 @@ public record struct LocationInfo
     [Key(4)] public uint WardId { get; set; }
     [Key(5)] public uint HouseId { get; set; }
     [Key(6)] public uint RoomId { get; set; }
+    [Key(7)] public uint InstanceId { get; set; }
 }
 
 [MessagePackObject]

LightlessSyncAPI/Dto/Chat/ChatDtos.cs

@@ -61,15 +61,10 @@ public readonly record struct ChatReportSubmitDto(
     string? AdditionalContext);
 
 [MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatParticipantResolveRequestDto(
+public readonly record struct ChatParticipantMuteRequestDto(
     ChatChannelDescriptor Channel,
-    string Token);
+    string Token,
-
+    bool Mute);
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatParticipantResolveResultDto(
-    ChatChannelDescriptor Channel,
-    ChatSenderDescriptor Sender,
-    UserProfileDto? Profile);
 
 [MessagePackObject(keyAsPropertyName: true)]
 public readonly record struct ZoneChatChannelInfoDto(

LightlessSyncAPI/Dto/Files/DownloadFileDto.cs

@@ -5,12 +5,14 @@ namespace LightlessSync.API.Dto.Files;
 [MessagePackObject(keyAsPropertyName: true)]
 public record DownloadFileDto : ITransferFileDto
 {
-    public bool FileExists { get; set; } = true;
+    public bool FileExists { get; set; } = true;
-    public string Hash { get; set; } = string.Empty;
+    public string Hash { get; set; } = string.Empty;
-    public string Url { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
-    public string CDNDownloadUrl { get; set; } = string.Empty;
+    public string CDNDownloadUrl { get; set; } = string.Empty;
-    public long Size { get; set; } = 0;
+    public List<string> HasFileDirectUrls { get; set; } = new();
-    public bool IsForbidden { get; set; } = false;
+    public List<string> PullThroughDirectUrls { get; set; } = new();
+    public long Size { get; set; } = 0;
+    public bool IsForbidden { get; set; } = false;
     public string ForbiddenBy { get; set; } = string.Empty;
     public long RawSize { get; set; } = 0;
 }

LightlessSyncAPI/Dto/User/LocationSharingDto.cs

@@ -0,0 +1,15 @@
+using LightlessSync.API.Data;
+using LightlessSync.API.Dto.CharaData;
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record LocationDto(UserData User, LocationInfo Location);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record LocationWithTimeDto(LocationDto LocationDto, DateTimeOffset ExpireAt);
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record SharingStatusDto(UserData User, DateTimeOffset ExpireAt);

LightlessSyncAPI/Dto/User/LocationSharingToggleDto.cs

@@ -0,0 +1,6 @@
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record LocationSharingToggleDto(List<string> users, DateTimeOffset duration);

LightlessSyncAPI/LightlessSync.API.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

LightlessSyncAPI/Routes/LightlessFiles.cs

@@ -23,8 +23,9 @@ public class LightlessFiles
     public const string Distribution = "/dist";
     public const string Distribution_Get = "get";
 
-    public const string Main = "/main";
+    public const string Main = "/main";
-    public const string Main_SendReady = "sendReady";
+    public const string Main_SendReady = "sendReady";
+    public const string Main_ShardFiles = "shardFiles";
 
     public const string Speedtest = "/speedtest";
     public const string Speedtest_Run = "run";
@@ -45,5 +46,6 @@ public class LightlessFiles
     public static Uri ServerFilesDirectDownloadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_DirectDownload + "/" + hash);
     public static Uri DistributionGetFullPath(Uri baseUri, string hash) => new(baseUri, Distribution + "/" + Distribution_Get + "?file=" + hash);
     public static Uri SpeedtestRunFullPath(Uri baseUri) => new(baseUri, Speedtest + "/" + Speedtest_Run);
-    public static Uri MainSendReadyFullPath(Uri baseUri, string uid, Guid request) => new(baseUri, Main + "/" + Main_SendReady + "/" + "?uid=" + uid + "&requestId=" + request.ToString());
+    public static Uri MainSendReadyFullPath(Uri baseUri, string uid, Guid request) => new(baseUri, Main + "/" + Main_SendReady + "/" + "?uid=" + uid + "&requestId=" + request.ToString());
+    public static Uri MainShardFilesFullPath(Uri baseUri) => new(baseUri, Main + "/" + Main_ShardFiles);
 }

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -10,7 +10,7 @@ namespace LightlessSync.API.SignalR;
 
 public interface ILightlessHub
 {
-    const int ApiVersion = 34;
+    const int ApiVersion = 35;
     const string Path = "/lightless";
 
     Task<bool> CheckClientHealth();
@@ -45,6 +45,7 @@ public interface ILightlessHub
     Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
     Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
     Task Client_ChatReceive(ChatMessageDto message);
+    Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt);
 
     Task<ConnectionDto> GetConnectionDto();
     Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
@@ -114,5 +115,10 @@ public interface ILightlessHub
     Task UpdateChatPresence(ChatPresenceUpdateDto presence);
     Task SendChatMessage(ChatSendRequestDto request);
     Task ReportChatMessage(ChatReportSubmitDto request);
-    Task<ChatParticipantResolveResultDto?> ResolveChatParticipant(ChatParticipantResolveRequestDto request);
+    Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
+    
+    Task UpdateLocation(LocationDto locationDto, bool offline);
+    Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
+    Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
+    
 }

LightlessSyncAPI/SignalR/ILightlessHubClient.cs

@@ -58,4 +58,5 @@ public interface ILightlessHubClient : ILightlessHub
     void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act);
     void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act);
     void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act);
+    void OnReceiveLocation(Action<LocationDto, DateTimeOffset> act);
 }