quick change

LightlessSyncAPI/Data/GroupData.cs

@@ -3,8 +3,8 @@
 namespace LightlessSync.API.Data;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record GroupData(string GID, string? Alias = null, DateTime? CreatedAt = null)
+public record GroupData(string GID, string? Alias = null)
 {
     [IgnoreMember]
-    public string AliasOrGID => Alias ?? GID;
+    public string AliasOrGID => string.IsNullOrWhiteSpace(Alias) ? GID : Alias;
 }

LightlessSyncAPI/Data/UserData.cs

@@ -1,16 +1,9 @@
-using MessagePack;
+using MessagePack;
 
 namespace LightlessSync.API.Data;
 
 [MessagePackObject(keyAsPropertyName: true)]
-public record UserData(
+public record UserData(string UID, string? Alias = null)
-    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/Chat/ChatDtos.cs

@@ -1,80 +0,0 @@
-using System;
-using System.Collections.Generic;
-using LightlessSync.API.Data;
-using LightlessSync.API.Dto.User;
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Chat;
-
-public enum ChatChannelType : byte
-{
-    Zone = 0,
-    Group = 1
-}
-
-public enum ChatSenderKind : byte
-{
-    Anonymous = 0,
-    IdentifiedUser = 1
-}
-
-[MessagePackObject]
-public readonly record struct ChatChannelDescriptor
-{
-    [Key(0)] public ChatChannelType Type { get; init; }
-    [Key(1)] public ushort WorldId { get; init; }
-    [Key(2)] public ushort ZoneId { get; init; }
-    [Key(3)] public string? CustomKey { get; init; }
-
-    public ChatChannelDescriptor WithNormalizedCustomKey() =>
-        this with { CustomKey = string.IsNullOrWhiteSpace(CustomKey) ? string.Empty : CustomKey };
-}
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatPresenceUpdateDto(ChatChannelDescriptor Channel, ushort TerritoryId, bool IsActive);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatSendRequestDto(ChatChannelDescriptor Channel, string Message);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatSenderDescriptor(
-    ChatSenderKind Kind,
-    string Token,
-    string? DisplayName,
-    string? HashedCid,
-    UserData? User,
-    bool CanResolveProfile);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatMessageDto(
-    ChatChannelDescriptor Channel,
-    ChatSenderDescriptor Sender,
-    string Message,
-    DateTime SentAtUtc,
-    string MessageId);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatReportSubmitDto(
-    ChatChannelDescriptor Channel,
-    string MessageId,
-    string Reason,
-    string? AdditionalContext);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ChatParticipantMuteRequestDto(
-    ChatChannelDescriptor Channel,
-    string Token,
-    bool Mute);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct ZoneChatChannelInfoDto(
-    ChatChannelDescriptor Channel,
-    string DisplayName,
-    IReadOnlyList<string> Territories);
-
-[MessagePackObject(keyAsPropertyName: true)]
-public readonly record struct GroupChatChannelInfoDto(
-    ChatChannelDescriptor Channel,
-    string DisplayName,
-    string GroupId,
-    bool IsOwner);

LightlessSyncAPI/Dto/ConnectionDto.cs

@@ -10,9 +10,6 @@ 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,7 +8,6 @@ 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/GroupBroadcastRequestDto.cs

@@ -1,11 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class GroupBroadcastRequestDto
-{
-    public required string GID { get; init; }
-    public string? HashedCID { get; set; }
-    public required bool Enabled { get; init; }
-}

LightlessSyncAPI/Dto/Group/GroupFullInfoDto.cs

@@ -7,9 +7,8 @@ namespace LightlessSync.API.Dto.Group;
 [MessagePackObject(keyAsPropertyName: true)]
 public record GroupFullInfoDto(GroupData Group, UserData Owner, GroupPermissions GroupPermissions,
     GroupUserPreferredPermissions GroupUserPermissions, GroupPairUserInfo GroupUserInfo,
-    Dictionary<string, GroupPairUserInfo> GroupPairUserInfos, int GroupUserCount) : GroupInfoDto(Group, Owner, GroupPermissions)
+    Dictionary<string, GroupPairUserInfo> GroupPairUserInfos) : GroupInfoDto(Group, Owner, GroupPermissions)
 {
     public GroupUserPreferredPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;
     public GroupPairUserInfo GroupUserInfo { get; set; } = GroupUserInfo;
-    public int GroupUserCount { get; set; } = GroupUserCount;
 }

