Merge branch 'main' into group-dto-changes

Reviewed-on: #8

LightlessSyncAPI/Dto/Files/DownloadFileDto.cs

@@ -8,6 +8,7 @@ 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 long Size { get; set; } = 0;
     public bool IsForbidden { get; set; } = false;
     public string ForbiddenBy { get; set; } = string.Empty;

LightlessSyncAPI/Dto/Group/GroupProfileDto.cs

@@ -2,5 +2,5 @@
 
 namespace LightlessSync.API.Dto.Group
 {
-    public record GroupProfileDto(GroupData Group, string? Description, string? Tags, string? PictureBase64) : GroupDto(Group);
+    public record GroupProfileDto(GroupData Group, string? Description, string? Tags, string? PictureBase64, bool? IsNsfw, bool? IsDisabled) : GroupDto(Group);
 }

LightlessSyncAPI/Routes/LightlessFiles.cs

@@ -18,6 +18,7 @@ public class LightlessFiles
     public const string ServerFiles_Upload = "upload";
     public const string ServerFiles_UploadMunged = "uploadMunged";
     public const string ServerFiles_DownloadServers = "downloadServers";
+    public const string ServerFiles_DirectDownload = "direct";
 
     public const string Distribution = "/dist";
     public const string Distribution_Get = "get";
@@ -41,6 +42,7 @@ public class LightlessFiles
     public static Uri ServerFilesUploadFullPath(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_Upload + "/" + hash);
     public static Uri ServerFilesUploadMunged(Uri baseUri, string hash) => new(baseUri, ServerFiles + "/" + ServerFiles_UploadMunged + "/" + hash);
     public static Uri ServerFilesGetDownloadServersFullPath(Uri baseUri) => new(baseUri, ServerFiles + "/" + ServerFiles_DownloadServers);
+    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());

LightlessSyncAPI/SignalR/ILightlessHub.cs

@@ -9,7 +9,7 @@ namespace LightlessSync.API.SignalR;
 
 public interface ILightlessHub
 {
-    const int ApiVersion = 33;
+    const int ApiVersion = 34;
     const string Path = "/lightless";
 
     Task<bool> CheckClientHealth();
@@ -69,19 +69,20 @@ public interface ILightlessHub
     Task<int> GroupPrune(GroupDto group, int days, bool execute);
 
     Task UserAddPair(UserDto user);
-    Task TryPairWithContentId(string otherCid, string myCid);
+    Task TryPairWithContentId(string otherCid);
 
-    Task SetBroadcastStatus(string hashedCid, bool enabled, GroupBroadcastRequestDto? groupDto = null);
+    Task SetBroadcastStatus(bool enabled, GroupBroadcastRequestDto? groupDto = null);
     Task<bool> SetGroupBroadcastStatus(GroupBroadcastRequestDto dto);
     Task<List<GroupJoinDto>> GetBroadcastedGroups(List<BroadcastStatusInfoDto> broadcastEntries);
     Task<BroadcastStatusInfoDto?> IsUserBroadcasting(string hashedCid);
     Task<BroadcastStatusBatchDto?> AreUsersBroadcasting(List<string> hashedCids);
-    Task<TimeSpan?> GetBroadcastTtl(string hashedCid);
+    Task<TimeSpan?> GetBroadcastTtl();
 
     Task UserDelete();
     Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto);
     Task<List<UserFullPairDto>> UserGetPairedClients();
     Task<UserProfileDto> UserGetProfile(UserDto dto);
+    Task<UserProfileDto?> UserGetLightfinderProfile(string hashedCid);
     Task UserPushData(UserCharaDataMessageDto dto);
     Task UserUpdateVanityColors(UserVanityColorsDto dto);
     Task UserRemovePair(UserDto userDto);