24 Commits

Author SHA1 Message Date
4ecd5375e6 location (#20)
Co-authored-by: Tsubasahane <wozaiha@gmail.com>
Reviewed-on: #20
2025-12-31 14:12:11 +00:00
a802f242b0 Merge pull request 'location' (#19) from location into main
Reviewed-on: #19
2025-12-27 16:39:21 +00:00
Tsubasahane
fdd492a8f4 introduce InstanceId 2025-12-27 19:53:49 +08:00
Tsubasahane
9feb0b3c35 Location Sharing 2025-12-27 19:19:20 +08:00
56566003e0 Merge pull request 'chat disable perms added' (#18) from chat-disable-perms into main
Reviewed-on: #18
2025-12-22 02:27:31 +00:00
Abelfreyja
d78f9dafcc chat disable perms added 2025-12-22 10:25:42 +09:00
8e4432af45 Merge pull request 'bumped api version' (#17) from bump-api into main
Reviewed-on: #17
2025-12-19 15:30:57 +00:00
cake
d92496020e bumped api version 2025-12-19 07:11:22 +01:00
35f3390dda Merge pull request 'DTO adjustment for Chat' (#15) from chat-adjustment into main
Reviewed-on: #15
2025-12-18 21:17:38 +00:00
efc0ef09f9 move to net10 2025-12-18 05:06:06 +09:00
azyges
6b543529aa removes nasty resolve dto and method 2025-12-17 03:42:54 +09:00
dfb0594a5b Merge pull request 'Auto-pruning of syncshell DTO, Added group user count in FullInfo' (#14) from auto-prune-syncshell into main
Reviewed-on: #14
Reviewed-by: defnotken <defnotken@noreply.git.lightless-sync.org>
2025-12-09 05:31:30 +01:00
cake
8e7d7bf489 Revert DTO, Changed messagepackprotocol again. 2025-12-06 23:39:24 +01:00
cake
9b2fea6fa4 Updated DTO 2025-12-06 22:58:30 +01:00
cake
efb5a8072b Added MessagePackObject in dto. 2025-12-06 20:16:03 +01:00
cake
8ea337ab2d Fixed some problems. 2025-12-06 18:02:39 +01:00
cake
b1d7ee5b34 Auto-pruning of syncshell, added metrics for pruning, return of count of users in fullgroupdto. 2025-12-05 22:01:48 +01:00
0170ac377d Initial Chat Merge
Reviewed-on: #13
2025-11-11 18:56:38 +01:00
9d9e8e9be6 Merge branch 'main' into chat 2025-11-11 18:56:23 +01:00
3500db98c2 Merge pull request 'Initial Bot Cleanup + Profile Toggling' (#12) from bot-refactoring into main
Reviewed-on: #12
2025-11-11 18:46:49 +01:00
defnotken
cec110d972 Initial Bot Cleanup + Profile Toggling 2025-10-29 17:23:07 -05:00
azyges
bb88bea5aa revert api bump from testing 2025-10-29 07:55:17 +09:00
azyges
67cb24a069 i hate chats 2025-10-29 07:43:49 +09:00
bb92cd477d Merge pull request 'Added banner info' (#11) from banner-profile into main
Reviewed-on: #11
2025-10-21 22:47:27 +02:00
14 changed files with 175 additions and 22 deletions

View File

@@ -8,4 +8,5 @@ public enum GroupPermissions
PreferDisableSounds = 0x2,
DisableInvites = 0x4,
PreferDisableVFX = 0x8,
DisableChat = 0x10,
}

View File

@@ -24,6 +24,11 @@ public static class GroupPermissionsExtensions
return perm.HasFlag(GroupPermissions.PreferDisableVFX);
}
public static bool IsDisableChat(this GroupPermissions perm)
{
return perm.HasFlag(GroupPermissions.DisableChat);
}
public static void SetDisableInvites(this ref GroupPermissions perm, bool set)
{
if (set) perm |= GroupPermissions.DisableInvites;
@@ -47,4 +52,10 @@ public static class GroupPermissionsExtensions
if (set) perm |= GroupPermissions.PreferDisableVFX;
else perm &= ~GroupPermissions.PreferDisableVFX;
}
public static void SetDisableChat(this ref GroupPermissions perm, bool set)
{
if (set) perm |= GroupPermissions.DisableChat;
else perm &= ~GroupPermissions.DisableChat;
}
}

View File

@@ -59,6 +59,7 @@ public record struct LocationInfo
[Key(4)] public uint WardId { get; set; }
[Key(5)] public uint HouseId { get; set; }
[Key(6)] public uint RoomId { get; set; }
[Key(7)] public uint InstanceId { get; set; }
}
[MessagePackObject]

View File

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

View File

@@ -7,8 +7,9 @@ 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) : GroupInfoDto(Group, Owner, GroupPermissions)
Dictionary<string, GroupPairUserInfo> GroupPairUserInfos, int GroupUserCount) : GroupInfoDto(Group, Owner, GroupPermissions)
{
public GroupUserPreferredPermissions GroupUserPermissions { get; set; } = GroupUserPermissions;
public GroupPairUserInfo GroupUserInfo { get; set; } = GroupUserInfo;
public int GroupUserCount { get; set; } = GroupUserCount;
}

View File

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

View File

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

View File

@@ -0,0 +1,15 @@
using LightlessSync.API.Data;
using LightlessSync.API.Dto.CharaData;
using MessagePack;
namespace LightlessSync.API.Dto.User;
[MessagePackObject(keyAsPropertyName: true)]
public record LocationDto(UserData User, LocationInfo Location);
[MessagePackObject(keyAsPropertyName: true)]
public record LocationWithTimeDto(LocationDto LocationDto, DateTimeOffset ExpireAt);
[MessagePackObject(keyAsPropertyName: true)]
public record SharingStatusDto(UserData User, DateTimeOffset ExpireAt);

View File

@@ -0,0 +1,6 @@
using MessagePack;
namespace LightlessSync.API.Dto.User;
[MessagePackObject(keyAsPropertyName: true)]
public record LocationSharingToggleDto(List<string> users, DateTimeOffset duration);

View File

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

View File

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

View File

@@ -13,9 +13,12 @@ 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);

View File

@@ -1,6 +1,7 @@
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;
@@ -9,7 +10,7 @@ namespace LightlessSync.API.SignalR;
public interface ILightlessHub
{
const int ApiVersion = 34;
const int ApiVersion = 35;
const string Path = "/lightless";
Task<bool> CheckClientHealth();
@@ -43,8 +44,12 @@ 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 Client_SendLocationToClient(LocationDto locationDto, DateTimeOffset expireAt);
Task<ConnectionDto> GetConnectionDto();
Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
Task<IReadOnlyList<GroupChatChannelInfoDto>> GetGroupChatChannels();
Task GroupBanUser(GroupPairDto dto, string reason);
Task GroupChangeGroupPermissionState(GroupPermissionDto dto);
@@ -64,6 +69,8 @@ public interface ILightlessHub
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);
@@ -105,4 +112,13 @@ 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);
Task UpdateLocation(LocationDto locationDto, bool offline);
Task<(List<LocationWithTimeDto>, List<SharingStatusDto>)> RequestAllLocationInfo();
Task<bool> ToggleLocationSharing(LocationSharingToggleDto dto);
}

View File

@@ -58,4 +58,5 @@ public interface ILightlessHubClient : ILightlessHub
void OnGposeLobbyPushCharacterData(Action<CharaDataDownloadDto> act);
void OnGposeLobbyPushPoseData(Action<UserData, PoseData> act);
void OnGposeLobbyPushWorldData(Action<UserData, WorldData> act);
void OnReceiveLocation(Action<LocationDto, DateTimeOffset> act);
}