LightlessSyncAPI/Dto/Group/GroupJoinHashedDto.cs

@@ -1,12 +0,0 @@
-using LightlessSync.API.Data;
-using LightlessSync.API.Data.Enum;
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record GroupJoinHashedDto(
-    GroupData Group,
-    string HashedPassword,
-    GroupUserPreferredPermissions GroupUserPreferredPermissions
-);

LightlessSyncAPI/Dto/Group/GroupPairDto.cs

@@ -9,5 +9,4 @@ public record GroupPairDto(GroupData Group, UserData User) : GroupDto(Group)
     public string UID => User.UID;
     public string? UserAlias => User.Alias;
     public string UserAliasOrUID => User.AliasOrUID;
-
 }

LightlessSyncAPI/Dto/Group/GroupProfileAvailabilityRequest.cs

@@ -1,6 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record GroupProfileAvailabilityRequest(string GID);

LightlessSyncAPI/Dto/Group/GroupProfileDto.cs

@@ -1,6 +0,0 @@
-using LightlessSync.API.Data;
-
-namespace LightlessSync.API.Dto.Group
-{
-    public record GroupProfileDto(GroupData Group, string? Description, int[]? Tags, string? PictureBase64, string? BannerBase64, bool? IsNsfw, bool? IsDisabled) : GroupDto(Group);
-}

LightlessSyncAPI/Dto/Group/GroupPruneSettingsDto.cs

@@ -1,7 +0,0 @@
-using LightlessSync.API.Data;
-using MessagePack;
-
-namespace LightlessSync.API.Dto.Group;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public record GroupPruneSettingsDto(GroupData Group, bool AutoPruneEnabled, int AutoPruneDays);

LightlessSyncAPI/Dto/User/BroadcastStatusBatchDto.cs

@@ -1,9 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class BroadcastStatusBatchDto
-{
-    public Dictionary<string, BroadcastStatusInfoDto> Results { get; init; } = new();
-}

LightlessSyncAPI/Dto/User/BroadcastStatusInfoDto.cs

@@ -1,12 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class BroadcastStatusInfoDto
-{
-    public required string HashedCID { get; init; }
-    public required bool IsBroadcasting { get; init; }
-    public TimeSpan? TTL { get; init; }
-    public string? GID { get; init; }
-}

LightlessSyncAPI/Dto/User/BroadcastStatusRequestDto.cs

@@ -1,12 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-
-[MessagePackObject(keyAsPropertyName: true)]
-public sealed class BroadcastStatusRequestDto
-{
-    public required string HashedCID { get; init; }
-    public required bool Enabled { get; init; }
-    public string? GID { get; init; }
-}
-

LightlessSyncAPI/Dto/User/UserPairNotificationDto.cs

@@ -1,10 +0,0 @@
-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/UserProfileAvailabilityRequest.cs

@@ -1,5 +0,0 @@
-using MessagePack;
-
-namespace LightlessSync.API.Dto.User;
-[MessagePackObject(keyAsPropertyName: true)]
-public record UserProfileAvailabilityRequest(string UID);

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? BannerPictureBase64, string? Description, int[]? Tags) : UserDto(User);
+public record UserProfileDto(UserData User, bool Disabled, bool? IsNSFW, string? ProfilePictureBase64, string? Description) : UserDto(User);

LightlessSyncAPI/Dto/User/UserVanityColorsDto.cs

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

