Merge pull request 'location' (#19) from location into main

Reviewed-on: #19
This commit was merged in pull request #19.
This commit is contained in:
2025-12-27 16:39:21 +00:00
8 changed files with 46 additions and 7 deletions

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

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

@@ -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();
@@ -115,4 +116,8 @@ public interface ILightlessHub
Task SendChatMessage(ChatSendRequestDto request);
Task ReportChatMessage(ChatReportSubmitDto 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);
}