Merge pull request 'tag-changes' (#10) from tag-changes into main

Reviewed-on: #10
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>

LightlessSyncAPI/Data/UserData.cs

@@ -1,9 +1,16 @@
-using MessagePack;
+using MessagePack;
 
 namespace LightlessSync.API.Data;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record UserData(string UID, string? Alias = null, bool IsAdmin = false, bool IsModerator = false)
+public record UserData(
+    string UID,
+    string? Alias = null,
+    bool IsAdmin = false,
+    bool IsModerator = false,
+    bool HasVanity = false,
+    string? TextColorHex = "",
+    string? TextGlowColorHex = "")
 {
     [IgnoreMember]
     public string AliasOrUID => string.IsNullOrWhiteSpace(Alias) ? UID : Alias;

LightlessSyncAPI/Dto/ConnectionDto.cs

@@ -10,6 +10,9 @@ public record ConnectionDto(UserData User)
     public int ServerVersion { get; set; }
     public bool IsAdmin { get; set; }
     public bool IsModerator { get; set; }
+    public bool HasVanity { get; set; }
+    public string? TextColorHex { get; set; }
+    public string? TextGlowColorHex { get; set; }
     public ServerInfo ServerInfo { get; set; } = new();
     public DefaultPermissionsDto DefaultPreferredPermissions { get; set; } = new();
 }

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

@@ -8,4 +8,4 @@ namespace LightlessSync.API.Dto.Group;
 public record GroupPasswordDto(GroupData Group, string Password) : GroupDto(Group);
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record GroupJoinDto(GroupData Group, string Password, GroupUserPreferredPermissions GroupUserPreferredPermissions, bool Finder = false) : GroupPasswordDto(Group, Password);
+public record GroupJoinDto(GroupData Group, string Password, GroupUserPreferredPermissions GroupUserPreferredPermissions) : GroupPasswordDto(Group, Password);

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, int[]? Tags, string? PictureBase64, bool? IsNsfw, bool? IsDisabled) : GroupDto(Group);
 }

LightlessSyncAPI/Dto/User/UserPairNotificationDto.cs

@@ -0,0 +1,10 @@
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+
+[MessagePackObject(keyAsPropertyName: true)]
+public sealed class UserPairNotificationDto
+{
+    public required string myHashedCid { get; init; }
+    public required string message { get; init; }
+}

LightlessSyncAPI/Dto/User/UserProfileDto.cs

@@ -4,4 +4,4 @@ using MessagePack;
 namespace LightlessSync.API.Dto.User;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record UserProfileDto(UserData User, bool Disabled, bool? IsNSFW, string? ProfilePictureBase64, string? Description) : UserDto(User);
+public record UserProfileDto(UserData User, bool Disabled, bool? IsNSFW, string? ProfilePictureBase64, string? Description, int[]? Tags) : UserDto(User);

LightlessSyncAPI/Dto/User/UserVanityColorsDto.cs

@@ -0,0 +1,6 @@
+using MessagePack;
+
+namespace LightlessSync.API.Dto.User;
+
+[MessagePackObject(keyAsPropertyName: true)]
+public record UserVanityColorsDto(string? TextColorHex, string? TextGlowColorHex);

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

@@ -1,4 +1,4 @@
-using LightlessSync.API.Data;
+using LightlessSync.API.Data;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Dto;
 using LightlessSync.API.Dto.CharaData;
@@ -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();
@@ -24,6 +24,7 @@ public interface ILightlessHub
     Task Client_GroupSendProfile (GroupProfileDto groupInfo);
     Task Client_GroupSendInfo(GroupInfoDto groupInfo);
     Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message);
+    Task Client_ReceiveBroadcastPairRequest(UserPairNotificationDto dto);
     Task Client_UpdateSystemInfo(SystemInfoDto systemInfo);
     Task Client_UserAddClientPair(UserPairDto dto);
     Task Client_UserReceiveCharacterData(OnlineUserCharaDataDto dataDto);
@@ -50,6 +51,7 @@ public interface ILightlessHub
     Task GroupChangeOwnership(GroupPairDto groupPair);
     Task<bool> GroupChangePassword(GroupPasswordDto groupPassword);
     Task GroupClear(GroupDto group);
+    Task GroupClearFinder(GroupDto group);
     Task<GroupJoinDto> GroupCreate();
     Task<List<string>> GroupCreateTempInvite(GroupDto group, int amount);
     Task GroupDelete(GroupDto group);
@@ -67,20 +69,22 @@ 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<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);
     Task UserSetProfile(UserProfileDto userDescription);
     Task UserUpdateDefaultPermissions(DefaultPermissionsDto defaultPermissionsDto);
@@ -101,4 +105,4 @@ public interface ILightlessHub
     Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
     Task GposeLobbyPushPoseData(PoseData poseData);
     Task GposeLobbyPushWorldData(WorldData worldData);
-}
+}