LightlessSyncAPI/LightlessSync.API.csproj

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

LightlessSyncAPI/Routes/LightlessAuth.cs

@@ -13,12 +13,9 @@ public class LightlessAuth
     public const string OAuth_GetUIDs = "getUIDs";
     public const string OAuth_GetDiscordOAuthToken = "getDiscordOAuthToken";
     public const string User = "/user";
-    public const string Group = "/group";
     public const string User_Unban_Discord = "unbanDiscord";
     public const string User_Unban_Uid = "unbanUID";
     public const string Ban_Uid = "ban";
-    public const string Disable_Profile = "disableProfile";
-    public const string Enable_Profile = "enableProfile";
     public static Uri AuthFullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_CreateIdent);
     public static Uri AuthWithOauthFullPath(Uri baseUri) => new Uri(baseUri, OAuth + "/" + OAuth_CreateOAuth);
     public static Uri RenewTokenFullPath(Uri baseUri) => new Uri(baseUri, Auth + "/" + Auth_RenewToken);

LightlessSyncAPI/Routes/LightlessFiles.cs

@@ -18,7 +18,6 @@ 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";
@@ -42,7 +41,6 @@ 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,16 +1,15 @@
-using LightlessSync.API.Data;
+using LightlessSync.API.Data;
 using LightlessSync.API.Data.Enum;
 using LightlessSync.API.Dto;
-using LightlessSync.API.Dto.Chat;
 using LightlessSync.API.Dto.CharaData;
 using LightlessSync.API.Dto.Group;
 using LightlessSync.API.Dto.User;
 
 namespace LightlessSync.API.SignalR;
 
-public interface ILightlessHub
+public interface ILightlessHub
-{
+{
-    const int ApiVersion = 35;
+    const int ApiVersion = 33;
     const string Path = "/lightless";
 
     Task<bool> CheckClientHealth();
@@ -22,10 +21,8 @@ public interface ILightlessHub
     Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto);
     Task Client_GroupPairLeft(GroupPairDto groupPairDto);
     Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo);
-    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);
@@ -44,53 +41,33 @@ public interface ILightlessHub
     Task Client_GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
     Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
     Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
-    Task Client_ChatReceive(ChatMessageDto message);
 
     Task<ConnectionDto> GetConnectionDto();
-    Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
-    Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels();
 
     Task GroupBanUser(GroupPairDto dto, string reason);
     Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
     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);
     Task<List<BannedGroupUserDto>> GroupGetBannedUsers(GroupDto group);
     Task<GroupJoinInfoDto> GroupJoin(GroupPasswordDto passwordedGroup);
     Task<bool> GroupJoinFinalize(GroupJoinDto passwordedGroup);
-    Task<GroupJoinInfoDto> GroupJoinHashed(GroupJoinHashedDto dto);
     Task GroupLeave(GroupDto group);
     Task GroupRemoveUser(GroupPairDto groupPair);
-    Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
-    Task GroupSetProfile(GroupProfileDto dto);
     Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
-    Task<GroupPruneSettingsDto> GroupGetPruneSettings(GroupDto dto);
-    Task GroupSetPruneSettings(GroupPruneSettingsDto dto);
     Task<List<GroupFullInfoDto>> GroupsGetAll();
     Task GroupUnbanUser(GroupPairDto groupPair);
     Task<int> GroupPrune(GroupDto group, int days, bool execute);
 
     Task UserAddPair(UserDto user);
-    Task TryPairWithContentId(string otherCid);
-
-    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();
-
     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);
@@ -111,8 +88,4 @@ public interface ILightlessHub
     Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
     Task GposeLobbyPushPoseData(PoseData poseData);
     Task GposeLobbyPushWorldData(WorldData worldData);
-    Task UpdateChatPresence(ChatPresenceUpdateDto presence);
+}
-    Task SendChatMessage(ChatSendRequestDto request);
-    Task ReportChatMessage(ChatReportSubmitDto request);
-    Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
-}