9 Commits

Author SHA1 Message Date
defnotken
aec2a5023e remove created at for now 2025-09-25 10:25:12 -05:00
CakeAndBanana
69055b0f32 Change in groupfullinfo 2025-09-25 03:34:36 +02:00
CakeAndBanana
7abe2b1ef7 Changed GroupJoinDto 2025-09-25 02:03:41 +02:00
CakeAndBanana
848eb510ff Lightfinder merge into group changes 2025-09-24 15:04:02 +02:00
fd4cd52d2e lightfinder support, context pairing 2025-09-24 05:05:57 +09:00
CakeAndBanana
75aebca693 Added client sendback of profileDTO 2025-09-17 05:37:04 +02:00
CakeAndBanana
96744f4f28 Adding getprofile in interface. 2025-09-17 02:41:42 +02:00
CakeAndBanana
43be25cc45 Added get of group profile, removed group from model. redone group data. 2025-09-17 02:38:21 +02:00
CakeAndBanana
28e1cc4695 Added changes for the API to support profiles 2025-09-17 02:09:23 +02:00
11 changed files with 80 additions and 4 deletions

View File

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

View File

@@ -3,7 +3,7 @@
namespace LightlessSync.API.Data; namespace LightlessSync.API.Data;
[MessagePackObject(keyAsPropertyName: true)] [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)
{ {
[IgnoreMember] [IgnoreMember]
public string AliasOrUID => string.IsNullOrWhiteSpace(Alias) ? UID : Alias; public string AliasOrUID => string.IsNullOrWhiteSpace(Alias) ? UID : Alias;

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

View File

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

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
);

View File

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

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

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

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

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

View File

@@ -21,6 +21,7 @@ public interface ILightlessHub
Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto); Task Client_GroupPairJoined(GroupPairFullInfoDto groupPairInfoDto);
Task Client_GroupPairLeft(GroupPairDto groupPairDto); Task Client_GroupPairLeft(GroupPairDto groupPairDto);
Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo); Task Client_GroupSendFullInfo(GroupFullInfoDto groupInfo);
Task Client_GroupSendProfile (GroupProfileDto groupInfo);
Task Client_GroupSendInfo(GroupInfoDto groupInfo); Task Client_GroupSendInfo(GroupInfoDto groupInfo);
Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message); Task Client_ReceiveServerMessage(MessageSeverity messageSeverity, string message);
Task Client_UpdateSystemInfo(SystemInfoDto systemInfo); Task Client_UpdateSystemInfo(SystemInfoDto systemInfo);
@@ -55,14 +56,26 @@ public interface ILightlessHub
Task<List<BannedGroupUserDto>> GroupGetBannedUsers(GroupDto group); Task<List<BannedGroupUserDto>> GroupGetBannedUsers(GroupDto group);
Task<GroupJoinInfoDto> GroupJoin(GroupPasswordDto passwordedGroup); Task<GroupJoinInfoDto> GroupJoin(GroupPasswordDto passwordedGroup);
Task<bool> GroupJoinFinalize(GroupJoinDto passwordedGroup); Task<bool> GroupJoinFinalize(GroupJoinDto passwordedGroup);
Task<GroupJoinInfoDto> GroupJoinHashed(GroupJoinHashedDto dto);
Task GroupLeave(GroupDto group); Task GroupLeave(GroupDto group);
Task GroupRemoveUser(GroupPairDto groupPair); Task GroupRemoveUser(GroupPairDto groupPair);
Task<GroupProfileDto> GroupGetProfile(GroupDto dto);
Task GroupSetProfile(GroupProfileDto dto);
Task GroupSetUserInfo(GroupPairUserInfoDto groupPair); Task GroupSetUserInfo(GroupPairUserInfoDto groupPair);
Task<List<GroupFullInfoDto>> GroupsGetAll(); Task<List<GroupFullInfoDto>> GroupsGetAll();
Task GroupUnbanUser(GroupPairDto groupPair); Task GroupUnbanUser(GroupPairDto groupPair);
Task<int> GroupPrune(GroupDto group, int days, bool execute); Task<int> GroupPrune(GroupDto group, int days, bool execute);
Task UserAddPair(UserDto user); 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 UserDelete();
Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto); Task<List<OnlineUserIdentDto>> UserGetOnlinePairs(CensusDataDto? censusDataDto);
Task<List<UserFullPairDto>> UserGetPairedClients(); Task<List<UserFullPairDto>> UserGetPairedClients();