9 Commits

11 changed files with 74 additions and 29 deletions

View File

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

View File

@@ -8,4 +8,5 @@ public enum GroupUserPreferredPermissions
DisableAnimations = 0x2,
DisableSounds = 0x4,
DisableVFX = 0x8,
ShareLocation = 0x10,
}

View File

@@ -9,4 +9,5 @@ public enum UserPermissions
DisableSounds = 4,
DisableVFX = 8,
Sticky = 16,
ShareLocation = 32
}

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

@@ -24,6 +24,11 @@ public static class GroupUserPermissionsExtensions
return perm.HasFlag(GroupUserPreferredPermissions.Paused);
}
public static bool IsSharingLocation(this GroupUserPreferredPermissions perm)
{
return perm.HasFlag(GroupUserPreferredPermissions.ShareLocation);
}
public static void SetDisableAnimations(this ref GroupUserPreferredPermissions perm, bool set)
{
if (set) perm |= GroupUserPreferredPermissions.DisableAnimations;
@@ -47,4 +52,10 @@ public static class GroupUserPermissionsExtensions
if (set) perm |= GroupUserPreferredPermissions.Paused;
else perm &= ~GroupUserPreferredPermissions.Paused;
}
public static void SetShareLocation(this ref GroupUserPreferredPermissions perm, bool set)
{
if (set) perm |= GroupUserPreferredPermissions.ShareLocation;
else perm &= ~GroupUserPreferredPermissions.ShareLocation;
}
}

View File

@@ -28,6 +28,10 @@ public static class UserPermissionsExtensions
{
return perm.HasFlag(UserPermissions.Sticky);
}
public static bool IsSharingLocation(this UserPermissions perm)
{
return perm.HasFlag(UserPermissions.ShareLocation);
}
public static void SetDisableAnimations(this ref UserPermissions perm, bool set)
{
@@ -58,4 +62,10 @@ public static class UserPermissionsExtensions
if (sticky) perm |= UserPermissions.Sticky;
else perm &= ~UserPermissions.Sticky;
}
public static void SetShareLocation(this ref UserPermissions perm, bool? set)
{
if (set == true) perm |= UserPermissions.ShareLocation;
else perm &= ~UserPermissions.ShareLocation;
}
}

View File

@@ -61,15 +61,10 @@ public readonly record struct ChatReportSubmitDto(
string? AdditionalContext);
[MessagePackObject(keyAsPropertyName: true)]
public readonly record struct ChatParticipantResolveRequestDto(
public readonly record struct ChatParticipantMuteRequestDto(
ChatChannelDescriptor Channel,
string Token);
[MessagePackObject(keyAsPropertyName: true)]
public readonly record struct ChatParticipantResolveResultDto(
ChatChannelDescriptor Channel,
ChatSenderDescriptor Sender,
UserProfileDto? Profile);
string Token,
bool Mute);
[MessagePackObject(keyAsPropertyName: true)]
public readonly record struct ZoneChatChannelInfoDto(

View File

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

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

@@ -10,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();
@@ -45,6 +45,7 @@ public interface ILightlessHub
Task Client_GposeLobbyPushPoseData(UserData userData, PoseData poseData);
Task Client_GposeLobbyPushWorldData(UserData userData, WorldData worldData);
Task Client_ChatReceive(ChatMessageDto message);
Task Client_SendLocationToClient(LocationDto locationDto);
Task<ConnectionDto> GetConnectionDto();
Task<IReadOnlyList<ZoneChatChannelInfoDto>> GetZoneChatChannels();
@@ -114,5 +115,9 @@ public interface ILightlessHub
Task UpdateChatPresence(ChatPresenceUpdateDto presence);
Task SendChatMessage(ChatSendRequestDto request);
Task ReportChatMessage(ChatReportSubmitDto request);
Task<ChatParticipantResolveResultDto?> ResolveChatParticipant(ChatParticipantResolveRequestDto request);
Task SetChatParticipantMute(ChatParticipantMuteRequestDto request);
Task UpdateLocation(LocationDto locationDto, bool offline);
Task<List<LocationDto>> RequestAllLocationInfo();
}

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 OnReciveLocation(Action<LocationDto> act);
}