transfer LocationWithTimeDto

LightlessSyncAPI/Data/Enum/UserPermissions.cs

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

LightlessSyncAPI/Data/Extensions/UserPermissionsExtensions.cs

@@ -28,6 +28,10 @@ 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)
     {
@@ -58,4 +62,10 @@ 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

@@ -5,14 +5,12 @@ namespace LightlessSync.API.Dto.Files;
 [MessagePackObject(keyAsPropertyName: true)]
 public record DownloadFileDto : ITransferFileDto
 {
-    public bool FileExists { get; set; } = true;
-    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 bool FileExists { get; set; } = true;
+    public string Hash { get; set; } = string.Empty;
+    public string Url { get; set; } = string.Empty;
+    public string CDNDownloadUrl { get; set; } = string.Empty;
+    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

@@ -9,7 +9,4 @@ namespace LightlessSync.API.Dto.User;
 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);
+public record LocationWithTimeDto(LocationDto Location, DateTimeOffset ExpireAt);

LightlessSyncAPI/Routes/LightlessFiles.cs

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

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -118,7 +118,7 @@ public interface ILightlessHub
     Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
     
     Task UpdateLocation(LocationDto locationDto, bool offline);
-    Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
-    Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
+    Task<List<LocationWithTimeDto>> RequestAllLocationInfo();
+    Task 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 OnReceiveLocation(Action<LocationDto, DateTimeOffset> act);
+    void OnReciveLocation(Action<LocationDto> act);
 }