Lightless-Sync/LightlessAPI
8
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '1.12.0-server' (#6) from 1.12.0-server into main

Browse Source 
Reviewed-on: #6
This commit was merged in pull request #6.
This commit is contained in:
defnotken
2025-10-04 20:48:16 +02:00
parent a337481243 6c542c0ccc
commit 167508d27b
13 changed files with 111 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LightlessSyncAPI/Data/GroupData.cs
View File

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

11
LightlessSyncAPI/Data/UserData.cs
View File

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

3
LightlessSyncAPI/Dto/ConnectionDto.cs
View File

@@ -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();
}

11
LightlessSyncAPI/Dto/Group/GroupBroadcastRequestDto.cs Normal file
View File

@@ -0,0 +1,11 @@
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; }
}

12
LightlessSyncAPI/Dto/Group/GroupJoinHashedDto.cs Normal file
View File

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

1
LightlessSyncAPI/Dto/Group/GroupPairDto.cs
View File

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

6
LightlessSyncAPI/Dto/Group/GroupProfileDto.cs Normal file
View File

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

9
LightlessSyncAPI/Dto/User/BroadcastStatusBatchDto.cs Normal file
View File

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

12
LightlessSyncAPI/Dto/User/BroadcastStatusInfoDto.cs Normal file
View File

@@ -0,0 +1,12 @@
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; }
}

12
LightlessSyncAPI/Dto/User/BroadcastStatusRequestDto.cs Normal file
View File

@@ -0,0 +1,12 @@
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; }
}

10
LightlessSyncAPI/Dto/User/UserPairNotificationDto.cs Normal file
View File

@@ -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; }
}

6
LightlessSyncAPI/Dto/User/UserVanityColorsDto.cs Normal file
View File

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

20
LightlessSyncAPI/SignalR/ILightlessHub.cs
View File

@@ -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;
@@ -21,8 +21,10 @@ 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);
@@ -49,25 +51,39 @@ 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);
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<List<GroupFullInfoDto>> GroupsGetAll();
Task GroupUnbanUser(GroupPairDto groupPair);
Task<int> GroupPrune(GroupDto group, int days, bool execute);
Task UserAddPair(UserDto user);
Task TryPairWithContentId(string otherCid, string myCid);
Task SetBroadcastStatus(string hashedCid, 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 UserDelete();
Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto);
Task<List<UserFullPairDto>> UserGetPairedClients();
Task<UserProfileDto> UserGetProfile(UserDto dto);
Task UserPushData(UserCharaDataMessageDto dto);
Task UserUpdateVanityColors(UserVanityColorsDto dto);
Task UserRemovePair(UserDto userDto);
Task UserSetProfile(UserProfileDto userDescription);
Task UserUpdateDefaultPermissions(DefaultPermissionsDto defaultPermissionsDto);
@@ -88,4 +104,4 @@ public interface ILightlessHub
Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
Task GposeLobbyPushPoseData(PoseData poseData);
Task GposeLobbyPushWorldData(WorldData worldData);
}
}