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/GroupUserPreferredPermissions.cs

@@ -8,5 +8,4 @@ public enum GroupUserPreferredPermissions
     DisableAnimations = 0x2,
     DisableSounds = 0x4,
     DisableVFX = 0x8,
-    ShareLocation = 0x10,
 }

LightlessSyncAPI/Data/Enum/UserPermissions.cs

@@ -9,5 +9,4 @@ public enum UserPermissions
     DisableSounds = 4,
     DisableVFX = 8,
     Sticky = 16,
-    ShareLocation = 32
 }

LightlessSyncAPI/Data/Extensions/GroupUserPermissionsExtensions.cs

@@ -24,11 +24,6 @@ public static class GroupUserPermissionsExtensions
         return perm.HasFlag(GroupUserPreferredPermissions.Paused);
     }
 
-    public static bool IsSharingLocation(this GroupUserPreferredPermissions perm)
-    {
-        return perm.HasFlag(GroupUserPreferredPermissions.ShareLocation);
-    }
-
     public static void SetDisableAnimations(this ref GroupUserPreferredPermissions perm, bool set)
     {
         if (set) perm |= GroupUserPreferredPermissions.DisableAnimations;
@@ -52,10 +47,4 @@ public static class GroupUserPermissionsExtensions
         if (set) perm |= GroupUserPreferredPermissions.Paused;
         else perm &= ~GroupUserPreferredPermissions.Paused;
     }
-    
-    public static void SetShareLocation(this ref GroupUserPreferredPermissions perm, bool set)
-    {
-        if (set) perm |= GroupUserPreferredPermissions.ShareLocation;
-        else perm &= ~GroupUserPreferredPermissions.ShareLocation;
-    }
 }

LightlessSyncAPI/Data/Extensions/UserPermissionsExtensions.cs

@@ -28,10 +28,6 @@ public static class UserPermissionsExtensions
     {
         return perm.HasFlag(UserPermissions.Sticky);
     }
-    public static bool IsSharingLocation(this UserPermissions perm)
-    {
-        return perm.HasFlag(UserPermissions.ShareLocation);
-    }
 
     public static void SetDisableAnimations(this ref UserPermissions perm, bool set)
     {
@@ -62,10 +58,4 @@ public static class UserPermissionsExtensions
         if (sticky) perm |= UserPermissions.Sticky;
         else perm &= ~UserPermissions.Sticky;
     }
-    
-    public static void SetShareLocation(this ref UserPermissions perm, bool? set)
-    {
-        if (set == true) perm |= UserPermissions.ShareLocation;
-        else perm &= ~UserPermissions.ShareLocation;
-    }
 }

LightlessSyncAPI/Dto/Files/DownloadFileDto.cs

@@ -9,6 +9,8 @@ public record DownloadFileDto : ITransferFileDto
     public string Hash { get; set; } = string.Empty;
     public string Url { get; set; } = string.Empty;
     public string CDNDownloadUrl { get; set; } = string.Empty;
+    public List<string> HasFileDirectUrls { get; set; } = new();
+    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;

LightlessSyncAPI/Dto/User/LocationDto.cs

@@ -1,9 +0,0 @@
-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);

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/Routes/LightlessFiles.cs

@@ -25,6 +25,7 @@ public class LightlessFiles
 
     public const string Main = "/main";
     public const string Main_SendReady = "sendReady";
+    public const string Main_ShardFiles = "shardFiles";
 
     public const string Speedtest = "/speedtest";
     public const string Speedtest_Run = "run";
@@ -46,4 +47,5 @@ public class LightlessFiles
     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 MainShardFilesFullPath(Uri baseUri) => new(baseUri, Main + "/" + Main_ShardFiles);
 }

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -45,7 +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);
+    Task Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt);
 
     Task<ConnectionDto> GetConnectionDto();
     Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
@@ -118,6 +118,7 @@ public interface ILightlessHub
     Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
     
     Task UpdateLocation(LocationDto locationDto, bool offline);
-    Task<List<LocationDto>> RequestAllLocationInfo();
+    Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
+    Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
     
 }

LightlessSyncAPI/SignalR/ILightlessHubClient.cs

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