23 Commits

Author SHA1 Message Date
azyges
fbbd311f18 lightfinder profiles 2025-10-16 23:51:40 +09:00
44fbe10458 LightFinder Changes + Adding LightSpeed
Reviewed-on: #7
2025-10-10 00:56:44 +02:00
4a0b6c3e4d Merge branch 'main' into lightfinder-rewrite 2025-10-10 00:55:37 +02:00
azyges
89ac34235d cdn url downloads 2025-10-10 07:36:34 +09:00
azyges
f3c6064892 update methods, bump api 2025-10-08 07:58:29 +09:00
167508d27b Merge pull request '1.12.0-server' (#6) from 1.12.0-server into main
Reviewed-on: #6
2025-10-04 20:48:16 +02:00
azyges
6c542c0ccc pair notification method + dto 2025-10-02 09:16:40 +09:00
azyges
69f0e310bd nullable dto 2025-09-29 04:57:07 +09:00
azyges
5bfd21aaa9 update connection dto 2025-09-26 23:40:44 +09:00
azyges
b85b54f560 vanity color dto, method 2025-09-26 18:52:35 +09:00
azyges
eb04433427 include vanity and colors 2025-09-26 17:59:11 +09:00
azyges
3c10380162 clear lightfinder joiners 2025-09-26 04:31:43 +09:00
d62adbb5b6 Merge pull request 'API Group changes' (#5) from api-groups-changes into 1.12.0-server
Reviewed-on: #5
2025-09-25 17:54:26 +02:00
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
a337481243 Unban work (#1)
Co-authored-by: defnotken <itsdefnotken@gmail.com>
Reviewed-on: #1
2025-09-06 00:14:27 +02:00
18 changed files with 134 additions and 7 deletions

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

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;

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

View File

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

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

@@ -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? UserAlias => User.Alias;
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,5 @@
using MessagePack;
namespace LightlessSync.API.Dto.User;
[MessagePackObject(keyAsPropertyName: true)]
public record BanRequest(string Uid);

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

@@ -0,0 +1,9 @@
using MessagePack;
namespace LightlessSync.API.Dto.User;
[MessagePackObject(keyAsPropertyName: true)]
public record UnbanRequest(string? Uid, string? DiscordId)
{
public bool IsValid => !string.IsNullOrEmpty(Uid) || !string.IsNullOrEmpty(DiscordId);
}

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

View File

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

View File

@@ -12,6 +12,10 @@ public class LightlessAuth
public const string OAuth_GetDiscordOAuthEndpoint = "getDiscordOAuthEndpoint";
public const string OAuth_GetUIDs = "getUIDs";
public const string OAuth_GetDiscordOAuthToken = "getDiscordOAuthToken";
public const string User = "/user";
public const string User_Unban_Discord = "unbanDiscord";
public const string User_Unban_Uid = "unbanUID";
public const string Ban_Uid = "ban";
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);

View File

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

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;
@@ -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();
@@ -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,40 @@ 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);
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);
@@ -88,4 +105,4 @@ public interface ILightlessHub
Task GposeLobbyPushCharacterData(CharaDataDownloadDto charaDownloadDto);
Task GposeLobbyPushPoseData(PoseData poseData);
Task GposeLobbyPushWorldData(WorldData worldData);
}
}